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

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

@@ -17,6 +17,7 @@ var _SpoListViewFieldSetCommand_instances, _SpoListViewFieldSetCommand_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,17 +38,27 @@ class SpoListViewFieldSetCommand 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)}')`;
+            }
             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 moveRequestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
                 const moveRequestOptions = {
                     url: moveRequestUrl,
                     headers: {
@@ -55,7 +66,7 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
                     },
                     data: {
                         field: field.InternalName,
-                        index: args.options.fieldPosition
+                        index: args.options.position
                     },
                     responseType: 'json'
                 };
@@ -67,8 +78,8 @@ class SpoListViewFieldSetCommand 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: {
@@ -84,10 +95,11 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
         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'
         });
     });
 }, _SpoListViewFieldSetCommand_initOptions = function _SpoListViewFieldSetCommand_initOptions() {
@@ -97,16 +109,18 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
         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>'
     });
 }, _SpoListViewFieldSetCommand_initValidators = function _SpoListViewFieldSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -124,19 +138,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({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['viewId', 'viewTitle'] }, { options: ['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({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['id', 'title'] });
 };
 module.exports = new SpoListViewGetCommand();
 //# sourceMappingURL=list-view-get.js.map

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

@@ -15,8 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListViewListCommand_instances, _SpoListViewListCommand_initTelemetry, _SpoListViewListCommand_initOptions, _SpoListViewListCommand_initValidators, _SpoListViewListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -40,27 +41,20 @@ class SpoListViewListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.verbose) {
-                const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-                logger.logToStderr(`Retrieving views information for list ${list} in site at ${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)}')/views`;
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/views`;
+            }
+            else if (args.options.listTitle) {
+                requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/views`;
             }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/views`;
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/views`;
             }
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value);
+                const res = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -72,7 +66,8 @@ _SpoListViewListCommand_instances = new WeakSet(), _SpoListViewListCommand_initT
     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'
         });
     });
 }, _SpoListViewListCommand_initOptions = function _SpoListViewListCommand_initOptions() {
@@ -82,6 +77,8 @@ _SpoListViewListCommand_instances = new WeakSet(), _SpoListViewListCommand_initT
         option: '-i, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListViewListCommand_initValidators = function _SpoListViewListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -97,7 +94,7 @@ _SpoListViewListCommand_instances = new WeakSet(), _SpoListViewListCommand_initT
         return true;
     }));
 }, _SpoListViewListCommand_initOptionSets = function _SpoListViewListCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListViewListCommand();
 //# sourceMappingURL=list-view-list.js.map

package/dist/m365/spo/commands/list/list-view-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");
@@ -39,14 +40,19 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             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}...`);
+                let listSelector = '';
+                if (args.options.listId) {
+                    listSelector = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
                 }
-                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)}')`;
-                requestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}`;
+                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 viewSelector = args.options.id ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
+                const requestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}`;
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -72,7 +78,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 || args.options.listUrl} in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
                     yield removeViewFromList();
@@ -86,8 +92,9 @@ _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',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -99,9 +106,11 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
     }, {
         option: '--listTitle [listTitle]'
     }, {
-        option: '--viewId [viewId]'
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '--id [id]'
     }, {
-        option: '--viewTitle [viewTitle]'
+        option: '--title [title]'
     }, {
         option: '--confirm'
     });
@@ -116,15 +125,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({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['id', 'title'] });
 };
 module.exports = new SpoListViewRemoveCommand();
 //# sourceMappingURL=list-view-remove.js.map

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

