@pnp/cli-microsoft365 7.3.0-beta.e0b37b9 → 7.3.0

package/dist/m365/spo/commands/listitem/listitem-batch-add.js

@@ -35,9 +35,9 @@ class SpoListItemBatchAddCommand extends SpoCommand {
     async commandAction(logger, args) {
         try {
             if (this.verbose) {
-                await logger.logToStderr(`Starting to create batch items from csv at path ${args.options.filePath}`);
+                await logger.logToStderr(`Starting to create batch items from csv ${args.options.filePath ? `at path ${args.options.filePath}` : 'from content'}`);
             }
-            const csvContent = fs.readFileSync(args.options.filePath, 'utf8');
+            const csvContent = args.options.filePath ? fs.readFileSync(args.options.filePath, 'utf8') : args.options.csvContent;
             const jsonContent = formatting.parseCsvToJson(csvContent);
             await this.addItemsAsBatch(jsonContent, args.options, logger);
         }
@@ -97,7 +97,7 @@ class SpoListItemBatchAddCommand extends SpoCommand {
             batchBody.push(`Accept: application/json;odata=nometadata\n`);
             batchBody.push(`Content-Type: application/json;odata=verbose\n`);
             batchBody.push(`If-Match: *\n\n`);
-            batchBody.push(`{\n"formValues": ${JSON.stringify(item)}\n}`);
+            batchBody.push(`{\n"formValues": ${JSON.stringify(this.formatFormValues(item))}\n}`);
         });
         // close batch body
         batchBody.push(`\n\n`);
@@ -105,6 +105,13 @@ class SpoListItemBatchAddCommand extends SpoCommand {
         batchBody.push(`--batch_${batchId}--\n`);
         return batchBody;
     }
+    formatFormValues(input) {
+        // Fix for PS 7
+        return input.map(obj => ({
+            FieldName: obj.FieldName.replace(/\\"/g, ''),
+            FieldValue: obj.FieldValue.replace(/\\"/g, '')
+        }));
+    }
     parseBatchResponseBody(response) {
         const batchResults = [];
         response.split('\r\n')
@@ -151,6 +158,8 @@ class SpoListItemBatchAddCommand extends SpoCommand {
 _SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddCommand_initTelemetry = function _SpoListItemBatchAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            filePath: typeof args.options.filePath !== 'undefined',
+            csvContent: typeof args.options.csvContent !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined'
@@ -158,9 +167,11 @@ _SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddComma
     });
 }, _SpoListItemBatchAddCommand_initOptions = function _SpoListItemBatchAddCommand_initOptions() {
     this.options.unshift({
-        option: '-p, --filePath <filePath>'
-    }, {
         option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-p, --filePath [filePath]'
+    }, {
+        option: '-c, --csvContent [csvContent]'
     }, {
         option: '-l, --listId [listId]'
     }, {
@@ -178,7 +189,7 @@ _SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddComma
             !validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (!fs.existsSync(args.options.filePath)) {
+        if (args.options.filePath && !fs.existsSync(args.options.filePath)) {
             return `File with path ${args.options.filePath} does not exist`;
         }
         return true;
@@ -186,7 +197,7 @@ _SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddComma
 }, _SpoListItemBatchAddCommand_initTypes = function _SpoListItemBatchAddCommand_initTypes() {
     this.types.string.push('webUrl', 'filePath', 'listId', 'listTitle', 'listUrl');
 }, _SpoListItemBatchAddCommand_initOptionSets = function _SpoListItemBatchAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['filePath', 'csvContent'] });
 };
 export default new SpoListItemBatchAddCommand();
 //# sourceMappingURL=listitem-batch-add.js.map

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

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddCommand_initOptions, _SpoPageAddCommand_initValidators;
-import { Auth } from '../../../../Auth.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -31,11 +30,9 @@ class SpoPageAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoPageAddCommand_instances, "m", _SpoPageAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const resource = Auth.getResourceFromUrl(args.options.webUrl);
         let requestDigest = '';
         let itemId = '';
         let pageName = args.options.name;
-        const serverRelativeSiteUrl = urlUtil.getServerRelativeSiteUrl(args.options.webUrl);
         const fileNameWithoutExtension = pageName.replace('.aspx', '');
         let bannerImageUrl = '';
         let canvasContent1 = '';
@@ -52,39 +49,22 @@ class SpoPageAddCommand extends SpoCommand {
             const reqDigest = await spo.getRequestDigest(args.options.webUrl);
             requestDigest = reqDigest.FormDigestValue;
             let requestOptions = {
-                url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${serverRelativeSiteUrl}/sitepages')/files/AddTemplateFile`,
+                url: `${args.options.webUrl}/_api/sitepages/pages`,
+                responseType: 'json',
                 headers: {
-                    'X-RequestDigest': requestDigest,
                     'content-type': 'application/json;odata=nometadata',
                     accept: 'application/json;odata=nometadata'
                 },
                 data: {
-                    urlOfFile: `${serverRelativeSiteUrl}/sitepages/${pageName}`,
-                    templateFileType: 3
-                },
-                responseType: 'json'
+                    PageLayoutType: args.options.layoutType || 'Article',
+                    Name: pageName,
+                    PromotedState: args.options.promoteAs === 'NewsPage' ? 2 : 0,
+                    Title: pageTitle
+                }
             };
             const template = await request.post(requestOptions);
             itemId = template.UniqueId;
             const listItemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
-            const layoutType = args.options.layoutType || 'Article';
-            const listItemSetOptions = {
-                webUrl: args.options.webUrl,
-                listUrl: listServerRelativeUrl,
-                id: listItemId,
-                systemUpdate: true,
-                ContentTypeId: '0x0101009D1CB255DA76424F860D91F20E6C4118',
-                Title: pageTitle,
-                ClientSideApplicationId: 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec',
-                PageLayoutType: layoutType,
-                verbose: this.verbose,
-                debug: this.debug
-            };
-            if (args.options.layoutType === 'Article') {
-                listItemSetOptions.PromotedState = 0;
-                listItemSetOptions.BannerImageUrl = `${resource}/_layouts/15/images/sitepagethumbnail.png, /_layouts/15/images/sitepagethumbnail.png`;
-            }
-            await cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
             const pageProps = await Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
             if (pageProps) {
                 pageId = pageProps.Id;
@@ -117,7 +97,6 @@ class SpoPageAddCommand extends SpoCommand {
                             listUrl: listServerRelativeUrl,
                             id: listItemId,
                             systemUpdate: true,
-                            PromotedState: 2,
                             FirstPublishedDate: new Date().toISOString(),
                             verbose: this.verbose,
                             debug: this.debug

package/dist/utils/aadAdministrativeUnit.js

@@ -1,7 +1,6 @@
-import { odata } from "./odata.js";
-import { formatting } from "./formatting.js";
-import { cli } from "../cli/cli.js";
-const graphResource = 'https://graph.microsoft.com';
+import { odata } from './odata.js';
+import { formatting } from './formatting.js';
+import { cli } from '../cli/cli.js';
 export const aadAdministrativeUnit = {
     /**
      * Get an administrative unit by its display name.
@@ -10,6 +9,7 @@ export const aadAdministrativeUnit = {
      * @throws Error when administrative unit was not found.
      */
     async getAdministrativeUnitByDisplayName(displayName) {
+        const graphResource = 'https://graph.microsoft.com';
         const administrativeUnits = await odata.getAllItems(`${graphResource}/v1.0/directory/administrativeUnits?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'`);
         if (administrativeUnits.length === 0) {
             throw `The specified administrative unit '${displayName}' does not exist.`;

package/docs/docs/cmd/aad/administrativeunit/administrativeunit-member-get.mdx

@@ -0,0 +1,130 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# aad administrativeunit member get
+
+Retrieves info about a specific member of an administrative unit
+
+## Usage
+
+```sh
+m365 aad administrativeunit member get [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --id <id>`
+: The id of a member to be retrieved.
+
+`-u, --administrativeUnitId [administrativeUnitId]`
+: The id of the administrative unit. Specify either `administrativeUnitId` or `administrativeUnitName`.
+
+`-n, --administrativeUnitName [administrativeUnitName]`
+: The name of the administrative unit. Specify either `administrativeUnitId` or `administrativeUnitName`.
+
+`-p, --properties [properties]`
+: Comma-separated list of properties to retrieve.
+```
+
+<Global />
+
+## Remarks
+
+To get the member of a hidden membership in an administrative unit, the `Member.Read.Hidden` permission is required.
+
+When the `properties` option includes values with a `/`, for example: `manager/displayName`, an additional `$expand` query parameter will be included on manager.
+
+## Examples
+
+Get information about a member specified by id from an administrative unit specified by id
+
+```sh
+m365 aad administrativeunit member get --id 64131a70-beb9-4ccb-b590-4401e58446ec --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 
+```
+
+Get information about a member specified by id from an administrative unit specified by name
+
+```sh
+m365 aad administrativeunit member get --id 64131a70-beb9-4ccb-b590-4401e58446ec --administrativeUnitName 'Marketing Division' 
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "id": "64131a70-beb9-4ccb-b590-4401e58446ec",
+    "businessPhones": [
+      "+20 255501070"
+    ],
+    "displayName": "Pradeep Gupta",
+    "givenName": "Pradeep",
+    "jobTitle": "Accountant",
+    "mail": "PradeepG@contoso.com",
+    "mobilePhone": null,
+    "officeLocation": "98/2202",
+    "preferredLanguage": "en-US",
+    "surname": "Gupta",
+    "userPrincipalName": "PradeepG@contoso.com",
+    "type": "user"
+  }
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  businessPhones   : ["+20 255501070"]
+  displayName      : Pradeep Gupta
+  givenName        : Pradeep
+  id               : 64131a70-beb9-4ccb-b590-4401e58446ec
+  jobTitle         : Accountant
+  mail             : PradeepG@contoso.com
+  mobilePhone      : null
+  officeLocation   : 98/2202
+  preferredLanguage: en-US
+  surname          : Gupta
+  type             : user
+  userPrincipalName: PradeepG@contoso.com
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  id,displayName,givenName,jobTitle,mail,officeLocation,preferredLanguage,surname,userPrincipalName,type
+  64131a70-beb9-4ccb-b590-4401e58446ec,Pradeep Gupta,Pradeep,Accountant,PradeepG@contoso.com,98/2202,en-US,Gupta,PradeepG@contoso.com,user
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  Date: 11/10/2023
+
+  ## Pradeep Gupta (64131a70-beb9-4ccb-b590-4401e58446ec)
+
+  Property | Value
+  ---------|-------
+  id | 64131a70-beb9-4ccb-b590-4401e58446ec
+  displayName | Pradeep Gupta
+  givenName | Pradeep
+  jobTitle | Accountant
+  mail | PradeepG@contoso.com
+  officeLocation | 98/2202
+  preferredLanguage | en-US
+  surname | Gupta
+  userPrincipalName | PradeepG@contoso.com
+  type | user
+  ```
+
+  </TabItem>
+</Tabs>
+
+## More information
+
+- Administrative units: https://learn.microsoft.com/entra/identity/role-based-access-control/administrative-units

package/docs/docs/cmd/external/connection/connection-schema-add.mdx

@@ -24,6 +24,9 @@ m365 search externalconnection schema add
 
 `-s, --schema [schema]`
 : The schema object to be added.
+
+`--wait`
+: Wait for the schema to be added before completing the command.
 ```
 
 <Global />
@@ -36,6 +39,16 @@ Adds a new schema to a specific external connection.
 m365 external connection schema add --externalConnectionId 'CliConnectionId' --schema '{"baseType":"microsoft.graph.externalItem","properties":[{"name":"ticketTitle","type":"String","isSearchable":"true","isRetrievable":"true","labels":["title"]},{"name":"priority","type":"String","isQueryable":"true","isRetrievable":"true","isSearchable":"false"},{"name":"assignee","type":"String","isRetrievable":"true"}]}'
 ```
 
+Adds a new schema to a specific external connection and wait for its provisioning to complete.
+
+```sh
+m365 external connection schema add --externalConnectionId 'CliConnectionId' --schema '{"baseType":"microsoft.graph.externalItem","properties":[{"name":"ticketTitle","type":"String","isSearchable":"true","isRetrievable":"true","labels":["title"]},{"name":"priority","type":"String","isQueryable":"true","isRetrievable":"true","isSearchable":"false"},{"name":"assignee","type":"String","isRetrievable":"true"}]}' --wait
+```
+
 ## Response
 
-The command won't return a response on success.
+Upon executing the command, you'll receive the job status URL. This URL enables manual checking of the job's progress if automated polling fails or for interactive monitoring purposes.
+
+```text
+"https://graph.microsoft.com/v1.0/external/connections/MyApp/operations/795b6888-4093-0fe7-6270-ddbcac9ebd3a"
+```

package/docs/docs/cmd/spo/listitem/listitem-batch-add.mdx

@@ -13,12 +13,15 @@ m365 spo listitem batch add [options]
 ## Options
 
 ```md definition-list
-`-p, --filePath <filePath>`
-: The absolute or relative path to a flat file containing the list items.
-
 `-u, --webUrl <webUrl>`
 : URL of the site.
 
+`-p, --filePath [filePath]`
+: The absolute or relative path to a flat file containing the list items. Specify `filePath` or `csvContent`, but not both.
+
+`-c, --csvContent [csvContent]`
+: A string content in CSV-format containing the list items. Specify `filePath` or `csvContent`, but not both.
+
 `-l, --listId [listId]`
 : ID of the list. Specify either `listTitle`, `listId` or `listUrl`, but not multiple.
 
@@ -54,6 +57,25 @@ Add a batch of items to a list retrieved by title in a specific site
 m365 spo listitem batch add --filePath "C:\Path\To\Csv\CsvFile.csv" --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle "Demo List"
 ```
 
+Add a batch of items to a list retrieved by title in a specific site using csv content
+
+```sh
+$obj = @(
+  [PSCustomObject]@{
+    Title = "Item A"
+    Age = 10
+  },
+  [PSCustomObject]@{
+    Title = "Item B"
+    Age = 20
+  }
+) 
+
+$csvContent = $obj | ConvertTo-Csv -NoTypeInformation -Delimiter "," | Out-String | ForEach-Object { $_.Replace('"','\"') }
+
+m365 spo listitem batch add --csvContent $csvContent --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle "Demo List"
+```
+
 Add a batch of items to a list retrieved by Id in a specific site
 
 ```sh

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "7.3.0-beta.e0b37b9",
+  "version": "7.3.0",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",
@@ -301,4 +301,4 @@
     "sinon": "^17.0.0",
     "source-map-support": "^0.5.21"
   }
-}
+}