@pnp/cli-microsoft365 10.6.0-beta.7205e34 → 10.6.0-beta.807bbab

package/dist/m365/pp/commands/card/card-clone.js

@@ -35,13 +35,19 @@ class PpCardCloneCommand extends PowerPlatformCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const card = await powerPlatform.getCardByName(dynamicsApiUrl, args.options.name, logger, this.verbose);
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving the card Id for card '${args.options.name}'`);
+        }
+        const card = await powerPlatform.getCardByName(dynamicsApiUrl, args.options.name);
         return card.cardid;
     }
     async cloneCard(args, logger) {
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
             const cardId = await this.getCardId(args, dynamicsApiUrl, logger);
+            if (this.verbose) {
+                await logger.logToStderr(`Cloning the card with id '${cardId}'`);
+            }
             const requestOptions = {
                 url: `${dynamicsApiUrl}/api/data/v9.1/CardCreateClone`,
                 headers: {

package/dist/m365/pp/commands/card/card-get.js

@@ -39,10 +39,13 @@ class PpCardGetCommand extends PowerPlatformCommand {
     }
     async getCard(dynamicsApiUrl, options, logger) {
         if (options.name) {
-            return await powerPlatform.getCardByName(dynamicsApiUrl, options.name, logger, this.verbose);
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving the card with name '${options.name}'`);
+            }
+            return await powerPlatform.getCardByName(dynamicsApiUrl, options.name);
         }
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving the card with id ${options.id}`);
+            await logger.logToStderr(`Retrieving the card with id '${options.id}'`);
         }
         const requestOptions = {
             url: `${dynamicsApiUrl}/api/data/v9.1/cards(${options.id})`,

package/dist/m365/pp/commands/card/card-remove.js

@@ -43,13 +43,19 @@ class PpCardRemoveCommand extends PowerPlatformCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const card = await powerPlatform.getCardByName(dynamicsApiUrl, args.options.name, logger, this.verbose);
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving the card with name '${args.options.name}'`);
+        }
+        const card = await powerPlatform.getCardByName(dynamicsApiUrl, args.options.name);
         return card.cardid;
     }
     async deleteCard(args, logger) {
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
             const cardId = await this.getCardId(args, dynamicsApiUrl, logger);
+            if (this.verbose) {
+                await logger.logToStderr(`Deleting card with Id '${cardId}'`);
+            }
             const requestOptions = {
                 url: `${dynamicsApiUrl}/api/data/v9.1/cards(${cardId})`,
                 headers: {

package/dist/m365/pp/commands/solution/solution-get.js

@@ -49,23 +49,17 @@ class PpSolutionGetCommand extends PowerPlatformCommand {
         }
     }
     async getSolution(dynamicsApiUrl, options) {
+        if (options.name) {
+            return powerPlatform.getSolutionByName(dynamicsApiUrl, options.name);
+        }
         const requestOptions = {
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
-        if (options.id) {
-            requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions(${options.id})?$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
-            const result = await request.get(requestOptions);
-            return result;
-        }
-        requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true and uniquename eq \'${options.name}\'&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
-        const result = await request.get(requestOptions);
-        if (result.value.length === 0) {
-            throw `The specified solution '${options.name}' does not exist.`;
-        }
-        return result.value[0];
+        requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions(${options.id})?$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
+        return request.get(requestOptions);
     }
 }
 _PpSolutionGetCommand_instances = new WeakSet(), _PpSolutionGetCommand_initTelemetry = function _PpSolutionGetCommand_initTelemetry() {

package/dist/m365/pp/commands/solution/solution-publish.js

@@ -4,14 +4,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PpSolutionPublishCommand_instances, _PpSolutionPublishCommand_initTelemetry, _PpSolutionPublishCommand_initOptions, _PpSolutionPublishCommand_initOptionSets, _PpSolutionPublishCommand_initValidators;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-import ppSolutionGetCommand from './solution-get.js';
 class PpSolutionPublishCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_PUBLISH;
@@ -29,8 +27,8 @@ class PpSolutionPublishCommand extends PowerPlatformCommand {
     }
     async commandAction(logger, args) {
         try {
-            const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const solutionId = await this.getSolutionId(args, logger);
+            const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+            const solutionId = await this.getSolutionId(args, dynamicsApiUrl, logger);
             const solutionComponents = await this.getSolutionComponents(dynamicsApiUrl, solutionId, logger);
             const parameterXml = await this.buildXmlRequestObject(solutionComponents, logger);
             const requestOptions = {
@@ -71,23 +69,15 @@ class PpSolutionPublishCommand extends PowerPlatformCommand {
         const response = await request.get(requestOptions);
         return response.value;
     }
-    async getSolutionId(args, logger) {
+    async getSolutionId(args, dynamicsApiUrl, logger) {
         if (args.options.id) {
             return args.options.id;
         }
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving solutionId`);
+            await logger.logToStderr(`Retrieving solutionId...`);
         }
-        const options = {
-            environmentName: args.options.environmentName,
-            name: args.options.name,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(ppSolutionGetCommand, { options: { ...options, _: [] } });
-        const getSolutionOutput = JSON.parse(output.stdout);
-        return getSolutionOutput.solutionid;
+        const solution = await powerPlatform.getSolutionByName(dynamicsApiUrl, args.options.name);
+        return solution.solutionid;
     }
     async buildXmlRequestObject(solutionComponents, logger) {
         if (this.verbose) {

package/dist/m365/pp/commands/solution/solution-remove.js

@@ -10,7 +10,6 @@ import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-import ppSolutionGetCommand from './solution-get.js';
 class PpSolutionRemoveCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_REMOVE;
@@ -40,25 +39,17 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand {
             }
         }
     }
-    async getSolutionId(args) {
+    async getSolutionId(args, dynamicsApiUrl) {
         if (args.options.id) {
             return args.options.id;
         }
-        const options = {
-            environmentName: args.options.environmentName,
-            name: args.options.name,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(ppSolutionGetCommand, { options: { ...options, _: [] } });
-        const getSolutionOutput = JSON.parse(output.stdout);
-        return getSolutionOutput.solutionid;
+        const solution = await powerPlatform.getSolutionByName(dynamicsApiUrl, args.options.name);
+        return solution.solutionid;
     }
     async deleteSolution(args) {
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const solutionId = await this.getSolutionId(args);
+            const solutionId = await this.getSolutionId(args, dynamicsApiUrl);
             const requestOptions = {
                 url: `${dynamicsApiUrl}/api/data/v9.1/solutions(${solutionId})`,
                 headers: {

package/dist/utils/powerPlatform.js

@@ -71,10 +71,7 @@ export const powerPlatform = {
      * @param logger The logger object
      * @param verbose Set for verbose logging
      */
-    async getCardByName(dynamicsApiUrl, name, logger, verbose) {
-        if (verbose && logger) {
-            await logger.logToStderr(`Retrieving the card with name ${name}`);
-        }
+    async getCardByName(dynamicsApiUrl, name) {
         const requestOptions = {
             url: `${dynamicsApiUrl}/api/data/v9.1/cards?$filter=name eq '${name}'`,
             headers: {
@@ -91,6 +88,30 @@ export const powerPlatform = {
             return cli.handleMultipleResultsFound(`Multiple cards with name '${name}' found.`, resultAsKeyValuePair);
         }
         return result.value[0];
+    },
+    /**
+   * Get a solution by name
+   * Returns the solution object
+   * @param dynamicsApiUrl The dynamics api url of the environment
+   * @param name The name of the solution
+   */
+    async getSolutionByName(dynamicsApiUrl, name) {
+        const requestOptions = {
+            url: `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true and uniquename eq \'${name}\'&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const result = await request.get(requestOptions);
+        if (result.value.length === 0) {
+            throw Error(`The specified solution '${name}' does not exist.`);
+        }
+        if (result.value.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('solutionid', result.value);
+            return cli.handleMultipleResultsFound(`Multiple solutions with name '${name}' found.`, resultAsKeyValuePair);
+        }
+        return result.value[0];
     }
 };
 //# sourceMappingURL=powerPlatform.js.map