Azure
diff --git a/‎Localize/lang/strings.json‎
Lines changed: 6 additions & 4 deletions b/‎Localize/lang/strings.json‎
Lines changed: 6 additions & 4 deletions
diff --git a/‎apps/Standalone/src/designer/app/AzureLogicAppsDesigner/DesignerCommandBar.tsx‎
Lines changed: 5 additions & 2 deletions b/‎apps/Standalone/src/designer/app/AzureLogicAppsDesigner/DesignerCommandBar.tsx‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎apps/Standalone/src/designer/app/AzureLogicAppsDesigner/DesignerCommandBarV2.tsx‎
Lines changed: 5 additions & 2 deletions b/‎apps/Standalone/src/designer/app/AzureLogicAppsDesigner/DesignerCommandBarV2.tsx‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎libs/designer-ui/src/lib/foundryagentdetails/__test__/foundryAgentDetails.spec.tsx‎
Lines changed: 139 additions & 34 deletions b/‎libs/designer-ui/src/lib/foundryagentdetails/__test__/foundryAgentDetails.spec.tsx‎
Lines changed: 139 additions & 34 deletions
@@ -168,6 +168,7 @@
   "1nODUD": "Hide functions",
   "1nvvw1": "Enter the value of the Authorization header",
   "1pjO9s": "Hide source schema",
+  "1r967W": "Edit in foundry portal",
   "1r9ljA": "Enter a valid URI.",
   "1tmN2o": "Workflow version",
   "1uGBLP": "5",
@@ -680,7 +681,6 @@
   "CyI9Au": "Dismiss",
   "CyT8H7": "Accepts 'Number', 'Integer', and 'Decimal' types.",
   "CypYLs": "Insert a new step between {parentName} and {childName}",
-  "Cz5vTr": "Edit in Foundry Portal",
   "Czt6YV": "at {times}",
   "D+Ptnq": "Returns the path and query from a URI",
   "D/xTXV": "Show source schema",
@@ -1875,6 +1875,7 @@
   "_1nODUD.comment": "Label to close Functions list",
   "_1nvvw1.comment": "Raw Value Placeholder Text",
   "_1pjO9s.comment": "Label to close source schema toolbox",
+  "_1r967W.comment": "Link to edit agent in Foundry Portal",
   "_1r9ljA.comment": "Error validation message for URIs",
   "_1tmN2o.comment": "Workflow version text",
   "_1uGBLP.comment": "Hour of the day",
@@ -2387,7 +2388,6 @@
   "_CyI9Au.comment": "Button text to dismiss the deprecation toast",
   "_CyT8H7.comment": "Explains that numerical type allows three different number types",
   "_CypYLs.comment": "Tooltip for the button to add a new step (action or branch)",
-  "_Cz5vTr.comment": "Link to edit agent in Foundry Portal",
   "_Czt6YV.comment": "Recurrence schedule description at times",
   "_D+Ptnq.comment": "Label for description of custom uriPathAndQuery Function",
   "_D/xTXV.comment": "Label to open source schema toolbox",
@@ -3756,7 +3756,6 @@
   "_haeWoU.comment": "Error message when splitOn cannot be evaluated",
   "_hbOvB4.comment": "Dislike button text for suggested flow",
   "_hbmiUp.comment": "Placeholder text for date picker",
-  "_hbwavm.comment": "Foundry agents version display",
   "_hdN+aw.comment": "Description for host field",
   "_hesDPs.comment": "Milliseconds",
   "_hflWi6.comment": "Description for trimByteOrderMark function",
@@ -3942,6 +3941,7 @@
   "_lbq5E1.comment": "description of upload content transfer setting",
   "_lciYKh.comment": "Loading message for the MCP server workflows field",
   "_lckgnb.comment": "Required collection parameter to apply reverse function on",
+  "_ld530c.comment": "Placeholder while agent versions load",
   "_ldBi4y.comment": "Aria label for the toggle filters button",
   "_ldn/IC.comment": "Test button",
   "_leA1MT.comment": "Tooltip for URL endpoint connection parameter",
@@ -4395,6 +4395,7 @@
   "_ur+ZvW.comment": "The tab label for the monitoring connections tab on the configure template wizard",
   "_ur3P27.comment": "Suggest to the user to try a conversion function instead",
   "_urAHv1.comment": "Hour of the day",
+  "_urJyNX.comment": "Placeholder for version dropdown",
   "_urmf+A.comment": "Message informing that target element cannot be removed",
   "_usCZ7R.comment": "Time zone value ",
   "_uwuGU0.comment": "Time zone value ",
