@pnp/cli-microsoft365 5.9.0-beta.fd6d022 → 6.0.0-beta.01ba480

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

@@ -15,8 +15,10 @@ 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");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -36,31 +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/lists`;
-            if (args.options.listId) {
-                requestUrl += `(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 {
-                requestUrl += `/getbytitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-            }
-            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);
+                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();
+                }
             }
         });
     }
@@ -69,7 +92,9 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined'
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _SpoListRoleInheritanceResetCommand_initOptions = function _SpoListRoleInheritanceResetCommand_initOptions() {
@@ -79,6 +104,10 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
         option: '-i, --listId [listId]'
     }, {
         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* () {
@@ -92,7 +121,7 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
         return true;
     }));
 }, _SpoListRoleInheritanceResetCommand_initOptionSets = function _SpoListRoleInheritanceResetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListRoleInheritanceResetCommand();
 //# sourceMappingURL=list-roleinheritance-reset.js.map

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

@@ -41,12 +41,12 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
             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)}')`;
@@ -59,7 +59,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,10 +67,10 @@ 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 moveRequestOptions = {
@@ -78,7 +78,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
                     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,7 +90,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
         });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.fieldId ? `/getbyid('${encodeURIComponent(options.fieldId)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.fieldTitle)}')`;
+        const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
         const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
@@ -109,9 +109,9 @@ _SpoListViewFieldAddCommand_instances = new WeakSet(), _SpoListViewFieldAddComma
             listTitle: typeof args.options.listTitle !== '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() {
@@ -126,11 +126,11 @@ _SpoListViewFieldAddCommand_instances = new WeakSet(), _SpoListViewFieldAddComma
     }, {
         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 +148,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(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewFieldAddCommand();
 //# sourceMappingURL=list-view-field-add.js.map

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

@@ -42,11 +42,11 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
             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}...`);
                     }
                     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}')`;
@@ -72,7 +72,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,7 +81,7 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
         });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.fieldId ? `/getbyid('${encodeURIComponent(options.fieldId)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.fieldTitle)}')`;
+        const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
         const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
@@ -100,8 +100,8 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
             listTitle: typeof args.options.listTitle !== '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()
         });
     });
@@ -117,9 +117,9 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
     }, {
         option: '--viewTitle [viewTitle]'
     }, {
-        option: '--fieldId [fieldId]'
+        option: '--id [id]'
     }, {
-        option: '--fieldTitle [fieldTitle]'
+        option: '--title [title]'
     }, {
         option: '--confirm'
     });
@@ -139,15 +139,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(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewFieldRemoveCommand();
 //# sourceMappingURL=list-view-field-remove.js.map

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

@@ -40,12 +40,12 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
             const listSelector = args.options.listId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             const viewSelector = args.options.viewId ? `('${formatting_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
             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(`Moving the field ${args.options.fieldId || args.options.fieldTitle} in view ${args.options.viewId || args.options.viewTitle} to position ${args.options.fieldPosition}...`);
+                    logger.logToStderr(`Moving the field ${args.options.id || args.options.title} in view ${args.options.viewId || args.options.viewTitle} to position ${args.options.position}...`);
                 }
                 const moveRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
                 const moveRequestOptions = {
@@ -55,7 +55,7 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
                     },
                     data: {
                         field: field.InternalName,
-                        index: args.options.fieldPosition
+                        index: args.options.position
                     },
                     responseType: 'json'
                 };
@@ -67,7 +67,7 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
         });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.fieldId ? `/getbyid('${encodeURIComponent(options.fieldId)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.fieldTitle)}')`;
+        const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
         const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
@@ -86,8 +86,8 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
             listTitle: typeof args.options.listTitle !== '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'
         });
     });
 }, _SpoListViewFieldSetCommand_initOptions = function _SpoListViewFieldSetCommand_initOptions() {
@@ -102,11 +102,11 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
     }, {
         option: '--viewTitle [viewTitle]'
     }, {
-        option: '--fieldId [fieldId]'
+        option: '--id [id]'
     }, {
-        option: '--fieldTitle [fieldTitle]'
+        option: '--title [title]'
     }, {
-        option: '--fieldPosition <fieldPosition>'
+        option: '--position <position>'
     });
 }, _SpoListViewFieldSetCommand_initValidators = function _SpoListViewFieldSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -124,19 +124,19 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
                 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`;
             }
         }
