@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

package/dist/m365/spo/commands/page/page-remove.js

@@ -33,53 +33,52 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes a modern page';
     }
-    commandAction(logger, args, cb) {
-        let requestDigest = '';
-        let pageName = args.options.name;
-        const removePage = () => {
-            utils_1.spo
-                .getRequestDigest(args.options.webUrl)
-                .then((res) => {
-                requestDigest = res.FormDigestValue;
-                if (!pageName.endsWith('.aspx')) {
-                    pageName += '.aspx';
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestDigest = '';
+            let pageName = args.options.name;
+            const removePage = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const reqDigest = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                    requestDigest = reqDigest.FormDigestValue;
+                    if (!pageName.endsWith('.aspx')) {
+                        pageName += '.aspx';
+                    }
+                    if (this.verbose) {
+                        logger.logToStderr(`Removing page ${pageName}...`);
+                    }
+                    const requestOptions = {
+                        url: `${args.options
+                            .webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                        headers: {
+                            'X-RequestDigest': requestDigest,
+                            'X-HTTP-Method': 'DELETE',
+                            'content-type': 'application/json;odata=nometadata',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                if (this.verbose) {
-                    logger.logToStderr(`Removing page ${pageName}...`);
-                }
-                const requestOptions = {
-                    url: `${args.options
-                        .webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
-                    headers: {
-                        'X-RequestDigest': requestDigest,
-                        'X-HTTP-Method': 'DELETE',
-                        'content-type': 'application/json;odata=nometadata',
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removePage();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the page '${args.options.name}'?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removePage();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removePage();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the page '${args.options.name}'?`
+                });
+                if (result.continue) {
+                    yield removePage();
+                }
+            }
+        });
     }
 }
 _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {

package/dist/m365/spo/commands/page/page-section-add.js

@@ -35,76 +35,74 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Adds section to modern page';
     }
-    commandAction(logger, args, cb) {
-        let pageFullName = args.options.name.toLowerCase();
-        if (pageFullName.indexOf('.aspx') < 0) {
-            pageFullName += '.aspx';
-        }
-        let canvasContent;
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving page information...`);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$select=CanvasContent1,IsPageCheckedOutToCurrentUser`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            canvasContent = JSON.parse(res.CanvasContent1 || "[{\"controlType\":0,\"pageSettingsSlice\":{\"isDefaultDescription\":true,\"isDefaultThumbnail\":true}}]");
-            if (res.IsPageCheckedOutToCurrentUser) {
-                return Promise.resolve();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let pageFullName = args.options.name.toLowerCase();
+            if (pageFullName.indexOf('.aspx') < 0) {
+                pageFullName += '.aspx';
+            }
+            let canvasContent;
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving page information...`);
+            }
+            try {
+                let requestOptions = {
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$select=CanvasContent1,IsPageCheckedOutToCurrentUser`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                canvasContent = JSON.parse(res.CanvasContent1 || "[{\"controlType\":0,\"pageSettingsSlice\":{\"isDefaultDescription\":true,\"isDefaultThumbnail\":true}}]");
+                if (!res.IsPageCheckedOutToCurrentUser) {
+                    requestOptions = {
+                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/checkoutpage`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    return request_1.default.post(requestOptions);
+                }
+                // get columns
+                const columns = canvasContent
+                    .filter(c => typeof c.controlType === 'undefined');
+                // get unique zoneIndex values given each section can have 1 or more
+                // columns each assigned to the zoneIndex of the corresponding section
+                const zoneIndices = columns
+                    .map(c => c.position.zoneIndex)
+                    .filter((value, index, array) => {
+                    return array.indexOf(value) === index;
+                })
+                    .sort();
+                // zoneIndex for the new section to add
+                const zoneIndex = this.getSectionIndex(zoneIndices, args.options.order);
+                // get the list of columns to insert based on the selected template
+                const columnsToAdd = this.getColumns(zoneIndex, args.options.sectionTemplate);
+                // insert the column in the right place in the array so that
+                // it stays sorted ascending by zoneIndex
+                let pos = canvasContent.findIndex(c => typeof c.controlType === 'undefined' && c.position.zoneIndex > zoneIndex);
+                if (pos === -1) {
+                    pos = canvasContent.length - 1;
+                }
+                canvasContent.splice(pos, 0, ...columnsToAdd);
+                requestOptions = {
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/savepage`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata',
+                        'content-type': 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        CanvasContent1: JSON.stringify(canvasContent)
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
             }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/checkoutpage`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(() => {
-            // get columns
-            const columns = canvasContent
-                .filter(c => typeof c.controlType === 'undefined');
-            // get unique zoneIndex values given each section can have 1 or more
-            // columns each assigned to the zoneIndex of the corresponding section
-            const zoneIndices = columns
-                .map(c => c.position.zoneIndex)
-                .filter((value, index, array) => {
-                return array.indexOf(value) === index;
-            })
-                .sort();
-            // zoneIndex for the new section to add
-            const zoneIndex = this.getSectionIndex(zoneIndices, args.options.order);
-            // get the list of columns to insert based on the selected template
-            const columnsToAdd = this.getColumns(zoneIndex, args.options.sectionTemplate);
-            // insert the column in the right place in the array so that
-            // it stays sorted ascending by zoneIndex
-            let pos = canvasContent.findIndex(c => typeof c.controlType === 'undefined' && c.position.zoneIndex > zoneIndex);
-            if (pos === -1) {
-                pos = canvasContent.length - 1;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            canvasContent.splice(pos, 0, ...columnsToAdd);
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/savepage`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                data: {
-                    CanvasContent1: JSON.stringify(canvasContent)
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => {
-            this.handleRejectedODataJsonPromise(err, logger, cb);
         });
     }
     getSectionIndex(zoneIndices, order) {

package/dist/m365/spo/commands/page/page-section-get.js

@@ -32,18 +32,21 @@ class SpoPageSectionGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Get information about the specified modern page section';
     }
-    commandAction(logger, args, cb) {
-        Page_1.Page
-            .getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose)
-            .then((clientSidePage) => {
-            const sections = clientSidePage.sections
-                .filter(section => section.order === args.options.section);
-            const isJSONOutput = args.options.output === 'json';
-            if (sections.length) {
-                logger.log(Page_1.Page.getSectionInformation(sections[0], isJSONOutput));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const clientSidePage = yield Page_1.Page.getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose);
+                const sections = clientSidePage.sections
+                    .filter(section => section.order === args.options.section);
+                const isJSONOutput = args.options.output === 'json';
+                if (sections.length) {
+                    logger.log(Page_1.Page.getSectionInformation(sections[0], isJSONOutput));
+                }
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoPageSectionGetCommand_instances = new WeakSet(), _SpoPageSectionGetCommand_initOptions = function _SpoPageSectionGetCommand_initOptions() {

package/dist/m365/spo/commands/page/page-section-list.js

@@ -32,28 +32,31 @@ class SpoPageSectionListCommand extends SpoCommand_1.default {
     get description() {
         return 'List sections in the specific modern page';
     }
-    commandAction(logger, args, cb) {
-        Page_1.Page
-            .getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose)
-            .then((clientSidePage) => {
-            const sections = clientSidePage.sections;
-            const isJSONOutput = args.options.output === 'json';
-            if (sections.length) {
-                const output = sections.map(section => Page_1.Page.getSectionInformation(section, isJSONOutput));
-                if (isJSONOutput) {
-                    logger.log(output);
-                }
-                else {
-                    logger.log(output.map(s => {
-                        return {
-                            order: s.order,
-                            columns: s.columns.length
-                        };
-                    }));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const clientSidePage = yield Page_1.Page.getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose);
+                const sections = clientSidePage.sections;
+                const isJSONOutput = args.options.output === 'json';
+                if (sections.length) {
+                    const output = sections.map(section => Page_1.Page.getSectionInformation(section, isJSONOutput));
+                    if (isJSONOutput) {
+                        logger.log(output);
+                    }
+                    else {
+                        logger.log(output.map(s => {
+                            return {
+                                order: s.order,
+                                columns: s.columns.length
+                            };
+                        }));
+                    }
                 }
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoPageSectionListCommand_instances = new WeakSet(), _SpoPageSectionListCommand_initOptions = function _SpoPageSectionListCommand_initOptions() {