@pnp/cli-microsoft365 6.3.0-beta.c3dc921 → 6.3.0-beta.fee5cdb

package/dist/m365/planner/commands/roster/roster-member-add.js

@@ -0,0 +1,113 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PlannerRosterMemberAddCommand_instances, _PlannerRosterMemberAddCommand_initTelemetry, _PlannerRosterMemberAddCommand_initOptions, _PlannerRosterMemberAddCommand_initOptionSets, _PlannerRosterMemberAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const AadUserGetCommand = require("../../../aad/commands/user/user-get");
+const Cli_1 = require("../../../../cli/Cli");
+class PlannerRosterMemberAddCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.ROSTER_MEMBER_ADD;
+    }
+    get description() {
+        return 'Adds a user to a Microsoft Planner Roster';
+    }
+    constructor() {
+        super();
+        _PlannerRosterMemberAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberAddCommand_instances, "m", _PlannerRosterMemberAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberAddCommand_instances, "m", _PlannerRosterMemberAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberAddCommand_instances, "m", _PlannerRosterMemberAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberAddCommand_instances, "m", _PlannerRosterMemberAddCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Adding a user to a Microsoft Planner Roster');
+            }
+            try {
+                const userId = yield this.getUserId(logger, args);
+                const requestOptions = {
+                    url: `${this.resource}/beta/planner/rosters/${args.options.rosterId}/members`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    data: {
+                        userId: userId
+                    },
+                    responseType: 'json'
+                };
+                const response = yield request_1.default.post(requestOptions);
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getUserId(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr("Getting the user ID");
+            }
+            if (args.options.userId) {
+                return args.options.userId;
+            }
+            const aadUserGetCommandoptions = {
+                userName: args.options.userName,
+                output: 'json',
+                debug: args.options.debug,
+                verbose: args.options.verbose
+            };
+            const aadUserGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, aadUserGetCommandoptions), { _: [] }) });
+            if (this.verbose) {
+                logger.logToStderr(aadUserGetOutput.stderr);
+            }
+            const aadUserGetJsonOutput = JSON.parse(aadUserGetOutput.stdout);
+            return aadUserGetJsonOutput.id;
+        });
+    }
+}
+_PlannerRosterMemberAddCommand_instances = new WeakSet(), _PlannerRosterMemberAddCommand_initTelemetry = function _PlannerRosterMemberAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _PlannerRosterMemberAddCommand_initOptions = function _PlannerRosterMemberAddCommand_initOptions() {
+    this.options.unshift({
+        option: '--rosterId <rosterId>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _PlannerRosterMemberAddCommand_initOptionSets = function _PlannerRosterMemberAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName'] });
+}, _PlannerRosterMemberAddCommand_initValidators = function _PlannerRosterMemberAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        return true;
+    }));
+};
+module.exports = new PlannerRosterMemberAddCommand();
+//# sourceMappingURL=roster-member-add.js.map

package/dist/m365/planner/commands/roster/roster-member-list.js