-        const position = parseInt(args.options.fieldPosition);
+        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;
     }));
 }, _SpoListViewFieldSetCommand_initOptionSets = function _SpoListViewFieldSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['fieldId', 'fieldTitle']);
+    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewFieldSetCommand();
 //# sourceMappingURL=list-view-field-set.js.map

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

@@ -50,7 +50,7 @@ class SpoListViewGetCommand extends SpoCommand_1.default {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 listRestUrl = `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
-            const viewRestUrl = `/views/${(args.options.viewId ? `getById('${formatting_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`)}`;
+            const viewRestUrl = `/views/${(args.options.id ? `getById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`)}`;
             const requestOptions = {
                 url: `${baseRestUrl}${listRestUrl}${viewRestUrl}`,
                 headers: {
@@ -74,8 +74,8 @@ _SpoListViewGetCommand_instances = new WeakSet(), _SpoListViewGetCommand_initTel
             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'
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined'
         });
     });
 }, _SpoListViewGetCommand_initOptions = function _SpoListViewGetCommand_initOptions() {
@@ -88,9 +88,9 @@ _SpoListViewGetCommand_instances = new WeakSet(), _SpoListViewGetCommand_initTel
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '--viewId [viewId]'
+        option: '--id [id]'
     }, {
-        option: '--viewTitle [viewTitle]'
+        option: '--title [title]'
     });
 }, _SpoListViewGetCommand_initValidators = function _SpoListViewGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -102,14 +102,14 @@ _SpoListViewGetCommand_instances = new WeakSet(), _SpoListViewGetCommand_initTel
             !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (args.options.viewId &&
-            !validation_1.validation.isValidGuid(args.options.viewId)) {
-            return `${args.options.viewId} in option viewId is not a valid GUID`;
+        if (args.options.id &&
+            !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} in option id is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoListViewGetCommand_initOptionSets = function _SpoListViewGetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['viewId', 'viewTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['id', 'title']);
 };
 module.exports = new SpoListViewGetCommand();
 //# sourceMappingURL=list-view-get.js.map

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

@@ -41,11 +41,11 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
             const removeViewFromList = () => __awaiter(this, void 0, void 0, function* () {
                 if (this.verbose) {
                     const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-                    logger.logToStderr(`Removing view ${args.options.viewId || args.options.viewTitle} from list ${list} in site at ${args.options.webUrl}...`);
+                    logger.logToStderr(`Removing view ${args.options.id || args.options.title} from list ${list} in site at ${args.options.webUrl}...`);
                 }
                 let requestUrl = '';
                 const listSelector = args.options.listId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-                const viewSelector = args.options.viewId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
+                const viewSelector = args.options.id ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
                 requestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}`;
                 const requestOptions = {
                     url: requestUrl,
@@ -72,7 +72,7 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove the view ${args.options.viewId || args.options.viewTitle} from the list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
+                    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} in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
                     yield removeViewFromList();
@@ -86,8 +86,8 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            viewId: typeof args.options.viewId !== 'undefined',
-            viewTitle: typeof args.options.viewTitle !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -99,9 +99,9 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
     }, {
         option: '--listTitle [listTitle]'
     }, {
-        option: '--viewId [viewId]'
+        option: '--id [id]'
     }, {
-        option: '--viewTitle [viewTitle]'
+        option: '--title [title]'
     }, {
         option: '--confirm'
     });
@@ -116,15 +116,15 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.viewId) {
-            if (!validation_1.validation.isValidGuid(args.options.viewId)) {
-                return `${args.options.viewId} 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`;
             }
         }
         return true;
     }));
 }, _SpoListViewRemoveCommand_initOptionSets = function _SpoListViewRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle']);
