@pnp/cli-microsoft365 5.0.0-beta.2e2ba7d → 5.0.0-beta.30c8613

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (111) hide show
  1. package/.devcontainer/devcontainer.json +13 -2
  2. package/.eslintrc.js +2 -0
  3. package/.mocharc.json +9 -0
  4. package/README.md +3 -3
  5. package/dist/Command.js +1 -1
  6. package/dist/Utils.js +7 -0
  7. package/dist/api.d.ts +11 -0
  8. package/dist/api.js +17 -0
  9. package/dist/appInsights.js +2 -1
  10. package/dist/cli/Cli.js +38 -6
  11. package/dist/m365/aad/commands/app/app-add.js +43 -7
  12. package/dist/m365/aad/commands/app/app-delete.js +123 -0
  13. package/dist/m365/aad/commands/app/app-get.js +56 -11
  14. package/dist/m365/aad/commands/app/app-set.js +98 -3
  15. package/dist/m365/aad/commands/group/group-list.js +54 -0
  16. package/dist/m365/aad/commands/o365group/{Group.js → GroupExtended.js} +1 -1
  17. package/dist/m365/aad/commands/o365group/o365group-conversation-list.js +41 -0
  18. package/dist/m365/aad/commands/o365group/o365group-user-set.js +3 -3
  19. package/dist/m365/aad/commands/user/user-get.js +33 -6
  20. package/dist/m365/aad/commands/user/user-hibp.js +67 -0
  21. package/dist/m365/aad/commands/user/user-list.js +7 -4
  22. package/dist/m365/aad/commands/user/user-password-validate.js +42 -0
  23. package/dist/m365/aad/commands.js +5 -0
  24. package/dist/m365/app/commands/permission/permission-list.js +266 -0
  25. package/dist/m365/app/commands.js +7 -0
  26. package/dist/m365/base/AppCommand.js +76 -0
  27. package/dist/m365/cli/commands/config/config-set.js +4 -1
  28. package/dist/m365/flow/commands/flow-get.js +2 -2
  29. package/dist/m365/outlook/commands/room/room-list.js +43 -0
  30. package/dist/m365/outlook/commands/roomlist/roomlist-list.js +25 -0
  31. package/dist/m365/outlook/commands.js +2 -0
  32. package/dist/m365/pa/cds-project-mutator.js +1 -1
  33. package/dist/m365/pa/commands/app/app-list.js +28 -1
  34. package/dist/m365/{aad/commands/o365group/GroupUser.js → planner/AppliedCategories.js} +1 -1
  35. package/dist/m365/planner/commands/task/task-add.js +288 -0
  36. package/dist/m365/planner/commands/task/task-details-get.js +39 -0
  37. package/dist/m365/planner/commands/task/task-get.js +37 -0
  38. package/dist/m365/planner/commands/task/task-list.js +37 -7
  39. package/dist/m365/planner/commands/task/task-set.js +357 -0
  40. package/dist/m365/planner/commands.js +5 -1
  41. package/dist/m365/spfx/commands/project/project-upgrade/rules/FN014008_CODE_launch_hostedWorkbench_type.js +62 -0
  42. package/dist/m365/spfx/commands/project/project-upgrade/{upgrade-1.14.0-beta.4.js → upgrade-1.14.0.js} +27 -25
  43. package/dist/m365/spfx/commands/project/project-upgrade.js +13 -15
  44. package/dist/m365/spfx/commands/spfx-doctor.js +25 -6
  45. package/dist/m365/spo/commands/group/group-user-add.js +74 -16
  46. package/dist/m365/spo/commands/group/group-user-remove.js +100 -0
  47. package/dist/m365/spo/commands/site/site-ensure.js +1 -1
  48. package/dist/m365/spo/commands/site/site-recyclebinitem-list.js +76 -0
  49. package/dist/m365/spo/commands.js +2 -0
  50. package/dist/m365/teams/commands/app/app-install.js +75 -21
  51. package/dist/m365/teams/commands/app/app-list.js +9 -6
  52. package/dist/m365/teams/commands/channel/channel-get.js +29 -7
  53. package/dist/m365/teams/commands/chat/chat-list.js +43 -0
  54. package/dist/m365/teams/commands/chat/chat-member-list.js +42 -0
  55. package/dist/m365/teams/commands/chat/chat-message-list.js +60 -0
  56. package/dist/m365/teams/commands/chat/chat-message-send.js +225 -0
  57. package/dist/m365/teams/commands/message/message-get.js +1 -1
  58. package/dist/m365/teams/commands/tab/tab-get.js +9 -6
  59. package/dist/m365/teams/commands.js +4 -0
  60. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-get.js +57 -0
  61. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-list.js +56 -0
  62. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-healthissue-get.js +39 -0
  63. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-healthissue-list.js +38 -0
  64. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-message-get.js +51 -0
  65. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-message-list.js +38 -0
  66. package/dist/m365/tenant/commands.js +6 -0
  67. package/dist/request.js +9 -4
  68. package/dist/settingsNames.js +6 -1
  69. package/docs/docs/cmd/_global.md +2 -2
  70. package/docs/docs/cmd/aad/app/app-delete.md +51 -0
  71. package/docs/docs/cmd/aad/app/app-get.md +12 -1
  72. package/docs/docs/cmd/aad/app/app-set.md +21 -0
  73. package/docs/docs/cmd/aad/group/group-list.md +30 -0
  74. package/docs/docs/cmd/aad/o365group/o365group-conversation-list.md +24 -0
  75. package/docs/docs/cmd/aad/user/user-get.md +13 -4
  76. package/docs/docs/cmd/aad/user/user-hibp.md +46 -0
  77. package/docs/docs/cmd/aad/user/user-list.md +9 -0
  78. package/docs/docs/cmd/aad/user/user-password-validate.md +29 -0
  79. package/docs/docs/cmd/app/permission/permission-list.md +36 -0
  80. package/docs/docs/cmd/outlook/room/room-list.md +30 -0
  81. package/docs/docs/cmd/outlook/roomlist/roomlist-list.md +21 -0
  82. package/docs/docs/cmd/pa/app/app-list.md +17 -1
  83. package/docs/docs/cmd/planner/task/task-add.md +78 -0
  84. package/docs/docs/cmd/planner/task/task-details-get.md +24 -0
  85. package/docs/docs/cmd/planner/task/task-get.md +29 -0
  86. package/docs/docs/cmd/planner/task/task-list.md +5 -0
  87. package/docs/docs/cmd/planner/task/task-set.md +99 -0
  88. package/docs/docs/cmd/search/externalconnection/externalconnection-add.md +3 -3
  89. package/docs/docs/cmd/spfx/project/project-externalize.md +1 -1
  90. package/docs/docs/cmd/spfx/project/project-rename.md +1 -1
  91. package/docs/docs/cmd/spfx/project/project-upgrade.md +8 -8
  92. package/docs/docs/cmd/spfx/spfx-doctor.md +1 -1
  93. package/docs/docs/cmd/spo/group/group-user-add.md +28 -6
  94. package/docs/docs/cmd/spo/group/group-user-remove.md +39 -0
  95. package/docs/docs/cmd/spo/site/site-recyclebinitem-list.md +40 -0
  96. package/docs/docs/cmd/teams/app/app-install.md +22 -4
  97. package/docs/docs/cmd/teams/channel/channel-get.md +11 -2
  98. package/docs/docs/cmd/teams/chat/chat-list.md +30 -0
  99. package/docs/docs/cmd/teams/chat/chat-member-list.md +24 -0
  100. package/docs/docs/cmd/teams/chat/chat-message-list.md +24 -0
  101. package/docs/docs/cmd/teams/chat/chat-message-send.md +55 -0
  102. package/docs/docs/cmd/teams/message/message-get.md +0 -3
  103. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-health-get.md +33 -0
  104. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-health-list.md +30 -0
  105. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-healthissue-get.md +24 -0
  106. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-healthissue-list.md +34 -0
  107. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-message-get.md +28 -0
  108. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-message-list.md +34 -0
  109. package/npm-shrinkwrap.json +1327 -1497
  110. package/package.json +38 -27
  111. package/dist/m365/base/AadCommand.js +0 -10
