@pnp/cli-microsoft365 10.10.0-beta.bd186ba → 10.10.0

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

@@ -0,0 +1,99 @@
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import { zod } from '../../../../utils/zod.js';
+import { cli } from '../../../../cli/cli.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { Page } from './Page.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+const options = globalOptionsZod
+    .extend({
+    webUrl: zod.alias('u', z.string())
+        .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
+        message: `'${url}' is not a valid SharePoint URL.`
+    })),
+    pageName: zod.alias('n', z.string()),
+    id: zod.alias('i', z.string())
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })),
+    draft: z.boolean().optional(),
+    force: zod.alias('f', z.boolean().optional())
+})
+    .strict();
+class SpoPageControlRemoveCommand extends SpoCommand {
+    get name() {
+        return commands.PAGE_CONTROL_REMOVE;
+    }
+    get description() {
+        return 'Removes a control from a modern page';
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        if (!args.options.force) {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to delete control '${args.options.id}' on page '${args.options.pageName}'?` });
+            if (!result) {
+                return;
+            }
+        }
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Getting page properties for page '${args.options.pageName}'...`);
+            }
+            const pageName = urlUtil.removeLeadingSlashes(args.options.pageName.toLowerCase().endsWith('.aspx') ? args.options.pageName : `${args.options.pageName}.aspx`);
+            let requestOptions = {
+                url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('SitePages/${formatting.encodeQueryParameter(pageName)}')?$select=CanvasContent1`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const pageProps = await request.get(requestOptions);
+            if (!pageProps.CanvasContent1) {
+                throw `Page '${pageName}' doesn't contain canvas control '${args.options.id}'.`;
+            }
+            const pageControls = JSON.parse(pageProps.CanvasContent1);
+            const hasControl = pageControls.some(control => control.id?.toLowerCase() === args.options.id.toLowerCase());
+            if (!hasControl) {
+                throw `Control with ID '${args.options.id}' was not found on page '${pageName}'.`;
+            }
+            if (this.verbose) {
+                await logger.logToStderr('Checking out page...');
+            }
+            const page = await Page.checkout(pageName, args.options.webUrl, logger, this.verbose);
+            const canvasContent = JSON.parse(page.CanvasContent1);
+            if (this.verbose) {
+                await logger.logToStderr(`Removing control with ID '${args.options.id}' from page...`);
+            }
+            const pageContent = canvasContent.filter(control => !control.id || control.id.toLowerCase() !== args.options.id.toLowerCase());
+            requestOptions = {
+                url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('SitePages/${formatting.encodeQueryParameter(pageName)}')/SavePageAsDraft`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    CanvasContent1: JSON.stringify(pageContent)
+                }
+            };
+            await request.patch(requestOptions);
+            if (!args.options.draft) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Republishing page...`);
+                }
+                await Page.publishPage(args.options.webUrl, pageName);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new SpoPageControlRemoveCommand();
+//# sourceMappingURL=page-control-remove.js.map

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

@@ -50,7 +50,7 @@ class SpoPageControlSetCommand extends SpoCommand {
                 await logger.logToStderr(`Control with ID ${args.options.id} found on the page`);
             }
             // Check out the page
