Merge pull request #325 from sasjs/select-target

fix: select target logic fixed
sasjs · Apr 26, 2022 · 85e9fe2 · 85e9fe2
2 parents d82809f + f96321f
commit 85e9fe2
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/src/commands/execute-code/ExecuteCodeCommand.ts b/src/commands/execute-code/ExecuteCodeCommand.ts
@@ -13,7 +13,7 @@ import {
 import { getEditorContent } from '../../utils/editor'
 import { createFile } from '../../utils/file'
 import { getAuthConfig, getAuthConfigSas9 } from './internal/configuration'
-import { selectTarget } from '../../utils/selectTarget'
+import { selectTarget } from '../../utils/target'
 import { getTimestamp } from './internal/utils'
 
 export class ExecuteCodeCommand {

diff --git a/src/commands/select-target/selectTargetCommand.ts b/src/commands/select-target/selectTargetCommand.ts
@@ -1,5 +1,5 @@
 import { window, ExtensionContext, commands, OutputChannel } from 'vscode'
-import { selectTarget } from '../../utils/selectTarget'
+import { configureTarget } from '../../utils/target'
 
 export class SelectTargetCommand {
   private outputChannel: OutputChannel
@@ -17,7 +17,7 @@ export class SelectTargetCommand {
   }
 
   private selectTarget = async () => {
-    selectTarget(this.outputChannel).then(() => {
+    configureTarget(this.outputChannel).then(() => {
       window.showInformationMessage('Target Selected!')
     })
   }

diff --git a/src/utils/selectTarget.ts → src/utils/target.ts b/src/utils/selectTarget.ts → src/utils/target.ts
@@ -6,6 +6,9 @@ import { getChoiceInput, getIsDefault } from './input'
 import { getGlobalConfiguration } from './config'
 import { createTarget } from './createTarget'
 
+/**
+ * This function will be called from execute command for selecting target before execution
+ */
 export const selectTarget = async (outputChannel: OutputChannel) => {
   const config = (await getGlobalConfiguration(outputChannel)) as Configuration
 
@@ -52,3 +55,42 @@ export const selectTarget = async (outputChannel: OutputChannel) => {
     return await createTarget(outputChannel)
   }
 }
+
+/**
+ * This function will be called from select target command for configuration of setting
+ */
+export const configureTarget = async (outputChannel: OutputChannel) => {
+  const config = (await getGlobalConfiguration(outputChannel)) as Configuration
+
+  if (config?.targets?.length) {
+    const extConfig = workspace.getConfiguration('sasjs-for-vscode')
+    const targetNames = (config?.targets || []).map((t: any) => t.name)
+    const targetName = await getChoiceInput(
+      [...targetNames, 'add and select new target'],
+      'Please select a target'
+    )
+    if (targetName === 'add and select new target') {
+      const target = await createTarget(outputChannel)
+      const isDefault = await getIsDefault()
+      if (isDefault) {
+        await extConfig.update('target', target.name, true)
+      }
+      return target
+    } else if (!!targetName) {
+      const isDefault = await getIsDefault()
+      if (isDefault) {
+        await extConfig.update('target', targetName, true)
+      }
+      const selectedTarget = config.targets.find(
+        (t: any) => t.name === targetName
+      )
+      return new Target(selectedTarget)
+    }
+  } else {
+    const response = await getChoiceInput(
+      ['Yes', 'No'],
+      'No targets are found. Would you like to create a new target?'
+    )
+    if (response === 'Yes') return await createTarget(outputChannel)
+  }
+}