feat: billing fixes

frontend/src/hooks/api/orgIdentityMembership/index.tsx

@@ -1,2 +1,6 @@
 export { useCreateOrgIdentityMembership, useDeleteOrgIdentityMembership } from "./mutation";
-export type { TCreateOrgIdentityMembershipDTO, TDeleteOrgIdentityMembershipDTO, TOrgIdentityMembership } from "./types";
+export type {
+  TCreateOrgIdentityMembershipDTO,
+  TDeleteOrgIdentityMembershipDTO,
+  TOrgIdentityMembership
+} from "./types";

frontend/src/hooks/api/organization/index.ts

@@ -1,12 +1,12 @@
 export {
   useAddOrgPmtMethod,
-  useGetAvailableOrgIdentities,
   useAddOrgTaxId,
   useCreateCustomerPortalSession,
   useCreateOrg,
   useDeleteOrgById,
   useDeleteOrgPmtMethod,
   useDeleteOrgTaxId,
+  useGetAvailableOrgIdentities,
   useGetIdentityMembershipOrgs,
   useGetOrganizationGroups,
   useGetOrganizations,

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

@@ -582,7 +582,7 @@ export const useGetAvailableOrgIdentities = (enabled = true) =>
     queryKey: organizationKeys.getAvailableIdentities(),
     queryFn: async () => {
       const { data } = await apiRequest.get<{ identities: { name: string; id: string }[] }>(
-        `/api/v1/organization/identities/available`
+        "/api/v1/organization/identities/available"
       );
 
       return data.identities;
@@ -596,7 +596,7 @@ export const useGetAvailableOrgUsers = (enabled = true) =>
     queryFn: async () => {
       const { data } = await apiRequest.get<{
         users: { username: string; id: string; firstName: string; lastName: string }[];
-      }>(`/api/v1/organization/users/available`);
+      }>("/api/v1/organization/users/available");
 
       return data.users;
     },

frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx

@@ -58,8 +58,8 @@ import { AuthMethod } from "@app/hooks/api/users/types";
 import { navigateUserToOrg } from "@app/pages/auth/LoginPage/Login.utils";
 
 import { ServerAdminsPanel } from "../ServerAdminsPanel/ServerAdminsPanel";
-import { NotificationDropdown } from "./NotificationDropdown";
 import { NewSubOrganizationForm } from "./NewSubOrganizationForm";
+import { NotificationDropdown } from "./NotificationDropdown";
 
 const getPlan = (subscription: SubscriptionPlan) => {
   if (subscription.groups) return "Enterprise";

frontend/src/layouts/OrganizationLayout/components/NavBar/NewSubOrganizationForm.tsx

@@ -4,8 +4,8 @@ import { z } from "zod";
 
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input } from "@app/components/v2";
-import { GenericResourceNameSchema } from "@app/lib/schemas";
 import { useCreateSubOrganization } from "@app/hooks/api";
+import { GenericResourceNameSchema } from "@app/lib/schemas";
 
 type ContentProps = {
   onClose: () => void;

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityLinkForm.tsx

@@ -105,7 +105,7 @@ export const IdentityLinkForm = ({ onClose }: Props) => {
               placeholder="Select role..."
               getOptionValue={(option) => option.slug}
               getOptionLabel={(option) => option.name}
-              menuPortalTarget={document.body}
+              // menuPortalTarget={document.body}
             />
           </FormControl>
         )}

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityModal.tsx

@@ -53,7 +53,7 @@ export const IdentityModal = ({ popUp, handlePopUpToggle }: Props) => {
   const orgId = currentOrg?.id || "";
 
   const { data: roles } = useGetOrgRoles(orgId);
-  const isOrgIdentity = orgId === popUp?.identity?.data?.orgId;
+  const isOrgIdentity = popUp?.identity?.data ? orgId === popUp?.identity?.data?.orgId : true;
 
   const { mutateAsync: createMutateAsync } = useCreateIdentity();
   const { mutateAsync: updateMutateAsync } = useUpdateIdentity();

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx

@@ -24,11 +24,11 @@ import { usePopUp } from "@app/hooks/usePopUp";
 
 import { IdentityAuthTemplateModal } from "./IdentityAuthTemplateModal";
 import { IdentityAuthTemplatesTable } from "./IdentityAuthTemplatesTable";
+import { IdentityLinkForm } from "./IdentityLinkForm";
 import { IdentityModal } from "./IdentityModal";
 import { IdentityTable } from "./IdentityTable";
 import { IdentityTokenAuthTokenModal } from "./IdentityTokenAuthTokenModal";
 import { MachineAuthTemplateUsagesModal } from "./MachineAuthTemplateUsagesModal";
-import { IdentityLinkForm } from "./IdentityLinkForm";
 
 export const IdentitySection = withPermission(
   () => {

frontend/src/pages/organization/SettingsPage/components/OrgTabGroup/OrgTabGroup.tsx

@@ -3,6 +3,7 @@ import { useSearch } from "@tanstack/react-router";
 
 import { Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
 import { ROUTE_PATHS } from "@app/const/routes";
+import { useOrganization } from "@app/context";
 
 import { AuditLogStreamsTab } from "../AuditLogStreamTab";
 import { ExternalMigrationsTab } from "../ExternalMigrationsTab";
@@ -14,7 +15,6 @@ import { OrgSecurityTab } from "../OrgSecurityTab";
 import { OrgSsoTab } from "../OrgSsoTab";
 import { OrgWorkflowIntegrationTab } from "../OrgWorkflowIntegrationTab";
 import { ProjectTemplatesTab } from "../ProjectTemplatesTab";
-import { useOrganization } from "@app/context";
 
 export const OrgTabGroup = () => {
   const search = useSearch({

frontend/src/pages/organization/layout.tsx

@@ -1,7 +1,7 @@
 import { createFileRoute, retainSearchParams } from "@tanstack/react-router";
+import { z } from "zod";
 
 import { OrganizationLayout } from "@app/layouts/OrganizationLayout";
-import { z } from "zod";
 
 export const Route = createFileRoute("/_authenticate/_inject-org-details/_org-layout")({
   component: OrganizationLayout,