feat(infisical-pg): new org role routes completed

frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx

@@ -30,6 +30,7 @@ import {
 import {
   useAddUserToOrg,
   useFetchServerStatus,
+  useGetOrgRoles,
   useGetOrgUsers,
   useGetRoles,
   useUpdateOrgUserRole
@@ -56,9 +57,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLink }: Prop
   const userId = user?.id || "";
   const orgId = currentOrg?.id || "";
 
-  const { data: roles, isLoading: isRolesLoading } = useGetRoles({
-    orgId
-  });
+  const { data: roles, isLoading: isRolesLoading } = useGetOrgRoles(orgId);
 
   const [searchMemberFilter, setSearchMemberFilter] = useState("");
 

frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleModifySection/OrgRoleModifySection.tsx

@@ -8,15 +8,16 @@ import {
   faServer,
   faSignIn,
   faUserCog,
-  faUsers} from "@fortawesome/free-solid-svg-icons";
+  faUsers
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { zodResolver } from "@hookform/resolvers/zod";
 
 import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
 import { Button, FormControl, Input } from "@app/components/v2";
 import { useOrganization } from "@app/context";
-import { useCreateRole, useUpdateRole } from "@app/hooks/api";
-import { TRole } from "@app/hooks/api/roles/types";
+import { useCreateOrgRole, useUpdateOrgRole } from "@app/hooks/api";
+import { TOrgRole } from "@app/hooks/api/roles/types";
 
 import {
   formRolePermission2API,
@@ -28,7 +29,7 @@ import { SimpleLevelPermissionOption } from "./SimpleLevelPermissionOptions";
 import { WorkspacePermission } from "./WorkspacePermission";
 
 type Props = {
-  role?: TRole<undefined>;
+  role?: TOrgRole;
   onGoBack: VoidFunction;
 };
 
@@ -101,8 +102,8 @@ export const OrgRoleModifySection = ({ role, onGoBack }: Props) => {
     resolver: zodResolver(formSchema)
   });
 
-  const { mutateAsync: createRole } = useCreateRole();
-  const { mutateAsync: updateRole } = useUpdateRole();
+  const { mutateAsync: createRole } = useCreateOrgRole();
+  const { mutateAsync: updateRole } = useUpdateOrgRole();
 
   const handleRoleUpdate = async (el: TFormSchema) => {
     if (!role?.id) return;

frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleModifySection/OrgRoleModifySection.utils.ts

@@ -32,7 +32,7 @@ export const formSchema = z.object({
       "secret-scanning": generalPermissionSchema,
       sso: generalPermissionSchema,
       billing: generalPermissionSchema,
-      "identity": generalPermissionSchema
+      identity: generalPermissionSchema
     })
     .optional()
 });

frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleTabSection.tsx

@@ -1,7 +1,7 @@
 import { motion } from "framer-motion";
 
 import { usePopUp } from "@app/hooks";
-import { TRole } from "@app/hooks/api/roles/types";
+import { TOrgRole } from "@app/hooks/api/roles/types";
 
 import { OrgRoleModifySection } from "./OrgRoleModifySection";
 import { OrgRoleTable } from "./OrgRoleTable";
@@ -17,7 +17,7 @@ export const OrgRoleTabSection = () => {
       exit={{ opacity: 0, translateX: 30 }}
     >
       <OrgRoleModifySection
-        role={popUp.editRole.data as TRole<undefined>}
+        role={popUp.editRole.data as TOrgRole}
         onGoBack={() => handlePopUpClose("editRole")}
       />
     </motion.div>

frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleTable.tsx

@@ -20,11 +20,11 @@ import {
 } from "@app/components/v2";
 import { OrgPermissionActions, OrgPermissionSubjects, useOrganization } from "@app/context";
 import { usePopUp } from "@app/hooks";
-import { useDeleteRole, useGetRoles } from "@app/hooks/api";
-import { TRole } from "@app/hooks/api/roles/types";
+import { useDeleteOrgRole, useGetOrgRoles } from "@app/hooks/api";
+import { TOrgRole } from "@app/hooks/api/roles/types";
 
 type Props = {
-  onSelectRole: (role?: TRole<undefined>) => void;
+  onSelectRole: (role?: TOrgRole) => void;
 };
 
 export const OrgRoleTable = ({ onSelectRole }: Props) => {
@@ -34,14 +34,12 @@ export const OrgRoleTable = ({ onSelectRole }: Props) => {
   const { createNotification } = useNotificationContext();
   const { popUp, handlePopUpOpen, handlePopUpClose } = usePopUp(["deleteRole"] as const);
 
-  const { data: roles, isLoading: isRolesLoading } = useGetRoles({
-    orgId
-  });
+  const { data: roles, isLoading: isRolesLoading } = useGetOrgRoles(orgId);
 
-  const { mutateAsync: deleteRole } = useDeleteRole();
+  const { mutateAsync: deleteRole } = useDeleteOrgRole();
 
   const handleRoleDelete = async () => {
-    const { id } = popUp?.deleteRole?.data as TRole<undefined>;
+    const { id } = popUp?.deleteRole?.data as TOrgRole;
     try {
       await deleteRole({
         orgId,
@@ -90,7 +88,7 @@ export const OrgRoleTable = ({ onSelectRole }: Props) => {
             </THead>
             <TBody>
               {isRolesLoading && <TableSkeleton columns={4} innerKey="org-roles" />}
-              {(roles as TRole<undefined>[])?.map((role) => {
+              {roles?.map((role) => {
                 const { id, name, slug } = role;
                 const isNonMutatable = ["owner", "admin", "member", "no-access"].includes(slug);
 
@@ -148,9 +146,9 @@ export const OrgRoleTable = ({ onSelectRole }: Props) => {
       <DeleteActionModal
         isOpen={popUp.deleteRole.isOpen}
         title={`Are you sure want to delete ${
-          (popUp?.deleteRole?.data as TRole<undefined>)?.name || " "
+          (popUp?.deleteRole?.data as TOrgRole)?.name || " "
         } role?`}
-        deleteKey={(popUp?.deleteRole?.data as TRole<undefined>)?.slug || ""}
+        deleteKey={(popUp?.deleteRole?.data as TOrgRole)?.slug || ""}
         onClose={() => handlePopUpClose("deleteRole")}
         onDeleteApproved={handleRoleDelete}
       />