@@ -0,0 +1,54 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PlannerRosterMemberListCommand_instances, _PlannerRosterMemberListCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const odata_1 = require("../../../../utils/odata");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class PlannerRosterMemberListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.ROSTER_MEMBER_LIST;
+    }
+    get description() {
+        return 'Lists members of the specified Microsoft Planner Roster';
+    }
+    constructor() {
+        super();
+        _PlannerRosterMemberListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberListCommand_instances, "m", _PlannerRosterMemberListCommand_initOptions).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Retrieving members of the specified Microsoft Planner Roster');
+            }
+            try {
+                const response = yield odata_1.odata.getAllItems(`${this.resource}/beta/planner/rosters/${args.options.rosterId}/members`);
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PlannerRosterMemberListCommand_instances = new WeakSet(), _PlannerRosterMemberListCommand_initOptions = function _PlannerRosterMemberListCommand_initOptions() {
+    this.options.unshift({
+        option: '--rosterId <rosterId>'
+    });
+};
+module.exports = new PlannerRosterMemberListCommand();
+//# sourceMappingURL=roster-member-list.js.map

package/dist/m365/planner/commands/roster/roster-member-remove.js

@@ -0,0 +1,140 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PlannerRosterMemberRemoveCommand_instances, _PlannerRosterMemberRemoveCommand_initTelemetry, _PlannerRosterMemberRemoveCommand_initOptions, _PlannerRosterMemberRemoveCommand_initOptionSets, _PlannerRosterMemberRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const odata_1 = require("../../../../utils/odata");
+const aadUser_1 = require("../../../../utils/aadUser");
+class PlannerRosterMemberRemoveCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.ROSTER_MEMBER_REMOVE;
+    }
+    get description() {
+        return 'Removes a member from a Microsoft Planner Roster';
+    }
+    constructor() {
+        super();
+        _PlannerRosterMemberRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing member ${args.options.userName || args.options.userId} from the Microsoft Planner Roster`);
+            }
+            if (args.options.confirm) {
+                yield this.removeRosterMember(args);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove member '${args.options.userId || args.options.userName}'?`
+                });
+                if (result.continue) {
+                    yield this.removeRosterMember(args);
+                }
+            }
+        });
+    }
+    getUserId(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.userId) {
+                return args.options.userId;
+            }
+            return aadUser_1.aadUser.getUserIdByUpn(args.options.userName);
+        });
+    }
+    removeRosterMember(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const rosterMembersContinue = yield this.removeLastMemberConfirmation(args);
+                if (rosterMembersContinue) {
+                    const userId = yield this.getUserId(args);
+                    const requestOptions = {
+                        url: `${this.resource}/beta/planner/rosters/${args.options.rosterId}/members/${userId}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    removeLastMemberConfirmation(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.confirm) {
+                const rosterMembers = yield odata_1.odata.getAllItems(`${this.resource}/beta/planner/rosters/${args.options.rosterId}/members?$select=Id`);
+                if (rosterMembers.length === 1) {
+                    const result = yield Cli_1.Cli.prompt({
+                        type: 'confirm',
+                        name: 'continue',
+                        default: false,
+                        message: `You are about to remove the last member of this Roster. When this happens, the Roster and all its contents will be deleted within 30 days. Are you sure you want to proceed?`
+                    });
+                    return result.continue;
+                }
+            }
+            return true;
+        });
+    }
+}
+_PlannerRosterMemberRemoveCommand_instances = new WeakSet(), _PlannerRosterMemberRemoveCommand_initTelemetry = function _PlannerRosterMemberRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _PlannerRosterMemberRemoveCommand_initOptions = function _PlannerRosterMemberRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--rosterId <rosterId>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--confirm'
+    });
+}, _PlannerRosterMemberRemoveCommand_initOptionSets = function _PlannerRosterMemberRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName'] });
+}, _PlannerRosterMemberRemoveCommand_initValidators = function _PlannerRosterMemberRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
+        return true;
+    }));
+};
+module.exports = new PlannerRosterMemberRemoveCommand();
+//# sourceMappingURL=roster-member-remove.js.map

package/dist/m365/planner/commands/roster/roster-remove.js

@@ -0,0 +1,88 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PlannerRosterRemoveCommand_instances, _PlannerRosterRemoveCommand_initTelemetry, _PlannerRosterRemoveCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class PlannerRosterRemoveCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.ROSTER_REMOVE;
+    }
+    get description() {
+        return 'Removes a Microsoft Planner Roster';
+    }
+    constructor() {
+        super();
+        _PlannerRosterRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerRosterRemoveCommand_instances, "m", _PlannerRosterRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterRemoveCommand_instances, "m", _PlannerRosterRemoveCommand_initOptions).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.removeRoster(args, logger);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove roster ${args.options.id}?`
+                });
+                if (result.continue) {
+                    yield this.removeRoster(args, logger);
+                }
+            }
+        });
+    }
+    removeRoster(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing roster ${args.options.id}`);
+            }
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/beta/planner/rosters/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PlannerRosterRemoveCommand_instances = new WeakSet(), _PlannerRosterRemoveCommand_initTelemetry = function _PlannerRosterRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: !!args.options.confirm
+        });
+    });
+}, _PlannerRosterRemoveCommand_initOptions = function _PlannerRosterRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--id <id>'
+    }, {
+        option: '--confirm'
+    });
+};
+module.exports = new PlannerRosterRemoveCommand();
+//# sourceMappingURL=roster-remove.js.map

package/dist/m365/planner/commands/task/task-add.js

@@ -69,6 +69,9 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
                 };
                 const newTask = yield request_1.default.post(requestOptions);
                 const result = yield this.updateTaskDetails(args.options, newTask);
+                if (result.description) {
+                    result.hasDescription = true;
+                }
                 logger.log(result);
             }
             catch (err) {

package/dist/m365/planner/commands/task/task-checklistitem-add.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerTaskChecklistItemAddCommand_instances, _PlannerTaskChecklistItemAddCommand_initTelemetry, _PlannerTaskChecklistItemAddCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -61,7 +62,7 @@ class PlannerTaskChecklistItemAddCommand extends GraphCommand_1.default {
                     data: body
                 };
                 const result = yield request_1.default.patch(requestOptions);
-                if (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(result.checklist);
                 }
                 else {

package/dist/m365/planner/commands/task/task-checklistitem-list.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerTaskChecklistItemListCommand_instances, _PlannerTaskChecklistItemListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -45,7 +46,7 @@ class PlannerTaskChecklistItemListCommand extends GraphCommand_1.default {
             };
             try {
                 const res = yield request_1.default.get(requestOptions);
-                if (!args.options.output || args.options.output === 'json') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res.checklist);
                 }
                 else {

package/dist/m365/planner/commands.js

@@ -12,6 +12,12 @@ exports.default = {
     PLAN_LIST: `${prefix} plan list`,
     PLAN_REMOVE: `${prefix} plan remove`,
     PLAN_SET: `${prefix} plan set`,
+    ROSTER_ADD: `${prefix} roster add`,
+    ROSTER_GET: `${prefix} roster get`,
+    ROSTER_MEMBER_ADD: `${prefix} roster member add`,
+    ROSTER_MEMBER_LIST: `${prefix} roster member list`,
+    ROSTER_MEMBER_REMOVE: `${prefix} roster member remove`,
+    ROSTER_REMOVE: `${prefix} roster remove`,
     TASK_ADD: `${prefix} task add`,
     TASK_CHECKLISTITEM_ADD: `${prefix} task checklistitem add`,
     TASK_CHECKLISTITEM_LIST: `${prefix} task checklistitem list`,

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PpSolutionGetCommand_instances, _PpSolutionGetCommand_initTelemetry, _PpSolutionGetCommand_initOptions, _PpSolutionGetCommand_initOptionSets, _PpSolutionGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const powerPlatform_1 = require("../../../../utils/powerPlatform");
 const validation_1 = require("../../../../utils/validation");
@@ -46,7 +47,7 @@ class PpSolutionGetCommand extends PowerPlatformCommand_1.default {
             try {
                 const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
                 const res = yield this.getSolution(dynamicsApiUrl, args.options);
-                if (!args.options.output || args.options.output === 'json') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res);
                 }
                 else {

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PpSolutionListCommand_instances, _PpSolutionListCommand_initTelemetry, _PpSolutionListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const odata_1 = require("../../../../utils/odata");
 const powerPlatform_1 = require("../../../../utils/powerPlatform");
 const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
@@ -44,7 +45,7 @@ class PpSolutionListCommand extends PowerPlatformCommand_1.default {
                 const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
                 const requestUrl = `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
                 const res = yield odata_1.odata.getAllItems(requestUrl);
-                if (!args.options.output || args.options.output === 'json') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res);
                 }
                 else {