+    this.optionSets.push(['listId', 'listTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewRemoveCommand();
 //# sourceMappingURL=list-view-remove.js.map

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

@@ -45,7 +45,7 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
             const listRestUrl = args.options.listId ?
                 `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`
                 : `/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-            const viewRestUrl = `/views/${(args.options.viewId ? `getById('${formatting_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`)}`;
+            const viewRestUrl = `/views/${(args.options.id ? `getById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`)}`;
             try {
                 const res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const requestOptions = {
@@ -71,8 +71,8 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
             'webUrl',
             'listId',
             'listTitle',
-            'viewId',
-            'viewTitle',
+            'id',
+            'title',
             'debug',
             'verbose',
             'output'
@@ -90,8 +90,8 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            viewId: typeof args.options.viewId !== 'undefined',
-            viewTitle: typeof args.options.viewTitle !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined'
         });
     });
 }, _SpoListViewSetCommand_initOptions = function _SpoListViewSetCommand_initOptions() {
@@ -102,9 +102,9 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
     }, {
         option: '--listTitle [listTitle]'
     }, {
-        option: '--viewId [viewId]'
+        option: '--id [id]'
     }, {
-        option: '--viewTitle [viewTitle]'
+        option: '--title [title]'
     });
 }, _SpoListViewSetCommand_initValidators = function _SpoListViewSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -116,14 +116,14 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
             !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (args.options.viewId &&
-            !validation_1.validation.isValidGuid(args.options.viewId)) {
-            return `${args.options.viewId} in option viewId is not a valid GUID`;
+        if (args.options.id &&
+            !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} in option id is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoListViewSetCommand_initOptionSets = function _SpoListViewSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle']);
+    this.optionSets.push(['listId', 'listTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewSetCommand();
 //# sourceMappingURL=list-view-set.js.map

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

@@ -17,6 +17,7 @@ var _SpoListWebhookAddCommand_instances, _SpoListWebhookAddCommand_initTelemetry
 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");
@@ -42,17 +43,21 @@ class SpoListWebhookAddCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Adding webhook to list ${args.options.listId ? args.options.listId : args.options.listTitle} located at site ${args.options.webUrl}...`);
+                logger.logToStderr(`Adding webhook to list ${args.options.listId || args.options.listTitle || args.options.listUrl} located at site ${args.options.webUrl}...`);
             }
-            let requestUrl = '';
+            let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions')`;
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions`;
             }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions')`;
+            else if (args.options.listTitle) {
+                requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Subscriptions`;
             }
             const requestBody = {};
-            requestBody.resource = args.options.listId ? args.options.listId : args.options.listTitle;
+            requestBody.resource = args.options.listId || args.options.listTitle || args.options.listUrl;
             requestBody.notificationUrl = args.options.notificationUrl;
             // If no expiration date has been provided we will default to the
             // maximum expiration date of 180 days from now 
@@ -84,10 +89,11 @@ class SpoListWebhookAddCommand extends SpoCommand_1.default {
 _SpoListWebhookAddCommand_instances = new WeakSet(), _SpoListWebhookAddCommand_initTelemetry = function _SpoListWebhookAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            listId: (!(!args.options.listId)).toString(),
-            listTitle: (!(!args.options.listTitle)).toString(),
-            expirationDateTime: (!(!args.options.expirationDateTime)).toString(),
-            clientState: (!(!args.options.clientState)).toString()
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            expirationDateTime: typeof args.options.expirationDateTime !== 'undefined',
+            clientState: typeof args.options.clientState !== 'undefined'
         });
     });
 }, _SpoListWebhookAddCommand_initOptions = function _SpoListWebhookAddCommand_initOptions() {
@@ -97,6 +103,8 @@ _SpoListWebhookAddCommand_instances = new WeakSet(), _SpoListWebhookAddCommand_i
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-n, --notificationUrl <notificationUrl>'
     }, {
@@ -129,7 +137,7 @@ _SpoListWebhookAddCommand_instances = new WeakSet(), _SpoListWebhookAddCommand_i
         return true;
     }));
 }, _SpoListWebhookAddCommand_initOptionSets = function _SpoListWebhookAddCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListWebhookAddCommand();
 //# sourceMappingURL=list-webhook-add.js.map