@@ -0,0 +1,288 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const request_1 = require("../../../../request");
4
+ const Utils_1 = require("../../../../Utils");
5
+ const GraphCommand_1 = require("../../../base/GraphCommand");
6
+ const commands_1 = require("../../commands");
7
+ class PlannerTaskAddCommand extends GraphCommand_1.default {
8
+ get name() {
9
+ return commands_1.default.TASK_ADD;
10
+ }
11
+ get description() {
12
+ return 'Adds a new Microsoft Planner Task';
13
+ }
14
+ getTelemetryProperties(args) {
15
+ const telemetryProps = super.getTelemetryProperties(args);
16
+ telemetryProps.planId = typeof args.options.planId !== 'undefined';
17
+ telemetryProps.planName = typeof args.options.planName !== 'undefined';
18
+ telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
19
+ telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
20
+ telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
21
+ telemetryProps.bucketName = typeof args.options.bucketName !== 'undefined';
22
+ telemetryProps.startDateTime = typeof args.options.startDateTime !== 'undefined';
23
+ telemetryProps.dueDateTime = typeof args.options.dueDateTime !== 'undefined';
24
+ telemetryProps.percentComplete = typeof args.options.percentComplete !== 'undefined';
25
+ telemetryProps.assignedToUserIds = typeof args.options.assignedToUserIds !== 'undefined';
26
+ telemetryProps.assignedToUserNames = typeof args.options.assignedToUserNames !== 'undefined';
27
+ telemetryProps.description = typeof args.options.description !== 'undefined';
28
+ telemetryProps.orderHint = typeof args.options.orderHint !== 'undefined';
29
+ return telemetryProps;
30
+ }
31
+ commandAction(logger, args, cb) {
32
+ this
33
+ .getPlanId(args)
34
+ .then(planId => {
35
+ this.planId = planId;
36
+ return this.getBucketId(args, planId);
37
+ })
38
+ .then(bucketId => {
39
+ this.bucketId = bucketId;
40
+ return this.generateUserAssignments(args);
41
+ })
42
+ .then(assignments => {
43
+ const requestOptions = {
44
+ url: `${this.resource}/v1.0/planner/tasks`,
45
+ headers: {
46
+ 'accept': 'application/json;odata.metadata=none'
47
+ },
48
+ responseType: 'json',
49
+ data: {
50
+ planId: this.planId,
51
+ bucketId: this.bucketId,
52
+ title: args.options.title,
53
+ startDateTime: args.options.startDateTime,
54
+ dueDateTime: args.options.dueDateTime,
55
+ percentComplete: args.options.percentComplete,
56
+ assignments: assignments,
57
+ orderHint: args.options.orderHint
58
+ }
59
+ };
60
+ return request_1.default.post(requestOptions);
61
+ })
62
+ .then(newTask => this.updateTaskDetails(args.options, newTask))
63
+ .then((res) => {
64
+ logger.log(res);
65
+ cb();
66
+ }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
67
+ }
68
+ getTaskDetailsEtag(taskId) {
69
+ const requestOptions = {
70
+ url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details`,
71
+ headers: {
72
+ accept: 'application/json'
73
+ },
74
+ responseType: 'json'
75
+ };
76
+ return request_1.default
77
+ .get(requestOptions)
78
+ .then((response) => {
79
+ const etag = response ? response['@odata.etag'] : undefined;
80
+ if (!etag) {
81
+ return Promise.reject(`Error fetching task details`);
82
+ }
83
+ return Promise.resolve(etag);
84
+ });
85
+ }
86
+ updateTaskDetails(options, newTask) {
87
+ const taskId = newTask.id;
88
+ if (!options.description) {
89
+ return Promise.resolve(newTask);
90
+ }
91
+ return this
92
+ .getTaskDetailsEtag(taskId)
93
+ .then(etag => {
94
+ const requestOptionsTaskDetails = {
95
+ url: `${this.resource}/v1.0/planner/tasks/${taskId}/details`,
96
+ headers: {
97
+ 'accept': 'application/json;odata.metadata=none',
98
+ 'If-Match': etag,
99
+ 'Prefer': 'return=representation'
100
+ },
101
+ responseType: 'json',
102
+ data: {
103
+ description: options.description
104
+ }
105
+ };
106
+ return request_1.default.patch(requestOptionsTaskDetails);
107
+ })
108
+ .then(taskDetails => {
109
+ return Object.assign(Object.assign({}, newTask), taskDetails);
110
+ });
111
+ }
112
+ generateUserAssignments(args) {
113
+ const assignments = {};
114
+ if (!args.options.assignedToUserIds && !args.options.assignedToUserNames) {
115
+ return Promise.resolve(assignments);
116
+ }
117
+ return this
118
+ .getUserIds(args.options)
119
+ .then((userIds) => {
120
+ userIds.map(x => assignments[x] = {
121
+ '@odata.type': '#microsoft.graph.plannerAssignment',
122
+ orderHint: ' !'
123
+ });
124
+ return Promise.resolve(assignments);
125
+ });
126
+ }
127
+ getBucketId(args, planId) {
128
+ if (args.options.bucketId) {
129
+ return Promise.resolve(args.options.bucketId);
130
+ }
131
+ const requestOptions = {
132
+ url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
133
+ headers: {
134
+ accept: 'application/json;odata.metadata=none'
135
+ },
136
+ responseType: 'json'
137
+ };
138
+ return request_1.default
139
+ .get(requestOptions)
140
+ .then((response) => {
141
+ const bucket = response.value.find(val => val.name === args.options.bucketName);
142
+ if (!bucket) {
143
+ return Promise.reject(`The specified bucket does not exist`);
144
+ }
145
+ return Promise.resolve(bucket.id);
146
+ });
147
+ }
148
+ getPlanId(args) {
149
+ if (args.options.planId) {
150
+ return Promise.resolve(args.options.planId);
151
+ }
152
+ return this
153
+ .getGroupId(args)
154
+ .then((groupId) => {
155
+ const requestOptions = {
156
+ url: `${this.resource}/v1.0/planner/plans?$filter=(owner eq '${groupId}')`,
157
+ headers: {
158
+ accept: 'application/json;odata.metadata=none'
159
+ },
160
+ responseType: 'json'
161
+ };
162
+ return request_1.default.get(requestOptions);
163
+ }).then((response) => {
164
+ const plan = response.value.find(val => val.title === args.options.planName);
165
+ if (!plan) {
166
+ return Promise.reject(`The specified plan does not exist`);
167
+ }
168
+ return Promise.resolve(plan.id);
169
+ });
170
+ }
171
+ getGroupId(args) {
172
+ if (args.options.ownerGroupId) {
173
+ return Promise.resolve(args.options.ownerGroupId);
174
+ }
175
+ const requestOptions = {
176
+ url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.ownerGroupName)}'`,
177
+ headers: {
178
+ accept: 'application/json;odata.metadata=none'
179
+ },
180
+ responseType: 'json'
181
+ };
182
+ return request_1.default
183
+ .get(requestOptions)
184
+ .then(response => {
185
+ const group = response.value[0];
186
+ if (!group) {
187
+ return Promise.reject(`The specified owner group does not exist`);
188
+ }
189
+ return Promise.resolve(group.id);
190
+ });
191
+ }
192
+ getUserIds(options) {
193
+ if (options.assignedToUserIds) {
194
+ return Promise.resolve(options.assignedToUserIds.split(','));
195
+ }
196
+ // Hitting this section means assignedToUserNames won't be undefined
197
+ const userNames = options.assignedToUserNames;
198
+ const userArr = userNames.split(',').map(o => o.trim());
199
+ let userIds = [];
200
+ const promises = userArr.map(user => {
201
+ const requestOptions = {
202
+ url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${Utils_1.default.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
203
+ headers: {
204
+ 'content-type': 'application/json'
205
+ },
206
+ responseType: 'json'
207
+ };
208
+ return request_1.default.get(requestOptions);
209
+ });
210
+ return Promise
211
+ .all(promises)
212
+ .then((usersRes) => {
213
+ let userUpns = [];
214
+ userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
215
+ userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
216
+ // Find the members where no graph response was found
217
+ const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
218
+ if (invalidUsers && invalidUsers.length > 0) {
219
+ return Promise.reject(`Cannot proceed with planner task creation. The following users provided are invalid : ${invalidUsers.join(',')}`);
220
+ }
221
+ return Promise.resolve(userIds);
222
+ });
223
+ }
224
+ options() {
225
+ const options = [
226
+ { option: '-t, --title <title>' },
227
+ { option: '--planId [planId]' },
228
+ { option: '--planName [planName]' },
229
+ { option: '--ownerGroupId [ownerGroupId]' },
230
+ { option: '--ownerGroupName [ownerGroupName]' },
231
+ { option: '--bucketId [bucketId]' },
232
+ { option: '--bucketName [bucketName]' },
233
+ { option: '--startDateTime [startDateTime]' },
234
+ { option: '--dueDateTime [dueDateTime]' },
235
+ { option: '--percentComplete [percentComplete]' },
236
+ { option: '--assignedToUserIds [assignedToUserIds]' },
237
+ { option: '--assignedToUserNames [assignedToUserNames]' },
238
+ { option: '--description [description]' },
239
+ { option: '--orderHint [orderHint]' }
240
+ ];
241
+ const parentOptions = super.options();
242
+ return options.concat(parentOptions);
243
+ }
244
+ validate(args) {
245
+ if (!args.options.planId && !args.options.planName) {
246
+ return 'Specify either planId or planName';
247
+ }
248
+ if (args.options.planId && args.options.planName) {
249
+ return 'Specify either planId or planName but not both';
250
+ }
251
+ if (args.options.planName && !args.options.ownerGroupId && !args.options.ownerGroupName) {
252
+ return 'Specify either ownerGroupId or ownerGroupName when using planName';
253
+ }
254
+ if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
255
+ return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
256
+ }
257
+ if (args.options.ownerGroupId && !Utils_1.default.isValidGuid(args.options.ownerGroupId)) {
258
+ return `${args.options.ownerGroupId} is not a valid GUID`;
259
+ }
260
+ if (!args.options.bucketId && !args.options.bucketName) {
261
+ return 'Specify either bucketId or bucketName';
262
+ }
263
+ if (args.options.bucketId && args.options.bucketName) {
264
+ return 'Specify either bucketId or bucketName but not both';
265
+ }
266
+ if (args.options.startDateTime && !Utils_1.default.isValidISODateTime(args.options.startDateTime)) {
267
+ return 'The startDateTime is not a valid ISO date string';
268
+ }
269
+ if (args.options.dueDateTime && !Utils_1.default.isValidISODateTime(args.options.dueDateTime)) {
270
+ return 'The dueDateTime is not a valid ISO date string';
271
+ }
272
+ if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
273
+ return `percentComplete is not a number`;
274
+ }
275
+ if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
276
+ return `percentComplete should be between 0 and 100 `;
277
+ }
278
+ if (args.options.assignedToUserIds && !Utils_1.default.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
279
+ return 'assignedToUserIds contains invalid GUID';
280
+ }
281
+ if (args.options.assignedToUserIds && args.options.assignedToUserNames) {
282
+ return 'Specify either assignedToUserIds or assignedToUserNames but not both';
283
+ }
284
+ return true;
285
+ }
286
+ }
287
+ module.exports = new PlannerTaskAddCommand();
288
+ //# sourceMappingURL=task-add.js.map
@@ -0,0 +1,39 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const request_1 = require("../../../../request");
4
+ const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
5
+ const commands_1 = require("../../commands");
6
+ class PlannerTaskDetailsGetCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
7
+ get name() {
8
+ return commands_1.default.TASK_DETAILS_GET;
9
+ }
10
+ get description() {
11
+ return 'Retrieve the details of the specified planner task';
12
+ }
13
+ commandAction(logger, args, cb) {
14
+ const requestOptions = {
15
+ url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(args.options.taskId)}/details`,
16
+ headers: {
17
+ accept: 'application/json;odata.metadata=none'
18
+ },
19
+ responseType: 'json'
20
+ };
21
+ request_1.default
22
+ .get(requestOptions)
23
+ .then((res) => {
24
+ logger.log(res);
25
+ cb();
26
+ }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
27
+ }
28
+ options() {
29
+ const options = [
30
+ {
31
+ option: '-i, --taskId <taskId>'
32
+ }
33
+ ];
34
+ const parentOptions = super.options();
35
+ return options.concat(parentOptions);
36
+ }
37
+ }
38
+ module.exports = new PlannerTaskDetailsGetCommand();
39
+ //# sourceMappingURL=task-details-get.js.map
@@ -0,0 +1,37 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const request_1 = require("../../../../request");
4
+ const GraphCommand_1 = require("../../../base/GraphCommand");
5
+ const commands_1 = require("../../commands");
6
+ class PlannerTaskGetCommand extends GraphCommand_1.default {
7
+ get name() {
8
+ return commands_1.default.TASK_GET;
9
+ }
10
+ get description() {
11
+ return 'Retrieve the the specified planner task';
12
+ }
13
+ commandAction(logger, args, cb) {
14
+ const requestOptions = {
15
+ url: `${this.resource}/beta/planner/tasks/${encodeURIComponent(args.options.id)}`,
16
+ headers: {
17
+ accept: 'application/json;odata.metadata=none'
18
+ },
19
+ responseType: 'json'
20
+ };
21
+ request_1.default
22
+ .get(requestOptions)
23
+ .then((res) => {
24
+ logger.log(res);
25
+ cb();
26
+ }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
27
+ }
28
+ options() {
29
+ const options = [
30
+ { option: '-i, --id <id>' }
31
+ ];
32
+ const parentOptions = super.options();
33
+ return options.concat(parentOptions);
34
+ }
35
+ }
36
+ module.exports = new PlannerTaskGetCommand();
37
+ //# sourceMappingURL=task-get.js.map
@@ -25,25 +25,40 @@ class PlannerTaskListCommand extends GraphItemsListCommand_1.GraphItemsListComma
25
25
  return ['id', 'title', 'startDateTime', 'dueDateTime', 'completedDateTime'];
26
26
  }
27
27
  commandAction(logger, args, cb) {
28
- const bucketId = args.options.bucketId;
29
28
  const bucketName = args.options.bucketName;
30
- const planId = args.options.planId;
29
+ let bucketId = args.options.bucketId;
31
30
  const planName = args.options.planName;
31
+ let planId = args.options.planId;
32
+ let taskItems = [];
32
33
  if (bucketId || bucketName) {
33
34
  this
34
35
  .getBucketId(args)
35
- .then((bucketId) => this.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks`, logger, true))
36
+ .then((retrievedBucketId) => {
37
+ bucketId = retrievedBucketId;
38
+ return this.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks`, logger, true);
39
+ })
36
40
  .then(() => {
37
- logger.log(this.items);
41
+ taskItems = this.items;
42
+ return this.getAllItems(`${this.resource}/beta/planner/buckets/${bucketId}/tasks`, logger, true);
43
+ })
44
+ .then(() => {
45
+ logger.log(this.mergeTaskPriority(taskItems, this.items));
38
46
  cb();
39
47
  }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
40
48
  }
41
49
  else if (planId || planName) {
42
50
  this
43
51
  .getPlanId(args)
44
- .then((planId) => this.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/tasks`, logger, true))
52
+ .then((retrievedPlanId) => {
53
+ planId = retrievedPlanId;
54
+ return this.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/tasks`, logger, true);
55
+ })
56
+ .then(() => {
57
+ taskItems = this.items;
58
+ return this.getAllItems(`${this.resource}/beta/planner/plans/${planId}/tasks`, logger, true);
59
+ })
45
60
  .then(() => {
46
- logger.log(this.items);
61
+ logger.log(this.mergeTaskPriority(taskItems, this.items));
47
62
  cb();
48
63
  }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
49
64
  }
@@ -51,7 +66,11 @@ class PlannerTaskListCommand extends GraphItemsListCommand_1.GraphItemsListComma
51
66
  this
52
67
  .getAllItems(`${this.resource}/v1.0/me/planner/tasks`, logger, true)
53
68
  .then(() => {
54
- logger.log(this.items);
69
+ taskItems = this.items;
70
+ return this.getAllItems(`${this.resource}/beta/me/planner/tasks`, logger, true);
71
+ })
72
+ .then(() => {
73
+ logger.log(this.mergeTaskPriority(taskItems, this.items));
55
74
  cb();
56
75
  }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
57
76
  }
@@ -125,6 +144,17 @@ class PlannerTaskListCommand extends GraphItemsListCommand_1.GraphItemsListComma
125
144
  return Promise.resolve(group.id);
126
145
  });
127
146
  }
147
+ mergeTaskPriority(taskItems, betaTaskItems) {
148
+ const findBetaTask = (id) => betaTaskItems.find(task => task.id === id);
149
+ taskItems.forEach(task => {
150
+ const betaTaskItem = findBetaTask(task.id);
151
+ if (betaTaskItem) {
152
+ const { priority } = betaTaskItem;
153
+ Object.assign(task, { priority });
154
+ }
155
+ });
156
+ return taskItems;
157
+ }
128
158
  options() {
129
159
  const options = [
130
160
  {