@pnp/cli-microsoft365 10.6.0-beta.3facb8f → 10.6.0-beta.7205e34

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

@@ -4,13 +4,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PpCardGetCommand_instances, _PpCardGetCommand_initTelemetry, _PpCardGetCommand_initOptions, _PpCardGetCommand_initOptionSets, _PpCardGetCommand_initValidators;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.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 { formatting } from '../../../../utils/formatting.js';
 class PpCardGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.CARD_GET;
@@ -32,35 +30,28 @@ class PpCardGetCommand extends PowerPlatformCommand {
         }
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const res = await this.getCard(dynamicsApiUrl, args.options);
+            const res = await this.getCard(dynamicsApiUrl, args.options, logger);
             await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getCard(dynamicsApiUrl, options) {
+    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 id ${options.id}`);
+        }
         const requestOptions = {
+            url: `${dynamicsApiUrl}/api/data/v9.1/cards(${options.id})`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
-        if (options.id) {
-            requestOptions.url = `${dynamicsApiUrl}/api/data/v9.1/cards(${options.id})`;
-            const result = await request.get(requestOptions);
-            return result;
-        }
-        requestOptions.url = `${dynamicsApiUrl}/api/data/v9.1/cards?$filter=name eq '${options.name}'`;
-        const result = await request.get(requestOptions);
-        if (result.value.length === 0) {
-            throw `The specified card '${options.name}' does not exist.`;
-        }
-        if (result.value.length > 1) {
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('cardid', result.value);
-            return cli.handleMultipleResultsFound(`Multiple cards with name '${options.name}' found`, resultAsKeyValuePair);
-        }
-        return result.value[0];
+        return await request.get(requestOptions);
     }
 }
 _PpCardGetCommand_instances = new WeakSet(), _PpCardGetCommand_initTelemetry = function _PpCardGetCommand_initTelemetry() {

package/dist/m365/pp/commands/card/card-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 ppCardGetCommand from './card-get.js';
 class PpCardRemoveCommand extends PowerPlatformCommand {
     get name() {
         return commands.CARD_REMOVE;
@@ -31,34 +30,26 @@ class PpCardRemoveCommand extends PowerPlatformCommand {
             await logger.logToStderr(`Removing card '${args.options.id || args.options.name}'...`);
         }
         if (args.options.force) {
-            await this.deleteCard(args);
+            await this.deleteCard(args, logger);
         }
         else {
             const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove card '${args.options.id || args.options.name}'?` });
             if (result) {
-                await this.deleteCard(args);
+                await this.deleteCard(args, logger);
             }
         }
     }
-    async getCardId(args) {
+    async getCardId(args, dynamicsApiUrl, logger) {
         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(ppCardGetCommand, { options: { ...options, _: [] } });
-        const getCardOutput = JSON.parse(output.stdout);
-        return getCardOutput.cardid;
+        const card = await powerPlatform.getCardByName(dynamicsApiUrl, args.options.name, logger, this.verbose);
+        return card.cardid;
     }
-    async deleteCard(args) {
+    async deleteCard(args, logger) {
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const cardId = await this.getCardId(args);
+            const cardId = await this.getCardId(args, dynamicsApiUrl, logger);
             const requestOptions = {
                 url: `${dynamicsApiUrl}/api/data/v9.1/cards(${cardId})`,
                 headers: {

package/dist/utils/powerPlatform.js

@@ -51,7 +51,7 @@ export const powerPlatform = {
         }
         if (items.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('websiteUrl', items);
-            return cli.handleMultipleResultsFound(`Multiple Power Page websites with name '${websiteName}' found`, resultAsKeyValuePair);
+            return cli.handleMultipleResultsFound(`Multiple Power Page websites with name '${websiteName}' found.`, resultAsKeyValuePair);
         }
         return items[0];
     },
@@ -62,6 +62,35 @@ export const powerPlatform = {
             throw Error(`The specified Power Page website with url '${url}' does not exist.`);
         }
         return items[0];
+    },
+    /**
+     * Get a card by name
+     * Returns a card object
+     * @param dynamicsApiUrl The dynamics api url of the environment
+     * @param name The name of the card
+     * @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}`);
+        }
+        const requestOptions = {
+            url: `${dynamicsApiUrl}/api/data/v9.1/cards?$filter=name eq '${name}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const result = await request.get(requestOptions);
+        if (result.value.length === 0) {
+            throw Error(`The specified card '${name}' does not exist.`);
+        }
+        if (result.value.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('cardid', result.value);
+            return cli.handleMultipleResultsFound(`Multiple cards with name '${name}' found.`, resultAsKeyValuePair);
+        }
+        return result.value[0];
     }
 };
 //# sourceMappingURL=powerPlatform.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "10.6.0-beta.3facb8f",
+  "version": "10.6.0-beta.7205e34",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",