feat: removed last bit of workspace in frontend. Fatality!

frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx

@@ -19,7 +19,7 @@ import {
   ProjectPermissionMemberActions,
   ProjectPermissionSub,
   useOrganization,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { getProjectBaseURL, getProjectHomePage } from "@app/helpers/project";
 import { usePopUp } from "@app/hooks";
@@ -40,12 +40,10 @@ export const Page = () => {
     select: (el) => el.membershipId as string
   });
   const { currentOrg } = useOrganization();
-  const { currentWorkspace } = useWorkspace();
-
-  const workspaceId = currentWorkspace?.id || "";
+  const { currentProject, projectId } = useProject();
 
   const { data: membershipDetails, isPending: isMembershipDetailsLoading } =
-    useGetWorkspaceUserDetails(workspaceId, membershipId);
+    useGetWorkspaceUserDetails(projectId, membershipId);
 
   const { mutateAsync: removeUserFromWorkspace, isPending: isRemovingUserFromWorkspace } =
     useDeleteUserFromWorkspace();
@@ -63,7 +61,7 @@ export const Page = () => {
       {
         actorId: userId,
         actorType: ActorType.USER,
-        projectId: workspaceId
+        projectId
       },
       {
         onSuccess: () => {
@@ -72,19 +70,19 @@ export const Page = () => {
             text: "User privilege assumption has started"
           });
 
-          const url = getProjectHomePage(currentWorkspace.type, currentWorkspace.environments);
-          window.location.href = url.replace("$projectId", currentWorkspace.id);
+          const url = getProjectHomePage(currentProject.type, currentProject.environments);
+          window.location.href = url.replace("$projectId", currentProject.id);
         }
       }
     );
   };
 
   const handleRemoveUser = async () => {
-    if (!currentOrg?.id || !currentWorkspace?.id || !membershipDetails?.user?.username) return;
+    if (!currentOrg?.id || !currentProject?.id || !membershipDetails?.user?.username) return;
 
     try {
       await removeUserFromWorkspace({
-        workspaceId: currentWorkspace.id,
+        projectId,
         usernames: [membershipDetails?.user?.username],
         orgId: currentOrg.id
       });
@@ -93,9 +91,9 @@ export const Page = () => {
         type: "success"
       });
       navigate({
-        to: `${getProjectBaseURL(currentWorkspace.type)}/access-management` as const,
+        to: `${getProjectBaseURL(currentProject.type)}/access-management` as const,
         params: {
-          projectId: currentWorkspace.id
+          projectId: currentProject.id
         }
       });
     } catch (error) {

frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MembershipProjectAdditionalPrivilegeModifySection.tsx

@@ -24,7 +24,7 @@ import {
   ProjectPermissionMemberActions,
   ProjectPermissionSub,
   useProjectPermission,
-  useWorkspace
+  useProject
 } from "@app/context";
 import {
   useCreateProjectUserAdditionalPrivilege,
@@ -77,8 +77,8 @@ export const MembershipProjectAdditionalPrivilegeModifySection = ({
   isDisabled
 }: Props) => {
   const isCreate = !privilegeId;
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
   const { data: privilegeDetails, isPending } = useGetProjectUserPrivilegeDetails(
     privilegeId || ""
   );
@@ -221,7 +221,7 @@ export const MembershipProjectAdditionalPrivilegeModifySection = ({
               >
                 Save
               </Button>
-              <AddPoliciesButton isDisabled={isDisabled} projectType={currentWorkspace.type} />
+              <AddPoliciesButton isDisabled={isDisabled} projectType={currentProject.type} />
             </div>
           </div>
         </div>

frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberRoleDetailsSection.tsx

@@ -22,12 +22,7 @@ import {
   Tooltip,
   Tr
 } from "@app/components/v2";
-import {
-  ProjectPermissionActions,
-  ProjectPermissionSub,
-  useUser,
-  useWorkspace
-} from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useUser, useProject } from "@app/context";
 import { formatProjectRoleName } from "@app/helpers/roles";
 import { usePopUp } from "@app/hooks";
 import { useUpdateUserWorkspaceRole } from "@app/hooks/api";
@@ -49,7 +44,7 @@ export const MemberRoleDetailsSection = ({
 }: Props) => {
   const { user } = useUser();
   const userId = user?.id;
-  const { currentWorkspace } = useWorkspace();
+  const { projectId } = useProject();
   const { popUp, handlePopUpOpen, handlePopUpToggle, handlePopUpClose } = usePopUp([
     "deleteRole",
     "modifyRole"
@@ -63,7 +58,7 @@ export const MemberRoleDetailsSection = ({
     try {
       const updatedRoles = membershipDetails?.roles?.filter((el) => el.id !== id);
       await updateUserWorkspaceRole({
-        workspaceId: currentWorkspace?.id || "",
+        projectId,
         roles: updatedRoles.map(
           ({
             role,

frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberRoleModify.tsx

@@ -31,12 +31,12 @@ import {
   ProjectPermissionSub,
   useProjectPermission,
   useSubscription,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useGetProjectRoles, useUpdateUserWorkspaceRole } from "@app/hooks/api";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { TWorkspaceUser } from "@app/hooks/api/types";
-import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/workspace/types";
+import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/projects/types";
 
 const roleFormSchema = z.object({
   roles: z
@@ -65,9 +65,8 @@ type Props = {
 
 export const MemberRoleModify = ({ projectMember, onOpenUpgradeModal }: Props) => {
   const { subscription } = useSubscription();
-  const { currentWorkspace } = useWorkspace();
-  const workspaceId = currentWorkspace?.id || "";
-  const { data: projectRoles, isPending: isRolesLoading } = useGetProjectRoles(workspaceId);
+  const { projectId } = useProject();
+  const { data: projectRoles, isPending: isRolesLoading } = useGetProjectRoles(projectId);
   const { permission } = useProjectPermission();
   const isMemberEditDisabled = permission.cannot(
     ProjectPermissionMemberActions.Edit,
@@ -131,7 +130,7 @@ export const MemberRoleModify = ({ projectMember, onOpenUpgradeModal }: Props) =
 
     try {
       await updateMembershipRole.mutateAsync({
-        workspaceId,
+        projectId,
         membershipId: projectMember.id,
         roles: sanitizedRoles
       });