@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.063a75a

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleInheritanceResetCommand_instances, _SpoListRoleInheritanceResetCommand_initTelemetry, _SpoListRoleInheritanceResetCommand_initOptions, _SpoListRoleInheritanceResetCommand_initValidators, _SpoListRoleInheritanceResetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
@@ -37,35 +38,52 @@ class SpoListRoleInheritanceResetCommand extends SpoCommand_1.default {
         return 'Restores role inheritance on list or library';
     }
     commandAction(logger, args) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Restore role inheritance of list in site at ${args.options.webUrl}...`);
             }
-            let requestUrl = `${args.options.webUrl}/_api/web/`;
-            if (args.options.listId) {
-                requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+            const resetListRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    let requestUrl = `${args.options.webUrl}/_api/web/`;
+                    if (args.options.listId) {
+                        requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                    }
+                    else if (args.options.listTitle) {
+                        requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+                    }
+                    const requestOptions = {
+                        url: `${requestUrl}resetroleinheritance`,
+                        method: 'POST',
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield resetListRoleInheritance();
             }
-            else if (args.options.listTitle) {
-                requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-            }
-            else if (args.options.listUrl) {
-                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-            }
-            const requestOptions = {
-                url: `${requestUrl}resetroleinheritance`,
-                method: 'POST',
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            try {
-                yield request_1.default.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to reset the role inheritance of ${(_a = args.options.listId) !== null && _a !== void 0 ? _a : args.options.listTitle}?`
+                });
+                if (result.continue) {
+                    yield resetListRoleInheritance();
+                }
             }
         });
     }
@@ -75,7 +93,8 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined'
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _SpoListRoleInheritanceResetCommand_initOptions = function _SpoListRoleInheritanceResetCommand_initOptions() {
@@ -87,6 +106,8 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
         option: '-t, --listTitle [listTitle]'
     }, {
         option: '--listUrl [listUrl]'
+    }, {
+        option: '--confirm'
     });
 }, _SpoListRoleInheritanceResetCommand_initValidators = function _SpoListRoleInheritanceResetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -100,7 +121,7 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
         return true;
     }));
 }, _SpoListRoleInheritanceResetCommand_initOptionSets = function _SpoListRoleInheritanceResetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListRoleInheritanceResetCommand();
 //# sourceMappingURL=list-roleinheritance-reset.js.map

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

@@ -13,9 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoListSetCommand_instances, _SpoListSetCommand_initTelemetry, _SpoListSetCommand_initOptions, _SpoListSetCommand_initValidators, _SpoListSetCommand_initTypes;
+var _SpoListSetCommand_instances, _SpoListSetCommand_initTelemetry, _SpoListSetCommand_initOptions, _SpoListSetCommand_initValidators, _SpoListSetCommand_initTypes, _SpoListSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -29,6 +31,7 @@ class SpoListSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListSetCommand_instances, "m", _SpoListSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListSetCommand_instances, "m", _SpoListSetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListSetCommand_instances, "m", _SpoListSetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoListSetCommand_instances, "m", _SpoListSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_SET;
@@ -68,8 +71,19 @@ class SpoListSetCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Updating list in site at ${args.options.webUrl}...`);
             }
             const requestBody = this.mapRequestBody(args.options);
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.id) {
+                requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/`;
+            }
+            else if (args.options.title) {
+                requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')/`;
+            }
+            else if (args.options.url) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+            }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.id)}')`,
+                url: requestUrl,
                 method: 'POST',
                 headers: {
                     'X-HTTP-Method': 'MERGE',
@@ -90,8 +104,8 @@ class SpoListSetCommand extends SpoCommand_1.default {
     }
     mapRequestBody(options) {
         const requestBody = {};
-        if (options.title) {
-            requestBody.Title = options.title;
+        if (options.newTitle) {
+            requestBody.Title = options.newTitle;
         }
         if (options.description) {
             requestBody.Description = options.description;
@@ -281,7 +295,10 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
         const telemetryProps = {};
         // add properties with identifiable data
         [
+            'id',
             'title',
+            'url',
+            'newTitle',
             'description',
             'templateFeatureId',
             'schemaXml',
@@ -325,11 +342,15 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
     });
 }, _SpoListSetCommand_initOptions = function _SpoListSetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-t, --title [title]'
+        option: '--id [id]'
+    }, {
+        option: '--url [url]'
+    }, {
+        option: '--title [title]'
+    }, {
+        option: '--newTitle [newTitle]'
     }, {
         option: '--allowDeletion [allowDeletion]',
         autocomplete: ['true', 'false']
@@ -504,7 +525,7 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!validation_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         for (let i = 0; i < SpoListSetCommand.booleanOptions.length; i++) {
@@ -570,6 +591,8 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
         'draftVersionVisibility',
         'listExperienceOptions'
     ]));