-            const page = await Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
+            const page = await Page.checkout(pageName, args.options.webUrl, logger, this.verbose);
             // Update the web part data
             const canvasContent = JSON.parse(page.CanvasContent1);
             if (this.debug) {

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

@@ -6,9 +6,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageHeaderSetCommand_instances, _SpoPageHeaderSetCommand_initTelemetry, _SpoPageHeaderSetCommand_initOptions, _SpoPageHeaderSetCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { Page } from './Page.js';
 const BannerWebPartId = 'cbe7b0a9-3504-44dd-a3a3-0e5cacd07788';
 class SpoPageHeaderSetCommand extends SpoCommand {
     get name() {
@@ -148,14 +150,7 @@ class SpoPageHeaderSetCommand extends SpoCommand {
                 pageData = await request.get(requestOptions);
             }
             else {
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting.encodeQueryParameter(pageFullName)}')/checkoutpage`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                pageData = await request.post(requestOptions);
+                pageData = await Page.checkout(pageFullName, args.options.webUrl, logger, this.verbose);
             }
             switch (args.options.type) {
                 case 'None':
@@ -220,23 +215,23 @@ class SpoPageHeaderSetCommand extends SpoCommand {
                 }
                 else {
                     const res = await Promise.all([
-                        this.getSiteId(args.options.webUrl, this.verbose, logger),
-                        this.getWebId(args.options.webUrl, this.verbose, logger),
+                        spo.getSiteIdBySPApi(args.options.webUrl, logger, this.verbose),
+                        spo.getWebId(args.options.webUrl, logger, this.verbose),
                         this.getImageInfo(args.options.webUrl, args.options.imageUrl, this.verbose, logger)
                     ]);
                     header.serverProcessedContent.customMetadata = {
                         imageSource: {
-                            siteId: res[0].Id,
-                            webId: res[1].Id,
+                            siteId: res[0],
+                            webId: res[1],
                             listId: res[2].ListId,
                             uniqueId: res[2].UniqueId
                         }
                     };
                     const properties = header.properties;
                     properties.listId = res[2].ListId;
-                    properties.siteId = res[0].Id;
+                    properties.siteId = res[0];
                     properties.uniqueId = res[2].UniqueId;
-                    properties.webId = res[1].Id;
+                    properties.webId = res[1];
                     header.properties = properties;
                 }
             }
@@ -306,32 +301,6 @@ class SpoPageHeaderSetCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getSiteId(siteUrl, verbose, logger) {
-        if (verbose) {
-            await logger.logToStderr(`Retrieving information about the site collection...`);
-        }
-        const requestOptions = {
-            url: `${siteUrl}/_api/site?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request.get(requestOptions);
-    }
-    async getWebId(siteUrl, verbose, logger) {
-        if (verbose) {
-            await logger.logToStderr(`Retrieving information about the site...`);
-        }
-        const requestOptions = {
-            url: `${siteUrl}/_api/web?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request.get(requestOptions);
-    }
     async getImageInfo(siteUrl, imageUrl, verbose, logger) {
         if (verbose) {
             await logger.logToStderr(`Retrieving information about the header image...`);

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

@@ -1,12 +1,11 @@
 import { z } from 'zod';
 import { zod } from '../../../../utils/zod.js';
 import { globalOptionsZod } from '../../../../Command.js';
-import request from '../../../../request.js';
-import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { Page } from './Page.js';
 const options = globalOptionsZod
     .extend({
     webUrl: zod.alias('u', z.string()
@@ -36,14 +35,7 @@ class SpoPagePublishCommand extends SpoCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Publishing page ${pageName}...`);
             }
-            const filePath = `${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${pageName}`;
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(filePath)}')/Publish()`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                }
-            };
-            await request.post(requestOptions);
+            await Page.publishPage(args.options.webUrl, pageName);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -11,6 +11,7 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { CanvasSectionTemplate } from './clientsidepages.js';
+import { Page } from './Page.js';
 class SpoPageSectionAddCommand extends SpoCommand {
     get name() {
         return commands.PAGE_SECTION_ADD;
@@ -21,10 +22,12 @@ class SpoPageSectionAddCommand extends SpoCommand {
     constructor() {
         super();
         _SpoPageSectionAddCommand_instances.add(this);
-        this.sectionTemplate = ['OneColumn', 'OneColumnFullWidth', 'TwoColumn', 'ThreeColumn', 'TwoColumnLeft', 'TwoColumnRight', 'Vertical'];
+        this.sectionTemplate = ['OneColumn', 'OneColumnFullWidth', 'TwoColumn', 'ThreeColumn', 'TwoColumnLeft', 'TwoColumnRight', 'Vertical', 'Flexible'];
         this.zoneEmphasis = ['None', 'Neutral', 'Soft', 'Strong', 'Image', 'Gradient'];
         this.iconAlignment = ['Left', 'Right'];
         this.fillMode = ['ScaleToFill', 'ScaleToFit', 'Tile', 'OriginalSize'];
+        this.zoneReflowStrategy = ['TopToBottom', 'LeftToRight'];
+        this.MINIMUM_ZONE_HEIGHT = 34;
         __classPrivateFieldGet(this, _SpoPageSectionAddCommand_instances, "m", _SpoPageSectionAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoPageSectionAddCommand_instances, "m", _SpoPageSectionAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPageSectionAddCommand_instances, "m", _SpoPageSectionAddCommand_initValidators).call(this);
@@ -49,15 +52,14 @@ class SpoPageSectionAddCommand extends SpoCommand {
             };
             const res = await request.get(requestOptions);
             canvasContent = JSON.parse(res.CanvasContent1 || "[{\"controlType\":0,\"pageSettingsSlice\":{\"isDefaultDescription\":true,\"isDefaultThumbnail\":true}}]");
+            if (args.options.sectionTemplate === 'OneColumnFullWidth') {
+                this.ensureFullWidthSectionCanBeAdded(canvasContent);
+            }
+            if (args.options.sectionTemplate === 'Vertical') {
+                this.ensureVerticalSectionCanBeAdded(canvasContent);
+            }
             if (!res.IsPageCheckedOutToCurrentUser) {
-                requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting.encodeQueryParameter(pageFullName)}')/checkoutpage`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                await request.post(requestOptions);
+                await Page.checkout(pageFullName, args.options.webUrl, logger, this.verbose);
             }
             // get unique zoneIndex values given each section can have 1 or more
             // columns each assigned to the zoneIndex of the corresponding section
@@ -148,6 +150,9 @@ class SpoPageSectionAddCommand extends SpoCommand {
             case 'Vertical':
                 columns.push(this.getVerticalColumn(args, zoneId));
                 break;
+            case 'Flexible':
+                columns.push(this.getFlexibleColumn(zoneIndex, sectionIndex++, args, zoneId));
+                break;
             case 'OneColumn':
             default:
                 columns.push(this.getColumn(zoneIndex, sectionIndex++, 12, args, zoneId));
@@ -168,9 +173,9 @@ class SpoPageSectionAddCommand extends SpoCommand {
             },
             emphasis: {}
         };
-        if (zoneEmphasis && ['none', 'neutral', 'soft', 'strong'].includes(zoneEmphasis?.toLocaleLowerCase())) {
+        if (zoneEmphasis && ['none', 'neutral', 'soft', 'strong'].includes(zoneEmphasis?.toLowerCase())) {
             // Just these zoneEmphasis values should be added to column emphasis
-            const zoneEmphasisValue = ['none', 'neutral', 'soft', 'strong'].indexOf(zoneEmphasis.toLocaleLowerCase());
+            const zoneEmphasisValue = ['none', 'neutral', 'soft', 'strong'].indexOf(zoneEmphasis.toLowerCase());
             columnValue.emphasis = { zoneEmphasis: zoneEmphasisValue };
         }
         if (isCollapsibleSection) {
@@ -178,8 +183,9 @@ class SpoPageSectionAddCommand extends SpoCommand {
                 type: 1,
                 isExpanded: !!isExpanded,
                 showDividerLine: !!showDivider,
-                iconAlignment: iconAlignment && iconAlignment.toLocaleLowerCase() === "right" ? "right" : "left",
-                displayName: collapsibleTitle
+                iconAlignment: iconAlignment && iconAlignment.toLowerCase() === "right" ? "right" : "left",
+                displayName: collapsibleTitle,
+                headingLevel: args.options.headingLevel ? args.options.headingLevel : 2 //2 is a default heading level
             };
         }
         return columnValue;
@@ -191,6 +197,14 @@ class SpoPageSectionAddCommand extends SpoCommand {
         columnValue.position.controlIndex = 1;
         return columnValue;
     }
+    getFlexibleColumn(zoneIndex, sectionIndex, args, zoneId) {
+        const columnValue = this.getColumn(zoneIndex, sectionIndex, 100, args, zoneId);
+        columnValue.zoneReflowStrategy = { axis: args.options.zoneReflowStrategy ? this.zoneReflowStrategy.indexOf(args.options.zoneReflowStrategy) : 0 };
+        if (args.options.zoneHeight) {
+            columnValue.zoneHeight = args.options.zoneHeight;
+        }
+        return columnValue;
+    }
     setBackgroundControl(zoneId, backgroundControl, args) {
         const { overlayColor, overlayOpacity, useLightText, imageUrl } = args.options;
         const backgroundDetails = this.getBackgroundDetails(args);
@@ -243,6 +257,18 @@ class SpoPageSectionAddCommand extends SpoCommand {
         }
         return backgroundDetails;
     }
+    ensureFullWidthSectionCanBeAdded(canvasContent) {
+        const hasVerticalSection = canvasContent.some((c) => c.position?.layoutIndex === 2 && c.position.sectionFactor === 12);
+        if (hasVerticalSection) {
+            throw "A vertical section already exists on the page. A full-width section cannot be added to a page that already has a vertical section.";
+        }
+    }
+    ensureVerticalSectionCanBeAdded(canvasContent) {
+        const hasFullWidthSection = canvasContent.some((c) => c.position?.layoutIndex === 1 && c.position.sectionFactor === 0);
+        if (hasFullWidthSection) {
+            throw "A full-width section already exists on the page. A vertical section cannot be added to a page that already has a full-width section.";
+        }
+    }
 }
 _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_initTelemetry = function _SpoPageSectionAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -262,7 +288,10 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
             useLightText: !!args.options.useLightText,
             overlayColor: typeof args.options.overlayColor !== 'undefined',
             overlayOpacity: typeof args.options.overlayOpacity !== 'undefined',
-            collapsibleTitle: typeof args.options.collapsibleTitle !== 'undefined'
+            collapsibleTitle: typeof args.options.collapsibleTitle !== 'undefined',
+            zoneReflowStrategy: typeof args.options.zoneReflowStrategy !== 'undefined',
+            zoneHeight: typeof args.options.zoneHeight !== 'undefined',
+            headingLevel: typeof args.options.headingLevel !== 'undefined'
         });
     });
 }, _SpoPageSectionAddCommand_initOptions = function _SpoPageSectionAddCommand_initOptions() {
@@ -308,11 +337,18 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
         option: '--overlayOpacity [overlayOpacity]'
     }, {
         option: '--collapsibleTitle [collapsibleTitle]'
+    }, {
+        option: '--zoneReflowStrategy [zoneReflowStrategy]',
+        autocomplete: this.zoneReflowStrategy
+    }, {
+        option: '--zoneHeight [zoneHeight]'
+    }, {
+        option: '--headingLevel [headingLevel]'
     });
 }, _SpoPageSectionAddCommand_initValidators = function _SpoPageSectionAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!(args.options.sectionTemplate in CanvasSectionTemplate)) {
-            return `${args.options.sectionTemplate} is not a valid section template. Allowed values are OneColumn|OneColumnFullWidth|TwoColumn|ThreeColumn|TwoColumnLeft|TwoColumnRight|Vertical`;
+            return `${args.options.sectionTemplate} is not a valid section template. Allowed values are OneColumn|OneColumnFullWidth|TwoColumn|ThreeColumn|TwoColumnLeft|TwoColumnRight|Vertical|Flexible`;
         }
         if (typeof args.options.order !== 'undefined') {
             if (!Number.isInteger(args.options.order) || args.options.order < 1) {
@@ -320,7 +356,7 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
             }
         }
         if (typeof args.options.zoneEmphasis !== 'undefined') {
-            if (!this.zoneEmphasis.some(zoneEmphasisValue => zoneEmphasisValue.toLocaleLowerCase() === args.options.zoneEmphasis?.toLowerCase())) {
+            if (!this.zoneEmphasis.some(zoneEmphasisValue => zoneEmphasisValue.toLowerCase() === args.options.zoneEmphasis?.toLowerCase())) {
                 return `The value of parameter zoneEmphasis must be ${this.zoneEmphasis.join(', ')}`;
             }
         }
@@ -330,20 +366,30 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
             }
         }
         if (typeof args.options.iconAlignment !== 'undefined') {
-            if (!this.iconAlignment.some(iconAlignmentValue => iconAlignmentValue.toLocaleLowerCase() === args.options.iconAlignment?.toLowerCase())) {
+            if (!this.iconAlignment.some(iconAlignmentValue => iconAlignmentValue.toLowerCase() === args.options.iconAlignment?.toLowerCase())) {
                 return `The value of parameter iconAlignment must be ${this.iconAlignment.join(', ')}`;
             }
         }
         if (typeof args.options.fillMode !== 'undefined') {
-            if (!this.fillMode.some(fillModeValue => fillModeValue.toLocaleLowerCase() === args.options.fillMode?.toLowerCase())) {
+            if (!this.fillMode.some(fillModeValue => fillModeValue.toLowerCase() === args.options.fillMode?.toLowerCase())) {
                 return `The value of parameter fillMode must be ${this.fillMode.join(', ')}`;
             }
         }
-        if (args.options.zoneEmphasis?.toLocaleLowerCase() !== 'image' && (args.options.imageUrl || args.options.imageWidth ||
+        if (typeof args.options.zoneReflowStrategy !== 'undefined') {
+            if (!this.zoneReflowStrategy.some(zoneReflowStrategyValue => zoneReflowStrategyValue.toLowerCase() === args.options.zoneReflowStrategy?.toLowerCase())) {
+                return `The value of parameter zoneReflowStrategy must be ${this.zoneReflowStrategy.join(', ')}`;
+            }
+        }
+        if (typeof args.options.headingLevel !== 'undefined') {
+            if (![2, 3, 4].some(headingLevelValue => headingLevelValue === args.options.headingLevel)) {
+                return `The value of parameter headingLevel must be 2, 3 or 4`;
+            }
+        }
+        if (args.options.zoneEmphasis?.toLowerCase() !== 'image' && (args.options.imageUrl || args.options.imageWidth ||
             args.options.imageHeight || args.options.fillMode)) {
             return 'Specify imageUrl, imageWidth, imageHeight or fillMode only when zoneEmphasis is set to Image';
         }
-        if (args.options.zoneEmphasis?.toLocaleLowerCase() === 'image' && !args.options.imageUrl) {
+        if (args.options.zoneEmphasis?.toLowerCase() === 'image' && !args.options.imageUrl) {
             return 'Specify imageUrl when zoneEmphasis is set to Image';
         }
         if (args.options.zoneEmphasis?.toLowerCase() !== 'gradient' && args.options.gradientText) {
@@ -361,10 +407,18 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
         if (!(args.options.zoneEmphasis && ['image', 'gradient'].includes(args.options.zoneEmphasis.toLowerCase())) && (args.options.overlayColor || args.options.overlayOpacity || args.options.useLightText)) {
             return 'Specify overlayColor or overlayOpacity only when zoneEmphasis is set to Image or Gradient';
         }
+        if (args.options.sectionTemplate?.toLowerCase() !== 'flexible' && (args.options.zoneReflowStrategy || args.options.zoneHeight)) {
+            return 'Specify zoneReflowStrategy or zoneHeight only when sectionTemplate is set to Flexible';
+        }
+        if (typeof args.options.zoneHeight !== 'undefined') {
+            if (!Number.isInteger(args.options.zoneHeight) || args.options.zoneHeight < this.MINIMUM_ZONE_HEIGHT) {
+                return `The value of parameter zoneHeight must be ${this.MINIMUM_ZONE_HEIGHT} or higher`;
+            }
+        }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
 }, _SpoPageSectionAddCommand_initTypes = function _SpoPageSectionAddCommand_initTypes() {
-    this.types.string = ['pageName', 'webUrl', 'sectionTemplate', 'zoneEmphasis', 'iconAlignment', 'gradientText', 'imageUrl', 'fillMode', 'overlayColor', 'collapsibleTitle'];
+    this.types.string = ['pageName', 'webUrl', 'sectionTemplate', 'zoneEmphasis', 'iconAlignment', 'gradientText', 'imageUrl', 'fillMode', 'overlayColor', 'collapsibleTitle', 'zoneReflowStrategy'];
     this.types.boolean = ['isLayoutReflowOnTop', 'isCollapsibleSection', 'showDivider', 'isExpanded', 'useLightText'];
 };
 export default new SpoPageSectionAddCommand();

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

@@ -52,7 +52,7 @@ class SpoPageSetCommand extends SpoCommand {
         try {
             const requestDigestResult = await spo.getRequestDigest(args.options.webUrl);
             const requestDigest = requestDigestResult.FormDigestValue;
-            const page = await Page.checkout(args.options.name, args.options.webUrl, logger, this.debug, this.verbose);
+            const page = await Page.checkout(args.options.name, args.options.webUrl, logger, this.verbose);
             if (page) {
                 pageTitle = pageTitle || page.Title;
                 pageId = page.Id;

package/dist/m365/spo/commands/site/site-admin-add.js

@@ -125,7 +125,7 @@ class SpoSiteAdminAddCommand extends SpoCommand {
         const ensuredUserData = await this.ensureUser(args, loginNameToAdd);
         await this.setSiteAdmin(args.options.siteUrl, loginNameToAdd);
         if (args.options.primary) {
-            const siteId = await this.getSiteId(args.options.siteUrl);
+            const siteId = await spo.getSiteIdBySPApi(args.options.siteUrl, logger, this.verbose);
             const previousPrimaryOwner = await this.getSiteOwnerLoginName(args.options.siteUrl);
             await this.setPrimaryOwnerLoginFromSite(logger, args.options.siteUrl, siteId, ensuredUserData);
             await this.setSiteAdmin(args.options.siteUrl, previousPrimaryOwner);
@@ -157,17 +157,6 @@ class SpoSiteAdminAddCommand extends SpoCommand {
         };
         return request.post(requestOptions);
     }
-    async getSiteId(siteUrl) {
-        const requestOptions = {
-            url: `${siteUrl}/_api/site?$select=Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const response = await request.get(requestOptions);
-        return response.Id;
-    }
     async getSiteOwnerLoginName(siteUrl) {
         const requestOptions = {
             url: `${siteUrl}/_api/site/owner?$select=LoginName`,

package/dist/m365/spo/commands/site/site-set.js

@@ -62,7 +62,7 @@ class SpoSiteSetCommand extends SpoCommand {
         if (this.debug) {
             await logger.logToStderr(`Setting the site its logo...`);
         }
-        const logoUrl = args.options.siteLogoUrl ? urlUtil.getServerRelativePath(args.options.url, args.options.siteLogoUrl) : "";
+        const logoUrl = args.options.siteLogoUrl ? urlUtil.getUrlRelativePath(args.options.siteLogoUrl) : "";
         const requestOptions = {
             url: `${args.options.url}/_api/siteiconmanager/setsitelogo`,
             headers: {
@@ -84,7 +84,7 @@ class SpoSiteSetCommand extends SpoCommand {
         if (this.debug) {
             await logger.logToStderr(`Setting the site thumbnail...`);
         }
-        const thumbnailUrl = args.options.siteThumbnailUrl ? urlUtil.getServerRelativePath(args.options.url, args.options.siteThumbnailUrl) : "";
+        const thumbnailUrl = args.options.siteThumbnailUrl ? urlUtil.getUrlRelativePath(args.options.siteThumbnailUrl) : "";
         const requestOptions = {
             url: `${args.options.url}/_api/siteiconmanager/setsitelogo`,
             headers: {

package/dist/m365/spo/commands.js

@@ -217,6 +217,7 @@ export default {
     PAGE_COLUMN_LIST: `${prefix} page column list`,
     PAGE_CONTROL_GET: `${prefix} page control get`,
     PAGE_CONTROL_LIST: `${prefix} page control list`,
+    PAGE_CONTROL_REMOVE: `${prefix} page control remove`,
     PAGE_CONTROL_SET: `${prefix} page control set`,
     PAGE_HEADER_SET: `${prefix} page header set`,
     PAGE_SECTION_ADD: `${prefix} page section add`,

package/dist/utils/entraServicePrincipal.js

@@ -1,6 +1,7 @@
 import { odata } from './odata.js';
 import { formatting } from './formatting.js';
 import { cli } from '../cli/cli.js';
+import request from '../request.js';
 export const entraServicePrincipal = {
     /**
      * Get service principal by its appId
@@ -52,6 +53,26 @@ export const entraServicePrincipal = {
             url += `?$select=${properties}`;
         }
         return odata.getAllItems(url);
+    },
+    /**
+     * Create a new service principal for the specified application.
+     * @param appId Application ID of the application for which to create a service principal.
+     * @returns The created service principal.
+     */
+    async createServicePrincipal(appId) {
+        const url = `https://graph.microsoft.com/v1.0/servicePrincipals`;
+        const requestOptions = {
+            url: url,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            data: {
+                appId
+            },
+            responseType: 'json'
+        };
+        return await request.post(requestOptions);
     }
 };
 //# sourceMappingURL=entraServicePrincipal.js.map

package/dist/utils/md.js

@@ -13,8 +13,8 @@ function convertHeadings(md) {
     });
 }
 function convertAdmonitions(md) {
-    const regex = new RegExp(/^:::(\w+)(?:\[([^\]]+)\])?([\s\S]*?):::$/, 'gm');
-    return md.replace(regex, (_, label, title, content) => label.toLocaleUpperCase() + (title ? EOL + EOL + title : '') + EOL + EOL + content.trim());
+    const regex = new RegExp(/^([ \t]*):::(\w+)(?:\[([^\]]+)\])?([\s\S]*?)^\1:::$/, 'gm');
+    return md.replace(regex, (_, indent, label, title, content) => indent + label.toLocaleUpperCase() + (title ? EOL + EOL + indent + title : '') + EOL + EOL + indent + content.trim());
 }
 function includeContent(md, rootFolder) {
     const mdxImports = [
@@ -49,7 +49,7 @@ function convertHyperlinks(md) {
 function convertContentTabs(md) {
     return md
         .replace(/<TabItem value="([^"]+)">/gm, '$1')
-        .replace(/.*<\/?(Tabs|TabItem)>.*\n?/g, '')
+        .replace(/.*\n?<\/?(Tabs|TabItem)>.*\n?/g, '')
         .replace(/```(?:\w+)?\s*([\s\S]*?)\s*```/g, '$1')
         .trim();
 }