chore: merge main into release for new releases

Marfuen · Marfuen · commit 9127a7b8d594 · 2026-02-18T15:43:33.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -86,3 +86,5 @@ packages/*/dist
 # Release script
 scripts/sync-release-branch.sh
 /.vscode
+
+.claude/projects/-Users-marfuen-code-comp/
diff --git a/apps/api/src/integration-platform/controllers/connections.controller.ts b/apps/api/src/integration-platform/controllers/connections.controller.ts
@@ -384,6 +384,13 @@ export class ConnectionsController {
       if (typeof credentials.externalId === 'string') {
         metadata.externalId = credentials.externalId;
       }
+      // Store Azure tenant/subscription IDs in metadata for display and pre-filling
+      if (typeof credentials.tenantId === 'string') {
+        metadata.tenantId = credentials.tenantId;
+      }
+      if (typeof credentials.subscriptionId === 'string') {
+        metadata.subscriptionId = credentials.subscriptionId;
+      }
     }
 
     // Create connection (only after validation passes)
diff --git a/apps/app/src/app/(app)/[orgId]/cloud-tests/actions/connect-cloud.ts b/apps/app/src/app/(app)/[orgId]/cloud-tests/actions/connect-cloud.ts
@@ -92,14 +92,27 @@ export const connectCloudAction = authActionClient
           ? [credentials.region]
           : [];
 
+      const tenantId =
+        typeof credentials.tenantId === 'string' ? credentials.tenantId.trim() : undefined;
+      const subscriptionId =
+        typeof credentials.subscriptionId === 'string'
+          ? credentials.subscriptionId.trim()
+          : undefined;
+
       const settings =
         cloudProvider === 'aws'
           ? {
               accountId,
               connectionName,
               regions: regionValues,
             }
-          : {};
+          : cloudProvider === 'azure'
+            ? {
+                connectionName,
+                tenantId,
+                subscriptionId,
+              }
+            : {};
 
       // Create new integration (allow multiple per provider)
       const newIntegration = await db.integration.create({
diff --git a/apps/app/src/app/(app)/[orgId]/cloud-tests/components/EmptyState.tsx b/apps/app/src/app/(app)/[orgId]/cloud-tests/components/EmptyState.tsx
@@ -142,26 +142,33 @@ export function EmptyState({
   onConnected,
   initialProvider = null,
 }: EmptyStateProps) {
-  const initialIsAws = initialProvider === 'aws';
-  const [step, setStep] = useState<Step>(initialProvider && !initialIsAws ? 'connect' : 'choose');
+  const initialUsesDialog = initialProvider === 'aws' || initialProvider === 'azure';
+  const [step, setStep] = useState<Step>(
+    initialProvider && !initialUsesDialog ? 'connect' : 'choose',
+  );
   const [selectedProvider, setSelectedProvider] = useState<CloudProvider>(
-    initialProvider && !initialIsAws ? initialProvider : null,
+    initialProvider && !initialUsesDialog ? initialProvider : null,
+  );
+  const [showConnectDialog, setShowConnectDialog] = useState(initialUsesDialog);
+  const [connectDialogProvider, setConnectDialogProvider] = useState<'aws' | 'azure'>(
+    initialProvider === 'azure' ? 'azure' : 'aws',
   );
-  const [showConnectDialog, setShowConnectDialog] = useState(initialIsAws);
   const [credentials, setCredentials] = useState<Record<string, string | string[]>>({});
   const [errors, setErrors] = useState<Record<string, string>>({});
   const [isConnecting, setIsConnecting] = useState(false);
   const [awsRegions, setAwsRegions] = useState<{ value: string; label: string }[]>([]);
   const [awsAccountId, setAwsAccountId] = useState<string>('');
 
   useEffect(() => {
-    if (initialProvider === 'aws') {
+    if (initialProvider === 'aws' || initialProvider === 'azure') {
+      setConnectDialogProvider(initialProvider);
       setShowConnectDialog(true);
     }
   }, [initialProvider]);
 
   const handleProviderSelect = (providerId: CloudProvider) => {
-    if (providerId === 'aws') {
+    if (providerId === 'aws' || providerId === 'azure') {
+      setConnectDialogProvider(providerId);
       setShowConnectDialog(true);
       return;
     }
@@ -414,9 +421,15 @@ export function EmptyState({
           <ConnectIntegrationDialog
             open={showConnectDialog}
             onOpenChange={(open) => setShowConnectDialog(open)}
-            integrationId="aws"
-            integrationName="Amazon Web Services"
-            integrationLogoUrl="https://img.logo.dev/aws.amazon.com?token=pk_AZatYxV5QDSfWpRDaBxzRQ"
+            integrationId={connectDialogProvider}
+            integrationName={
+              connectDialogProvider === 'azure' ? 'Microsoft Azure' : 'Amazon Web Services'
+            }
+            integrationLogoUrl={
+              connectDialogProvider === 'azure'
+                ? 'https://img.logo.dev/azure.microsoft.com?token=pk_AZatYxV5QDSfWpRDaBxzRQ'
+                : 'https://img.logo.dev/aws.amazon.com?token=pk_AZatYxV5QDSfWpRDaBxzRQ'
+            }
             onConnected={() => {
               setShowConnectDialog(false);
               onConnected?.();
@@ -426,7 +439,8 @@ export function EmptyState({
 
         <div className="grid w-full gap-4 md:grid-cols-3">
           {CLOUD_PROVIDERS.filter(
-            (cp) => cp.id === 'aws' || !connectedProviders.includes(cp.id),
+            (cp) =>
+              cp.id === 'aws' || cp.id === 'azure' || !connectedProviders.includes(cp.id),
           ).map((cloudProvider) => (
             <Card
               key={cloudProvider.id}
diff --git a/apps/app/src/app/(app)/[orgId]/cloud-tests/components/ProviderTabs.tsx b/apps/app/src/app/(app)/[orgId]/cloud-tests/components/ProviderTabs.tsx
@@ -94,6 +94,14 @@ function ConnectionDetails({ connection }: { connection: Provider }) {
     details.push(`Account: ${connection.accountId}`);
   }
 
+  if (connection.tenantId) {
+    details.push(`Tenant: ${connection.tenantId}`);
+  }
+
+  if (connection.subscriptionId) {
+    details.push(`Subscription: ${connection.subscriptionId}`);
+  }
+
   if (connection.regions?.length) {
     details.push(
       `${connection.regions.length} region${connection.regions.length !== 1 ? 's' : ''}`,
diff --git a/apps/app/src/app/(app)/[orgId]/cloud-tests/components/TestsLayout.tsx b/apps/app/src/app/(app)/[orgId]/cloud-tests/components/TestsLayout.tsx
@@ -287,13 +287,13 @@ export function TestsLayout({ initialFindings, initialProviders, orgId }: TestsL
         needsConfiguration={needsVariableConfiguration}
       />
 
-      {/* CloudSettingsModal only for providers that do NOT support multiple connections */}
-      {/* AWS is managed via ConnectIntegrationDialog since it supports multiple connections */}
+      {/* CloudSettingsModal for single-connection providers AND legacy connections */}
+      {/* Legacy connections need this modal for disconnect since ConnectIntegrationDialog can't see them */}
       <CloudSettingsModal
         open={showSettings}
         onOpenChange={setShowSettings}
         connectedProviders={connectedProviders
-          .filter((p) => !p.supportsMultipleConnections)
+          .filter((p) => !p.supportsMultipleConnections || p.isLegacy)
           .map((p) => ({
             id: p.integrationId,
             connectionId: p.id,
diff --git a/apps/app/src/app/(app)/[orgId]/cloud-tests/page.tsx b/apps/app/src/app/(app)/[orgId]/cloud-tests/page.tsx
@@ -107,6 +107,8 @@ export default async function CloudTestsPage({ params }: { params: Promise<{ org
     requiredVariables: string[];
     accountId?: string;
     regions?: string[];
+    tenantId?: string;
+    subscriptionId?: string;
     supportsMultipleConnections?: boolean;
   };
 
@@ -118,6 +120,9 @@ export default async function CloudTestsPage({ params }: { params: Promise<{ org
     const regions = Array.isArray(metadata.regions)
       ? metadata.regions.filter((region): region is string => typeof region === 'string')
       : undefined;
+    const tenantId = typeof metadata.tenantId === 'string' ? metadata.tenantId : undefined;
+    const subscriptionId =
+      typeof metadata.subscriptionId === 'string' ? metadata.subscriptionId : undefined;
     const manifest = getManifest(conn.provider.slug);
 
     return {
@@ -135,6 +140,8 @@ export default async function CloudTestsPage({ params }: { params: Promise<{ org
       requiredVariables: getRequiredVariables(conn.provider.slug),
       accountId,
       regions,
+      tenantId,
+      subscriptionId,
       supportsMultipleConnections: manifest?.supportsMultipleConnections ?? false,
     };
   });
@@ -147,6 +154,9 @@ export default async function CloudTestsPage({ params }: { params: Promise<{ org
     const regions = Array.isArray(settings.regions)
       ? settings.regions.filter((region): region is string => typeof region === 'string')
       : undefined;
+    const tenantId = typeof settings.tenantId === 'string' ? settings.tenantId : undefined;
+    const subscriptionId =
+      typeof settings.subscriptionId === 'string' ? settings.subscriptionId : undefined;
     const manifest = getManifest(integration.integrationId);
 
     return {
@@ -164,6 +174,8 @@ export default async function CloudTestsPage({ params }: { params: Promise<{ org
       requiredVariables: getRequiredVariables(integration.integrationId),
       accountId,
       regions,
+      tenantId,
+      subscriptionId,
       supportsMultipleConnections: manifest?.supportsMultipleConnections ?? false,
     };
   });
diff --git a/apps/app/src/app/(app)/[orgId]/cloud-tests/types.ts b/apps/app/src/app/(app)/[orgId]/cloud-tests/types.ts
@@ -28,6 +28,8 @@ export interface Provider {
   requiredVariables?: string[];
   accountId?: string;
   regions?: string[];
+  tenantId?: string;
+  subscriptionId?: string;
   supportsMultipleConnections?: boolean;
 }
 export type FailedIntegration = {
diff --git a/apps/app/src/app/(app)/[orgId]/people/all/components/PendingInvitationRow.tsx b/apps/app/src/app/(app)/[orgId]/people/all/components/PendingInvitationRow.tsx
@@ -119,7 +119,7 @@ export function PendingInvitationRow({
                 <OverflowMenuVertical />
               </DropdownMenuTrigger>
               <DropdownMenuContent align="end">
-                <DropdownMenuItem variant="destructive" onSelect={handleOpenCancelDialog}>
+                <DropdownMenuItem variant="destructive" onClick={handleOpenCancelDialog}>
                   <TrashCan size={16} />
                   Cancel Invitation
                 </DropdownMenuItem>
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/components/TasksByCategory.tsx b/apps/app/src/app/(app)/[orgId]/tasks/components/TasksByCategory.tsx
@@ -3,8 +3,8 @@
 import type { Member, Task, User } from '@db';
 import { ArrowLeft, Folder } from 'lucide-react';
 import Image from 'next/image';
-import { usePathname, useRouter } from 'next/navigation';
-import { useMemo, useState } from 'react';
+import { usePathname, useRouter, useSearchParams } from 'next/navigation';
+import { useMemo } from 'react';
 import { AutomationIndicator } from './AutomationIndicator';
 import { TaskStatusSelector } from './TaskStatusSelector';
 
@@ -62,7 +62,7 @@ const statusPalette = {
 export function TasksByCategory({ tasks, members, statusFilter }: TasksByCategoryProps) {
   const router = useRouter();
   const pathname = usePathname();
-  const [selectedCategory, setSelectedCategory] = useState<string | null>(null);
+  const searchParams = useSearchParams();
 
   // Group tasks by their first control, or "Uncategorized"
   const categories = useMemo(() => {
@@ -110,6 +110,13 @@ export function TasksByCategory({ tasks, members, statusFilter }: TasksByCategor
     return sortedCategories;
   }, [tasks]);
 
+  // Selected category from URL so it survives back navigation
+  const categoryFromUrl = searchParams.get('category');
+  const selectedCategory = useMemo(() => {
+    if (!categoryFromUrl) return null;
+    return categories.some((c) => c.id === categoryFromUrl) ? categoryFromUrl : null;
+  }, [categoryFromUrl, categories]);
+
   // Calculate stats for a category
   const getCategoryStats = (categoryTasks: Task[]) => {
     const total = categoryTasks.length;
@@ -129,7 +136,19 @@ export function TasksByCategory({ tasks, members, statusFilter }: TasksByCategor
   };
 
   const handleCategoryClick = (categoryId: string) => {
-    setSelectedCategory(selectedCategory === categoryId ? null : categoryId);
+    const next = selectedCategory === categoryId ? null : categoryId;
+    const params = new URLSearchParams(searchParams.toString());
+    if (next) params.set('category', next);
+    else params.delete('category');
+    const query = params.toString();
+    router.replace(query ? `${pathname}?${query}` : pathname);
+  };
+
+  const handleBackToCategories = () => {
+    const params = new URLSearchParams(searchParams.toString());
+    params.delete('category');
+    const query = params.toString();
+    router.replace(query ? `${pathname}?${query}` : pathname);
   };
 
   // If a category is selected, show only that category's tasks
@@ -212,7 +231,7 @@ export function TasksByCategory({ tasks, members, statusFilter }: TasksByCategor
       {/* Back button and category header */}
       <div className="flex items-center justify-between">
         <button
-          onClick={() => setSelectedCategory(null)}
+          onClick={handleBackToCategories}
           className="inline-flex items-center gap-2 rounded-sm border border-border/60 px-3 py-1.5 text-[11px] font-medium uppercase tracking-[0.18em] text-muted-foreground transition-colors hover:bg-muted/20 hover:text-foreground"
         >
           <ArrowLeft className="h-3 w-3" />
diff --git a/apps/app/src/components/integrations/ConnectIntegrationDialog.tsx b/apps/app/src/components/integrations/ConnectIntegrationDialog.tsx
@@ -41,6 +41,8 @@ interface ExistingConnection {
   displayName: string;
   accountId?: string;
   regions?: string[];
+  tenantId?: string;
+  subscriptionId?: string;
   status: string;
   lastSyncAt?: string | null;
   isLegacy?: boolean;
@@ -215,6 +217,9 @@ export function ConnectIntegrationDialog({
               : conn.providerName || integrationName,
           accountId: typeof metadata.accountId === 'string' ? metadata.accountId : undefined,
           regions: Array.isArray(metadata.regions) ? (metadata.regions as string[]) : undefined,
+          tenantId: typeof metadata.tenantId === 'string' ? metadata.tenantId : undefined,
+          subscriptionId:
+            typeof metadata.subscriptionId === 'string' ? metadata.subscriptionId : undefined,
           status: conn.status,
           lastSyncAt: conn.lastSyncAt,
           isLegacy: false,
@@ -421,6 +426,13 @@ export function ConnectIntegrationDialog({
       if (Array.isArray(metadata.regions)) {
         prefillCredentials.regions = metadata.regions as string[];
       }
+      // Azure-specific metadata pre-fill
+      if (typeof metadata.tenantId === 'string') {
+        prefillCredentials.tenantId = metadata.tenantId;
+      }
+      if (typeof metadata.subscriptionId === 'string') {
+        prefillCredentials.subscriptionId = metadata.subscriptionId;
+      }
 
       setConfigureConnectionId(connectionId);
       setCredentials(prefillCredentials);
@@ -474,6 +486,13 @@ export function ConnectIntegrationDialog({
       if (typeof credentials.externalId === 'string' && credentials.externalId.trim()) {
         metadataUpdates.externalId = credentials.externalId.trim();
       }
+      // Azure-specific metadata updates
+      if (typeof credentials.tenantId === 'string' && credentials.tenantId.trim()) {
+        metadataUpdates.tenantId = credentials.tenantId.trim();
+      }
+      if (typeof credentials.subscriptionId === 'string' && credentials.subscriptionId.trim()) {
+        metadataUpdates.subscriptionId = credentials.subscriptionId.trim();
+      }
 
       if (Object.keys(metadataUpdates).length > 0) {
         const metadataResult = await api.patch<{ success: boolean }>(
@@ -532,11 +551,16 @@ export function ConnectIntegrationDialog({
                       </span>
                     )}
                   </div>
-                  {(conn.accountId || conn.regions?.length) && (
+                  {(conn.accountId || conn.regions?.length || conn.tenantId || conn.subscriptionId) && (
                     <div className="text-xs text-muted-foreground">
-                      {conn.accountId && <span>Account: {conn.accountId}</span>}
-                      {conn.accountId && conn.regions?.length ? ' • ' : ''}
-                      {conn.regions?.length && <span>{conn.regions.length} regions</span>}
+                      {[
+                        conn.accountId && `Account: ${conn.accountId}`,
+                        conn.regions?.length && `${conn.regions.length} regions`,
+                        conn.tenantId && `Tenant: ${conn.tenantId}`,
+                        conn.subscriptionId && `Subscription: ${conn.subscriptionId}`,
+                      ]
+                        .filter(Boolean)
+                        .join(' • ')}
                     </div>
                   )}
                 </div>
diff --git a/packages/integration-platform/src/manifests/azure/credentials.ts b/packages/integration-platform/src/manifests/azure/credentials.ts
@@ -4,6 +4,14 @@ import { z } from 'zod';
  * Azure credential fields for the connection form
  */
 export const azureCredentialFields = [
+  {
+    id: 'connectionName',
+    label: 'Connection Name',
+    type: 'text' as const,
+    required: true,
+    placeholder: 'Production Tenant',
+    helpText: 'A friendly name to identify this Azure tenant (e.g., "Production", "DevOps")',
+  },
   {
     id: 'tenantId',
     label: 'Tenant ID (Directory ID)',
@@ -42,6 +50,7 @@ export const azureCredentialFields = [
  * Validation schema for Azure credentials
  */
 export const azureCredentialSchema = z.object({
+  connectionName: z.string().min(1, 'Connection name is required'),
   tenantId: z
     .string()
     .uuid('Must be a valid UUID')
diff --git a/packages/integration-platform/src/manifests/azure/index.ts b/packages/integration-platform/src/manifests/azure/index.ts
@@ -1,5 +1,9 @@
 import type { IntegrationManifest } from '../../types';
-import { azureCredentialFields, azureSetupInstructions } from './credentials';
+import {
+  azureCredentialFields,
+  azureCredentialSchema,
+  azureSetupInstructions,
+} from './credentials';
 
 export const azureManifest: IntegrationManifest = {
   id: 'azure',
@@ -8,13 +12,15 @@ export const azureManifest: IntegrationManifest = {
   category: 'Cloud',
   logoUrl: 'https://img.logo.dev/azure.com?token=pk_AZatYxV5QDSfWpRDaBxzRQ',
   docsUrl: 'https://docs.microsoft.com/en-us/azure/defender-for-cloud/',
+  supportsMultipleConnections: true,
   isActive: true,
 
   auth: {
     type: 'custom',
     config: {
       description: 'Azure Service Principal - secure application access',
       credentialFields: azureCredentialFields,
+      validationSchema: azureCredentialSchema,
       setupInstructions: azureSetupInstructions,
     },
   },

Original file line number	Diff line number	Diff line change
`@@ -384,6 +384,13 @@ export class ConnectionsController {`
`384`	`384`	`if (typeof credentials.externalId === 'string') {`
`385`	`385`	`metadata.externalId = credentials.externalId;`
`386`	`386`	`}`
	`387`	`+ // Store Azure tenant/subscription IDs in metadata for display and pre-filling`
	`388`	`+ if (typeof credentials.tenantId === 'string') {`
	`389`	`+ metadata.tenantId = credentials.tenantId;`
	`390`	`+ }`
	`391`	`+ if (typeof credentials.subscriptionId === 'string') {`
	`392`	`+ metadata.subscriptionId = credentials.subscriptionId;`
	`393`	`+ }`
`387`	`394`	`}`
`388`	`395`
`389`	`396`	`// Create connection (only after validation passes)`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ export interface Provider {`
`28`	`28`	`requiredVariables?: string[];`
`29`	`29`	`accountId?: string;`
`30`	`30`	`regions?: string[];`
	`31`	`+ tenantId?: string;`
	`32`	`+ subscriptionId?: string;`
`31`	`33`	`supportsMultipleConnections?: boolean;`
`32`	`34`	`}`
`33`	`35`	`export type FailedIntegration = {`