merge main

frontend/src/components/navigation/NavHeader.tsx

@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Link, useParams } from "@tanstack/react-router";
 import { twMerge } from "tailwind-merge";
 
-import { useOrganization, useWorkspace } from "@app/context";
+import { useOrganization, useProject } from "@app/context";
 import { useToggle } from "@app/hooks";
 
 import { createNotification } from "../notifications";
@@ -51,7 +51,7 @@ export default function NavHeader({
   isProtectedBranch = false,
   protectionPolicyName
 }: Props): JSX.Element {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { currentOrg } = useOrganization();
 
   const [isCopied, { timedToggle: toggleIsCopied }] = useToggle(false);
@@ -79,7 +79,7 @@ export default function NavHeader({
         <>
           <FontAwesomeIcon icon={faAngleRight} className="ml-3 mr-3 text-xs text-gray-400" />
           <div className="truncate text-sm font-semibold text-bunker-300">
-            {currentWorkspace?.name}
+            {currentProject?.name}
           </div>
         </>
       )}
@@ -93,7 +93,7 @@ export default function NavHeader({
       {pageName === "Secrets" ? (
         <Link
           to="/projects/secret-management/$projectId/overview"
-          params={{ projectId: currentWorkspace.id }}
+          params={{ projectId: currentProject.id }}
           className="text-sm font-semibold text-primary/80 hover:text-primary"
         >
           {pageName}
@@ -129,7 +129,7 @@ export default function NavHeader({
           <FontAwesomeIcon icon={faAngleRight} className="ml-3 mr-1.5 text-xs text-gray-400" />
           <Link
             to="/projects/secret-management/$projectId/secrets/$envSlug"
-            params={{ projectId: currentWorkspace.id, envSlug: routerEnvSlug }}
+            params={{ projectId: currentProject.id, envSlug: routerEnvSlug }}
             className="text-sm font-semibold text-primary/80 hover:text-primary"
           >
             {userAvailableEnvs?.find(({ slug }) => slug === currentEnv)?.name}
@@ -192,7 +192,7 @@ export default function NavHeader({
                 <Link
                   to="/projects/secret-management/$projectId/secrets/$envSlug"
                   params={{
-                    projectId: currentWorkspace.id,
+                    projectId: currentProject.id,
                     envSlug: routerEnvSlug || ""
                   }}
                   search={(query) => ({ ...query, secretPath: newSecretPath })}

frontend/src/components/permissions/AccessTree/hooks/index.ts

@@ -3,7 +3,7 @@ import { useFormContext, useWatch } from "react-hook-form";
 import { MongoAbility, MongoQuery } from "@casl/ability";
 import { Edge, Node, useEdgesState, useNodesState } from "@xyflow/react";
 
-import { ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionSub, useProject } from "@app/context";
 import { ProjectPermissionSet } from "@app/context/ProjectPermissionContext";
 import { useListProjectEnvironmentsFolders } from "@app/hooks/api/secretFolders/queries";
 import { TSecretFolderWithPath } from "@app/hooks/api/secretFolders/types";
@@ -36,15 +36,15 @@ export const useAccessTree = (
   searchPath: string,
   subject: ProjectPermissionSub
 ) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { secretName, setSecretName, setViewMode, viewMode } = useAccessTreeContext();
   const { control } = useFormContext<AccessTreeForm>();
   const metadata = useWatch({ control, name: "metadata" });
   const [nodes, setNodes] = useNodesState<Node>([]);
   const [edges, setEdges] = useEdgesState<Edge>([]);
-  const [environment, setEnvironment] = useState(currentWorkspace.environments[0]?.slug ?? "");
+  const [environment, setEnvironment] = useState(currentProject.environments[0]?.slug ?? "");
   const { data: environmentsFolders, isPending } = useListProjectEnvironmentsFolders(
-    currentWorkspace.id
+    currentProject.id
   );
 
   const [levelFolderMap, setLevelFolderMap] = useState<LevelFolderMap>({});
@@ -279,7 +279,7 @@ export const useAccessTree = (
     environment,
     setEnvironment,
     isLoading: isPending,
-    environments: currentWorkspace.environments,
+    environments: currentProject.environments,
     secretName,
     setSecretName,
     viewMode,

frontend/src/components/project/ProjectOverviewChangeSection.tsx

@@ -6,7 +6,7 @@ import { z } from "zod";
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import { Button, FormControl, Input, TextArea } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { useUpdateProject } from "@app/hooks/api";
 
 const baseFormSchema = z.object({
@@ -37,35 +37,35 @@ type Props = {
 };
 
 export const ProjectOverviewChangeSection = ({ showSlugField = false }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { mutateAsync, isPending } = useUpdateProject();
   const { handleSubmit, control, reset, watch } = useForm<BaseFormData | FormDataWithSlug>({
     resolver: zodResolver(showSlugField ? formSchemaWithSlug : baseFormSchema)
   });
 
-  const currentSlug = showSlugField ? watch("slug") : currentWorkspace?.slug;
+  const currentSlug = showSlugField ? watch("slug") : currentProject?.slug;
 
   useEffect(() => {
-    if (currentWorkspace) {
+    if (currentProject) {
       reset({
-        name: currentWorkspace.name,
-        description: currentWorkspace.description ?? "",
-        ...(showSlugField && { slug: currentWorkspace.slug })
+        name: currentProject.name,
+        description: currentProject.description ?? "",
+        ...(showSlugField && { slug: currentProject.slug })
       });
     }
-  }, [currentWorkspace, showSlugField]);
+  }, [currentProject, showSlugField]);
 
   const onFormSubmit = async (data: BaseFormData | FormDataWithSlug) => {
     try {
-      if (!currentWorkspace?.id) return;
+      if (!currentProject?.id) return;
 
       await mutateAsync({
-        projectID: currentWorkspace.id,
+        projectId: currentProject.id,
         newProjectName: data.name,
         newProjectDescription: data.description,
         ...(showSlugField &&
           "slug" in data && {
-            newSlug: data.slug !== currentWorkspace.slug ? data.slug : undefined
+            newSlug: data.slug !== currentProject.slug ? data.slug : undefined
           })
       });
 
@@ -105,7 +105,7 @@ export const ProjectOverviewChangeSection = ({ showSlugField = false }: Props) =
             variant="outline_bg"
             size="sm"
             onClick={() => {
-              navigator.clipboard.writeText(currentWorkspace?.id || "");
+              navigator.clipboard.writeText(currentProject?.id || "");
               createNotification({
                 text: "Copied project ID to clipboard",
                 type: "success"

frontend/src/components/projects/NewProjectModal.tsx

@@ -34,10 +34,10 @@ import {
   useUser
 } from "@app/context";
 import { getProjectHomePage, getProjectLottieIcon } from "@app/helpers/project";
-import { useCreateWorkspace, useGetExternalKmsList, useGetUserWorkspaces } from "@app/hooks/api";
+import { useCreateWorkspace, useGetExternalKmsList, useGetUserProjects } from "@app/hooks/api";
 import { INTERNAL_KMS_KEY_ID } from "@app/hooks/api/kms/types";
+import { ProjectType } from "@app/hooks/api/projects/types";
 import { InfisicalProjectTemplate, useListProjectTemplates } from "@app/hooks/api/projectTemplates";
-import { ProjectType } from "@app/hooks/api/workspace/types";
 
 const formSchema = z.object({
   name: z.string().trim().min(1, "Required").max(64, "Too long, maximum length is 64 characters"),
@@ -89,7 +89,7 @@ const NewProjectForm = ({ onOpenChange }: NewProjectFormProps) => {
   const { permission } = useOrgPermission();
   const { user } = useUser();
   const createWs = useCreateWorkspace();
-  const { refetch: refetchWorkspaces } = useGetUserWorkspaces();
+  const { refetch: refetchWorkspaces } = useGetUserProjects();
   const { subscription } = useSubscription();
 
   const canReadProjectTemplates = permission.can(

frontend/src/components/projects/RequestProjectAccessModal.tsx

@@ -3,7 +3,7 @@ import { useForm } from "react-hook-form";
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input, Modal, ModalClose, ModalContent } from "@app/components/v2";
 import { useRequestProjectAccess } from "@app/hooks/api";
-import { Workspace } from "@app/hooks/api/workspace/types";
+import { Project } from "@app/hooks/api/projects/types";
 
 type ContentProps = {
   projectId: string;
@@ -57,7 +57,7 @@ const Content = ({ projectId, onComplete }: ContentProps) => {
 type RequestProjectAccessModalProps = {
   isOpen: boolean;
   onOpenChange: (isOpen: boolean) => void;
-  project?: Workspace;
+  project?: Project;
   onComplete?: () => void;
 };
 

frontend/src/components/secret-rotations-v2/CreateSecretRotationV2Modal.tsx

@@ -8,13 +8,13 @@ import { TSecretRotationV2Form } from "@app/components/secret-rotations-v2/forms
 import { SecretRotationV2ModalHeader } from "@app/components/secret-rotations-v2/SecretRotationV2ModalHeader";
 import { SecretRotationV2Select } from "@app/components/secret-rotations-v2/SecretRotationV2Select";
 import { Modal, ModalContent } from "@app/components/v2";
+import { ProjectEnv } from "@app/hooks/api/projects/types";
 import { SecretRotation, TSecretRotationV2 } from "@app/hooks/api/secretRotationsV2";
-import { WorkspaceEnv } from "@app/hooks/api/workspace/types";
 
 type SharedProps = {
   secretPath: string;
   environment?: string;
-  environments?: WorkspaceEnv[];
+  environments?: ProjectEnv[];
 };
 
 type Props = {

frontend/src/components/secret-rotations-v2/forms/SecretRotationV2ConfigurationFields.tsx

@@ -9,14 +9,14 @@ import {
   IS_ROTATION_DUAL_CREDENTIALS,
   SECRET_ROTATION_MAP
 } from "@app/helpers/secretRotationsV2";
-import { WorkspaceEnv } from "@app/hooks/api/workspace/types";
+import { ProjectEnv } from "@app/hooks/api/projects/types";
 
 import { TSecretRotationV2Form } from "./schemas";
 import { SecretRotationV2ConnectionField } from "./SecretRotationV2ConnectionField";
 
 type Props = {
   isUpdate: boolean;
-  environments?: WorkspaceEnv[];
+  environments?: ProjectEnv[];
 };
 
 export const SecretRotationV2ConfigurationFields = ({ isUpdate, environments }: Props) => {

frontend/src/components/secret-rotations-v2/forms/SecretRotationV2ConnectionField.tsx

@@ -5,7 +5,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { AppConnectionOption } from "@app/components/app-connections";
 import { FilterableSelect, FormControl } from "@app/components/v2";
-import { ProjectPermissionSub, useProjectPermission, useWorkspace } from "@app/context";
+import { ProjectPermissionSub, useProject, useProjectPermission } from "@app/context";
 import { ProjectPermissionAppConnectionActions } from "@app/context/ProjectPermissionContext/types";
 import { APP_CONNECTION_MAP } from "@app/helpers/appConnections";
 import { SECRET_ROTATION_CONNECTION_MAP } from "@app/helpers/secretRotationsV2";
@@ -29,11 +29,11 @@ export const SecretRotationV2ConnectionField = ({ onChange: callback, isUpdate }
   const rotationType = watch("type");
   const app = SECRET_ROTATION_CONNECTION_MAP[rotationType];
 
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
 
   const { data: availableConnections, isPending } = useListAvailableAppConnections(
     app,
-    currentWorkspace.id
+    currentProject.id
   );
 
   const connectionName = APP_CONNECTION_MAP[app].name;
@@ -117,8 +117,8 @@ export const SecretRotationV2ConnectionField = ({ onChange: callback, isUpdate }
           localStorage.removeItem("secretRotationFormData");
           handlePopUpToggle("addConnection", isOpen);
         }}
-        projectType={currentWorkspace.type}
-        projectId={currentWorkspace.id}
+        projectType={currentProject.type}
+        projectId={currentProject.id}
         app={app}
         onComplete={(connection) => {
           if (connection) {

frontend/src/components/secret-rotations-v2/forms/SecretRotationV2Form.tsx

@@ -11,8 +11,9 @@ import { SecretRotationV2ParametersFields } from "@app/components/secret-rotatio
 import { SecretRotationV2ReviewFields } from "@app/components/secret-rotations-v2/forms/SecretRotationV2ReviewFields";
 import { SecretRotationV2SecretsMappingFields } from "@app/components/secret-rotations-v2/forms/SecretRotationV2SecretsMappingFields";
 import { Button } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { IS_ROTATION_DUAL_CREDENTIALS, SECRET_ROTATION_MAP } from "@app/helpers/secretRotationsV2";
+import { ProjectEnv } from "@app/hooks/api/projects/types";
 import {
   SecretRotation,
   TSecretRotationV2,
@@ -22,7 +23,6 @@ import {
   useCreateSecretRotationV2,
   useUpdateSecretRotationV2
 } from "@app/hooks/api/secretRotationsV2/mutations";
-import { WorkspaceEnv } from "@app/hooks/api/workspace/types";
 
 import { SecretRotationV2FormSchema, TSecretRotationV2Form } from "./schemas";
 
@@ -32,7 +32,7 @@ type Props = {
   onCancel: () => void;
   secretPath: string;
   environment?: string;
-  environments?: WorkspaceEnv[];
+  environments?: ProjectEnv[];
   secretRotation?: TSecretRotationV2;
   initialFormData?: Partial<TSecretRotationV2Form>;
 };
@@ -70,7 +70,7 @@ export const SecretRotationV2Form = ({
 }: Props) => {
   const createSecretRotation = useCreateSecretRotationV2();
   const updateSecretRotation = useUpdateSecretRotationV2();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { name: rotationType } = SECRET_ROTATION_MAP[type];
 
   const [selectedTabIndex, setSelectedTabIndex] = useState(0);
@@ -82,7 +82,7 @@ export const SecretRotationV2Form = ({
     defaultValues: secretRotation
       ? {
           ...secretRotation,
-          environment: currentWorkspace?.environments.find((env) => env.slug === envSlug),
+          environment: currentProject?.environments.find((env) => env.slug === envSlug),
           secretPath
         }
       : {
@@ -93,7 +93,7 @@ export const SecretRotationV2Form = ({
             hours: 0,
             minutes: 0
           },
-          environment: currentWorkspace?.environments.find((env) => env.slug === envSlug),
+          environment: currentProject?.environments.find((env) => env.slug === envSlug),
           secretPath,
           ...((rotationOption?.template as object) ?? {}), // can't infer type since we don't know which specific type it is
           ...(initialFormData as object)
@@ -118,7 +118,7 @@ export const SecretRotationV2Form = ({
 
           connectionId: connection.id,
           environment: environment.slug,
-          projectId: currentWorkspace.id
+          projectId: currentProject.id
         });
     try {
       const rotation = await mutation;

frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx

@@ -5,7 +5,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { AppConnectionOption } from "@app/components/app-connections";
 import { FilterableSelect, FormControl } from "@app/components/v2";
-import { ProjectPermissionSub, useProjectPermission, useWorkspace } from "@app/context";
+import { ProjectPermissionSub, useProject, useProjectPermission } from "@app/context";
 import { ProjectPermissionAppConnectionActions } from "@app/context/ProjectPermissionContext/types";
 import { APP_CONNECTION_MAP } from "@app/helpers/appConnections";
 import { SECRET_SCANNING_DATA_SOURCE_CONNECTION_MAP } from "@app/helpers/secretScanningV2";
@@ -32,11 +32,11 @@ export const SecretScanningDataSourceConnectionField = ({
   const dataSourceType = watch("type");
   const app = SECRET_SCANNING_DATA_SOURCE_CONNECTION_MAP[dataSourceType];
 
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
 
   const { data: availableConnections, isPending } = useListAvailableAppConnections(
     app,
-    currentWorkspace.id
+    currentProject.id
   );
 
   const connectionName = APP_CONNECTION_MAP[app].name;
@@ -119,8 +119,8 @@ export const SecretScanningDataSourceConnectionField = ({
           localStorage.removeItem("secretScanningDataSourceFormData");
           handlePopUpToggle("addConnection", isOpen);
         }}
-        projectType={currentWorkspace.type}
-        projectId={currentWorkspace.id}
+        projectType={currentProject.type}
+        projectId={currentProject.id}
         app={app}
         onComplete={(connection) => {
           if (connection) {

frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx

@@ -6,7 +6,7 @@ import { twMerge } from "tailwind-merge";
 
 import { createNotification } from "@app/components/notifications";
 import { Button } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { SECRET_SCANNING_DATA_SOURCE_MAP } from "@app/helpers/secretScanningV2";
 import {
   SecretScanningDataSource,
@@ -46,7 +46,7 @@ export const SecretScanningDataSourceForm = ({
 }: Props) => {
   const createDataSource = useCreateSecretScanningDataSource();
   const updateDataSource = useUpdateSecretScanningDataSource();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { name: sourceType } = SECRET_SCANNING_DATA_SOURCE_MAP[type];
 
   const [selectedTabIndex, setSelectedTabIndex] = useState(0);
@@ -71,7 +71,7 @@ export const SecretScanningDataSourceForm = ({
       : createDataSource.mutateAsync({
           ...formData,
           connectionId: connection?.id,
-          projectId: currentWorkspace.id
+          projectId: currentProject.id
         });
     try {
       const source = await mutation;

frontend/src/components/secret-syncs/forms/CreateSecretSyncForm.tsx

@@ -8,7 +8,7 @@ import { twMerge } from "tailwind-merge";
 
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Switch } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { SECRET_SYNC_MAP } from "@app/helpers/secretSyncs";
 import {
   SecretSync,
@@ -47,7 +47,7 @@ export const CreateSecretSyncForm = ({
   initialFormData
 }: Props) => {
   const createSecretSync = useCreateSecretSync();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { name: destinationName } = SECRET_SYNC_MAP[destination];
 
   const [showConfirmation, setShowConfirmation] = useState(false);
@@ -78,7 +78,7 @@ export const CreateSecretSyncForm = ({
         ...formData,
         connectionId: connection.id,
         environment: environment.slug,
-        projectId: currentWorkspace.id
+        projectId: currentProject.id
       });
 
       createNotification({

frontend/src/components/secret-syncs/forms/SecretSyncConnectionField.tsx

@@ -5,7 +5,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { AppConnectionOption } from "@app/components/app-connections";
 import { FilterableSelect, FormControl } from "@app/components/v2";
-import { ProjectPermissionSub, useProjectPermission, useWorkspace } from "@app/context";
+import { ProjectPermissionSub, useProject, useProjectPermission } from "@app/context";
 import { ProjectPermissionAppConnectionActions } from "@app/context/ProjectPermissionContext/types";
 import { APP_CONNECTION_MAP } from "@app/helpers/appConnections";
 import { SECRET_SYNC_CONNECTION_MAP } from "@app/helpers/secretSyncs";
@@ -28,11 +28,11 @@ export const SecretSyncConnectionField = ({ onChange: callback }: Props) => {
   const destination = watch("destination");
   const app = SECRET_SYNC_CONNECTION_MAP[destination];
 
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
 
   const { data: availableConnections, isPending } = useListAvailableAppConnections(
     app,
-    currentWorkspace.id
+    currentProject.id
   );
 
   const connectionName = APP_CONNECTION_MAP[app].name;
@@ -101,8 +101,8 @@ export const SecretSyncConnectionField = ({ onChange: callback }: Props) => {
           localStorage.removeItem("secretSyncFormData");
           handlePopUpToggle("addConnection", isOpen);
         }}
-        projectType={currentWorkspace.type}
-        projectId={currentWorkspace.id}
+        projectType={currentProject.type}
+        projectId={currentProject.id}
         app={app}
         onComplete={(connection) => {
           if (connection) {

frontend/src/components/secret-syncs/forms/SecretSyncSourceFields.tsx

@@ -4,7 +4,7 @@ import { subject } from "@casl/ability";
 
 import { FilterableSelect, FormControl } from "@app/components/v2";
 import { SecretPathInput } from "@app/components/v2/SecretPathInput";
-import { useProjectPermission, useWorkspace } from "@app/context";
+import { useProject, useProjectPermission } from "@app/context";
 import {
   ProjectPermissionSecretSyncActions,
   ProjectPermissionSub
@@ -16,7 +16,7 @@ export const SecretSyncSourceFields = () => {
   const { control, watch, setError, clearErrors } = useFormContext<TSecretSyncForm>();
 
   const { permission } = useProjectPermission();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
 
   const selectedEnvironment = watch("environment");
   const selectedSecretPath = watch("secretPath");
@@ -48,7 +48,7 @@ export const SecretSyncSourceFields = () => {
       </p>
 
       <Controller
-        defaultValue={currentWorkspace.environments[0]}
+        defaultValue={currentProject.environments[0]}
         control={control}
         name="environment"
         render={({ field: { value, onChange }, fieldState: { error } }) => (
@@ -56,7 +56,7 @@ export const SecretSyncSourceFields = () => {
             <FilterableSelect
               value={value}
               onChange={onChange}
-              options={currentWorkspace.environments}
+              options={currentProject.environments}
               placeholder="Select environment..."
               getOptionLabel={(option) => option?.name}
               getOptionValue={(option) => option?.id}

frontend/src/components/secrets/SecretReferenceDetails/SecretReferenceDetails.tsx

@@ -13,7 +13,7 @@ import { twMerge } from "tailwind-merge";
 
 import { createNotification } from "@app/components/notifications";
 import { FormControl, FormLabel, SecretInput, Spinner, Tooltip } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useGetSecretReferenceTree } from "@app/hooks/api";
 import { ApiErrorTypes, TApiErrors, TSecretReferenceTraceNode } from "@app/hooks/api/types";
 
@@ -89,8 +89,8 @@ export const SecretReferenceNode = ({
 };
 
 export const SecretReferenceTree = ({ secretPath, environment, secretKey }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
 
   const { data, isPending, isError, error } = useGetSecretReferenceTree({
     secretPath,

frontend/src/components/tags/CreateTagModal/CreateTagModal.tsx

@@ -15,7 +15,7 @@ import {
   ModalContent,
   Tooltip
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useCreateWsTag } from "@app/hooks/api";
 import { slugSchema } from "@app/lib/schemas";
 
@@ -115,11 +115,10 @@ export const CreateTagModal = ({ isOpen, onToggle }: Props): JSX.Element => {
     }
   });
 
-  const { currentWorkspace } = useWorkspace();
-  const workspaceId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
 
   const { mutateAsync: createWsTag } = useCreateWsTag();
-
   const [showHexInput, setShowHexInput] = useState<boolean>(false);
   const selectedTagColor = watch("color", secretTagsColors[0].hex);
 
@@ -130,7 +129,7 @@ export const CreateTagModal = ({ isOpen, onToggle }: Props): JSX.Element => {
   const onFormSubmit = async ({ slug, color }: FormData) => {
     try {
       await createWsTag({
-        workspaceID: workspaceId,
+        projectId,
         tagColor: color,
         tagSlug: slug
       });

frontend/src/components/v2/InfisicalSecretInput/InfisicalSecretInput.tsx

@@ -3,7 +3,7 @@ import { faFolder, faKey, faLayerGroup } from "@fortawesome/free-solid-svg-icons
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import * as Popover from "@radix-ui/react-popover";
 
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useDebounce, useToggle } from "@app/hooks";
 import { useGetProjectFolders, useGetProjectSecrets } from "@app/hooks/api";
 
@@ -76,8 +76,8 @@ export const InfisicalSecretInput = forwardRef<HTMLTextAreaElement, Props>(
     },
     ref
   ) => {
-    const { currentWorkspace } = useWorkspace();
-    const workspaceId = currentWorkspace?.id || "";
+    const { currentProject } = useProject();
+    const projectId = currentProject?.id || "";
 
     const [debouncedValue] = useDebounce(value, 100);
 
@@ -101,7 +101,7 @@ export const InfisicalSecretInput = forwardRef<HTMLTextAreaElement, Props>(
       let predicate = suggestionSourceValue;
       if (isDeep) {
         const [envSlug, ...folderPaths] = suggestionSourceValue.split(".");
-        const isValidEnvSlug = currentWorkspace?.environments.find((e) => e.slug === envSlug);
+        const isValidEnvSlug = currentProject?.environments.find((e) => e.slug === envSlug);
         suggestionSourceEnv = isValidEnvSlug ? envSlug : undefined;
         suggestionSourceSecretPath = `/${folderPaths.slice(0, -1)?.join("/")}`;
         predicate = folderPaths[folderPaths.length - 1];
@@ -125,7 +125,7 @@ export const InfisicalSecretInput = forwardRef<HTMLTextAreaElement, Props>(
       viewSecretValue: false,
       environment: suggestionSource.environment || "",
       secretPath: suggestionSource.secretPath || "",
-      workspaceId,
+      projectId,
       options: {
         enabled: isPopupOpen
       }
@@ -133,7 +133,7 @@ export const InfisicalSecretInput = forwardRef<HTMLTextAreaElement, Props>(
     const { data: folders } = useGetProjectFolders({
       environment: suggestionSource.environment || "",
       path: suggestionSource.secretPath || "",
-      projectId: workspaceId,
+      projectId,
       options: {
         enabled: isPopupOpen
       }
@@ -148,7 +148,7 @@ export const InfisicalSecretInput = forwardRef<HTMLTextAreaElement, Props>(
 
       if (!suggestionSource.isDeep) {
         // At first level only environments and secrets
-        (currentWorkspace?.environments || []).forEach(({ name, slug }) => {
+        (currentProject?.environments || []).forEach(({ name, slug }) => {
           if (name.toLowerCase().startsWith(predicate))
             suggestionsArr.push({
               label: name,
@@ -176,7 +176,7 @@ export const InfisicalSecretInput = forwardRef<HTMLTextAreaElement, Props>(
           });
       });
       return suggestionsArr;
-    }, [secrets, folders, currentWorkspace?.environments, isPopupOpen, suggestionSource.value]);
+    }, [secrets, folders, currentProject?.environments, isPopupOpen, suggestionSource.value]);
 
     const handleSuggestionSelect = (selectIndex?: number) => {
       const selectedSuggestion =

frontend/src/components/v2/SecretPathInput/SecretPathInput.tsx

@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import * as Popover from "@radix-ui/react-popover";
 import { twMerge } from "tailwind-merge";
 
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useDebounce } from "@app/hooks";
 import { useGetFoldersByEnv } from "@app/hooks/api";
 
@@ -35,12 +35,12 @@ export const SecretPathInput = ({
   const [highlightedIndex, setHighlightedIndex] = useState(-1);
   const [debouncedInputValue] = useDebounce(inputValue, 200);
 
-  const { currentWorkspace } = useWorkspace();
-  const workspaceId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
   const { folderNames: folders } = useGetFoldersByEnv({
     path: secretPath,
-    environments: [environment || currentWorkspace?.environments?.[0].slug || ""],
-    projectId: workspaceId
+    environments: [environment || currentProject?.environments?.[0].slug || ""],
+    projectId
   });
 
   useEffect(() => {