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

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

@@ -57,13 +57,8 @@ class SpoKnowledgehubRemoveCommand extends SpoCommand {
             await removeKnowledgehub();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove Knowledge Hub Site from your tenant?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove Knowledge Hub Site from your tenant?` });
+            if (result) {
                 await removeKnowledgehub();
             }
         }

package/dist/m365/spo/commands/list/list-contenttype-remove.js

@@ -64,13 +64,8 @@ class SpoListContentTypeRemoveCommand extends SpoCommand {
             await removeContentTypeFromList();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the content type ${args.options.id} from the list ${args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl} in site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the content type ${args.options.id} from the list ${args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl} in site ${args.options.webUrl}?` });
+            if (result) {
                 await removeContentTypeFromList();
             }
         }

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

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

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

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListRetentionLabelEnsureCommand_instances, _SpoListRetentionLabelEnsureCommand_initTelemetry, _SpoListRetentionLabelEnsureCommand_initOptions, _SpoListRetentionLabelEnsureCommand_initValidators, _SpoListRetentionLabelEnsureCommand_initOptionSets;
 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';
@@ -27,49 +28,38 @@ class SpoListRetentionLabelEnsureCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            let listRestUrl = '';
-            let listServerRelativeUrl = '';
-            if (args.options.listUrl) {
-                const listServerRelativeUrlFromPath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                listServerRelativeUrl = listServerRelativeUrlFromPath;
-            }
-            else {
-                if (args.options.listId) {
-                    listRestUrl = `lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')/`;
-                }
-                else {
-                    listRestUrl = `lists/getByTitle('${formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-                }
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/${listRestUrl}?$expand=RootFolder&$select=RootFolder`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const listInstance = await request.get(requestOptions);
-                listServerRelativeUrl = listInstance.RootFolder.ServerRelativeUrl;
-            }
+            const listServerRelativeUrl = await this.getListServerRelativeUrl(args, logger);
             const listAbsoluteUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
-            const requestUrl = `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetListComplianceTag`;
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: {
-                    listUrl: listAbsoluteUrl,
-                    complianceTagValue: args.options.name,
-                    syncToItems: args.options.syncToItems || false
-                },
-                responseType: 'json'
-            };
-            await request.post(requestOptions);
+            await spo.applyDefaultRetentionLabelToList(args.options.webUrl, args.options.name, listAbsoluteUrl, args.options.syncToItems, logger, args.options.verbose);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getListServerRelativeUrl(args, logger) {
+        if (this.verbose) {
+            logger.logToStderr('Getting the list server relative URL');
+        }
+        if (args.options.listUrl) {
+            return urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+        }
+        let requestUrl = `${args.options.webUrl}/_api/web/`;
+        if (args.options.listId) {
+            requestUrl += `lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')/`;
+        }
+        else {
+            requestUrl += `lists/getByTitle('${formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+        }
+        const requestOptions = {
+            url: `${requestUrl}?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const listInstance = await request.get(requestOptions);
+        return listInstance.RootFolder.ServerRelativeUrl;
+    }
 }
 _SpoListRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListRetentionLabelEnsureCommand_initTelemetry = function _SpoListRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -11,6 +11,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 { spo } from '../../../../utils/spo.js';
 class SpoListRetentionLabelRemoveCommand extends SpoCommand {
     get name() {
         return commands.LIST_RETENTIONLABEL_REMOVE;
@@ -31,13 +32,8 @@ class SpoListRetentionLabelRemoveCommand extends SpoCommand {
             await this.removeListRetentionLabel(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the retention label from list '${args.options.listId || args.options.listTitle || args.options.listUrl}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the retention label from list '${args.options.listId || args.options.listTitle || args.options.listUrl}'?` });
+            if (result) {
                 await this.removeListRetentionLabel(logger, args);
             }
         }
@@ -49,21 +45,7 @@ class SpoListRetentionLabelRemoveCommand extends SpoCommand {
         try {
             const listServerRelativeUrl = await this.getListServerRelativeUrl(args, logger);
             const listAbsoluteUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetListComplianceTag`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: {
-                    listUrl: listAbsoluteUrl,
-                    complianceTagValue: '',
-                    blockDelete: false,
-                    blockEdit: false,
-                    syncToItems: false
-                },
-                responseType: 'json'
-            };
-            await request.post(requestOptions);
+            await spo.removeDefaultRetentionLabelFromList(args.options.webUrl, listAbsoluteUrl, logger, args.options.verbose);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -76,15 +58,15 @@ class SpoListRetentionLabelRemoveCommand extends SpoCommand {
         if (args.options.listUrl) {
             return urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
         }
-        let listRestUrl = '';
+        let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.listId) {
-            listRestUrl = `lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')/`;
+            requestUrl += `lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')/`;
         }
         else {
-            listRestUrl = `lists/getByTitle('${formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+            requestUrl += `lists/getByTitle('${formatting.encodeQueryParameter(args.options.listTitle)}')/`;
         }
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/${listRestUrl}?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl`,
+            url: `${requestUrl}?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },

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

@@ -65,13 +65,8 @@ class SpoListRoleAssignmentRemoveCommand 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 list ${args.options.listId || args.options.listTitle} from site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove role assignment from list ${args.options.listId || args.options.listTitle} from site ${args.options.webUrl}?` });
+            if (result) {
                 await removeRoleAssignment();
             }
         }

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

@@ -66,13 +66,8 @@ class SpoListRoleInheritanceBreakCommand extends SpoCommand {
             await breakListRoleInheritance();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to break the role inheritance of ${args.options.listId ?? args.options.listTitle}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to break the role inheritance of ${args.options.listId ?? args.options.listTitle}?` });
+            if (result) {
                 await breakListRoleInheritance();
             }
         }

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

@@ -62,13 +62,8 @@ class SpoListRoleInheritanceResetCommand extends SpoCommand {
             await resetListRoleInheritance();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to reset the role inheritance of ${args.options.listId ?? args.options.listTitle}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to reset the role inheritance of ${args.options.listId ?? args.options.listTitle}?` });
+            if (result) {
                 await resetListRoleInheritance();
             }
         }

