@pnp/cli-microsoft365 10.4.0-beta.946980f → 10.4.0-beta.b552c1b

package/dist/appInsights.js

@@ -12,7 +12,7 @@ import url from 'url';
 import { app } from './utils/app.js';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 appInsights
-    .setup('6b908c80-d09f-4cf6-8274-e54349a0149a')
+    .setup('InstrumentationKey=6b908c80-d09f-4cf6-8274-e54349a0149a;IngestionEndpoint=https://westeurope-3.in.applicationinsights.azure.com/;LiveEndpoint=https://westeurope.livediagnostics.monitor.azure.com/;ApplicationId=d42020c6-da32-44f7-bbb7-666f0b3a664d')
     .setInternalLogging(false, false);
 // append -dev to the version number when ran locally
 // to distinguish production and dev version of the CLI

package/dist/config.js

@@ -34,7 +34,7 @@ export default {
         'https://graph.microsoft.com/Place.Read.All',
         'https://graph.microsoft.com/Policy.Read.All',
         'https://graph.microsoft.com/RecordsManagement.ReadWrite.All',
-        'https://graph.microsoft.com/Reports.ReadWrite.All',
+        'https://graph.microsoft.com/Reports.Read.All',
         'https://graph.microsoft.com/ReportSettings.ReadWrite.All',
         'https://graph.microsoft.com/RoleAssignmentSchedule.ReadWrite.Directory',
         'https://graph.microsoft.com/RoleEligibilitySchedule.Read.Directory',

package/dist/m365/spo/commands/page/clientsidepages.js

@@ -271,6 +271,12 @@ export class ClientSidePage {
         for (let i = 0; i < this.sections.length; i++) {
             html.push(this.sections[i].toHtml());
         }
+        if (this.pageSettings) {
+            html.push(this.pageSettings.toHtml());
+        }
+        if (this.backgroundSettings) {
+            html.push(this.backgroundSettings.toHtml());
+        }
         html.push("</div>");
         return html.join("");
     }
@@ -286,17 +292,23 @@ export class ClientSidePage {
         // gather our controls from the supplied html
         getBoundedDivMarkup(html, /<div\b[^>]*data-sp-canvascontrol[^>]*?>/i, markup => {
             // get the control type
-            const ct = /controlType&quot;&#58;(\d*?),/i.exec(markup);
+            const ct = /controlType&quot;&#58;(\d*?)(,|&)/i.exec(markup);
             // if no control type is present this is a column which we give type 0 to let us process it
-            const controlType = ct == null || ct.length < 2 ? 0 : parseInt(ct[1], 10);
+            const controlType = ct == null || ct.length < 0 ? -1 : parseInt(ct[1], 10);
             let control = null;
             switch (controlType) {
-                case 0:
+                case -1:
                     // empty canvas column
                     control = new CanvasColumn(null, 0);
                     control.fromHtml(markup);
                     page.mergeColumnToTree(control);
                     break;
+                case 0:
+                    // page settings
+                    control = new PageSettings();
+                    control.fromHtml(markup);
+                    page.pageSettings = control;
+                    break;
                 case 3:
                     // client side webpart
                     control = new ClientSideWebpart("");
@@ -309,6 +321,12 @@ export class ClientSidePage {
                     control.fromHtml(markup);
                     page.mergePartToTree(control);
                     break;
+                case 14:
+                    // backgroundSection
+                    control = new BackgroundSettings();
+                    control.fromHtml(markup);
+                    page.backgroundSettings = control;
+                    break;
             }
         });
         // refresh all the orders within the tree
@@ -364,7 +382,7 @@ export class ClientSidePage {
         }
         const sections = this.sections.filter(s => s.order === zoneIndex);
         if (sections.length < 1) {
-            section = new CanvasSection(this, zoneIndex);
+            section = new CanvasSection(this, zoneIndex, [], control?.controlData?.position.zoneId, control.controlData?.zoneGroupMetadata);
             this.sections.push(section);
         }
         else {
@@ -392,7 +410,7 @@ export class ClientSidePage {
         let section = null;
         const sections = this.sections.filter(s => s.order === order);
         if (sections.length < 1) {
-            section = new CanvasSection(this, order);
+            section = new CanvasSection(this, order, [], column.controlData?.position?.zoneId, column.controlData?.zoneGroupMetadata);
             this.sections.push(section);
         }
         else {
@@ -403,10 +421,12 @@ export class ClientSidePage {
     }
 }
 export class CanvasSection {
-    constructor(page, order, columns = []) {
+    constructor(page, order, columns = [], zoneId, zoneGroupMetadata) {
         this.page = page;
         this.order = order;
         this.columns = columns;
+        this.zoneId = zoneId;
+        this.zoneGroupMetadata = zoneGroupMetadata;
     }
     /**
      * Default column (this.columns[0]) for this section
@@ -457,6 +477,20 @@ class CanvasControl {
         this.id = this.controlData.id;
     }
 }
+export class PageSettings extends CanvasControl {
+    constructor() {
+        super(0, "1.0");
+    }
+    getControlData() {
+        return this.controlData;
+    }
+    toHtml() {
+        return `<div data-sp-canvascontrol="" data-sp-canvasdataversion="${this.dataVersion}" data-sp-controldata="${this.jsonData}"></div>`;
+    }
+    fromHtml(html) {
+        super.fromHtml(html);
+    }
+}
 export class CanvasColumn extends CanvasControl {
     constructor(section, order, factor = 12, controls = [], dataVersion = "1.0") {
         super(0, dataVersion);
@@ -513,8 +547,10 @@ export class CanvasColumn extends CanvasControl {
             position: {
                 sectionFactor: this.factor,
                 sectionIndex: this.order,
-                zoneIndex: this.section ? this.section.order : 0
+                zoneIndex: this.section ? this.section.order : 0,
+                zoneId: this.section?.zoneId
             },
+            zoneGroupMetadata: this.section?.zoneGroupMetadata,
         };
     }
     /**
@@ -543,6 +579,58 @@ export class ClientSidePart extends CanvasControl {
         }
     }
 }
+export class BackgroundSettings extends ClientSidePart {
+    constructor() {
+        super(0, "1.0");
+        this.propertieJson = {};
+        this.serverProcessedContent = null;
+    }
+    getControlData() {
+        return {
+            controlType: this.controlType
+        };
+    }
+    toHtml() {
+        // will form the value of the data-sp-webpartdata attribute
+        const data = {
+            dataVersion: this.dataVersion,
+            instanceId: this.id,
+            properties: this.propertieJson,
+            serverProcessedContent: this.serverProcessedContent,
+        };
+        const html = [];
+        html.push(`<div data-sp-canvascontrol="" data-sp-canvasdataversion="${this.dataVersion}" data-sp-controldata="${this.jsonData}">`);
+        html.push(`<div data-sp-webpart="" data-sp-webpartdataversion="${this.dataVersion}" data-sp-webpartdata="${ClientSidePage.jsonToEscapedString(data)}">`);
+        html.push(`<div data-sp-componentid="">`);
+        html.push("</div>");
+        html.push(`<div data-sp-htmlproperties="">`);
+        for (let imageSource in this.serverProcessedContent?.imageSources) {
+            html.push(`<img data-sp-prop-name="${imageSource}" src="${this.serverProcessedContent?.imageSources[imageSource]}" />`);
+        }
+        html.push("</div>");
+        html.push("</div>");
+        html.push("</div>");
+        return html.join("");
+    }
+    setProperties(properties) {
+        this.propertieJson = extend(this.propertieJson, properties);
+        return this;
+    }
+    fromHtml(html) {
+        super.fromHtml(html);
+        const webPartData = ClientSidePage.escapedStringToJson(getAttrValueFromString(html, "data-sp-webpartdata"));
+        this.setProperties(webPartData.properties);
+        if (typeof webPartData.serverProcessedContent !== "undefined") {
+            this.serverProcessedContent = webPartData.serverProcessedContent;
+        }
+        if (typeof webPartData.dynamicDataPaths !== "undefined") {
+            this.dynamicDataPaths = webPartData.dynamicDataPaths;
+        }
+        if (typeof webPartData.dynamicDataValues !== "undefined") {
+            this.dynamicDataValues = webPartData.dynamicDataValues;
+        }
+    }
+}
 export class ClientSideText extends ClientSidePart {
     constructor(text = "") {
         super(4, "1.0");
@@ -570,8 +658,10 @@ export class ClientSideText extends ClientSidePart {
                 controlIndex: this.order,
                 sectionFactor: this.column ? this.column.factor : 0,
                 sectionIndex: this.column ? this.column.order : 0,
-                zoneIndex: this.column && this.column.section ? this.column.section.order : 0
+                zoneIndex: this.column && this.column.section ? this.column.section.order : 0,
+                zoneId: this.column?.section?.zoneId
             },
+            zoneGroupMetadata: this.column?.section?.zoneGroupMetadata,
         };
     }
     toHtml(index) {
@@ -684,9 +774,11 @@ export class ClientSideWebpart extends ClientSidePart {
                 controlIndex: this.order,
                 sectionFactor: this.column ? this.column.factor : 0,
                 sectionIndex: this.column ? this.column.order : 0,
-                zoneIndex: this.column && this.column.section ? this.column.section.order : 0
+                zoneIndex: this.column && this.column.section ? this.column.section.order : 0,
+                zoneId: this.column?.section?.zoneId
             },
             webPartId: this.webPartId,
+            zoneGroupMetadata: this.column?.section?.zoneGroupMetadata,
         };
     }
     renderHtmlProperties() {

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

@@ -132,7 +132,8 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand {
                 id: webPart.id,
                 position: Object.assign({}, control.position),
                 webPartId: webPart.webPartId,
-                emphasis: {}
+                emphasis: {},
+                zoneGroupMetadata: control.zoneGroupMetadata
             }, webPart);
             if (!control.controlType) {
                 // it's an empty column so we need to replace it with the web part

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

@@ -10,7 +10,7 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import { ClientSideText } from './clientsidepages.js';
+import { CanvasSection, ClientSideText } from './clientsidepages.js';
 import { Page } from './Page.js';
 class SpoPageTextAddCommand extends SpoCommand {
     get name() {
@@ -46,6 +46,12 @@ class SpoPageTextAddCommand extends SpoCommand {
             const page = await Page.getPage(pageName, args.options.webUrl, logger, this.debug, this.verbose);
             const section = (args.options.section || 1) - 1;
             const column = (args.options.column || 1) - 1;
+            // Add a new section when page does not contain any sections
+            if (page.sections.length < 1) {
+                const newSection = new CanvasSection(page, 1);
+                newSection.defaultColumn;
+                page.sections.push(newSection);
+            }
             // Make sure the section is in range
             if (section >= page.sections.length) {
                 throw new Error(`Invalid section '${section + 1}'`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "10.4.0-beta.946980f",
+  "version": "10.4.0-beta.b552c1b",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",