Merge branch 'main' into mg/OPS-3112-oss

Author: MarceloRGonc

packages/server/api/src/app/authentication/context/create-project-auth-context.ts

@@ -15,6 +15,7 @@ import { accessTokenManager } from './access-token-manager';
 export async function getProjectAndToken(
   user: User,
   tablesRefreshToken: string,
+  expiresInSeconds?: number,
 ): Promise<{
   user: User;
   project: Project;
@@ -38,15 +39,18 @@ export async function getProjectAndToken(
     project.organizationId,
   );
 
-  const token = await accessTokenManager.generateToken({
-    id: user.id,
-    externalId: user.externalId,
-    type: PrincipalType.USER,
-    projectId: project.id,
-    organization: {
-      id: organization.id,
+  const token = await accessTokenManager.generateToken(
+    {
+      id: user.id,
+      externalId: user.externalId,
+      type: PrincipalType.USER,
+      projectId: project.id,
+      organization: {
+        id: organization.id,
+      },
     },
-  });
+    expiresInSeconds,
+  );
 
   return {
     user: updatedUser,

packages/ui-components/src/components/flow-template/domain-icons.tsx

@@ -1,5 +1,6 @@
 import {
   AlertTriangle,
+  FileBadge,
   Gauge,
   LucideIcon,
   PieChart,
@@ -11,4 +12,5 @@ export const DOMAIN_ICON_SUGGESTIONS: Record<string, LucideIcon> = {
   'Anomaly Management': AlertTriangle,
   'Rate Optimization': TrendingUp,
   'Workload Optimization': Gauge,
+  'Policy & Governance': FileBadge,
 };