@pnp/cli-microsoft365 5.8.0-beta.9cf7616 → 5.8.0-beta.9e55865

package/dist/m365/spo/commands/page/page-control-set.js

@@ -34,110 +34,110 @@ class SpoPageControlSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates web part data or properties of a control on a modern page';
     }
-    commandAction(logger, args, cb) {
-        let pageName = args.options.name;
-        if (args.options.name.indexOf('.aspx') < 0) {
-            pageName += '.aspx';
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (!res.CanvasContent1) {
-                return Promise.reject(`Page ${pageName} doesn't contain canvas controls.`);
-            }
-            const canvasContent = JSON.parse(res.CanvasContent1);
-            const control = canvasContent.find(control => control.id && control.id.toLowerCase() === args.options.id.toLowerCase());
-            if (!control) {
-                return Promise.reject(`Control with ID ${args.options.id} not found on page ${pageName}`);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Control with ID ${args.options.id} found on the page`);
-            }
-            // Check out the page
-            return Page_1.Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
-        })
-            .then((page) => {
-            // Update the web part data
-            const canvasContent = JSON.parse(page.CanvasContent1);
-            if (this.debug) {
-                logger.logToStderr(canvasContent);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let pageName = args.options.name;
+            if (args.options.name.indexOf('.aspx') < 0) {
+                pageName += '.aspx';
             }
-            const canvasControl = canvasContent.find(c => c.id.toLowerCase() === args.options.id.toLowerCase());
-            if (!canvasControl) {
-                return Promise.reject(`Control with ID ${args.options.id} not found on page ${pageName}`);
-            }
-            if (args.options.webPartData) {
-                if (this.verbose) {
-                    logger.logToStderr('web part data:');
-                    logger.logToStderr(args.options.webPartData);
-                    logger.logToStderr('');
+            try {
+                let requestOptions = {
+                    url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                if (!res.CanvasContent1) {
+                    throw `Page ${pageName} doesn't contain canvas controls.`;
                 }
-                const webPartData = JSON.parse(args.options.webPartData);
-                canvasControl.webPartData = Object.assign(Object.assign(Object.assign({}, canvasControl.webPartData), webPartData), { id: canvasControl.webPartData.id, instanceId: canvasControl.webPartData.instanceId });
-                if (this.verbose) {
-                    logger.logToStderr('Updated web part data:');
-                    logger.logToStderr(canvasControl.webPartData);
-                    logger.logToStderr('');
+                const pageControls = JSON.parse(res.CanvasContent1);
+                const control = pageControls.find(control => control.id && control.id.toLowerCase() === args.options.id.toLowerCase());
+                if (!control) {
+                    throw `Control with ID ${args.options.id} not found on page ${pageName}`;
                 }
-            }
-            if (args.options.webPartProperties) {
                 if (this.verbose) {
-                    logger.logToStderr('web part properties data:');
-                    logger.logToStderr(args.options.webPartProperties);
-                    logger.logToStderr('');
+                    logger.logToStderr(`Control with ID ${args.options.id} found on the page`);
                 }
-                const webPartProperties = JSON.parse(args.options.webPartProperties);
-                canvasControl.webPartData.properties = Object.assign(Object.assign({}, canvasControl.webPartData.properties), webPartProperties);
-                if (this.verbose) {
-                    logger.logToStderr('Updated web part properties:');
-                    logger.logToStderr(canvasControl.webPartData.properties);
-                    logger.logToStderr('');
+                // Check out the page
+                const page = yield Page_1.Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
+                // Update the web part data
+                const canvasContent = JSON.parse(page.CanvasContent1);
+                if (this.debug) {
+                    logger.logToStderr(canvasContent);
                 }
+                const canvasControl = canvasContent.find(c => c.id.toLowerCase() === args.options.id.toLowerCase());
+                if (!canvasControl) {
+                    throw `Control with ID ${args.options.id} not found on page ${pageName}`;
+                }
+                if (args.options.webPartData) {
+                    if (this.verbose) {
+                        logger.logToStderr('web part data:');
+                        logger.logToStderr(args.options.webPartData);
+                        logger.logToStderr('');
+                    }
+                    const webPartData = JSON.parse(args.options.webPartData);
+                    canvasControl.webPartData = Object.assign(Object.assign(Object.assign({}, canvasControl.webPartData), webPartData), { id: canvasControl.webPartData.id, instanceId: canvasControl.webPartData.instanceId });
+                    if (this.verbose) {
+                        logger.logToStderr('Updated web part data:');
+                        logger.logToStderr(canvasControl.webPartData);
+                        logger.logToStderr('');
+                    }
+                }
+                if (args.options.webPartProperties) {
+                    if (this.verbose) {
+                        logger.logToStderr('web part properties data:');
+                        logger.logToStderr(args.options.webPartProperties);
+                        logger.logToStderr('');
+                    }
+                    const webPartProperties = JSON.parse(args.options.webPartProperties);
+                    canvasControl.webPartData.properties = Object.assign(Object.assign({}, canvasControl.webPartData.properties), webPartProperties);
+                    if (this.verbose) {
+                        logger.logToStderr('Updated web part properties:');
+                        logger.logToStderr(canvasControl.webPartData.properties);
+                        logger.logToStderr('');
+                    }
+                }
+                const pageData = {};
+                if (page.AuthorByline) {
+                    pageData.AuthorByline = page.AuthorByline;
+                }
+                if (page.BannerImageUrl) {
+                    pageData.BannerImageUrl = page.BannerImageUrl;
+                }
+                if (page.Description) {
+                    pageData.Description = page.Description;
+                }
+                if (page.Title) {
+                    pageData.Title = page.Title;
+                }
+                if (page.TopicHeader) {
+                    pageData.TopicHeader = page.TopicHeader;
+                }
+                if (page.LayoutWebpartsContent) {
+                    pageData.LayoutWebpartsContent = page.LayoutWebpartsContent;
+                }
+                if (canvasContent) {
+                    pageData.CanvasContent1 = JSON.stringify(canvasContent);
+                }
+                requestOptions = {
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')/SavePageAsDraft`,
+                    headers: {
+                        'X-HTTP-Method': 'MERGE',
+                        'IF-MATCH': '*',
+                        'content-type': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: pageData,
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const pageData = {};
-            if (page.AuthorByline) {
-                pageData.AuthorByline = page.AuthorByline;
-            }
-            if (page.BannerImageUrl) {
-                pageData.BannerImageUrl = page.BannerImageUrl;
-            }
-            if (page.Description) {
-                pageData.Description = page.Description;
-            }
-            if (page.Title) {
-                pageData.Title = page.Title;
-            }
-            if (page.TopicHeader) {
-                pageData.TopicHeader = page.TopicHeader;
-            }
-            if (page.LayoutWebpartsContent) {
-                pageData.LayoutWebpartsContent = page.LayoutWebpartsContent;
-            }
-            if (canvasContent) {
-                pageData.CanvasContent1 = JSON.stringify(canvasContent);
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')/SavePageAsDraft`,
-                headers: {
-                    'X-HTTP-Method': 'MERGE',
-                    'IF-MATCH': '*',
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: pageData,
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb())
-            .catch((err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoPageControlSetCommand_instances = new WeakSet(), _SpoPageControlSetCommand_initTelemetry = function _SpoPageControlSetCommand_initTelemetry() {

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

@@ -37,59 +37,59 @@ class SpoPageCopyCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'PageLayoutType', 'Title', 'Url'];
     }
-    commandAction(logger, args, cb) {
-        let { webUrl } = args.options;
-        const { targetUrl, overwrite } = args.options;
-        webUrl = this.removeTrailingSlash(webUrl);
-        let sourceFullName = args.options.sourceName.toLowerCase();
-        const targetPageInfo = this.getTargetSiteUrl(webUrl, targetUrl.toLowerCase());
-        let { siteUrl: targetSiteUrl, pageName: targetFullName } = targetPageInfo;
-        if (sourceFullName.indexOf('.aspx') < 0) {
-            sourceFullName += '.aspx';
-        }
-        if (targetFullName.indexOf('.aspx') < 0) {
-            targetFullName += '.aspx';
-        }
-        targetSiteUrl = this.removeTrailingSlash(targetSiteUrl);
-        if (targetFullName.startsWith('/')) {
-            targetFullName = targetFullName.substring(1);
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Creating page copy...`);
-        }
-        const requestOptions = {
-            url: `${webUrl}/_api/SP.MoveCopyUtil.CopyFileByPath()`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: {
-                srcPath: { DecodedUrl: `${webUrl}/sitepages/${sourceFullName}` },
-                destPath: { DecodedUrl: `${targetSiteUrl}/sitepages/${targetFullName}` },
-                options: { ResetAuthorAndCreatedOnCopy: true, ShouldBypassSharedLocks: true },
-                overwrite: !!overwrite
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(() => {
-            const requestOptions = {
-                url: `${targetSiteUrl}/_api/sitepages/pages/GetByUrl('sitepages/${targetFullName}')`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { webUrl } = args.options;
+            const { targetUrl, overwrite } = args.options;
+            webUrl = this.removeTrailingSlash(webUrl);
+            let sourceFullName = args.options.sourceName.toLowerCase();
+            const targetPageInfo = this.getTargetSiteUrl(webUrl, targetUrl.toLowerCase());
+            let { siteUrl: targetSiteUrl, pageName: targetFullName } = targetPageInfo;
+            if (sourceFullName.indexOf('.aspx') < 0) {
+                sourceFullName += '.aspx';
+            }
+            if (targetFullName.indexOf('.aspx') < 0) {
+                targetFullName += '.aspx';
+            }
+            targetSiteUrl = this.removeTrailingSlash(targetSiteUrl);
+            if (targetFullName.startsWith('/')) {
+                targetFullName = targetFullName.substring(1);
+            }
             if (this.verbose) {
-                logger.logToStderr(chalk.green('DONE'));
+                logger.logToStderr(`Creating page copy...`);
+            }
+            try {
+                let requestOptions = {
+                    url: `${webUrl}/_api/SP.MoveCopyUtil.CopyFileByPath()`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        srcPath: { DecodedUrl: `${webUrl}/sitepages/${sourceFullName}` },
+                        destPath: { DecodedUrl: `${targetSiteUrl}/sitepages/${targetFullName}` },
+                        options: { ResetAuthorAndCreatedOnCopy: true, ShouldBypassSharedLocks: true },
+                        overwrite: !!overwrite
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+                requestOptions = {
+                    url: `${targetSiteUrl}/_api/sitepages/pages/GetByUrl('sitepages/${targetFullName}')`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+                if (this.verbose) {
+                    logger.logToStderr(chalk.green('DONE'));
+                }
             }
-            cb();
-        })
-            .catch(err => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getTargetSiteUrl(webUrl, targetFullName) {
         const siteSplit = targetFullName.split('sitepages/');

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

@@ -35,61 +35,59 @@ class SpoPageGetCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['commentsDisabled', 'numSections', 'numControls', 'title', 'layoutType'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about the page...`);
-        }
-        let pageName = args.options.name;
-        if (args.options.name.indexOf('.aspx') < 0) {
-            pageName += '.aspx';
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId,ListItemAllFields/PageLayoutType,ListItemAllFields/CommentsDisabled`,
-            headers: {
-                'content-type': 'application/json;charset=utf-8',
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        let pageItemData = {};
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.ListItemAllFields.ClientSideApplicationId !== 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec') {
-                return Promise.reject(`Page ${args.options.name} is not a modern page.`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about the page...`);
             }
-            pageItemData = Object.assign({}, res);
-            pageItemData.commentsDisabled = res.ListItemAllFields.CommentsDisabled;
-            pageItemData.title = res.ListItemAllFields.Title;
-            if (res.ListItemAllFields.PageLayoutType) {
-                pageItemData.layoutType = res.ListItemAllFields.PageLayoutType;
+            let pageName = args.options.name;
+            if (args.options.name.indexOf('.aspx') < 0) {
+                pageName += '.aspx';
             }
-            if (args.options.metadataOnly) {
-                return Promise.resolve();
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/SitePages/Pages(${res.ListItemAllFields.Id})`,
-                headers: {
-                    'content-type': 'application/json;charset=utf-8',
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (res && res.CanvasContent1) {
-                const canvasData = JSON.parse(res.CanvasContent1);
-                pageItemData.canvasContentJson = res.CanvasContent1;
-                if (canvasData && canvasData.length > 0) {
-                    pageItemData.numControls = canvasData.length;
-                    const sections = [...new Set(canvasData.filter(c => c.position).map(c => c.position.zoneIndex))];
-                    pageItemData.numSections = sections.length;
+            try {
+                let requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId,ListItemAllFields/PageLayoutType,ListItemAllFields/CommentsDisabled`,
+                    headers: {
+                        'content-type': 'application/json;charset=utf-8',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const page = yield request_1.default.get(requestOptions);
+                if (page.ListItemAllFields.ClientSideApplicationId !== 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec') {
+                    throw `Page ${args.options.name} is not a modern page.`;
+                }
+                let pageItemData = {};
+                pageItemData = Object.assign({}, page);
+                pageItemData.commentsDisabled = page.ListItemAllFields.CommentsDisabled;
+                pageItemData.title = page.ListItemAllFields.Title;
+                if (page.ListItemAllFields.PageLayoutType) {
+                    pageItemData.layoutType = page.ListItemAllFields.PageLayoutType;
                 }
+                if (!args.options.metadataOnly) {
+                    requestOptions = {
+                        url: `${args.options.webUrl}/_api/SitePages/Pages(${page.ListItemAllFields.Id})`,
+                        headers: {
+                            'content-type': 'application/json;charset=utf-8',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const res = yield request_1.default.get(requestOptions);
+                    const canvasData = JSON.parse(res.CanvasContent1);
+                    pageItemData.canvasContentJson = res.CanvasContent1;
+                    if (canvasData && canvasData.length > 0) {
+                        pageItemData.numControls = canvasData.length;
+                        const sections = [...new Set(canvasData.filter(c => c.position).map(c => c.position.zoneIndex))];
+                        pageItemData.numSections = sections.length;
+                    }
+                }
+                logger.log(pageItemData);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(pageItemData);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoPageGetCommand_instances = new WeakSet(), _SpoPageGetCommand_initOptions = function _SpoPageGetCommand_initOptions() {