chore: merge main into release for new releases

Author: Marfuen

apps/app/src/app/(app)/[orgId]/settings/layout.tsx

@@ -24,10 +24,6 @@ export default async function Layout({ children }: { children: React.ReactNode }
               path: `/${orgId}/settings`,
               label: 'General',
             },
-            {
-              path: `/${orgId}/settings/trust-portal`,
-              label: 'Trust Portal',
-            },
             {
               path: `/${orgId}/settings/context-hub`,
               label: 'Context',

apps/app/src/app/(app)/[orgId]/settings/trust-portal/loading.tsx

@@ -0,0 +1,30 @@
+import { SecondaryMenu } from '@comp/ui/secondary-menu';
+
+export default async function Layout({ 
+  children,
+  params 
+}: { 
+  children: React.ReactNode;
+  params: Promise<{ orgId: string }>;
+}) {
+  const { orgId } = await params;
+
+  return (
+    <div className="m-auto max-w-[1200px] py-8">
+      <SecondaryMenu
+        items={[
+          {
+            path: `/${orgId}/trust`,
+            label: 'Access & Grants',
+          },
+          {
+            path: `/${orgId}/trust/portal-settings`,
+            label: 'Portal Settings',
+          },
+        ]}
+      />
+      <div>{children}</div>
+    </div>
+  );
+}
+

apps/app/src/app/(app)/[orgId]/trust/layout.tsx

@@ -6,22 +6,20 @@ export default async function TrustAccessPage({ params }: { params: Promise<{ or
   const { orgId } = await params;
 
   return (
-    <div className="mx-auto max-w-[1200px] py-8">
-      <PageCore>
-        <div className="space-y-4">
-          <div>
-            <h1 className="text-2xl font-semibold">Trust Access Management</h1>
-            <p className="text-muted-foreground">Manage data access requests and grants</p>
-          </div>
-          <TrustAccessRequestsClient orgId={orgId} />
+    <PageCore>
+      <div className="space-y-4">
+        <div>
+          <h1 className="text-2xl font-semibold">Access & Grants</h1>
+          <p className="text-muted-foreground">Manage data access requests and grants</p>
         </div>
-      </PageCore>
-    </div>
+        <TrustAccessRequestsClient orgId={orgId} />
+      </div>
+    </PageCore>
   );
 }
 
 export async function generateMetadata(): Promise<Metadata> {
   return {
-    title: 'Trust Access Management',
+    title: 'Access & Grants',
   };
 }

apps/app/src/app/(app)/[orgId]/trust/page.tsx

@@ -162,7 +162,8 @@ export const checkDnsRecordAction = authActionClient
       },
     });
 
-    revalidatePath(`/${activeOrgId}/settings/trust-portal`);
+    revalidatePath(`/${activeOrgId}/trust`);
+    revalidatePath(`/${activeOrgId}/trust/portal-settings`);
     revalidateTag(`organization_${activeOrgId}`);
 
     return {

…trust-portal/actions/check-dns-record.ts …tal-settings/actions/check-dns-record.tsapps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/check-dns-record.ts renamed to apps/app/src/app/(app)/[orgId]/trust/portal-settings/actions/check-dns-record.ts apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/check-dns-record.ts renamed to apps/app/src/app/(app)/[orgId]/trust/portal-settings/actions/check-dns-record.ts

@@ -100,7 +100,8 @@ export const customDomainAction = authActionClient
         },
       });
 
-      revalidatePath(`/${activeOrganizationId}/settings/trust-portal`);
+      revalidatePath(`/${activeOrganizationId}/trust`);
+      revalidatePath(`/${activeOrganizationId}/trust/portal-settings`);
       revalidateTag(`organization_${activeOrganizationId}`);
 
       return {

…gs/trust-portal/actions/custom-domain.ts …portal-settings/actions/custom-domain.tsapps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/custom-domain.ts renamed to apps/app/src/app/(app)/[orgId]/trust/portal-settings/actions/custom-domain.ts apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/custom-domain.ts renamed to apps/app/src/app/(app)/[orgId]/trust/portal-settings/actions/custom-domain.ts

@@ -48,7 +48,8 @@ export const trustPortalSwitchAction = authActionClient
         },
       });
 
-      revalidatePath(`/${activeOrganizationId}/settings/trust-portal`);
+      revalidatePath(`/${activeOrganizationId}/trust`);
+      revalidatePath(`/${activeOrganizationId}/trust/portal-settings`);
       revalidateTag(`organization_${activeOrganizationId}`);
 
       return {

…-portal/actions/is-friendly-available.ts …ettings/actions/is-friendly-available.tsapps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/is-friendly-available.ts renamed to apps/app/src/app/(app)/[orgId]/trust/portal-settings/actions/is-friendly-available.ts apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/is-friendly-available.ts renamed to apps/app/src/app/(app)/[orgId]/trust/portal-settings/actions/is-friendly-available.ts

@@ -94,6 +94,7 @@ export async function updateTrustPortalFrameworks({
     },
   });
 
-  revalidatePath(`/${orgId}/settings/trust-portal`);
+  revalidatePath(`/${orgId}/trust`);
+  revalidatePath(`/${orgId}/trust/portal-settings`);
   revalidateTag(`organization_${orgId}`);
 }