@pnp/cli-microsoft365 10.0.0-beta.7dfc31a → 10.0.0-beta.977d78b

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 (126) hide show
  1. package/allCommands.json +1 -1
  2. package/allCommandsFull.json +1 -1
  3. package/dist/Auth.js +14 -13
  4. package/dist/Command.js +4 -1
  5. package/dist/cli/cli.js +14 -0
  6. package/dist/config.js +60 -5
  7. package/dist/m365/base/PowerAutomateCommand.js +1 -1
  8. package/dist/m365/base/SpoCommand.js +1 -1
  9. package/dist/m365/cli/commands/cli-consent.js +2 -2
  10. package/dist/m365/cli/commands/cli-doctor.js +2 -2
  11. package/dist/m365/cli/commands/cli-reconsent.js +2 -3
  12. package/dist/m365/cli/commands/config/config-set.js +12 -4
  13. package/dist/m365/commands/login.js +28 -9
  14. package/dist/m365/commands/setup.js +256 -33
  15. package/dist/m365/commands/setupPresets.js +2 -4
  16. package/dist/m365/connection/commands/connection-list.js +4 -4
  17. package/dist/m365/entra/commands/app/app-add.js +52 -288
  18. package/dist/m365/file/commands/file-move.js +135 -0
  19. package/dist/m365/file/commands.js +2 -1
  20. package/dist/m365/flow/commands/environment/environment-get.js +1 -1
  21. package/dist/m365/flow/commands/environment/environment-list.js +1 -1
  22. package/dist/m365/flow/commands/flow-disable.js +1 -1
  23. package/dist/m365/flow/commands/flow-enable.js +1 -1
  24. package/dist/m365/flow/commands/flow-export.js +17 -16
  25. package/dist/m365/flow/commands/flow-get.js +1 -1
  26. package/dist/m365/flow/commands/flow-list.js +1 -1
  27. package/dist/m365/flow/commands/flow-remove.js +1 -1
  28. package/dist/m365/flow/commands/owner/owner-ensure.js +1 -1
  29. package/dist/m365/flow/commands/owner/owner-list.js +1 -1
  30. package/dist/m365/flow/commands/owner/owner-remove.js +1 -1
  31. package/dist/m365/flow/commands/recyclebinitem/recyclebinitem-list.js +47 -0
  32. package/dist/m365/flow/commands/recyclebinitem/recyclebinitem-restore.js +48 -0
  33. package/dist/m365/flow/commands/run/run-cancel.js +1 -1
  34. package/dist/m365/flow/commands/run/run-get.js +1 -1
  35. package/dist/m365/flow/commands/run/run-list.js +1 -1
  36. package/dist/m365/flow/commands/run/run-resubmit.js +2 -2
  37. package/dist/m365/flow/commands.js +2 -0
  38. package/dist/m365/spfx/commands/project/project-doctor/doctor-1.20.0-rc.1.js +25 -0
  39. package/dist/m365/spfx/commands/project/project-doctor.js +2 -1
  40. package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.20.0-rc.1.js +57 -0
  41. package/dist/m365/spfx/commands/project/project-upgrade.js +16 -13
  42. package/dist/m365/spfx/commands/spfx-doctor.js +15 -0
  43. package/dist/m365/spo/commands/contenttype/contenttype-field-remove.js +8 -8
  44. package/dist/m365/spo/commands/contenttype/contenttype-field-set.js +2 -2
  45. package/dist/m365/spo/commands/file/file-roleassignment-add.js +17 -54
  46. package/dist/m365/spo/commands/file/file-roleassignment-remove.js +13 -40
  47. package/dist/m365/spo/commands/file/file-roleinheritance-break.js +5 -13
  48. package/dist/m365/spo/commands/file/file-roleinheritance-reset.js +5 -13
  49. package/dist/m365/spo/commands/folder/folder-sharinglink-add.js +143 -0
  50. package/dist/m365/spo/commands/folder/folder-sharinglink-clear.js +111 -0
  51. package/dist/m365/spo/commands/folder/folder-sharinglink-remove.js +95 -0
  52. package/dist/m365/spo/commands/list/list-get.js +17 -4
  53. package/dist/m365/spo/commands/page/page-section-add.js +185 -34
  54. package/dist/m365/spo/commands/site/SiteAdmin.js +2 -0
  55. package/dist/m365/spo/commands/site/site-admin-add.js +252 -0
  56. package/dist/m365/spo/commands/site/site-admin-list.js +2 -27
  57. package/dist/m365/spo/commands/site/site-admin-remove.js +193 -0
  58. package/dist/m365/spo/commands/sitescript/sitescript-get.js +3 -2
  59. package/dist/m365/spo/commands/user/user-get.js +67 -9
  60. package/dist/m365/spo/commands.js +5 -0
  61. package/dist/m365/spp/commands/contentcenter/contentcenter-list.js +56 -0
  62. package/dist/m365/spp/commands.js +5 -0
  63. package/dist/m365/teams/MeetingTranscript.js +2 -0
  64. package/dist/m365/teams/commands/meeting/meeting-transcript-get.js +152 -0
  65. package/dist/m365/teams/commands.js +1 -0
  66. package/dist/settingsNames.js +6 -1
  67. package/dist/utils/driveUtil.js +51 -0
  68. package/dist/utils/entraApp.js +283 -0
  69. package/dist/utils/spo.js +75 -7
  70. package/dist/utils/zod.js +1 -1
  71. package/docs/docs/_clisettings.mdx +6 -1
  72. package/docs/docs/cmd/entra/m365group/m365group-report-activitystorage.mdx +2 -2
  73. package/docs/docs/cmd/file/file-move.mdx +79 -0
  74. package/docs/docs/cmd/flow/recyclebinitem/recyclebinitem-list.mdx +132 -0
  75. package/docs/docs/cmd/flow/recyclebinitem/recyclebinitem-restore.mdx +55 -0
  76. package/docs/docs/cmd/setup.mdx +17 -6
  77. package/docs/docs/cmd/spo/cdn/cdn-get.mdx +1 -1
  78. package/docs/docs/cmd/spo/cdn/cdn-origin-add.mdx +1 -1
  79. package/docs/docs/cmd/spo/cdn/cdn-origin-list.mdx +1 -1
  80. package/docs/docs/cmd/spo/cdn/cdn-origin-remove.mdx +1 -1
  81. package/docs/docs/cmd/spo/cdn/cdn-policy-list.mdx +1 -1
  82. package/docs/docs/cmd/spo/cdn/cdn-policy-set.mdx +1 -1
  83. package/docs/docs/cmd/spo/contenttype/contenttype-field-remove.mdx +7 -7
  84. package/docs/docs/cmd/spo/contenttype/contenttype-field-set.mdx +2 -2
  85. package/docs/docs/cmd/spo/externaluser/externaluser-list.mdx +1 -1
  86. package/docs/docs/cmd/spo/folder/folder-sharinglink-add.mdx +125 -0
  87. package/docs/docs/cmd/spo/folder/folder-sharinglink-clear.mdx +50 -0
  88. package/docs/docs/cmd/spo/folder/folder-sharinglink-remove.mdx +50 -0
  89. package/docs/docs/cmd/spo/hidedefaultthemes/hidedefaultthemes-get.mdx +1 -1
  90. package/docs/docs/cmd/spo/hidedefaultthemes/hidedefaultthemes-set.mdx +1 -1
  91. package/docs/docs/cmd/spo/homesite/homesite-remove.mdx +1 -1
  92. package/docs/docs/cmd/spo/knowledgehub/knowledgehub-get.mdx +1 -1
  93. package/docs/docs/cmd/spo/knowledgehub/knowledgehub-remove.mdx +1 -1
  94. package/docs/docs/cmd/spo/knowledgehub/knowledgehub-set.mdx +1 -1
  95. package/docs/docs/cmd/spo/orgassetslibrary/orgassetslibrary-add.mdx +1 -1
  96. package/docs/docs/cmd/spo/orgassetslibrary/orgassetslibrary-list.mdx +1 -1
  97. package/docs/docs/cmd/spo/orgassetslibrary/orgassetslibrary-remove.mdx +1 -1
  98. package/docs/docs/cmd/spo/orgnewssite/orgnewssite-list.mdx +1 -1
  99. package/docs/docs/cmd/spo/orgnewssite/orgnewssite-remove.mdx +1 -1
  100. package/docs/docs/cmd/spo/orgnewssite/orgnewssite-set.mdx +1 -1
  101. package/docs/docs/cmd/spo/page/page-section-add.mdx +57 -2
  102. package/docs/docs/cmd/spo/site/site-admin-add.mdx +67 -0
  103. package/docs/docs/cmd/spo/site/site-admin-remove.mdx +67 -0
  104. package/docs/docs/cmd/spo/site/site-appcatalog-add.mdx +1 -1
  105. package/docs/docs/cmd/spo/site/site-appcatalog-remove.mdx +1 -1
  106. package/docs/docs/cmd/spo/site/site-commsite-enable.mdx +1 -1
  107. package/docs/docs/cmd/spo/site/site-list.mdx +6 -4
  108. package/docs/docs/cmd/spo/site/site-set.mdx +1 -1
  109. package/docs/docs/cmd/spo/sitescript/sitescript-get.mdx +14 -1
  110. package/docs/docs/cmd/spo/storageentity/storageentity-remove.mdx +1 -1
  111. package/docs/docs/cmd/spo/storageentity/storageentity-set.mdx +1 -1
  112. package/docs/docs/cmd/spo/tenant/tenant-appcatalog-add.mdx +1 -1
  113. package/docs/docs/cmd/spo/tenant/tenant-appcatalogurl-get.mdx +1 -1
  114. package/docs/docs/cmd/spo/tenant/tenant-recyclebinitem-list.mdx +1 -1
  115. package/docs/docs/cmd/spo/tenant/tenant-recyclebinitem-remove.mdx +1 -1
  116. package/docs/docs/cmd/spo/tenant/tenant-settings-list.mdx +1 -1
  117. package/docs/docs/cmd/spo/theme/theme-apply.mdx +1 -1
  118. package/docs/docs/cmd/spo/theme/theme-get.mdx +1 -1
  119. package/docs/docs/cmd/spo/theme/theme-list.mdx +1 -1
  120. package/docs/docs/cmd/spo/theme/theme-remove.mdx +1 -1
  121. package/docs/docs/cmd/spo/theme/theme-set.mdx +1 -1
  122. package/docs/docs/cmd/spo/user/user-get.mdx +35 -9
  123. package/docs/docs/cmd/spp/contentcenter/contentcenter-list.mdx +287 -0
  124. package/docs/docs/cmd/teams/meeting/meeting-transcript-get.mdx +132 -0
  125. package/npm-shrinkwrap.json +203 -375
  126. package/package.json +16 -17
