feat(DesignerV2): Standard Draft A2A, Consumption Draft Req, Tree log bugs

apps/Standalone/src/designer/app/AzureLogicAppsDesigner/Services/WorkflowAndArtifacts.tsx

@@ -163,16 +163,16 @@ const getAllCustomCodeFiles = async (
   return customCodeFiles;
 };
 
-export const useWorkflowAndArtifactsConsumption = (workflowId: string) => {
-  return useQuery(['workflowArtifactsConsumption', workflowId], () => getWorkflowAndArtifactsConsumption(workflowId), {
+export const useWorkflowAndArtifactsConsumption = (workflowId: string, isDraft = false) => {
+  return useQuery(['workflowArtifactsConsumption', workflowId, isDraft], () => getWorkflowAndArtifactsConsumption(workflowId, isDraft), {
     refetchOnMount: false,
     refetchOnReconnect: false,
     refetchOnWindowFocus: false,
   });
 };
 
-export const getWorkflowAndArtifactsConsumption = async (workflowId: string): Promise<Workflow> => {
-  const uri = `${baseUrl}${workflowId}?api-version=${consumptionApiVersion}`;
+export const getWorkflowAndArtifactsConsumption = async (workflowId: string, isDraft = false): Promise<Workflow> => {
+  const uri = `${baseUrl}${workflowId}${isDraft ? '/drafts/default' : ''}?api-version=${consumptionApiVersion}`;
   const response = await axios.get(uri, {
     headers: {
       Authorization: `Bearer ${environment.armToken}`,
@@ -425,6 +425,7 @@ export const fetchAgentUrl = (siteResourceId: string, workflowName: string, host
 
     try {
       let queryParams: AgentQueryParams | undefined = undefined;
+      let a2aKey = '';
       let a2aCodeForDraft = '';
       const authentication = await fetchAuthentication(siteResourceId);
 
@@ -440,7 +441,7 @@ export const fetchAgentUrl = (siteResourceId: string, workflowName: string, host
         const oboData = await fetchOBOData(siteResourceId);
 
         // Add authentication tokens if available
-        const a2aKey = a2aData?.key;
+        a2aKey = a2aData?.key;
         if (a2aKey) {
           queryParams = { apiKey: a2aKey };
 
@@ -453,13 +454,30 @@ export const fetchAgentUrl = (siteResourceId: string, workflowName: string, host
       }
 
       const agentBaseUrl = hostName.startsWith('https://') ? hostName : `https://${hostName}`;
+
       const agentUrl = `${agentBaseUrl}/api/Agents/${workflowName}`;
-      const agentCardUrlForDraft = `${agentBaseUrl}/runtime/webhooks/workflow/scaleUnits/prod-00/agents/${workflowName}/draft/.well-known/agent-card.json${a2aCodeForDraft ? `${encodeURIComponent(`?${a2aCodeForDraft}`)}` : ''}`;
-      const chatUrl = `${agentBaseUrl}/api/agentsChat/${workflowName}/IFrame${isDraftMode ? `?agentCard=${agentCardUrlForDraft}` : ''}`;
+      const prodChatUrl = `${agentBaseUrl}/api/agentsChat/${workflowName}/IFrame`;
+
+      const agentCardUrlForDraft = new URL(
+        `${agentBaseUrl}/runtime/webhooks/workflow/scaleUnits/prod-00/agents/${workflowName}/draft/.well-known/agent-card.json`
+      );
+      if (a2aKey) {
+        agentCardUrlForDraft.searchParams.append('x-api-key', a2aKey);
+      }
+      if (a2aCodeForDraft) {
+        const codeParamParts = a2aCodeForDraft.split('=');
+        if (codeParamParts.length > 1 && codeParamParts[1]) {
+          agentCardUrlForDraft.searchParams.append('code', decodeURIComponent(codeParamParts[1]));
+        }
+      }
+
+      const draftChatUrl = new URL(`${agentBaseUrl}/api/draftAgentsChat/${workflowName}/IFrame`);
+      draftChatUrl.searchParams.append('api-version', '2022-05-01');
+      draftChatUrl.searchParams.append('agentCard', agentCardUrlForDraft.href);
 
       return {
-        agentUrl,
-        chatUrl,
+        agentUrl: agentUrl,
+        chatUrl: isDraftMode ? draftChatUrl.href : prodChatUrl,
         queryParams,
         hostName,
       };

apps/Standalone/src/designer/app/AzureLogicAppsDesigner/laDesignerConsumptionV2.tsx

@@ -92,6 +92,21 @@ const DesignerEditorConsumption = () => {
     isError: isWorkflowAndArtifactsError,
     error: workflowAndArtifactsError,
   } = useWorkflowAndArtifactsConsumption(workflowId);
+
+  const {
+    workflow: prodWorkflow,
+    connectionReferences,
+    parameters,
+    notes,
+  } = useMemo(() => getDataForConsumption(workflowAndArtifactsData), [workflowAndArtifactsData]);
+
+  const { data: draftWorkflowAndArtifactsData, isFetching: isDraftWorkflowAndArtifactsLoading } = useWorkflowAndArtifactsConsumption(
+    workflowId,
+    true
+  );
+
+  const { workflow: draftWorkflow } = useMemo(() => getDataForConsumption(draftWorkflowAndArtifactsData), [draftWorkflowAndArtifactsData]);
+
   const { data: runInstanceData } = useRunInstanceConsumption(workflowName, appId, runId);
 
   const { data: tenantId } = useCurrentTenantId();
@@ -109,15 +124,6 @@ const DesignerEditorConsumption = () => {
     setIsDraftMode(draftMode);
   }, []);
 
-  const {
-    workflow: prodWorkflow,
-    connectionReferences,
-    parameters,
-    notes,
-  } = useMemo(() => getDataForConsumption(workflowAndArtifactsData), [workflowAndArtifactsData]);
-  // TODO: Implement draft workflow fetching properly
-  const draftWorkflow = useMemo(() => prodWorkflow, [prodWorkflow]);
-
   const [definition, setDefinition] = useState<any>();
   const codeEditorRef = useRef<{ getValue: () => string | undefined; hasChanges: () => boolean }>(null);
 
@@ -371,7 +377,7 @@ const DesignerEditorConsumption = () => {
   }, [isMonitoringView, runInstanceData]);
 
   useEffect(() => {
-    if (isWorkflowAndArtifactsLoading || !prodWorkflow) {
+    if (isWorkflowAndArtifactsLoading || !prodWorkflow || isDraftWorkflowAndArtifactsLoading) {
       return;
     }
 
@@ -384,7 +390,7 @@ const DesignerEditorConsumption = () => {
     } else {
       setWorkflow(prodWorkflow as any);
     }
-  }, [isWorkflowAndArtifactsLoading, draftWorkflow, isDraftMode, prodWorkflow, resetDraftWorkflow]);
+  }, [isWorkflowAndArtifactsLoading, draftWorkflow, isDraftMode, prodWorkflow, isDraftWorkflowAndArtifactsLoading]);
 
   if (isWorkflowAndArtifactsError) {
     throw workflowAndArtifactsError;
@@ -470,7 +476,8 @@ const DesignerEditorConsumption = () => {
                       saveDraftWorkflow={saveWorkflowFromDesigner}
                       onRun={onRun}
                       isDarkMode={isDarkMode}
-                      isDraftMode={false} // TODO: Support draft mode runs once backend is ready
+                      isDraftMode={isDraftMode}
+                      isConsumption={true}
                     />
                   </div>
                 )}