@@ -4972,7 +4973,6 @@
   "haeWoU": "Failed to evaluate outputs because splitOn {splitOn} cannot be evaluated. As a result, this operation's outputs might not be correctly visible in subsequent actions",
   "hbOvB4": "This isn't what I'm looking for",
   "hbmiUp": "Select a date...",
-  "hbwavm": "Agents (v2)",
   "hdN+aw": "Specifies which Logic App sku the template supports (e.g., Standard, Consumption).",
   "hesDPs": "{count} Milliseconds",
   "hflWi6": "Removes Byte Order Mark (BOM) characters from the beginning of strings or binary content.",
@@ -5158,6 +5158,7 @@
   "lbq5E1": "Large messages may be split up into smaller requests to the connector to allow large message upload. More details can be found at http://aka.ms/logicapps-chunk#upload-content-in-chunks",
   "lciYKh": "Loading workflows...",
   "lckgnb": "Required. The collection to reverse.",
+  "ld530c": "Loading versions...",
   "ldBi4y": "Toggle filters",
   "ldn/IC": "Test",
   "leA1MT": "The endpoint of the Cosmos DB account",
@@ -5611,6 +5612,7 @@
   "ur+ZvW": "Connections",
   "ur3P27": "Try using a Conversion function such as: {conversionFunctions}",
   "urAHv1": "4",
+  "urJyNX": "Select a version",
   "urmf+A": "Target schema element can't be deleted.",
   "usCZ7R": "(UTC+11:00) Magadan",
   "uwuGU0": "(UTC+06:30) Yangon (Rangoon)",
 
@@ -43,7 +43,7 @@ import {
   flushPendingFoundryUpdates,
 } from '@microsoft/logic-apps-designer';
 import { useMemo } from 'react';
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useDispatch, useSelector } from 'react-redux';
 import LogicAppsIcon from '../../../assets/logicapp.svg';
 import { environment } from '../../../environments/environment';
