From fd6422da4c4e31c52e80addbce903b0f3b873fc2 Mon Sep 17 00:00:00 2001 From: Ana Silva Date: Tue, 20 Aug 2024 18:13:59 +0200 Subject: [PATCH] removed logic of requesting user to select metadatatype for retrieve and deploy --- .../commands/DevToolsAdminCommands.ts | 12 ++----- src/devtools/commands/DevToolsCommands.ts | 31 +------------------ .../commands/DevToolsStandardCommands.ts | 20 +++--------- src/devtools/commands/commands.config.json | 8 ++--- 4 files changed, 11 insertions(+), 60 deletions(-) diff --git a/src/devtools/commands/DevToolsAdminCommands.ts b/src/devtools/commands/DevToolsAdminCommands.ts index 58f2854..1d2c98d 100644 --- a/src/devtools/commands/DevToolsAdminCommands.ts +++ b/src/devtools/commands/DevToolsAdminCommands.ts @@ -59,11 +59,7 @@ class DevToolsAdminCommands extends DevToolsCommands { } log("debug", `Init payload: ${JSON.stringify(initArgs)}`); - const commandConfigured: string | undefined = await this.configureCommandWithParameters( - config, - initArgs, - [] - ); + const commandConfigured: string | undefined = await this.configureCommandWithParameters(config, initArgs); // Checks if the command is still missing so required parameter if (this.hasPlaceholders(commandConfigured)) { log("debug", `Required Parameters missing from Init command: ${commandConfigured}`); @@ -89,11 +85,7 @@ class DevToolsAdminCommands extends DevToolsCommands { try { log("info", `Running DevTools Admin Command: Explain Types...`); if ("command" in config && config.command) { - const commandConfigured: string | undefined = await this.configureCommandWithParameters( - config, - args, - [] - ); + const commandConfigured: string | undefined = await this.configureCommandWithParameters(config, args); log("debug", `Explain types final command: ${commandConfigured}`); const commandResult: string | number = await this.executeCommand( commandConfigured, diff --git a/src/devtools/commands/DevToolsCommands.ts b/src/devtools/commands/DevToolsCommands.ts index 39824f7..a7f1d6a 100644 --- a/src/devtools/commands/DevToolsCommands.ts +++ b/src/devtools/commands/DevToolsCommands.ts @@ -44,8 +44,7 @@ abstract class DevToolsCommands { async configureCommandWithParameters( config: DevToolsCommandSetting, - args: { [key: string]: string | string[] | boolean }, - mdTypes: SupportedMetadataTypes[] + args: { [key: string]: string | string[] | boolean } ): Promise { log("debug", `ConfigureCommandWithParameters: ${JSON.stringify(config)}`); let { command } = config; @@ -54,14 +53,6 @@ abstract class DevToolsCommands { for (const param of config.requiredParams) { if (param in args && args[param]) { command = command.replace(`{{${param}}}`, args[param] as string); - } else { - // Requests user - if (param.toLowerCase() === "mdtypes" && mdTypes.length) { - const userSelecteMDTypes: string | undefined = await this.handleMetadataTypeRequest(mdTypes); - if (userSelecteMDTypes) { - command = command.replace(`{{${param}}}`, `"${userSelecteMDTypes}"`); - } - } } } } @@ -78,26 +69,6 @@ abstract class DevToolsCommands { return command; } - async handleMetadataTypeRequest(mdTypes: SupportedMetadataTypes[]): Promise { - const mdTypeInputOptions: InputOptionsSettings[] = mdTypes.map((mdType: SupportedMetadataTypes) => ({ - id: mdType.apiName, - label: mdType.name, - detail: "" - })); - const userResponse: InputOptionsSettings | InputOptionsSettings[] | undefined = - await editorInput.handleQuickPickSelection( - mdTypeInputOptions, - "Please select one or multiple metadata types...", - true - ); - if (userResponse && Array.isArray(userResponse)) { - const mdTypes: string = `${userResponse.map((response: InputOptionsSettings) => response.id)}`; - log("debug", `User selected metadata types: "${mdTypes}"`); - return mdTypes; - } - return; - } - hasPlaceholders(command: string): boolean { const pattern: RegExp = /{{.*?}}/g; return pattern.test(command); diff --git a/src/devtools/commands/DevToolsStandardCommands.ts b/src/devtools/commands/DevToolsStandardCommands.ts index 7df04cc..ccbc968 100644 --- a/src/devtools/commands/DevToolsStandardCommands.ts +++ b/src/devtools/commands/DevToolsStandardCommands.ts @@ -70,15 +70,8 @@ class DevToolsStandardCommands extends DevToolsCommands { ) { log("info", `Running DevTools Standard Command: Retrieve...`); if ("command" in config && config.command) { - // Gets that metadata types that are supported for retrieve - const supportedMdTypes: SupportedMetadataTypes[] = this.getSupportedMetadataTypeByAction("retrieve"); - // Configures the command to replace all the parameters with the values - const commandConfigured: string | undefined = await this.configureCommandWithParameters( - config, - args, - supportedMdTypes - ); + const commandConfigured: string | undefined = await this.configureCommandWithParameters(config, args); // Checks if the command is still missing so required parameter if (this.hasPlaceholders(commandConfigured)) { @@ -89,6 +82,7 @@ class DevToolsStandardCommands extends DevToolsCommands { log("debug", `Retrieve Command configured: ${commandConfigured}`); loadingNotification(); + const commandResult: string | number = await this.executeCommand(commandConfigured, path, true); if (typeof commandResult === "number") { handleCommandResult({ success: commandResult === 0, cancelled: false }); @@ -106,15 +100,8 @@ class DevToolsStandardCommands extends DevToolsCommands { ) { log("info", `Running DevTools Standard Command: Deploy...`); if ("command" in config && config.command) { - // Gets that metadata types that are supported for deploy - const supportedMdTypes: SupportedMetadataTypes[] = this.getSupportedMetadataTypeByAction("deploy"); - // Configures the command to replace all the parameters with the values - const commandConfigured: string | undefined = await this.configureCommandWithParameters( - config, - args, - supportedMdTypes - ); + const commandConfigured: string | undefined = await this.configureCommandWithParameters(config, args); // Checks if the command is still missing so required parameter if (this.hasPlaceholders(commandConfigured)) { @@ -125,6 +112,7 @@ class DevToolsStandardCommands extends DevToolsCommands { log("debug", `Deploy Command configured: ${commandConfigured}`); loadingNotification(); + const commandResult: string | number = await this.executeCommand(commandConfigured, path, true); if (typeof commandResult === "number") { handleCommandResult({ success: commandResult === 0, cancelled: false }); diff --git a/src/devtools/commands/commands.config.json b/src/devtools/commands/commands.config.json index 39abc9b..041fcee 100644 --- a/src/devtools/commands/commands.config.json +++ b/src/devtools/commands/commands.config.json @@ -41,8 +41,8 @@ "id":"retrieve", "title": "Retrieve", "command": "mcdev retrieve {{bu}} {{mdtypes}} {{key}} --skipInteraction", - "requiredParams": ["bu", "mdtypes"], - "optionalParams": ["key"], + "requiredParams": ["bu"], + "optionalParams": ["key", "mdtypes"], "description": "Retrieves metadata of a business unit.", "isAvailable": true }, @@ -50,8 +50,8 @@ "id":"deploy", "title": "Deploy", "command": "mcdev deploy {{bu}} {{mdtypes}} {{key}} {{fromRetrieve}} --skipInteraction", - "requiredParams": ["bu", "mdtypes"], - "optionalParams": ["key", "fromRetrieve"], + "requiredParams": ["bu"], + "optionalParams": ["key", "mdtypes", "fromRetrieve"], "description": "Deploys local metadata to a business unit.", "isAvailable": true },