@@ -17,6 +17,7 @@ var _SpoListViewSetCommand_instances, _SpoListViewSetCommand_initTelemetry, _Spo
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -41,15 +42,22 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const baseRestUrl = `${args.options.webUrl}/_api/web/lists`;
-            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)}')`)}`;
+            let listRestUrl = '';
+            if (args.options.listId) {
+                listRestUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                listRestUrl = `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);
+                listRestUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
+            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 = {
-                    url: `${baseRestUrl}${listRestUrl}${viewRestUrl}`,
+                    url: `${args.options.webUrl}/_api/web/${listRestUrl}${viewRestUrl}`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue,
                         'content-type': 'application/json;odata=nometadata',
@@ -71,8 +79,9 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
             'webUrl',
             'listId',
             'listTitle',
-            'viewId',
-            'viewTitle',
+            'listUrl',
+            'id',
+            'title',
             'debug',
             'verbose',
             'output'
@@ -90,8 +99,9 @@ _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'
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined'
         });
     });
 }, _SpoListViewSetCommand_initOptions = function _SpoListViewSetCommand_initOptions() {
@@ -102,9 +112,11 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
     }, {
         option: '--listTitle [listTitle]'
     }, {
-        option: '--viewId [viewId]'
+        option: '--listUrl [listUrl]'
+    }, {
+        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 +128,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({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['id', 'title'] });
 };
 module.exports = new SpoListViewSetCommand();
 //# sourceMappingURL=list-view-set.js.map

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

@@ -137,7 +137,7 @@ _SpoListWebhookAddCommand_instances = new WeakSet(), _SpoListWebhookAddCommand_i
         return true;
     }));
 }, _SpoListWebhookAddCommand_initOptionSets = function _SpoListWebhookAddCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListWebhookAddCommand();
 //# sourceMappingURL=list-webhook-add.js.map

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

@@ -111,7 +111,7 @@ _SpoListWebhookGetCommand_instances = new WeakSet(), _SpoListWebhookGetCommand_i
         return true;
     }));
 }, _SpoListWebhookGetCommand_initOptionSets = function _SpoListWebhookGetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListWebhookGetCommand();
 //# sourceMappingURL=list-webhook-get.js.map

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

@@ -15,9 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListWebhookListCommand_instances, _SpoListWebhookListCommand_initTelemetry, _SpoListWebhookListCommand_initOptions, _SpoListWebhookListCommand_initValidators, _SpoListWebhookListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk = require("chalk");
-const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -42,47 +41,27 @@ class SpoListWebhookListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.title && this.verbose) {
-                logger.logToStderr(chalk.yellow(`Option 'title' is deprecated. Please use 'listTitle' instead`));
-            }
-            if (args.options.id && this.verbose) {
-                logger.logToStderr(chalk.yellow(`Option 'id' is deprecated. Please use 'listId' instead`));
-            }
             if (this.verbose) {
-                logger.logToStderr(`Retrieving webhook information for list ${args.options.id || args.options.listId || args.options.listUrl} in site at ${args.options.webUrl}...`);
+                logger.logToStderr(`Retrieving webhook information for list ${args.options.listTitle || args.options.listId || args.options.listUrl} in site at ${args.options.webUrl}...`);
             }
             let requestUrl = `${args.options.webUrl}/_api/web`;
-            if (args.options.id) {
-                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/Subscriptions`;
-            }
-            else if (args.options.listId) {
+            if (args.options.listId) {
                 requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions`;
             }
             else if (args.options.listTitle) {
                 requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions`;
             }
-            else if (args.options.title) {
-                requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')/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 requestOptions = {
-                url: requestUrl,
-                method: 'GET',
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                if (res.value && res.value.length > 0) {
-                    res.value.forEach(w => {
+                const res = yield odata_1.odata.getAllItems(requestUrl);
+                if (res && res.length > 0) {
+                    res.forEach(w => {
                         w.clientState = w.clientState || '';
                     });
-                    logger.log(res.value);
+                    logger.log(res);
                 }
                 else {
                     if (this.verbose) {
@@ -99,11 +78,9 @@ class SpoListWebhookListCommand extends SpoCommand_1.default {
 _SpoListWebhookListCommand_instances = new WeakSet(), _SpoListWebhookListCommand_initTelemetry = function _SpoListWebhookListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            title: typeof args.options.title !== 'undefined'
+            listUrl: typeof args.options.listUrl !== 'undefined'
         });
     });
 }, _SpoListWebhookListCommand_initOptions = function _SpoListWebhookListCommand_initOptions() {
@@ -115,10 +92,6 @@ _SpoListWebhookListCommand_instances = new WeakSet(), _SpoListWebhookListCommand
         option: '-t, --listTitle [listTitle]'
     }, {
         option: '--listUrl [listUrl]'
-    }, {
-        option: '--id [id]'
-    }, {
-        option: '--title [title]'
     });
 }, _SpoListWebhookListCommand_initValidators = function _SpoListWebhookListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -126,11 +99,6 @@ _SpoListWebhookListCommand_instances = new WeakSet(), _SpoListWebhookListCommand
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.id) {
-            if (!validation_1.validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
-        }
         if (args.options.listId) {
             if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
@@ -139,7 +107,7 @@ _SpoListWebhookListCommand_instances = new WeakSet(), _SpoListWebhookListCommand
         return true;
     }));
 }, _SpoListWebhookListCommand_initOptionSets = function _SpoListWebhookListCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListWebhookListCommand();
 //# sourceMappingURL=list-webhook-list.js.map

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

@@ -129,7 +129,7 @@ _SpoListWebhookRemoveCommand_instances = new WeakSet(), _SpoListWebhookRemoveCom
         return true;
     }));
 }, _SpoListWebhookRemoveCommand_initOptionSets = function _SpoListWebhookRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListWebhookRemoveCommand();
 //# sourceMappingURL=list-webhook-remove.js.map