package/dist/m365/spo/commands/list/list-view-field-remove.js

@@ -67,13 +67,8 @@ class SpoListViewFieldRemoveCommand extends SpoCommand {
             await removeFieldFromView();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the field ${args.options.id || args.options.title} from the view ${args.options.viewId || args.options.viewTitle} from list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the field ${args.options.id || args.options.title} from the view ${args.options.viewId || args.options.viewTitle} from list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?` });
+            if (result) {
                 await removeFieldFromView();
             }
         }

package/dist/m365/spo/commands/list/list-view-remove.js

@@ -65,13 +65,8 @@ class SpoListViewRemoveCommand extends SpoCommand {
             await removeViewFromList();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the view ${args.options.id || args.options.title} from the list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the view ${args.options.id || args.options.title} from the list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}?` });
+            if (result) {
                 await removeViewFromList();
             }
         }

package/dist/m365/spo/commands/list/list-webhook-remove.js

@@ -63,13 +63,8 @@ class SpoListWebhookRemoveCommand extends SpoCommand {
             await removeWebhook();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove webhook ${args.options.id} from list ${args.options.listTitle || args.options.listId || args.options.listUrl} located at site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove webhook ${args.options.id} from list ${args.options.listTitle || args.options.listId || args.options.listUrl} located at site ${args.options.webUrl}?` });
+            if (result) {
                 await removeWebhook();
             }
         }

package/dist/m365/spo/commands/listitem/listitem-attachment-remove.js

@@ -63,13 +63,8 @@ class SpoListItemAttachmentRemoveCommand extends SpoCommand {
             await removeListItemAttachment();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the attachment ${args.options.fileName} of item with id ${args.options.listItemId} from the list ${args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl} in site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the attachment ${args.options.fileName} of item with id ${args.options.listItemId} from the list ${args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl} in site ${args.options.webUrl}?` });