@@ -100,6 +100,7 @@ export const DesignerCommandBar = ({
 }) => {
   const dispatch = useDispatch<AppDispatch>();
   const isCopilotReady = useNodesInitialized();
+  const queryClient = useQueryClient();
   const { isLoading: isSaving, mutate: saveWorkflowMutate } = useMutation(async () => {
     const designerState = DesignerStore.getState();
     const serializedWorkflow = await serializeBJSWorkflow(designerState, {
@@ -135,7 +136,9 @@ export const DesignerCommandBar = ({
     const customCodeFilesWithData = getCustomCodeFilesWithData(designerState.customCode);
 
     if (!hasParametersErrors) {
-      await flushPendingFoundryUpdates().catch(console.error);
+      await flushPendingFoundryUpdates(() => {
+        queryClient.invalidateQueries({ queryKey: ['foundryAgentVersions'] });
+      }).catch(console.error);
       await saveWorkflow(serializedWorkflow, customCodeFilesWithData, () => dispatch(resetDesignerDirtyState(undefined)));
       if (Object.keys(serializedWorkflow?.definition?.triggers ?? {}).length > 0) {
         updateCallbackUrl(designerState, dispatch);
 
@@ -50,7 +50,7 @@ import {
   flushPendingFoundryUpdates,
 } from '@microsoft/logic-apps-designer-v2';
 import { useEffect, useMemo, useState } from 'react';
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useDispatch, useSelector } from 'react-redux';
 import { environment } from '../../../environments/environment';
 import { isSuccessResponse } from './Services/HttpClient';
@@ -160,6 +160,7 @@ export const DesignerCommandBar = ({
 
   const dispatch = useDispatch<AppDispatch>();
   const isCopilotReady = useNodesInitialized();
+  const queryClient = useQueryClient();
   const { isLoading: isSaving, mutate: saveWorkflowMutate } = useMutation(async (autoSave?: boolean) => {
     try {
       setAutoSaving(autoSave ?? false);
@@ -197,7 +198,9 @@ export const DesignerCommandBar = ({
       const customCodeFilesWithData = getCustomCodeFilesWithData(designerState.customCode);
 
       if (!hasParametersErrors || autoSave) {
-        await flushPendingFoundryUpdates().catch(console.error);
+        await flushPendingFoundryUpdates(() => {
+          queryClient.invalidateQueries({ queryKey: ['foundryAgentVersions'] });
+        }).catch(console.error);
         await saveWorkflow(serializedWorkflow, customCodeFilesWithData, () => dispatch(resetDesignerDirtyState(undefined)), autoSave);
         if (Object.keys(serializedWorkflow?.definition?.triggers ?? {}).length > 0) {
           updateCallbackUrl(designerState, dispatch);
 
@@ -2,8 +2,8 @@ import * as React from 'react';
 import * as renderer from 'react-test-renderer';
 import { IntlProvider } from 'react-intl';
 import { describe, vi, it, expect } from 'vitest';
-import { FoundryAgentDetails } from '../index';
-import type { FoundryAgent, FoundryModel } from '@microsoft/logic-apps-shared';
+import { FoundryAgentDetails, buildFoundryPortalUrl } from '../index';
+import type { FoundryAgent, FoundryAgentVersion, FoundryModel } from '@microsoft/logic-apps-shared';
 
 function renderWithIntl(component: React.ReactElement) {
   return renderer.create(<IntlProvider locale="en">{component}</IntlProvider>);
@@ -27,68 +27,173 @@ describe('FoundryAgentDetails', () => {
     { id: 'gpt-35-turbo', name: 'GPT-3.5 Turbo' },
   ];
 
+  const baseVersions: FoundryAgentVersion[] = [
+    {
+      id: 'agent-1:3',
+      name: 'agent-1',
+      version: '3',
+      description: '',
+      created_at: 1772564608,
+      metadata: {},
+      object: 'agent.version',
+      definition: { kind: 'prompt', model: 'gpt-4', instructions: 'v3 instructions' },
+    },
+    {
+      id: 'agent-1:2',
+      name: 'agent-1',
+      version: '2',
+      description: '',
+      created_at: 1770322055,
+      metadata: {},
+      object: 'agent.version',
+      definition: { kind: 'prompt', model: 'gpt-35-turbo', instructions: 'v2 instructions' },
+    },
+  ];
+
   it('should render without crashing', () => {
     const tree = renderWithIntl(
       <FoundryAgentDetails agent={baseAgent} models={baseModels} onModelChange={vi.fn()} onInstructionsChange={vi.fn()} />
     );
     expect(tree.toJSON()).toBeTruthy();
   });
 
-  it('should render version text', () => {
+  it('should render with versions dropdown when versions are provided', () => {
     const tree = renderWithIntl(
-      <FoundryAgentDetails agent={baseAgent} models={baseModels} onModelChange={vi.fn()} onInstructionsChange={vi.fn()} />
+      <FoundryAgentDetails
+        agent={baseAgent}
+        models={baseModels}
+        onModelChange={vi.fn()}
+        onInstructionsChange={vi.fn()}
+        versions={baseVersions}
+        selectedVersion="3"
+        onVersionChange={vi.fn()}
+      />
     );
     const json = tree.toJSON() as renderer.ReactTestRendererJSON;
     expect(json.children).toBeTruthy();
     expect(json.children!.length).toBeGreaterThan(0);
   });
 
-  it('should render tools summary as "None" when no tools', () => {
-    const tree = renderWithIntl(
-      <FoundryAgentDetails agent={baseAgent} models={baseModels} onModelChange={vi.fn()} onInstructionsChange={vi.fn()} />
-    );
-    expect(tree.toJSON()).toBeTruthy();
-  });
-
-  it('should render portal link when projectResourceId is provided', () => {
-    const resourceId = '/subscriptions/sub-1/resourceGroups/rg-1/providers/Microsoft.CognitiveServices/accounts/acct-1/projects/proj-1';
+  it('should render with numeric version values from the API (runtime type mismatch)', () => {
+    // The Foundry API may return version as a number despite the TypeScript interface declaring string.
+    // The component must handle this gracefully via String() coercion.
+    const numericVersions = baseVersions.map((v) => ({ ...v, version: Number(v.version) as unknown as string }));
     const tree = renderWithIntl(
       <FoundryAgentDetails
         agent={baseAgent}
         models={baseModels}
         onModelChange={vi.fn()}
         onInstructionsChange={vi.fn()}
-        projectResourceId={resourceId}
+        versions={numericVersions}
+        selectedVersion="3"
+        onVersionChange={vi.fn()}
       />
     );
-    const root = tree.root;
-    // Find the Link element (rendered as an anchor with href)
-    const links = root.findAll(
-      (node) => node.props.href && typeof node.props.href === 'string' && node.props.href.startsWith('https://ai.azure.com/')
-    );
-    expect(links.length).toBeGreaterThan(0);
-    expect(links[0].props.href).toContain('agent-1');
+    const json = tree.toJSON() as renderer.ReactTestRendererJSON;
+    expect(json.children).toBeTruthy();
+    expect(json.children!.length).toBeGreaterThan(0);
   });
 
-  it('should not render portal link when projectResourceId is missing', () => {
+  it('should render disabled version dropdown when no versions available', () => {
     const tree = renderWithIntl(
-      <FoundryAgentDetails agent={baseAgent} models={baseModels} onModelChange={vi.fn()} onInstructionsChange={vi.fn()} />
+      <FoundryAgentDetails agent={baseAgent} models={baseModels} onModelChange={vi.fn()} onInstructionsChange={vi.fn()} versions={[]} />
     );
-    const root = tree.root;
-    const links = root.findAll(
-      (node) => node.props.href && typeof node.props.href === 'string' && node.props.href.startsWith('https://ai.azure.com/')
-    );
-    expect(links.length).toBe(0);
+    expect(tree.toJSON()).toBeTruthy();
   });
 
-  it('should render agent with tools summary', () => {
-    const agentWithTools: FoundryAgent = {
-      ...baseAgent,
-      tools: [{ type: 'code_interpreter' }, { type: 'file_search' }],
-    };
+  it('should show loading placeholder when versions are loading', () => {
     const tree = renderWithIntl(
-      <FoundryAgentDetails agent={agentWithTools} models={baseModels} onModelChange={vi.fn()} onInstructionsChange={vi.fn()} />
+      <FoundryAgentDetails
+        agent={baseAgent}
+        models={baseModels}
+        onModelChange={vi.fn()}
+        onInstructionsChange={vi.fn()}
+        versionsLoading={true}
+      />
     );
     expect(tree.toJSON()).toBeTruthy();
   });
 });
+
+describe('handleVersionSelect logic (String coercion)', () => {
+  // Extracted logic from handleVersionSelect to verify the String() coercion fix
+  // works for both string and numeric version values from the API.
+  function findVersion(versions: FoundryAgentVersion[], optionValue: string): FoundryAgentVersion | undefined {
+    return versions.find((v) => String(v.version) === optionValue);
+  }
+
+  const versions: FoundryAgentVersion[] = [
+    {
+      id: 'a:8',
+      name: 'a',
+      version: '8',
+      description: '',
+      created_at: 0,
+      metadata: {},
+      object: 'agent.version',
+      definition: { kind: 'prompt', model: 'gpt-4', instructions: '' },
+    },
+    {
+      id: 'a:7',
+      name: 'a',
+      version: '7',
+      description: '',
+      created_at: 0,
+      metadata: {},
+      object: 'agent.version',
+      definition: { kind: 'prompt', model: 'gpt-4', instructions: '' },
+    },
+  ];
+
+  it('should find version when version field is a string', () => {
+    const result = findVersion(versions, '8');
+    expect(result).toBeDefined();
+    expect(result!.id).toBe('a:8');
+  });
+
+  it('should find version when API returns version as a number (runtime type mismatch)', () => {
+    const numericVersions = versions.map((v) => ({ ...v, version: Number(v.version) as unknown as string }));
+    const result = findVersion(numericVersions, '8');
+    expect(result).toBeDefined();
+    expect(result!.id).toBe('a:8');
+  });
+
+  it('should return undefined for non-existent version', () => {
+    expect(findVersion(versions, '99')).toBeUndefined();
+  });
+
+  it('should return undefined for empty optionValue', () => {
+    expect(findVersion(versions, '')).toBeUndefined();
+  });
+});
+
+describe('buildFoundryPortalUrl', () => {
+  it('should return a portal URL when given a valid project resource ID', () => {
+    const resourceId = '/subscriptions/sub-1/resourceGroups/rg-1/providers/Microsoft.CognitiveServices/accounts/acct-1/projects/proj-1';
+    const url = buildFoundryPortalUrl(resourceId, 'agent-1');
+    expect(url).toContain('https://ai.azure.com/');
+    expect(url).toContain('agent-1');
+  });
+
+  it('should return undefined when projectResourceId is missing', () => {
+    expect(buildFoundryPortalUrl(undefined, 'agent-1')).toBeUndefined();
+  });
+
+  it('should return undefined for an invalid resource ID', () => {
+    expect(buildFoundryPortalUrl('/subscriptions/sub-1/resourceGroups/rg-1', 'agent-1')).toBeUndefined();
+  });
+
+  it('should use versionNumber as the version query param when provided', () => {
+    const resourceId = '/subscriptions/sub-1/resourceGroups/rg-1/providers/Microsoft.CognitiveServices/accounts/acct-1/projects/proj-1';
+    const url = buildFoundryPortalUrl(resourceId, 'agent-1', '5');
+    expect(url).toContain('?version=5');
+    expect(url).not.toContain('version=2');
+  });
+
+  it('should omit version query param when versionNumber is not provided', () => {
+    const resourceId = '/subscriptions/sub-1/resourceGroups/rg-1/providers/Microsoft.CognitiveServices/accounts/acct-1/projects/proj-1';
+    const url = buildFoundryPortalUrl(resourceId, 'agent-1');
+    expect(url).not.toContain('?version=');
+    expect(url).toContain('/build/agents/agent-1/build');
+  });
+});