feat(infisical-pg): completed checklist run for dashboard

frontend/src/hooks/api/users/mutation.tsx

@@ -35,7 +35,7 @@ export const useAddUserToWs = () => {
           workspaceEncryptedNonce: inviteeNonce
         };
       });
-      const { data } = await apiRequest.post(`/api/v2/workspace/${workspaceId}/memberships`, {
+      const { data } = await apiRequest.post(`/api/v1/workspace/${workspaceId}/memberships`, {
         members: newWsMembers
       });
       return data;

frontend/src/hooks/api/users/types.ts

@@ -49,7 +49,7 @@ export type OrgUser = {
   role: "owner" | "admin" | "member" | "no-access" | "custom";
   status: "invited" | "accepted" | "verified" | "completed";
   deniedPermissions: any[];
-  customRole: string;
+  roleId: string;
 };
 
 export type TWorkspaceUser = OrgUser;

frontend/src/hooks/api/workspace/queries.tsx

@@ -14,7 +14,6 @@ import {
   DeleteWorkspaceDTO,
   NameWorkspaceSecretsDTO,
   RenameWorkspaceDTO,
-  ReorderEnvironmentsDTO,
   ToggleAutoCapitalizationDTO,
   UpdateEnvironmentDTO,
   Workspace
@@ -29,8 +28,9 @@ export const workspaceKeys = {
   getWorkspaceAuthorization: (workspaceId: string) => [{ workspaceId }, "workspace-authorizations"],
   getWorkspaceIntegrations: (workspaceId: string) => [{ workspaceId }, "workspace-integrations"],
   getAllUserWorkspace: ["workspaces"] as const,
-  getWorkspaceAuditLogs: (workspaceId: string) => [{ workspaceId }] as const,
-  getWorkspaceUsers: (workspaceId: string) => [{ workspaceId }] as const,
+  getWorkspaceAuditLogs: (workspaceId: string) =>
+    [{ workspaceId }, "workspace-audit-logs"] as const,
+  getWorkspaceUsers: (workspaceId: string) => [{ workspaceId }, "workspace-users"] as const,
   getWorkspaceIdentityMemberships: (workspaceId: string) =>
     [{ workspaceId }, "workspace-identity-memberships"] as const
 };
@@ -234,38 +234,15 @@ export const useCreateWsEnvironment = () => {
   });
 };
 
-export const useReorderWsEnvironment = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation<{}, {}, ReorderEnvironmentsDTO>({
-    mutationFn: ({
-      workspaceId,
-      environmentSlug,
-      environmentName,
-      otherEnvironmentSlug,
-      otherEnvironmentName
-    }) => {
-      return apiRequest.patch(`/api/v1/workspace/${workspaceId}/environments`, {
-        environmentSlug,
-        environmentName,
-        otherEnvironmentSlug,
-        otherEnvironmentName
-      });
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries(workspaceKeys.getAllUserWorkspace);
-    }
-  });
-};
-
 export const useUpdateWsEnvironment = () => {
   const queryClient = useQueryClient();
 
   return useMutation<{}, {}, UpdateEnvironmentDTO>({
-    mutationFn: ({ workspaceId, id, name, slug }) => {
+    mutationFn: ({ workspaceId, id, name, slug, position }) => {
       return apiRequest.patch(`/api/v1/workspace/${workspaceId}/environments/${id}`, {
         name,
-        slug
+        slug,
+        position
       });
     },
     onSuccess: () => {
@@ -335,7 +312,7 @@ export const useDeleteUserFromWorkspace = () => {
     }) => {
       const {
         data: { deletedMembership }
-      } = await apiRequest.delete(`/api/v1/${workspaceId}/membership/${membershipId}`);
+      } = await apiRequest.delete(`/api/v1/workspace/${workspaceId}/memberships/${membershipId}`);
       return deletedMembership;
     },
     onSuccess: (_, { workspaceId }) => {
@@ -358,13 +335,16 @@ export const useUpdateUserWorkspaceRole = () => {
     }) => {
       const {
         data: { membership }
-      } = await apiRequest.post(`/api/v1/${workspaceId}/membership/${membershipId}`, {
-        role
-      });
+      } = await apiRequest.patch<{ membership: { projectId: string } }>(
+        `/api/v1/workspace/${workspaceId}/memberships/${membershipId}`,
+        {
+          role
+        }
+      );
       return membership;
     },
     onSuccess: (res) => {
-      queryClient.invalidateQueries(workspaceKeys.getWorkspaceUsers(res.workspace));
+      queryClient.invalidateQueries(workspaceKeys.getWorkspaceUsers(res.projectId));
     }
   });
 };

frontend/src/hooks/api/workspace/types.ts

@@ -53,6 +53,7 @@ export type UpdateEnvironmentDTO = {
   id: string;
   name?: string;
   slug?: string;
+  position?: number;
 };
 
 export type DeleteEnvironmentDTO = { workspaceId: string; id: string };