fix(designer): Update token code for powershell custom code (#4960)

* remove outputs if not included * boilerplate code update * add a space
Azure · Jun 14, 2024 · 47b7c07 · 47b7c07
1 parent 7ded280
commit 47b7c07
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/libs/designer-ui/src/lib/code/util.ts b/libs/designer-ui/src/lib/code/util.ts
@@ -76,7 +76,7 @@ export function buildInlineCodeTextFromToken(inputToken: Token, language: string
       return formatForJavascript(property, actionName, source);
     }
     case constants.PARAMETER.EDITOR_OPTIONS.LANGUAGE.POWERSHELL: {
-      return formatForPowershell(segmentedProperty, actionName, source);
+      return formatForPowershell(property, actionName, source);
     }
     case constants.PARAMETER.EDITOR_OPTIONS.LANGUAGE.CSHARP: {
       return formatForCSharp(segmentedProperty, actionName, source ? capitalizeFirstLetter(source) : source);
@@ -116,9 +116,16 @@ function formatForJavascript(property: string, actionName?: string, source?: str
 }
 
 function formatForPowershell(property: string, actionName?: string, source?: string): string {
-  const result = `(get-WorkflowActionOutputs -actionName ${actionName ?? capitalizeFirstLetter(OperationCategory.Trigger)})${
-    source ? `["${source}"]` : ''
-  }${property}`;
+  const type = actionName ? `(Get-ActionOutput -ActionName "${actionName}")` : '(Get-TriggerOutput)';
+  let result = type;
+  if (source === 'outputs') {
+    result = `${result}.${source}`;
+  } else {
+    result = `${result}.outputs.${source}`;
+  }
+  if (property) {
+    result = `${result}.${property}`;
+  }
 
   return result;
 }

diff --git a/libs/logic-apps-shared/src/utils/src/lib/helpers/customcode.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/customcode.ts
@@ -37,7 +37,7 @@ export const getFileExtensionName = (language: EditorLanguage): string => {
 
 export const getAppFileForFileExtension = (fileExtension: string): string => {
   if (fileExtension === '.ps1') {
-    return "# This file enables modules to be automatically managed by the Functions service.\r\n# See https://aka.ms/functionsmanageddependency for additional information.\r\n#\r\n@{\r\n    # For latest supported version, go to 'https://www.powershellgallery.com/packages/Az'. Uncomment the next line and replace the MAJOR_VERSION, e.g., 'Az' = '5.*'\r\n     'Az' = '10.*'\r\n}";
+    return "# This file enables modules to be automatically managed by the Functions service.\r\n# See https://aka.ms/functionsmanageddependency for additional information.\r\n#\r\n@{\r\n    # For latest supported version, go to 'https://www.powershellgallery.com/packages/Az'. Uncomment the next line and replace the MAJOR_VERSION, e.g., 'Az' = '5.*'\r\n     # 'Az' = '10.*'\r\n}";
   }
   return '';
 };