@@ -11,6 +11,7 @@ import { formatting } from '../../../utils/formatting.js';
11
11
  import { validation } from '../../../utils/validation.js';
12
12
  import PowerPlatformCommand from '../../base/PowerPlatformCommand.js';
13
13
  import commands from '../commands.js';
14
+ import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
14
15
  class FlowExportCommand extends PowerPlatformCommand {
15
16
  get name() {
16
17
  return commands.EXPORT;
@@ -27,15 +28,15 @@ class FlowExportCommand extends PowerPlatformCommand {
27
28
  }
28
29
  async commandAction(logger, args) {
29
30
  let filenameFromApi = '';
30
- const formatArgument = args.options.format ? args.options.format.toLowerCase() : '';
31
+ const formatArgument = args.options.format?.toLowerCase() || '';
31
32
  if (this.verbose) {
32
33
  await logger.logToStderr(`Retrieving package resources for Microsoft Flow ${args.options.name}...`);
33
34
  }
34
35
  try {
35
36
  let res;
36
37
  if (formatArgument === 'json') {
37
- if (this.debug) {
38
- await logger.logToStderr('format = json, skipping listing package resources step');
38
+ if (this.verbose) {
39
+ await logger.logToStderr('format = json, skipping listing package resources step.');
39
40
  }
40
41
  }
41
42
  else {
@@ -61,7 +62,7 @@ class FlowExportCommand extends PowerPlatformCommand {
61
62
  }
62
63
  let requestOptions = {
63
64
  url: formatArgument === 'json' ?
64
- `https://management.azure.com/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`
65
+ `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`
65
66
  : `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/exportPackage?api-version=2016-11-01`,
66
67
  headers: {
67
68
  accept: 'application/json'
@@ -76,17 +77,17 @@ class FlowExportCommand extends PowerPlatformCommand {
76
77
  ? res.resources[key].suggestedCreationType = 'Update'
77
78
  : res.resources[key].suggestedCreationType = 'Existing';
78
79
  });
79
- requestOptions['data'] = {
80
- "includedResourceIds": [
80
+ requestOptions.data = {
81
+ includedResourceIds: [
81
82
  `/providers/Microsoft.Flow/flows/${args.options.name}`
82
83
  ],
83
- "details": {
84
- "displayName": args.options.packageDisplayName,
85
- "description": args.options.packageDescription,
86
- "creator": args.options.packageCreatedBy,
87
- "sourceEnvironment": args.options.packageSourceEnvironment
84
+ details: {
85
+ displayName: args.options.packageDisplayName,
86
+ description: args.options.packageDescription,
87
+ creator: args.options.packageCreatedBy,
88
+ sourceEnvironment: args.options.packageSourceEnvironment
88
89
  },
89
- "resources": res.resources
90
+ resources: res.resources
90
91
  };
91
92
  }
92
93
  res = formatArgument === 'json' ? await request.get(requestOptions) : await request.post(requestOptions);
@@ -99,13 +100,13 @@ class FlowExportCommand extends PowerPlatformCommand {
99
100
  // Replace all illegal characters from the file name
100
101
  const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
101
102
  filenameFromApi = filenameFromApi.replace(illegalCharsRegEx, '_');
102
- if (this.debug) {
103
- await logger.logToStderr(`Filename from PowerApps API: ${filenameFromApi}`);
103
+ if (this.verbose) {
104
+ await logger.logToStderr(`Filename from PowerApps API: ${filenameFromApi}.`);
104
105
  await logger.logToStderr('');
105
106
  }
106
107
  requestOptions = {
107
108
  url: formatArgument === 'json' ?
108
- `https://management.azure.com/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/exportToARMTemplate?api-version=2016-11-01`
109
+ `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/exportToARMTemplate?api-version=2016-11-01`
109
110
  : downloadFileUrl,
110
111
  // Set responseType to arraybuffer, otherwise binary data will be encoded
111
112
  // to utf8 and binary data is corrupt
@@ -124,7 +125,7 @@ class FlowExportCommand extends PowerPlatformCommand {
124
125
  fs.writeFileSync(path, file, 'binary');
125
126
  if (!args.options.path || this.verbose) {
126
127
  if (this.verbose) {
127
- await logger.logToStderr(`File saved to path '${path}'`);
128
+ await logger.logToStderr(`File saved to path '${path}'.`);
128
129
  }
129
130
  else {
130
131
  await logger.log(path);
@@ -29,7 +29,7 @@ class FlowGetCommand extends PowerAutomateCommand {
29
29
  await logger.logToStderr(`Retrieving information about Microsoft Flow ${args.options.name}...`);
30
30
  }
31
31
  const requestOptions = {
32
- url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01&$expand=swagger,properties.connectionreferences.apidefinition,properties.definitionsummary.operations.apioperation,operationDefinition,plan,properties.throttleData,properties.estimatedsuspensiondata,properties.licenseData`,
32
+ url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01&$expand=swagger,properties.connectionreferences.apidefinition,properties.definitionsummary.operations.apioperation,operationDefinition,plan,properties.throttleData,properties.estimatedsuspensiondata,properties.licenseData`,
33
33
  headers: {
34
34
  accept: 'application/json'
35
35
  },
@@ -67,7 +67,7 @@ class FlowListCommand extends PowerAutomateCommand {
67
67
  }
68
68
  }
69
69
  getApiUrl(environmentName, asAdmin, includeSolutionFlows, filter) {
70
- const baseEndpoint = `${this.resource}/providers/Microsoft.ProcessSimple`;
70
+ const baseEndpoint = `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple`;
71
71
  const environmentSegment = `/environments/${formatting.encodeQueryParameter(environmentName)}`;
72
72
  const adminSegment = `/scopes/admin${environmentSegment}/v2`;
73
73
  const flowsEndpoint = '/flows?api-version=2016-11-01';
@@ -30,7 +30,7 @@ class FlowRemoveCommand extends PowerAutomateCommand {
30
30
  }
31
31
  const removeFlow = async () => {
32
32
  const requestOptions = {
33
- url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
33
+ url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
34
34
  fullResponse: true,
35
35
  headers: {
36
36
  accept: 'application/json'
@@ -52,7 +52,7 @@ class FlowOwnerEnsureCommand extends PowerAutomateCommand {
52
52
  type = 'Group';
53
53
  }
54
54
  const requestOptions = {
55
- url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
55
+ url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
56
56
  headers: {
57
57
  accept: 'application/json'
58
58
  },
@@ -32,7 +32,7 @@ class FlowOwnerListCommand extends PowerAutomateCommand {
32
32
  if (this.verbose) {
33
33
  await logger.logToStderr(`Listing owners for flow ${args.options.flowName} in environment ${args.options.environmentName}`);
34
34
  }
35
- const response = await odata.getAllItems(`${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/permissions?api-version=2016-11-01`);
35
+ const response = await odata.getAllItems(`${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/permissions?api-version=2016-11-01`);
36
36
  if (!cli.shouldTrimOutput(args.options.output)) {
37
37
  await logger.log(response);
38
38
  }
@@ -47,7 +47,7 @@ class FlowOwnerRemoveCommand extends PowerAutomateCommand {
47
47
  idToRemove = await entraGroup.getGroupIdByDisplayName(args.options.groupName);
48
48
  }
49
49
  const requestOptions = {
50
- url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
50
+ url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
51
51
  headers: {
52
52
  accept: 'application/json'
53
53
  },
@@ -0,0 +1,47 @@
1
+ import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
2
+ import { globalOptionsZod } from '../../../../Command.js';
3
+ import { z } from 'zod';
4
+ import { zod } from '../../../../utils/zod.js';
5
+ import commands from '../../commands.js';
6
+ import { formatting } from '../../../../utils/formatting.js';
7
+ import { odata } from '../../../../utils/odata.js';
8
+ import { cli } from '../../../../cli/cli.js';
9
+ const options = globalOptionsZod
10
+ .extend({
11
+ environmentName: zod.alias('e', z.string())
12
+ })
13
+ .strict();
14
+ class FlowRecycleBinItemListCommand extends PowerAutomateCommand {
15
+ get name() {
16
+ return commands.RECYCLEBINITEM_LIST;
17
+ }
18
+ get description() {
19
+ return 'Lists all soft-deleted Power Automate flows within an environment';
20
+ }
21
+ defaultProperties() {
22
+ return ['name', 'displayName'];
23
+ }
24
+ get schema() {
25
+ return options;
26
+ }
27
+ async commandAction(logger, args) {
28
+ try {
29
+ if (this.verbose) {
30
+ await logger.logToStderr(`Getting list of soft-deleted flows in environment ${args.options.environmentName}...`);
31
+ }
32
+ const flows = await odata.getAllItems(`${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/scopes/admin/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/v2/flows?api-version=2016-11-01&include=softDeletedFlows`);
33
+ const deletedFlows = flows.filter(flow => flow.properties.state === 'Deleted');
34
+ if (cli.shouldTrimOutput(args.options.output)) {
35
+ deletedFlows.forEach(flow => {
36
+ flow.displayName = flow.properties.displayName;
37
+ });
38
+ }
39
+ await logger.log(deletedFlows);
40
+ }
41
+ catch (err) {
42
+ this.handleRejectedODataJsonPromise(err);
43
+ }
44
+ }
45
+ }
46
+ export default new FlowRecycleBinItemListCommand();
47
+ //# sourceMappingURL=recyclebinitem-list.js.map
@@ -0,0 +1,48 @@
1
+ import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
2
+ import { globalOptionsZod } from '../../../../Command.js';
3
+ import { z } from 'zod';
4
+ import { zod } from '../../../../utils/zod.js';
5
+ import commands from '../../commands.js';
6
+ import { validation } from '../../../../utils/validation.js';
7
+ import { formatting } from '../../../../utils/formatting.js';
8
+ import request from '../../../../request.js';
9
+ const options = globalOptionsZod
10
+ .extend({
11
+ environmentName: zod.alias('e', z.string()),
12
+ flowName: zod.alias('n', z.string()
13
+ .refine(name => validation.isValidGuid(name), name => ({
14
+ message: `'${name}' is not a valid GUID.`
15
+ })))
16
+ })
17
+ .strict();
18
+ class FlowRecycleBinItemRestoreCommand extends PowerAutomateCommand {
19
+ get name() {
20
+ return commands.RECYCLEBINITEM_RESTORE;
21
+ }
22
+ get description() {
23
+ return 'Restores a soft-deleted Power Automate flow';
24
+ }
25
+ get schema() {
26
+ return options;
27
+ }
28
+ async commandAction(logger, args) {
29
+ try {
30
+ if (this.verbose) {
31
+ await logger.logToStderr(`Restoring soft-deleted flow ${args.options.flowName} from environment ${args.options.environmentName}...`);
32
+ }
33
+ const requestOptions = {
34
+ url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/scopes/admin/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${args.options.flowName}/restore?api-version=2016-11-01`,
35
+ headers: {
36
+ accept: 'application/json'
37
+ },
38
+ responseType: 'json'
39
+ };
40
+ await request.post(requestOptions);
41
+ }
42
+ catch (err) {
43
+ this.handleRejectedODataJsonPromise(err);
44
+ }
45
+ }
46
+ }
47
+ export default new FlowRecycleBinItemRestoreCommand();
48
+ //# sourceMappingURL=recyclebinitem-restore.js.map
@@ -30,7 +30,7 @@ class FlowRunCancelCommand extends PowerAutomateCommand {
30
30
  }
31
31
  const cancelFlow = async () => {
32
32
  const requestOptions = {
33
- url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
33
+ url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
34
34
  headers: {
35
35
  accept: 'application/json'
36
36
  },
@@ -35,7 +35,7 @@ class FlowRunGetCommand extends PowerAutomateCommand {
35
35
  }
36
36
  const actionsParameter = args.options.withActions ? '$expand=properties%2Factions&' : '';
37
37
  const requestOptions = {
38
- url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?${actionsParameter}api-version=2016-11-01`,
38
+ url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?${actionsParameter}api-version=2016-11-01`,
39
39
  headers: {
40
40
  accept: 'application/json'
41
41
  },
@@ -32,7 +32,7 @@ class FlowRunListCommand extends PowerAutomateCommand {
32
32
  if (this.verbose) {
33
33
  await logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flowName}...`);
34
34
  }
35
- let url = `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
35
+ let url = `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
36
36
  const filters = this.getFilters(args.options);
37
37
  if (filters.length > 0) {
38
38
  url += `&$filter=${filters.join(' and ')}`;
@@ -36,7 +36,7 @@ class FlowRunResubmitCommand extends PowerAutomateCommand {
36
36
  await logger.logToStderr(chalk.yellow(`Retrieved trigger: ${triggerName}`));
37
37
  }
38
38
  const requestOptions = {
39
- url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting.encodeQueryParameter(triggerName)}/histories/${formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
39
+ url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting.encodeQueryParameter(triggerName)}/histories/${formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
40
40
  headers: {
41
41
  accept: 'application/json'
42
42
  },
@@ -60,7 +60,7 @@ class FlowRunResubmitCommand extends PowerAutomateCommand {
60
60
  }
61
61
  async getTriggerName(environment, flow) {
62
62
  const requestOptions = {
63
- url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(environment)}/flows/${formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
63
+ url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(environment)}/flows/${formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
64
64
  headers: {
65
65
  accept: 'application/json'
66
66
  },
@@ -12,6 +12,8 @@ export default {
12
12
  OWNER_ENSURE: `${prefix} owner ensure`,
13
13
  OWNER_LIST: `${prefix} owner list`,
14
14
  OWNER_REMOVE: `${prefix} owner remove`,
15
+ RECYCLEBINITEM_LIST: `${prefix} recyclebinitem list`,
16
+ RECYCLEBINITEM_RESTORE: `${prefix} recyclebinitem restore`,
15
17
  REMOVE: `${prefix} remove`,
16
18
  RUN_CANCEL: `${prefix} run cancel`,
17
19
  RUN_GET: `${prefix} run get`,
@@ -0,0 +1,25 @@
1
+ import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
2
+ import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
3
+ import { FN001035_DEP_fluentui_react } from './rules/FN001035_DEP_fluentui_react.js';
4
+ import { FN002004_DEVDEP_gulp } from './rules/FN002004_DEVDEP_gulp.js';
5
+ import { FN002007_DEVDEP_ajv } from './rules/FN002007_DEVDEP_ajv.js';
6
+ import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types_webpack_env.js';
7
+ import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
8
+ import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
9
+ import { FN002019_DEVDEP_microsoft_rush_stack_compiler } from './rules/FN002019_DEVDEP_microsoft_rush_stack_compiler.js';
10
+ import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
11
+ import { FN021013_PKG_spfx_devdeps_match_version } from './rules/FN021013_PKG_spfx_devdeps_match_version.js';
12
+ export default [
13
+ new FN001008_DEP_react('17'),
14
+ new FN001009_DEP_react_dom('17'),
15
+ new FN001035_DEP_fluentui_react('^8.106.4'),
16
+ new FN002004_DEVDEP_gulp('4.0.2'),
17
+ new FN002007_DEVDEP_ajv('^6.12.5'),
18
+ new FN002013_DEVDEP_types_webpack_env('~1.15.2'),
19
+ new FN002015_DEVDEP_types_react('17'),
20
+ new FN002016_DEVDEP_types_react_dom('17'),
21
+ new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.7']),
22
+ new FN021001_PKG_spfx_deps_versions_match_project_version(false),
23
+ new FN021013_PKG_spfx_devdeps_match_version('1.20.1')
24
+ ];
25
+ //# sourceMappingURL=doctor-1.20.0-rc.1.js.map
@@ -70,7 +70,8 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
70
70
  '1.18.0',
71
71
  '1.18.1',
72
72
  '1.18.2',
73
- '1.19.0'
73
+ '1.19.0',
74
+ '1.20.0-rc.1'
74
75
  ];
75
76
  __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
76
77
  __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);
@@ -0,0 +1,57 @@
1
+ import { FN001001_DEP_microsoft_sp_core_library } from './rules/FN001001_DEP_microsoft_sp_core_library.js';
2
+ import { FN001002_DEP_microsoft_sp_lodash_subset } from './rules/FN001002_DEP_microsoft_sp_lodash_subset.js';
3
+ import { FN001003_DEP_microsoft_sp_office_ui_fabric_core } from './rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core.js';
4
+ import { FN001004_DEP_microsoft_sp_webpart_base } from './rules/FN001004_DEP_microsoft_sp_webpart_base.js';
5
+ import { FN001011_DEP_microsoft_sp_dialog } from './rules/FN001011_DEP_microsoft_sp_dialog.js';
6
+ import { FN001012_DEP_microsoft_sp_application_base } from './rules/FN001012_DEP_microsoft_sp_application_base.js';
7
+ import { FN001013_DEP_microsoft_decorators } from './rules/FN001013_DEP_microsoft_decorators.js';
8
+ import { FN001014_DEP_microsoft_sp_listview_extensibility } from './rules/FN001014_DEP_microsoft_sp_listview_extensibility.js';
9
+ import { FN001021_DEP_microsoft_sp_property_pane } from './rules/FN001021_DEP_microsoft_sp_property_pane.js';
10
+ import { FN001023_DEP_microsoft_sp_component_base } from './rules/FN001023_DEP_microsoft_sp_component_base.js';
11
+ import { FN001024_DEP_microsoft_sp_diagnostics } from './rules/FN001024_DEP_microsoft_sp_diagnostics.js';
12
+ import { FN001025_DEP_microsoft_sp_dynamic_data } from './rules/FN001025_DEP_microsoft_sp_dynamic_data.js';
13
+ import { FN001026_DEP_microsoft_sp_extension_base } from './rules/FN001026_DEP_microsoft_sp_extension_base.js';
14
+ import { FN001027_DEP_microsoft_sp_http } from './rules/FN001027_DEP_microsoft_sp_http.js';
15
+ import { FN001028_DEP_microsoft_sp_list_subscription } from './rules/FN001028_DEP_microsoft_sp_list_subscription.js';
16
+ import { FN001029_DEP_microsoft_sp_loader } from './rules/FN001029_DEP_microsoft_sp_loader.js';
17
+ import { FN001030_DEP_microsoft_sp_module_interfaces } from './rules/FN001030_DEP_microsoft_sp_module_interfaces.js';
18
+ import { FN001031_DEP_microsoft_sp_odata_types } from './rules/FN001031_DEP_microsoft_sp_odata_types.js';
19
+ import { FN001032_DEP_microsoft_sp_page_context } from './rules/FN001032_DEP_microsoft_sp_page_context.js';
20
+ import { FN001034_DEP_microsoft_sp_adaptive_card_extension_base } from './rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base.js';
21
+ import { FN002001_DEVDEP_microsoft_sp_build_web } from './rules/FN002001_DEVDEP_microsoft_sp_build_web.js';
22
+ import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
23
+ import { FN002022_DEVDEP_microsoft_eslint_plugin_spfx } from './rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx.js';
24
+ import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_DEVDEP_microsoft_eslint_config_spfx.js';
25
+ import { FN002024_DEVDEP_eslint } from './rules/FN002024_DEVDEP_eslint.js';
26
+ import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
27
+ import { FN010010_YORC_sdkVersions_teams_js } from './rules/FN010010_YORC_sdkVersions_teams_js.js';
28
+ export default [
29
+ new FN001001_DEP_microsoft_sp_core_library('1.20.0-rc.1'),
30
+ new FN001002_DEP_microsoft_sp_lodash_subset('1.20.0-rc.1'),
31
+ new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.20.0-rc.1'),
32
+ new FN001004_DEP_microsoft_sp_webpart_base('1.20.0-rc.1'),
33
+ new FN001011_DEP_microsoft_sp_dialog('1.20.0-rc.1'),
34
+ new FN001012_DEP_microsoft_sp_application_base('1.20.0-rc.1'),
35
+ new FN001014_DEP_microsoft_sp_listview_extensibility('1.20.0-rc.1'),
36
+ new FN001021_DEP_microsoft_sp_property_pane('1.20.0-rc.1'),
37
+ new FN001023_DEP_microsoft_sp_component_base('1.20.0-rc.1'),
38
+ new FN001024_DEP_microsoft_sp_diagnostics('1.20.0-rc.1'),
39
+ new FN001025_DEP_microsoft_sp_dynamic_data('1.20.0-rc.1'),
40
+ new FN001026_DEP_microsoft_sp_extension_base('1.20.0-rc.1'),
41
+ new FN001027_DEP_microsoft_sp_http('1.20.0-rc.1'),
42
+ new FN001028_DEP_microsoft_sp_list_subscription('1.20.0-rc.1'),
43
+ new FN001029_DEP_microsoft_sp_loader('1.20.0-rc.1'),
44
+ new FN001030_DEP_microsoft_sp_module_interfaces('1.20.0-rc.1'),
45
+ new FN001031_DEP_microsoft_sp_odata_types('1.20.0-rc.1'),
46
+ new FN001032_DEP_microsoft_sp_page_context('1.20.0-rc.1'),
47
+ new FN001013_DEP_microsoft_decorators('1.20.0-rc.1'),
48
+ new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.20.0-rc.1'),
49
+ new FN002001_DEVDEP_microsoft_sp_build_web('1.20.1'),
50
+ new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.20.1'),
51
+ new FN002024_DEVDEP_eslint('8.57.0'),
52
+ new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.20.1'),
53
+ new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.20.1'),
54
+ new FN010001_YORC_version('1.20.0-rc.1'),
55
+ new FN010010_YORC_sdkVersions_teams_js('2.24.0')
56
+ ];
57
+ //# sourceMappingURL=upgrade-1.20.0-rc.1.js.map
@@ -7,6 +7,8 @@ var _SpfxProjectUpgradeCommand_instances, _a, _SpfxProjectUpgradeCommand_initTel
7
7
  import fs from 'fs';
8
8
  import os from 'os';
9
9
  import path from 'path';
10
+ // uncomment to support upgrading to preview releases
11
+ import { prerelease } from 'semver';
10
12
  import { CommandError } from '../../../../Command.js';
11
13
  import { fsUtil } from '../../../../utils/fsUtil.js';
12
14
  import { packageManager } from '../../../../utils/packageManager.js';
@@ -72,7 +74,8 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
72
74
  '1.18.0',
73
75
  '1.18.1',
74
76
  '1.18.2',
75
- '1.19.0'
77
+ '1.19.0',
78
+ '1.20.0-rc.1'
76
79
  ];
77
80
  __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
78
81
  __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -85,15 +88,15 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
85
88
  }
86
89
  this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
87
90
  // uncomment to support upgrading to preview releases
88
- // if (!args.options.toVersion &&
89
- // !args.options.preview &&
90
- // prerelease(this.toVersion)) {
91
- // // no version and no preview specified while the current version to
92
- // // upgrade to is a prerelease so let's grab the first non-preview version
93
- // // since we're supporting only one preview version, it's sufficient for
94
- // // us to take second to last version
95
- // this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
96
- // }
91
+ if (!args.options.toVersion &&
92
+ !args.options.preview &&
93
+ prerelease(this.toVersion)) {
94
+ // no version and no preview specified while the current version to
95
+ // upgrade to is a prerelease so let's grab the first non-preview version
96
+ // since we're supporting only one preview version, it's sufficient for
97
+ // us to take second to last version
98
+ this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
99
+ }
97
100
  this.packageManager = args.options.packageManager || 'npm';
98
101
  this.shell = args.options.shell || 'bash';
99
102
  if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -482,9 +485,9 @@ _a = SpfxProjectUpgradeCommand, _SpfxProjectUpgradeCommand_instances = new WeakS
482
485
  preview: args.options.preview
483
486
  });
484
487
  // uncomment to support upgrading to preview releases
485
- // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
486
- // this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
487
- // }
488
+ if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
489
+ this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
490
+ }
488
491
  });
489
492
  }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
490
493
  this.options.unshift({
@@ -575,6 +575,21 @@ class SpfxDoctorCommand extends BaseProjectCommand {
575
575
  range: '^4 || ^5',
576
576
  fix: 'npm i -g yo@5'
577
577
  }
578
+ },
579
+ '1.20.0-rc.1': {
580
+ gulpCli: {
581
+ range: '^1 || ^2 || ^3',
582
+ fix: 'npm i -g gulp-cli@3'
583
+ },
584
+ node: {
585
+ range: '>=18.17.1 <19.0.0',
586
+ fix: 'Install Node.js >=18.17.1 <19.0.0'
587
+ },
588
+ sp: SharePointVersion.SPO,
589
+ yo: {
590
+ range: '^4 || ^5',
591
+ fix: 'npm i -g yo@5'
592
+ }
578
593
  }
579
594
  };
580
595
  this.output = '';
@@ -78,15 +78,15 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
78
78
  const updateChildContentTypes = args.options.listTitle || args.options.listId || args.options.listUrl ? false : args.options.updateChildContentTypes === true;
79
79
  if (this.debug) {
80
80
  const additionalLog = args.options.listTitle ? `; ListTitle='${args.options.listTitle}'` : args.options.listId ? `; ListId='${args.options.listId}'` : args.options.listUrl ? `; ListUrl='${args.options.listUrl}'` : ` ; UpdateChildContentTypes='${updateChildContentTypes}`;
81
- await logger.logToStderr(`Remove FieldLink from ContentType. FieldLinkId='${args.options.fieldLinkId}' ; ContentTypeId='${args.options.contentTypeId}' ${additionalLog}`);
81
+ await logger.logToStderr(`Remove FieldLink from ContentType. Id='${args.options.id}' ; ContentTypeId='${args.options.contentTypeId}' ${additionalLog}`);
82
82
  await logger.logToStderr(`Execute ProcessQuery.`);
83
83
  }
84
84
  let requestBody = '';
85
85
  if (listId) {
86
- requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><Method Name="DeleteObject" Id="21" ObjectPathId="19" /><Method Name="Update" Id="22" ObjectPathId="15"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="17" ParentId="15" Name="FieldLinks" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.fieldLinkId)}}</Parameter></Parameters></Method><Identity Id="15" Name="09eec89e-709b-0000-558c-c222dcaf9162|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:list:${listId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
86
+ requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><Method Name="DeleteObject" Id="21" ObjectPathId="19" /><Method Name="Update" Id="22" ObjectPathId="15"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="17" ParentId="15" Name="FieldLinks" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method><Identity Id="15" Name="09eec89e-709b-0000-558c-c222dcaf9162|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:list:${listId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
87
87
  }
88
88
  else {
89
- requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="77" ObjectPathId="76" /><ObjectPath Id="79" ObjectPathId="78" /><Method Name="DeleteObject" Id="80" ObjectPathId="78" /><Method Name="Update" Id="81" ObjectPathId="24"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="76" ParentId="24" Name="FieldLinks" /><Method Id="78" ParentId="76" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.fieldLinkId)}}</Parameter></Parameters></Method><Identity Id="24" Name="6b3ec69e-00a7-0000-55a3-61f8d779d2b3|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
89
+ requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="77" ObjectPathId="76" /><ObjectPath Id="79" ObjectPathId="78" /><Method Name="DeleteObject" Id="80" ObjectPathId="78" /><Method Name="Update" Id="81" ObjectPathId="24"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="76" ParentId="24" Name="FieldLinks" /><Method Id="78" ParentId="76" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method><Identity Id="24" Name="6b3ec69e-00a7-0000-55a3-61f8d779d2b3|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
90
90
  }
91
91
  requestOptions = {
92
92
  url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
@@ -110,7 +110,7 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
110
110
  await removeFieldLink();
111
111
  }
112
112
  else {
113
- const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the column ${args.options.fieldLinkId} from content type ${args.options.contentTypeId}?` });
113
+ const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the column ${args.options.id} from content type ${args.options.contentTypeId}?` });
114
114
  if (result) {
115
115
  await removeFieldLink();
116
116
  }
@@ -160,9 +160,9 @@ _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFiel
160
160
  }, {
161
161
  option: '--listUrl [listUrl]'
162
162
  }, {
163
- option: '-i, --contentTypeId <contentTypeId>'
163
+ option: '--contentTypeId <contentTypeId>'
164
164
  }, {
165
- option: '--fieldLinkId <fieldLinkId>'
165
+ option: '-i, --id <id>'
166
166
  }, {
167
167
  option: '-c, --updateChildContentTypes'
168
168
  }, {
@@ -170,8 +170,8 @@ _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFiel
170
170
  });
171
171
  }, _SpoContentTypeFieldRemoveCommand_initValidators = function _SpoContentTypeFieldRemoveCommand_initValidators() {
172
172
  this.validators.push(async (args) => {
173
- if (!validation.isValidGuid(args.options.fieldLinkId)) {
174
- return `${args.options.fieldLinkId} is not a valid GUID`;
173
+ if (!validation.isValidGuid(args.options.id)) {
174
+ return `${args.options.id} is not a valid GUID`;
175
175
  }
176
176
  if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
177
177
  return `${args.options.listId} is not a valid GUID`;
@@ -262,9 +262,9 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
262
262
  this.options.unshift({
263
263
  option: '-u, --webUrl <webUrl>'
264
264
  }, {
265
- option: '-c, --contentTypeId <contentTypeId>'
265
+ option: '--contentTypeId <contentTypeId>'
266
266
  }, {
267
- option: '--id <id>'
267
+ option: '-i, --id <id>'
268
268
  }, {
269
269
  option: '-r, --required [required]',
270
270
  autocomplete: ['true', 'false']