fix(Designer): Reverted app settings resolve change (#4353)

Reverted app settings resolve change
Azure · Mar 12, 2024 · 38e3959 · 38e3959
1 parent 2c6cede
commit 38e3959
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Utilities/Workflow.ts b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Utilities/Workflow.ts
@@ -58,7 +58,11 @@ export class WorkflowUtility {
     return references;
   }
 
-  public static resolveConnectionsReferences(content: string, parameters: ParametersData | undefined): any {
+  public static resolveConnectionsReferences(
+    content: string,
+    parameters: ParametersData | undefined,
+    appsettings?: Record<string, string> | undefined
+  ): any {
     let result = content;
 
     if (parameters) {
@@ -69,6 +73,14 @@ export class WorkflowUtility {
       }
     }
 
+    if (appsettings) {
+      for (const settingName of Object.keys(appsettings)) {
+        const settingValue = appsettings[settingName] !== undefined ? appsettings[settingName] : '';
+        result = replaceAllOccurrences(result, `@appsetting('${settingName}')`, settingValue);
+        result = replaceAllOccurrences(result, `@{appsetting('${settingName}')}`, settingValue);
+      }
+    }
+
     try {
       return JSON.parse(result);
     } catch (error) {

diff --git a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/laDesigner.tsx b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/laDesigner.tsx
@@ -93,8 +93,13 @@ const DesignerEditor = () => {
   const { data: runInstanceData } = useRunInstanceStandard(workflowName, onRunInstanceSuccess, appId, runId);
 
   const connectionsData = useMemo(
-    () => WorkflowUtility.resolveConnectionsReferences(JSON.stringify(clone(originalConnectionsData ?? {})), parameters),
-    [originalConnectionsData, parameters]
+    () =>
+      WorkflowUtility.resolveConnectionsReferences(
+        JSON.stringify(clone(originalConnectionsData ?? {})),
+        parameters,
+        settingsData?.properties ?? {}
+      ),
+    [originalConnectionsData, parameters, settingsData?.properties]
   );
 
   const addConnectionData = async (connectionAndSetting: ConnectionAndAppSetting): Promise<void> => {
@@ -113,7 +118,11 @@ const DesignerEditor = () => {
 
     if (connectionInfo) {
       // TODO(psamband): Add new settings in this blade so that we do not resolve all the appsettings in the connectionInfo.
-      const resolvedConnectionInfo = WorkflowUtility.resolveConnectionsReferences(JSON.stringify(connectionInfo), {});
+      const resolvedConnectionInfo = WorkflowUtility.resolveConnectionsReferences(
+        JSON.stringify(connectionInfo),
+        {},
+        settingsData?.properties
+      );
       delete resolvedConnectionInfo.displayName;
 
       return {