@pnp/cli-microsoft365 7.2.0-beta.f440e15 → 7.3.0-beta.01256d2

package/dist/m365/spo/commands/file/file-retentionlabel-ensure.js

@@ -4,14 +4,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoFileRetentionLabelEnsureCommand_instances, _SpoFileRetentionLabelEnsureCommand_initTelemetry, _SpoFileRetentionLabelEnsureCommand_initOptions, _SpoFileRetentionLabelEnsureCommand_initValidators, _SpoFileRetentionLabelEnsureCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import * as url from 'url';
 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 spoListItemRetentionLabelEnsureCommand from '../listitem/listitem-retentionlabel-ensure.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { spo } from '../../../../utils/spo.js';
 class SpoFileRetentionLabelEnsureCommand extends SpoCommand {
     get name() {
         return commands.FILE_RETENTIONLABEL_ENSURE;
@@ -30,22 +30,13 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand {
     async commandAction(logger, args) {
         try {
             const fileProperties = await this.getFileProperties(logger, args);
+            const parsedUrl = url.parse(args.options.webUrl);
+            const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+            const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, fileProperties.listServerRelativeUrl);
             if (args.options.assetId) {
-                await this.applyAssetId(args.options.webUrl, fileProperties.ListItemAllFields.ParentList.Id, fileProperties.ListItemAllFields.Id, args.options.assetId);
-            }
-            const options = {
-                webUrl: args.options.webUrl,
-                listId: fileProperties.ListItemAllFields.ParentList.Id,
-                listItemId: fileProperties.ListItemAllFields.Id,
-                name: args.options.name,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const spoListItemRetentionLabelEnsureCommandOutput = await Cli.executeCommandWithOutput(spoListItemRetentionLabelEnsureCommand, { options: { ...options, _: [] } });
-            if (this.verbose) {
-                await logger.logToStderr(spoListItemRetentionLabelEnsureCommandOutput.stderr);
+                await this.applyAssetId(args.options.webUrl, fileProperties.listServerRelativeUrl, fileProperties.listItemId, args.options.assetId);
             }
+            await spo.applyRetentionLabelToListItems(args.options.webUrl, args.options.name, listAbsoluteUrl, [parseInt(fileProperties.listItemId)], logger, args.options.verbose);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -64,19 +55,19 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand {
             requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
         const requestOptions = {
-            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,
+            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList/RootFolder&$select=ServerRelativeUrl,ListItemAllFields/ParentList/RootFolder/ServerRelativeUrl,ListItemAllFields/Id`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
-        return request.get(requestOptions);
+        const response = await request.get(requestOptions);
+        return { listItemId: response.ListItemAllFields.Id, listServerRelativeUrl: response.ListItemAllFields.ParentList.RootFolder.ServerRelativeUrl };
     }
-    async applyAssetId(webUrl, listId, listItemId, assetId) {
-        const requestUrl = `${webUrl}/_api/web/lists(guid'${formatting.encodeQueryParameter(listId)}')`;
+    async applyAssetId(webUrl, listServerRelativeUrl, listItemId, assetId) {
         const requestBody = { "formValues": [{ "FieldName": "ComplianceAssetId", "FieldValue": assetId }] };
         const requestOptions = {
-            url: `${requestUrl}/items(${listItemId})/ValidateUpdateListItem()`,
+            url: `${webUrl}/_api/web/GetList(@listUrl)/items(${listItemId})/ValidateUpdateListItem()?@listUrl='${formatting.encodeQueryParameter(listServerRelativeUrl)}'`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },

package/dist/m365/spo/commands/file/file-retentionlabel-remove.js

@@ -4,14 +4,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoFileRetentionLabelRemoveCommand_instances, _SpoFileRetentionLabelRemoveCommand_initTelemetry, _SpoFileRetentionLabelRemoveCommand_initOptions, _SpoFileRetentionLabelRemoveCommand_initValidators, _SpoFileRetentionLabelRemoveCommand_initOptionSets;
+import * as url from 'url';
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.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 spoListItemRetentionLabelRemoveCommand from '../listitem/listitem-retentionlabel-remove.js';
 class SpoFileRetentionLabelRemoveCommand extends SpoCommand {
     get name() {
         return commands.FILE_RETENTIONLABEL_REMOVE;
@@ -32,48 +33,28 @@ class SpoFileRetentionLabelRemoveCommand extends SpoCommand {
             await this.removeFileRetentionLabel(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the retentionlabel from file ${args.options.fileId || args.options.fileUrl} located in site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the retentionlabel from file ${args.options.fileId || args.options.fileUrl} located in site ${args.options.webUrl}?` });
+            if (result) {
                 await this.removeFileRetentionLabel(logger, args);
             }
         }
     }
     async removeFileRetentionLabel(logger, args) {
-        if (this.verbose) {
-            await logger.logToStderr(`Removing retention label from file ${args.options.fileId || args.options.fileUrl} in site at ${args.options.webUrl}...`);
-        }
         try {
-            const fileProperties = await this.getFileProperties(args);
-            const options = {
-                webUrl: args.options.webUrl,
-                listId: fileProperties.listId,
-                listItemId: fileProperties.id,
-                force: true,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const spoListItemRetentionLabelRemoveCommandOutput = await Cli.executeCommandWithOutput(spoListItemRetentionLabelRemoveCommand, { options: { ...options, _: [] } });
-            if (this.verbose) {
-                await logger.logToStderr(spoListItemRetentionLabelRemoveCommandOutput.stderr);
-            }
+            const fileProperties = await this.getFileProperties(logger, args);
+            const parsedUrl = url.parse(args.options.webUrl);
+            const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+            const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, fileProperties.listServerRelativeUrl);
+            await spo.removeRetentionLabelFromListItems(args.options.webUrl, listAbsoluteUrl, [parseInt(fileProperties.listItemId)], logger, args.options.verbose);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getFileProperties(args) {
-        const requestOptions = {
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
+    async getFileProperties(logger, args) {
+        if (this.verbose) {
+            logger.logToStderr(`Retrieving list and item information for file '${args.options.fileId || args.options.fileUrl}' in site at ${args.options.webUrl}...`);
+        }
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileId) {
             requestUrl += `GetFileById('${args.options.fileId}')`;
@@ -82,9 +63,15 @@ class SpoFileRetentionLabelRemoveCommand extends SpoCommand {
             const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
             requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
-        requestOptions.url = `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ListItemAllFields/ParentList/Id,ListItemAllFields/Id`;
+        const requestOptions = {
+            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList/RootFolder&$select=ServerRelativeUrl,ListItemAllFields/ParentList/RootFolder/ServerRelativeUrl,ListItemAllFields/Id`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
         const response = await request.get(requestOptions);
-        return { id: response.ListItemAllFields.Id, listId: response.ListItemAllFields.ParentList.Id };
+        return { listItemId: response.ListItemAllFields.Id, listServerRelativeUrl: response.ListItemAllFields.ParentList.RootFolder.ServerRelativeUrl };
     }
 }
 _SpoFileRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoFileRetentionLabelRemoveCommand_initTelemetry = function _SpoFileRetentionLabelRemoveCommand_initTelemetry() {

package/dist/m365/spo/commands/file/file-roleassignment-remove.js

@@ -64,13 +64,8 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
             await removeRoleAssignment();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove role assignment from file ${args.options.fileUrl || args.options.fileId} from site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove role assignment from file ${args.options.fileUrl || args.options.fileId} from site ${args.options.webUrl}?` });
+            if (result) {
                 await removeRoleAssignment();
             }
         }

package/dist/m365/spo/commands/file/file-roleinheritance-break.js

@@ -52,13 +52,8 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand {
             await breakFileRoleInheritance();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to break the role inheritance of file ${args.options.fileUrl || args.options.fileId} located in site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to break the role inheritance of file ${args.options.fileUrl || args.options.fileId} located in site ${args.options.webUrl}?` });
+            if (result) {
                 await breakFileRoleInheritance();
             }
         }

package/dist/m365/spo/commands/file/file-roleinheritance-reset.js

@@ -51,13 +51,8 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand {
             await resetFileRoleInheritance();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to reset the role inheritance of file ${args.options.fileUrl || args.options.fileId} located in site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to reset the role inheritance of file ${args.options.fileUrl || args.options.fileId} located in site ${args.options.webUrl}?` });
+            if (result) {
                 await resetFileRoleInheritance();
             }
         }

package/dist/m365/spo/commands/file/file-sharinglink-clear.js

@@ -54,13 +54,8 @@ class SpoFileSharingLinkClearCommand extends SpoCommand {
             await clearSharingLinks();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to clear the sharing links of file ${args.options.fileUrl || args.options.fileId}${args.options.scope ? ` with scope ${args.options.scope}` : ''}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to clear the sharing links of file ${args.options.fileUrl || args.options.fileId}${args.options.scope ? ` with scope ${args.options.scope}` : ''}?` });
+            if (result) {
                 await clearSharingLinks();
             }
         }

package/dist/m365/spo/commands/file/file-sharinglink-remove.js

@@ -49,13 +49,8 @@ class SpoFileSharingLinkRemoveCommand extends SpoCommand {
             await removeSharingLink();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove sharing link ${args.options.id} of file ${args.options.fileUrl || args.options.fileId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove sharing link ${args.options.id} of file ${args.options.fileUrl || args.options.fileId}?` });
+            if (result) {
                 await removeSharingLink();
             }
         }

package/dist/m365/spo/commands/file/file-version-clear.js

@@ -35,13 +35,8 @@ class SpoFileVersionClearCommand extends SpoCommand {
                 await this.clearVersions(args);
             }
             else {
-                const result = await Cli.prompt({
-                    type: 'confirm',
-                    name: 'continue',
-                    default: false,
-                    message: `Are you sure you want to delete all version history for file ${args.options.fileId || args.options.fileUrl}'?`
-                });
-                if (result.continue) {
+                const result = await Cli.promptForConfirmation({ message: `Are you sure you want to delete all version history for file ${args.options.fileId || args.options.fileUrl}'?` });
+                if (result) {
                     await this.clearVersions(args);
                 }
             }

package/dist/m365/spo/commands/file/file-version-remove.js

@@ -36,13 +36,8 @@ class SpoFileVersionRemoveCommand extends SpoCommand {
                 await this.removeVersion(args);
             }
             else {
-                const result = await Cli.prompt({
-                    type: 'confirm',
-                    name: 'continue',
-                    default: false,
-                    message: `Are you sure you want to remove the version ${args.options.label} from file ${args.options.fileId || args.options.fileUrl}'?`
-                });
-                if (result.continue) {
+                const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the version ${args.options.label} from file ${args.options.fileId || args.options.fileUrl}'?` });
+                if (result) {
                     await this.removeVersion(args);
                 }
             }

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -36,13 +36,8 @@ class SpoFileVersionRestoreCommand extends SpoCommand {
                 await this.restoreVersion(args);
             }
             else {
-                const result = await Cli.prompt({
-                    type: 'confirm',
-                    name: 'continue',
-                    default: false,
-                    message: `Are you sure you want to restore the version ${args.options.label} from file ${args.options.fileId || args.options.fileUrl}'?`
-                });
-                if (result.continue) {
+                const result = await Cli.promptForConfirmation({ message: `Are you sure you want to restore the version ${args.options.label} from file ${args.options.fileId || args.options.fileUrl}'?` });
+                if (result) {
                     await this.restoreVersion(args);
                 }
             }

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

@@ -33,13 +33,8 @@ class SpoFolderRemoveCommand extends SpoCommand {
             await this.removeFolder(logger, args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.url} located in site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.url} located in site ${args.options.webUrl}?` });
+            if (result) {
                 await this.removeFolder(logger, args.options);
             }
         }

package/dist/m365/spo/commands/folder/folder-retentionlabel-ensure.js

@@ -4,15 +4,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoFolderRetentionLabelEnsureCommand_instances, _SpoFolderRetentionLabelEnsureCommand_initTelemetry, _SpoFolderRetentionLabelEnsureCommand_initOptions, _SpoFolderRetentionLabelEnsureCommand_initValidators, _SpoFolderRetentionLabelEnsureCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import * as url from 'url';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.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 spoListRetentionLabelEnsureCommand from '../list/list-retentionlabel-ensure.js';
-import spoListItemRetentionLabelEnsureCommand from '../listitem/listitem-retentionlabel-ensure.js';
 class SpoFolderRetentionLabelEnsureCommand extends SpoCommand {
     get name() {
         return commands.FOLDER_RETENTIONLABEL_ENSURE;
@@ -32,33 +31,14 @@ class SpoFolderRetentionLabelEnsureCommand extends SpoCommand {
         try {
             const folderProperties = await this.getFolderProperties(logger, args);
             if (folderProperties.ListItemAllFields) {
-                const options = {
-                    webUrl: args.options.webUrl,
-                    listId: folderProperties.ListItemAllFields.ParentList.Id,
-                    listItemId: folderProperties.ListItemAllFields.Id,
-                    name: args.options.name,
-                    output: 'json',
-                    debug: this.debug,
-                    verbose: this.verbose
-                };
-                const spoListItemRetentionLabelEnsureCommandOutput = await Cli.executeCommandWithOutput(spoListItemRetentionLabelEnsureCommand, { options: { ...options, _: [] } });
-                if (this.verbose) {
-                    await logger.logToStderr(spoListItemRetentionLabelEnsureCommandOutput.stderr);
-                }
+                const parsedUrl = url.parse(args.options.webUrl);
+                const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+                const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, folderProperties.ListItemAllFields.ParentList.RootFolder.ServerRelativeUrl);
+                await spo.applyRetentionLabelToListItems(args.options.webUrl, args.options.name, listAbsoluteUrl, [parseInt(folderProperties.ListItemAllFields.Id)], logger, args.options.verbose);
             }
             else {
-                const options = {
-                    webUrl: args.options.webUrl,
-                    listUrl: folderProperties.ServerRelativeUrl,
-                    name: args.options.name,
-                    output: 'json',
-                    debug: this.debug,
-                    verbose: this.verbose
-                };
-                const spoListRetentionLabelEnsureCommandOutput = await Cli.executeCommandWithOutput(spoListRetentionLabelEnsureCommand, { options: { ...options, _: [] } });
-                if (this.verbose) {
-                    await logger.logToStderr(spoListRetentionLabelEnsureCommandOutput.stderr);
-                }
+                const listAbsoluteUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, folderProperties.ServerRelativeUrl);
+                await spo.applyDefaultRetentionLabelToList(args.options.webUrl, args.options.name, listAbsoluteUrl, false, logger, args.options.verbose);
             }
         }
         catch (err) {
@@ -78,7 +58,7 @@ class SpoFolderRetentionLabelEnsureCommand extends SpoCommand {
             requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
         const requestOptions = {
-            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,
+            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList/RootFolder&$select=ServerRelativeUrl,ListItemAllFields/ParentList/RootFolder/ServerRelativeUrl,ListItemAllFields/Id`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },

package/dist/m365/spo/commands/folder/folder-retentionlabel-remove.js

@@ -4,15 +4,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoFolderRetentionLabelRemoveCommand_instances, _SpoFolderRetentionLabelRemoveCommand_initTelemetry, _SpoFolderRetentionLabelRemoveCommand_initOptions, _SpoFolderRetentionLabelRemoveCommand_initValidators, _SpoFolderRetentionLabelRemoveCommand_initOptionSets;
+import * as url from 'url';
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.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 spoListRetentionLabelRemoveCommand from '../list/list-retentionlabel-remove.js';
-import spoListItemRetentionLabelRemoveCommand from '../listitem/listitem-retentionlabel-remove.js';
 class SpoFolderRetentionLabelRemoveCommand extends SpoCommand {
     get name() {
         return commands.FOLDER_RETENTIONLABEL_REMOVE;
@@ -33,13 +33,8 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand {
             await this.removeFolderRetentionLabel(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the retentionlabel from folder ${args.options.folderId || args.options.folderUrl} located in site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the retentionlabel from folder ${args.options.folderId || args.options.folderUrl} located in site ${args.options.webUrl}?` });
+            if (result) {
                 await this.removeFolderRetentionLabel(logger, args);
             }
         }
@@ -48,33 +43,14 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand {
         try {
             const folderProperties = await this.getFolderProperties(logger, args);
             if (folderProperties.ListItemAllFields) {
-                const options = {
-                    webUrl: args.options.webUrl,
-                    listId: folderProperties.ListItemAllFields.ParentList.Id,
-                    listItemId: folderProperties.ListItemAllFields.Id,
-                    force: true,
-                    output: 'json',
-                    debug: this.debug,
-                    verbose: this.verbose
-                };
-                const spoListItemRetentionLabelRemoveCommandOutput = await Cli.executeCommandWithOutput(spoListItemRetentionLabelRemoveCommand, { options: { ...options, _: [] } });
-                if (this.verbose) {
-                    await logger.logToStderr(spoListItemRetentionLabelRemoveCommandOutput.stderr);
-                }
+                const parsedUrl = url.parse(args.options.webUrl);
+                const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+                const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, folderProperties.ListItemAllFields.ParentList.RootFolder.ServerRelativeUrl);
+                await spo.removeRetentionLabelFromListItems(args.options.webUrl, listAbsoluteUrl, [parseInt(folderProperties.ListItemAllFields.Id)], logger, args.options.verbose);
             }
             else {
-                const options = {
-                    webUrl: args.options.webUrl,
-                    listUrl: folderProperties.ServerRelativeUrl,
-                    force: true,
-                    output: 'json',
-                    debug: this.debug,
-                    verbose: this.verbose
-                };
-                const spoListRetentionLabelEnsureCommandOutput = await Cli.executeCommandWithOutput(spoListRetentionLabelRemoveCommand, { options: { ...options, _: [] } });
-                if (this.verbose) {
-                    await logger.logToStderr(spoListRetentionLabelEnsureCommandOutput.stderr);
-                }
+                const listAbsoluteUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, folderProperties.ServerRelativeUrl);
+                await spo.removeDefaultRetentionLabelFromList(args.options.webUrl, listAbsoluteUrl, logger, args.options.verbose);
             }
         }
         catch (err) {
@@ -94,7 +70,7 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand {
             requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
         const requestOptions = {
-            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,
+            url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList/RootFolder&$select=ServerRelativeUrl,ListItemAllFields/ParentList/RootFolder/ServerRelativeUrl,ListItemAllFields/Id`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },

package/dist/m365/spo/commands/folder/folder-roleassignment-remove.js

@@ -55,13 +55,8 @@ class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand {
             await removeRoleAssignment();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove a role assignment from the folder with url '${args.options.folderUrl}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove a role assignment from the folder with url '${args.options.folderUrl}'?` });
+            if (result) {
                 await removeRoleAssignment();
             }
         }

package/dist/m365/spo/commands/folder/folder-roleinheritance-break.js

@@ -55,13 +55,8 @@ class SpoFolderRoleInheritanceBreakCommand extends SpoCommand {
             await breakFolderRoleInheritance();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to break the role inheritance of folder ${args.options.folderUrl} located in site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to break the role inheritance of folder ${args.options.folderUrl} located in site ${args.options.webUrl}?` });
+            if (result) {
                 await breakFolderRoleInheritance();
             }
         }

package/dist/m365/spo/commands/folder/folder-roleinheritance-reset.js

@@ -54,13 +54,8 @@ class SpoFolderRoleInheritanceResetCommand extends SpoCommand {
             await resetFolderRoleInheritance();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to reset the role inheritance of folder ${args.options.folderUrl} located in site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to reset the role inheritance of folder ${args.options.folderUrl} located in site ${args.options.webUrl}?` });
+            if (result) {
                 await resetFolderRoleInheritance();
             }
         }

package/dist/m365/spo/commands/group/group-member-remove.js

@@ -52,13 +52,8 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
             await this.removeUserfromSPGroup(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove user ${args.options.userName || args.options.userId || args.options.email || args.options.aadGroupId || args.options.aadGroupName} from the SharePoint group?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove user ${args.options.userName || args.options.userId || args.options.email || args.options.aadGroupId || args.options.aadGroupName} from the SharePoint group?` });
+            if (result) {
                 await this.removeUserfromSPGroup(logger, args);
             }
         }

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

@@ -66,13 +66,8 @@ class SpoGroupRemoveCommand extends SpoCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the group ${args.options.id || args.options.name} from web ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group ${args.options.id || args.options.name} from web ${args.options.webUrl}?` });
+            if (result) {
                 await removeGroup();
             }
         }

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

@@ -53,13 +53,8 @@ class SpoHomeSiteRemoveCommand extends SpoCommand {
             await removeHomeSite();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the Home Site?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the Home Site?` });
+            if (result) {
                 await removeHomeSite();
             }
         }

package/dist/m365/spo/commands/hubsite/hubsite-disconnect.js

@@ -55,13 +55,8 @@ class SpoHubSiteDisconnectCommand extends SpoCommand {
             await disconnectHubSite();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want disconnect hub site '${args.options.id || args.options.title || args.options.url}' from its parent hub site?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want disconnect hub site '${args.options.id || args.options.title || args.options.url}' from its parent hub site?` });
+            if (result) {
                 await disconnectHubSite();
             }
         }

package/dist/m365/spo/commands/hubsite/hubsite-rights-revoke.js

@@ -60,13 +60,8 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand {
             await revokeRights();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to revoke rights to join sites to the hub site ${args.options.hubSiteUrl} from the specified users?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to revoke rights to join sites to the hub site ${args.options.hubSiteUrl} from the specified users?` });
+            if (result) {
                 await revokeRights();
             }
         }

package/dist/m365/spo/commands/hubsite/hubsite-unregister.js

@@ -49,13 +49,8 @@ class SpoHubSiteUnregisterCommand extends SpoCommand {
             await unregisterHubSite();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to unregister the site collection ${args.options.url} as a hub site?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to unregister the site collection ${args.options.url} as a hub site?` });
+            if (result) {
                 await unregisterHubSite();
             }
         }