+            if (result) {
                 await removeListItemAttachment();
             }
         }

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

@@ -111,6 +111,11 @@ class SpoListItemBatchAddCommand extends SpoCommand {
             .filter((line) => line.startsWith('{'))
             .forEach((line, index) => {
             const parsedResponse = JSON.parse(line);
+            if (parsedResponse.error) {
+                // if an error object is returned, the request failed
+                const error = parsedResponse.error;
+                throw error.message.value;
+            }
             parsedResponse.value.forEach((fieldValueResult) => {
                 batchResults.push({
                     csvLineNumber: (index + 2),

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

@@ -68,13 +68,8 @@ class SpoListItemRemoveCommand extends SpoCommand {
             await removeListItem();
         }
         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 list item ${args.options.id} from list ${args.options.listId || args.options.listTitle || args.options.listUrl} 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 list item ${args.options.id} from list ${args.options.listId || args.options.listTitle || args.options.listUrl} located in site ${args.options.webUrl}?` });
+            if (result) {
                 await removeListItem();
             }
         }

package/dist/m365/spo/commands/listitem/listitem-retentionlabel-ensure.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 _SpoListItemRetentionLabelEnsureCommand_instances, _SpoListItemRetentionLabelEnsureCommand_initTelemetry, _SpoListItemRetentionLabelEnsureCommand_initOptions, _SpoListItemRetentionLabelEnsureCommand_initValidators, _SpoListItemRetentionLabelEnsureCommand_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 spoWebRetentionLabelListCommand from '../web/web-retentionlabel-list.js';
+import { spo } from '../../../../utils/spo.js';
+import { odata } from '../../../../utils/odata.js';
 class SpoListItemRetentionLabelEnsureCommand extends SpoCommand {
     get name() {
         return commands.LISTITEM_RETENTIONLABEL_ENSURE;
@@ -29,68 +30,66 @@ class SpoListItemRetentionLabelEnsureCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            const labelInformation = await this.getLabelInformation(args.options, logger);
+            const listAbsoluteUrl = await this.getListAbsoluteUrl(args.options, logger);
+            const labelName = await this.getLabelName(args.options, logger);
             if (args.options.assetId) {
                 await this.applyAssetId(args.options, logger);
             }
-            await this.applyLabel(args.options, labelInformation, logger);
+            await spo.applyRetentionLabelToListItems(args.options.webUrl, labelName, listAbsoluteUrl, [parseInt(args.options.listItemId)], logger, args.options.verbose);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getLabelInformation(options, logger) {
-        const cmdOptions = {
-            webUrl: options.webUrl,
-            output: 'json',
-            debug: options.debug,
-            verbose: options.verbose
-        };
-        const output = await Cli.executeCommandWithOutput(spoWebRetentionLabelListCommand, { options: { ...cmdOptions, _: [] } });
+    async getLabelName(options, logger) {
+        if (options.name) {
+            return options.name;
+        }
         if (this.verbose) {
-            await logger.logToStderr(output.stderr);
+            logger.logToStderr(`Retrieving the name of the retention label based on the Id '${options.id}'...`);
+        }
+        const requestUrl = `${options.webUrl}/_api/SP.CompliancePolicy.SPPolicyStoreProxy.GetAvailableTagsForSite(siteUrl=@a1)?@a1='${formatting.encodeQueryParameter(options.webUrl)}'`;
+        const labels = await odata.getAllItems(requestUrl);
+        const label = labels.find(l => l.TagId === options.id);
+        if (label === undefined) {
+            throw new Error(`The specified retention label does not exist or is not published to this SharePoint site. Use the name of the label if you want to apply an unpublished label.`);
         }
-        const labels = JSON.parse(output.stdout);
-        const label = labels.find(l => l.TagName === options.name || l.TagId === options.id);
         if (this.verbose && label !== undefined) {
             await logger.logToStderr(`Retention label found in the list of available labels: '${label.TagName}' / '${label.TagId}'...`);
         }
-        if (label === undefined) {
-            throw new Error(`The specified retention label does not exist`);
-        }
-        return {
-            complianceTag: label.TagName,
-            isTagPolicyHold: label.BlockDelete,
-            isTagPolicyRecord: label.BlockEdit,
-            isEventBasedTag: label.IsEventTag,
-            isTagSuperLock: label.SuperLock,
-            isUnlockedAsDefault: label.UnlockedAsDefault
-        };
+        return label.TagName;
     }
-    async applyLabel(options, labelInformation, logger) {
+    async getListAbsoluteUrl(options, logger) {
+        const parsedUrl = url.parse(options.webUrl);
+        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+        if (options.listUrl) {
+            const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+            return urlUtil.urlCombine(tenantUrl, serverRelativePath);
+        }
         if (this.verbose) {
-            await logger.logToStderr(`Applying retention label to item in list '${options.listId || options.listTitle || options.listUrl}' in site at ${options.webUrl}...`);
+            await logger.logToStderr(`Retrieving list absolute URL...`);
         }
         let requestUrl = `${options.webUrl}/_api/web`;
         if (options.listId) {
-            requestUrl += `/lists(guid'${formatting.encodeQueryParameter(options.listId)}')/items(${options.listItemId})/SetComplianceTag()`;
+            requestUrl += `/lists(guid'${formatting.encodeQueryParameter(options.listId)}')`;
         }
         else if (options.listTitle) {
-            requestUrl += `/lists/getByTitle('${formatting.encodeQueryParameter(options.listTitle)}')/items(${options.listItemId})/SetComplianceTag()`;
-        }
-        else if (options.listUrl) {
-            const listServerRelativeUrl = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
-            requestUrl += `/GetList(@listUrl)/items(${options.listItemId})/SetComplianceTag()?@listUrl='${formatting.encodeQueryParameter(listServerRelativeUrl)}'`;
+            requestUrl += `/lists/getByTitle('${formatting.encodeQueryParameter(options.listTitle)}')`;
         }
         const requestOptions = {
-            url: requestUrl,
+            url: `${requestUrl}?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
-            data: labelInformation,
             responseType: 'json'
         };
-        await request.post(requestOptions);
+        const response = await request.get(requestOptions);
+        const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, response.RootFolder.ServerRelativeUrl);
+        const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, serverRelativePath);
+        if (this.verbose) {
+            logger.logToStderr(`List absolute URL found: '${listAbsoluteUrl}'`);
+        }
+        return listAbsoluteUrl;
     }
     async applyAssetId(options, logger) {
         if (this.verbose) {

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

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoListItemRetentionLabelRemoveCommand_instances, _SpoListItemRetentionLabelRemoveCommand_initTelemetry, _SpoListItemRetentionLabelRemoveCommand_initOptions, _SpoListItemRetentionLabelRemoveCommand_initValidators, _SpoListItemRetentionLabelRemoveCommand_initOptionSets;
+import * as url from 'url';
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,6 +12,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 { spo } from '../../../../utils/spo.js';
 class SpoListItemRetentionLabelRemoveCommand extends SpoCommand {
     get name() {
         return commands.LISTITEM_RETENTIONLABEL_REMOVE;
@@ -31,56 +33,53 @@ class SpoListItemRetentionLabelRemoveCommand extends SpoCommand {
             await this.removeListItemRetentionLabel(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 list item ${args.options.listItemId} from list '${args.options.listId || args.options.listTitle || args.options.listUrl}' 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 list item ${args.options.listItemId} from list '${args.options.listId || args.options.listTitle || args.options.listUrl}' located in site ${args.options.webUrl}?` });
+            if (result) {
                 await this.removeListItemRetentionLabel(logger, args);
             }
         }
     }
     async removeListItemRetentionLabel(logger, args) {
-        if (this.verbose) {
-            await logger.logToStderr(`Removing retention label from list item ${args.options.listItemId} from list '${args.options.listId || args.options.listTitle || args.options.listUrl}' in site at ${args.options.webUrl}...`);
-        }
         try {
-            let url = `${args.options.webUrl}/_api/web`;
-            if (args.options.listId) {
-                url += `/lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')/items(${args.options.listItemId})/SetComplianceTag()`;
-            }
-            else if (args.options.listTitle) {
-                url += `/lists/getByTitle('${formatting.encodeQueryParameter(args.options.listTitle)}')/items(${args.options.listItemId})/SetComplianceTag()`;
-            }
-            else {
-                const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                url += `/GetList(@a1)/items(@a2)/SetComplianceTag()?@a1='${formatting.encodeQueryParameter(listServerRelativeUrl)}'&@a2='${args.options.listItemId}'`;
-            }
-            const requestBody = {
-                "complianceTag": "",
-                "isTagPolicyHold": false,
-                "isTagPolicyRecord": false,
-                "isEventBasedTag": false,
-                "isTagSuperLock": false,
-                "isUnlockedAsDefault": false
-            };
-            const requestOptions = {
-                url: url,
-                method: 'POST',
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: requestBody,
-                responseType: 'json'
-            };
-            await request.post(requestOptions);
+            const listAbsoluteUrl = await this.getListAbsoluteUrl(args.options, logger);
+            await spo.removeRetentionLabelFromListItems(args.options.webUrl, listAbsoluteUrl, [parseInt(args.options.listItemId)], logger, args.options.verbose);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getListAbsoluteUrl(options, logger) {
+        const parsedUrl = url.parse(options.webUrl);
+        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+        if (options.listUrl) {
+            const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+            return urlUtil.urlCombine(tenantUrl, serverRelativePath);
+        }
+        if (this.verbose) {
+            logger.logToStderr(`Retrieving list absolute URL...`);
+        }
+        let requestUrl = `${options.webUrl}/_api/web`;
+        if (options.listId) {
+            requestUrl += `/lists(guid'${formatting.encodeQueryParameter(options.listId)}')`;
+        }
+        else if (options.listTitle) {
+            requestUrl += `/lists/getByTitle('${formatting.encodeQueryParameter(options.listTitle)}')`;
+        }
+        const requestOptions = {
+            url: `${requestUrl}?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, response.RootFolder.ServerRelativeUrl);
+        const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, serverRelativePath);
+        if (this.verbose) {
+            logger.logToStderr(`List absolute URL found: '${listAbsoluteUrl}'`);
+        }
+        return listAbsoluteUrl;
+    }
 }
 _SpoListItemRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoListItemRetentionLabelRemoveCommand_initTelemetry = function _SpoListItemRetentionLabelRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -33,13 +33,8 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand {
             await this.removeRoleAssignment(logger, args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove role assignment from listitem ${args.options.listItemId} from list ${args.options.listId || args.options.listTitle} from site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove role assignment from listitem ${args.options.listItemId} from list ${args.options.listId || args.options.listTitle} from site ${args.options.webUrl}?` });
+            if (result) {
                 await this.removeRoleAssignment(logger, args.options);
             }
         }

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

@@ -34,13 +34,8 @@ class SpoListItemRoleInheritanceBreakCommand extends SpoCommand {
             await this.breakListItemRoleInheritance(args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to break the role inheritance of ${args.options.listItemId} in list ${args.options.listId ?? args.options.listTitle}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to break the role inheritance of ${args.options.listItemId} in list ${args.options.listId ?? args.options.listTitle}?` });
+            if (result) {
                 await this.breakListItemRoleInheritance(args.options);
             }
         }

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

@@ -34,13 +34,8 @@ class SpoListItemRoleInheritanceResetCommand extends SpoCommand {
             await this.resetListItemRoleInheritance(args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to reset the role inheritance of ${args.options.listItemId} in list ${args.options.listId ?? args.options.listTitle}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to reset the role inheritance of ${args.options.listItemId} in list ${args.options.listId ?? args.options.listTitle}?` });
+            if (result) {
                 await this.resetListItemRoleInheritance(args.options);
             }
         }