+}, _SpoListSetCommand_initOptionSets = function _SpoListSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title', 'url'] });
 };
 SpoListSetCommand.booleanOptions = [
     'allowDeletion',

package/dist/m365/spo/commands/list/list-sitescript-get.js

@@ -40,34 +40,42 @@ class SpoListSiteScriptGetCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (this.verbose) {
-                    const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-                    logger.logToStderr(`Extracting Site Script from list ${list} in site at ${args.options.webUrl}...`);
+                    logger.logToStderr(`Extracting Site Script from list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site at ${args.options.webUrl}...`);
                 }
-                let requestUrl = '';
-                if (args.options.listId) {
+                let listServerRelativeUrl = '';
+                if (args.options.listUrl) {
                     if (this.debug) {
-                        logger.logToStderr(`Retrieving List Url from Id '${args.options.listId}'...`);
+                        logger.logToStderr(`Retrieving List from URL '${args.options.listUrl}'...`);
                     }
-                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')?$expand=RootFolder`;
+                    listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 }
                 else {
-                    if (this.debug) {
-                        logger.logToStderr(`Retrieving List Url from Title '${args.options.listTitle}'...`);
+                    let requestUrl = `${args.options.webUrl}/_api/web/`;
+                    if (args.options.listId) {
+                        if (this.debug) {
+                            logger.logToStderr(`Retrieving List from Id '${args.options.listId}'...`);
+                        }
+                        requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')?$expand=RootFolder`;
+                    }
+                    else if (args.options.listTitle) {
+                        if (this.debug) {
+                            logger.logToStderr(`Retrieving List from Title '${args.options.listTitle}'...`);
+                        }
+                        requestUrl += `lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$expand=RootFolder`;
                     }
-                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$expand=RootFolder`;
+                    const requestOptions = {
+                        url: requestUrl,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const listInstance = yield request_1.default.get(requestOptions);
+                    listServerRelativeUrl = listInstance.RootFolder.ServerRelativeUrl;
                 }
-                let requestOptions = {
-                    url: requestUrl,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const listInstance = yield request_1.default.get(requestOptions);
-                const listAbsoluteUrl = urlUtil_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listInstance.RootFolder.ServerRelativeUrl);
-                requestUrl = `${args.options.webUrl}/_api/Microsoft_SharePoint_Utilities_WebTemplateExtensions_SiteScriptUtility_GetSiteScriptFromList`;
-                requestOptions = {
-                    url: requestUrl,
+                const listAbsoluteUrl = urlUtil_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
+                const reqOptions = {
+                    url: `${args.options.webUrl}/_api/Microsoft_SharePoint_Utilities_WebTemplateExtensions_SiteScriptUtility_GetSiteScriptFromList`,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
                         'content-type': 'application/json;odata=nometadata'
@@ -77,7 +85,7 @@ class SpoListSiteScriptGetCommand extends SpoCommand_1.default {
                         listUrl: listAbsoluteUrl
                     }
                 };
-                const res = yield request_1.default.post(requestOptions);
+                const res = yield request_1.default.post(reqOptions);
                 const siteScript = res.value;
                 if (!siteScript) {
                     throw `An error has occurred, the site script could not be extracted from list '${args.options.listId || args.options.listTitle}'`;
@@ -94,7 +102,8 @@ _SpoListSiteScriptGetCommand_instances = new WeakSet(), _SpoListSiteScriptGetCom
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: (!(!args.options.listId)).toString(),
-            listTitle: (!(!args.options.listTitle)).toString()
+            listTitle: (!(!args.options.listTitle)).toString(),
+            listUrl: (!(!args.options.listUrl)).toString()
         });
     });
 }, _SpoListSiteScriptGetCommand_initOptions = function _SpoListSiteScriptGetCommand_initOptions() {
@@ -104,6 +113,8 @@ _SpoListSiteScriptGetCommand_instances = new WeakSet(), _SpoListSiteScriptGetCom
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListSiteScriptGetCommand_initValidators = function _SpoListSiteScriptGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -119,7 +130,7 @@ _SpoListSiteScriptGetCommand_instances = new WeakSet(), _SpoListSiteScriptGetCom
         return true;
     }));
 }, _SpoListSiteScriptGetCommand_initOptionSets = function _SpoListSiteScriptGetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListSiteScriptGetCommand();
 //# sourceMappingURL=list-sitescript-get.js.map

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

@@ -123,7 +123,7 @@ _SpoListViewAddCommand_instances = new WeakSet(), _SpoListViewAddCommand_initTel
         return true;
     }));
 }, _SpoListViewAddCommand_initOptionSets = function _SpoListViewAddCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListViewAddCommand();
 //# sourceMappingURL=list-view-add.js.map

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

@@ -17,6 +17,7 @@ var _SpoListViewFieldAddCommand_instances, _SpoListViewFieldAddCommand_initTelem
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -37,20 +38,30 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const listSelector = args.options.listId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            let listSelector = '';
+            if (args.options.listId) {
+                listSelector = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                listSelector = `lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                listSelector = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
             let viewSelector = '';
             let currentField;
             if (this.verbose) {
-                logger.logToStderr(`Getting field ${args.options.fieldId || args.options.fieldTitle}...`);
+                logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
             }
             try {
                 const field = yield this.getField(args.options, listSelector);
                 if (this.verbose) {
-                    logger.logToStderr(`Adding the field ${args.options.fieldId || args.options.fieldTitle} to the view ${args.options.viewId || args.options.viewTitle}...`);
+                    logger.logToStderr(`Adding the field ${args.options.id || args.options.title} to the view ${args.options.viewId || args.options.viewTitle}...`);
                 }
                 currentField = field;
                 viewSelector = args.options.viewId ? `('${formatting_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
-                const postRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/addviewfield('${field.InternalName}')`;
+                const postRequestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}/viewfields/addviewfield('${field.InternalName}')`;
                 const postRequestOptions = {
                     url: postRequestUrl,
                     headers: {
@@ -59,7 +70,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
                     responseType: 'json'
                 };
                 yield request_1.default.post(postRequestOptions);
-                if (typeof args.options.fieldPosition === 'undefined') {
+                if (typeof args.options.position === 'undefined') {
                     if (this.debug) {
                         logger.logToStderr(`No field position.`);
                     }
@@ -67,18 +78,18 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
                 }
                 if (this.debug) {
                     logger.logToStderr(`moveField request...`);
-                    logger.logToStderr(args.options.fieldPosition);
+                    logger.logToStderr(args.options.position);
                 }
                 if (this.verbose) {
-                    logger.logToStderr(`Moving the field ${args.options.fieldId || args.options.fieldTitle} to the position ${args.options.fieldPosition} from view ${args.options.viewId || args.options.viewTitle}...`);
+                    logger.logToStderr(`Moving the field ${args.options.id || args.options.title} to the position ${args.options.position} from view ${args.options.viewId || args.options.viewTitle}...`);
                 }
-                const moveRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
+                const moveRequestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
                 const moveRequestOptions = {
                     url: moveRequestUrl,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
-                    data: { 'field': currentField.InternalName, 'index': args.options.fieldPosition },
+                    data: { 'field': currentField.InternalName, 'index': args.options.position },
                     responseType: 'json'
                 };
                 yield request_1.default.post(moveRequestOptions);
@@ -90,8 +101,8 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
         });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.fieldId ? `/getbyid('${encodeURIComponent(options.fieldId)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.fieldTitle)}')`;
-        const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
+        const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
+        const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
             headers: {
@@ -107,11 +118,12 @@ _SpoListViewFieldAddCommand_instances = new WeakSet(), _SpoListViewFieldAddComma
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             viewId: typeof args.options.viewId !== 'undefined',
             viewTitle: typeof args.options.viewTitle !== 'undefined',
-            fieldId: typeof args.options.fieldId !== 'undefined',
-            fieldTitle: typeof args.options.fieldTitle !== 'undefined',
-            fieldPosition: typeof args.options.fieldPosition !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            position: typeof args.options.position !== 'undefined'
         });
     });
 }, _SpoListViewFieldAddCommand_initOptions = function _SpoListViewFieldAddCommand_initOptions() {
@@ -121,16 +133,18 @@ _SpoListViewFieldAddCommand_instances = new WeakSet(), _SpoListViewFieldAddComma
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--viewId [viewId]'
     }, {
         option: '--viewTitle [viewTitle]'
     }, {
-        option: '--fieldId [fieldId]'
+        option: '--id [id]'
     }, {
-        option: '--fieldTitle [fieldTitle]'
+        option: '--title [title]'
     }, {
-        option: '--fieldPosition [fieldPosition]'
+        option: '--position [position]'
     });
 }, _SpoListViewFieldAddCommand_initValidators = function _SpoListViewFieldAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -148,21 +162,21 @@ _SpoListViewFieldAddCommand_instances = new WeakSet(), _SpoListViewFieldAddComma
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }
-        if (args.options.fieldId) {
-            if (!validation_1.validation.isValidGuid(args.options.fieldId)) {
-                return `${args.options.fieldId} is not a valid GUID`;
+        if (args.options.id) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
+                return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.fieldPosition) {
-            const position = parseInt(args.options.fieldPosition);
+        if (args.options.position) {
+            const position = parseInt(args.options.position);
             if (isNaN(position)) {
-                return `${args.options.fieldPosition} is not a number`;
+                return `${args.options.position} is not a number`;
             }
         }
         return true;
     }));
 }, _SpoListViewFieldAddCommand_initOptionSets = function _SpoListViewFieldAddCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['fieldId', 'fieldTitle']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['viewId', 'viewTitle'] }, { options: ['id', 'title'] });
 };
 module.exports = new SpoListViewFieldAddCommand();
 //# sourceMappingURL=list-view-field-add.js.map

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,18 +39,28 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const listSelector = args.options.listId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             const removeFieldFromView = () => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (this.verbose) {
-                        logger.logToStderr(`Getting field ${args.options.fieldId || args.options.fieldTitle}...`);
+                        logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
+                    }
+                    let listSelector = '';
+                    if (args.options.listId) {
+                        listSelector = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                    }
+                    else if (args.options.listTitle) {
+                        listSelector = `lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        listSelector = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
                     }
                     const field = yield this.getField(args.options, listSelector);
                     if (this.verbose) {
-                        logger.logToStderr(`Removing field ${args.options.fieldId || args.options.fieldTitle} from view ${args.options.viewId || args.options.viewTitle}...`);
+                        logger.logToStderr(`Removing field ${args.options.id || args.options.title} from view ${args.options.viewId || args.options.viewTitle}...`);
                     }
                     const viewSelector = args.options.viewId ? `('${formatting_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
-                    const postRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/removeviewfield('${field.InternalName}')`;
+                    const postRequestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}/viewfields/removeviewfield('${field.InternalName}')`;
                     const postRequestOptions = {
                         url: postRequestUrl,
                         headers: {
@@ -72,7 +83,7 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove the field ${args.options.fieldId || args.options.fieldTitle} from the view ${args.options.viewId || args.options.viewTitle} from list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
+                    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) {
                     yield removeFieldFromView();
@@ -81,8 +92,8 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
         });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.fieldId ? `/getbyid('${encodeURIComponent(options.fieldId)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.fieldTitle)}')`;
-        const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
+        const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
+        const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
             headers: {
@@ -98,10 +109,11 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             viewId: typeof args.options.viewId !== 'undefined',
             viewTitle: typeof args.options.viewTitle !== 'undefined',
-            fieldId: typeof args.options.fieldId !== 'undefined',
-            fieldTitle: typeof args.options.fieldTitle !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -112,14 +124,16 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--viewId [viewId]'
     }, {
         option: '--viewTitle [viewTitle]'
     }, {
-        option: '--fieldId [fieldId]'
+        option: '--id [id]'
     }, {
-        option: '--fieldTitle [fieldTitle]'
+        option: '--title [title]'
     }, {
         option: '--confirm'
     });
@@ -139,15 +153,15 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }
-        if (args.options.fieldId) {
-            if (!validation_1.validation.isValidGuid(args.options.fieldId)) {
+        if (args.options.id) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }
         return true;
     }));
 }, _SpoListViewFieldRemoveCommand_initOptionSets = function _SpoListViewFieldRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['fieldId', 'fieldTitle']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['viewId', 'viewTitle'] }, { options: ['id', 'title'] });
 };
 module.exports = new SpoListViewFieldRemoveCommand();
 //# sourceMappingURL=list-view-field-remove.js.map