Skip to content

Commit 2d2c22c

Browse files
Merge pull request #2276 from contentstack/development
Development
2 parents db773a4 + 1502509 commit 2d2c22c

File tree

14 files changed

+209
-180
lines changed

14 files changed

+209
-180
lines changed

.talismanrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
fileignoreconfig:
22
- filename: package-lock.json
3-
checksum: fa02e2883b15c973134368ce26c78187e247d3761ef14f603afc0d5ea83102a6
3+
checksum: 1ceb6098ec964ce35feb105249528fcb938de002551a22d81ef771f378da8062
44
- filename: pnpm-lock.yaml
5-
checksum: d4174feb2ba68c22cc45987afdaf4d89997df084e7e7eb9edc7e309b5a24aca5
5+
checksum: 050da770b23a0ca135648f7c857f4511fda57a6c125906698d7cf2e2efdeacf7
66
- filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
77
checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
88
- filename: packages/contentstack-import-setup/test/config.json

package-lock.json

Lines changed: 36 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/contentstack-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@contentstack/cli-config",
33
"description": "Contentstack CLI plugin for configuration",
4-
"version": "1.16.0",
4+
"version": "1.16.1",
55
"author": "Contentstack",
66
"scripts": {
77
"build": "npm run clean && npm run compile",

packages/contentstack-config/src/commands/config/set/region.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
4848
launch: _flags.string({
4949
description: 'Custom host to set for Launch API',
5050
}),
51-
'composable-studio': _flags.string({
52-
description: 'Custom host to set for Composable Studio API',
51+
studio: _flags.string({
52+
description: 'Custom host to set for Studio API',
5353
}),
5454
};
5555
static examples = [
@@ -65,8 +65,8 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
6565
'$ csdx config:set:region --cma <custom_cma_host_url> --cda <custom_cda_host_url> --ui-host <custom_ui_host_url> --name "India" --developer-hub <custom_developer_hub_url>',
6666
'$ csdx config:set:region --cma <custom_cma_host_url> --cda <custom_cda_host_url> --ui-host <custom_ui_host_url> --name "India" --personalize <custom_personalize_url>',
6767
'$ csdx config:set:region --cma <custom_cma_host_url> --cda <custom_cda_host_url> --ui-host <custom_ui_host_url> --name "India" --launch <custom_launch_url>',
68-
'$ csdx config:set:region --cma <custom_cma_host_url> --cda <custom_cda_host_url> --ui-host <custom_ui_host_url> --name "India" --composable-studio <custom_composable_studio_url>',
69-
'$ csdx config:set:region --cda <custom_cda_host_url> --cma <custom_cma_host_url> --ui-host <custom_ui_host_url> --name "India" --developer-hub <custom_developer_hub_url> --launch <custom_launch_url> --personalize <custom_personalize_url> --composable-studio <custom_composable_studio_url>',
68+
'$ csdx config:set:region --cma <custom_cma_host_url> --cda <custom_cda_host_url> --ui-host <custom_ui_host_url> --name "India" --studio <custom_studio_url>',
69+
'$ csdx config:set:region --cda <custom_cda_host_url> --cma <custom_cma_host_url> --ui-host <custom_ui_host_url> --name "India" --developer-hub <custom_developer_hub_url> --launch <custom_launch_url> --personalize <custom_personalize_url> --studio <custom_studio_url>',
7070
];
7171

7272
static args: ArgInput = {
@@ -82,7 +82,7 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
8282
let developerHubUrl = regionSetFlags['developer-hub'];
8383
let personalizeUrl = regionSetFlags['personalize'];
8484
let launchHubUrl = regionSetFlags['launch'];
85-
let composableStudioUrl = regionSetFlags['composable-studio'];
85+
let composableStudioUrl = regionSetFlags['studio'];
8686
let selectedRegion = args.region;
8787
if (!(cda && cma && uiHost && name) && !selectedRegion) {
8888
selectedRegion = await interactive.askRegions();
@@ -132,7 +132,7 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
132132
cliux.success(`Developer Hub URL: ${customRegion.developerHubUrl}`);
133133
cliux.success(`Personalize URL: ${customRegion.personalizeUrl}`);
134134
cliux.success(`Launch URL: ${customRegion.launchHubUrl}`);
135-
cliux.success(`Composable Studio URL: ${customRegion.composableStudioUrl}`);
135+
cliux.success(`Studio URL: ${customRegion.composableStudioUrl}`);
136136
} catch (error) {
137137
this.logger.error('failed to set the region', error);
138138
cliux.error(`Failed to set region due to: ${error.message}`);
@@ -151,7 +151,7 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
151151
cliux.success(`Developer Hub URL: ${regionDetails.developerHubUrl}`);
152152
cliux.success(`Personalize URL: ${regionDetails.personalizeUrl}`);
153153
cliux.success(`Launch URL: ${regionDetails.launchHubUrl}`);
154-
cliux.success(`Composable Studio URL: ${regionDetails.composableStudioUrl}`);
154+
cliux.success(`Studio URL: ${regionDetails.composableStudioUrl}`);
155155
} else {
156156
cliux.error(`Invalid region specified.`);
157157
}

packages/contentstack-config/test/unit/commands/region.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ describe('Region command', function () {
274274
expect(result.launchHubUrl).to.equal(customRegion.launchHubUrl);
275275
});
276276

277-
it('should set a custom region with composable studio URL', function () {
277+
it('should set a custom region with studio URL', function () {
278278
const customRegion = {
279279
cma: 'https://custom-cma.com',
280280
cda: 'https://custom-cda.com',
Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
{
2-
"ASSET_EXPORT_COMPLETE": "Asset export process completed successfully",
3-
"ASSET_FOLDERS_EXPORT_COMPLETE": "Asset folder structure exported successfully",
4-
"ASSET_METADATA_EXPORT_COMPLETE": "Asset metadata exported successfully",
5-
"ASSET_VERSIONED_METADATA_EXPORT_COMPLETE": "Versioned asset metadata exported successfully",
6-
"ASSET_DOWNLOAD_COMPLETE": "Asset download completed successfully",
7-
"ASSET_DOWNLOAD_SUCCESS": "Asset '%s' (UID: %s) downloaded successfully",
8-
"ASSET_DOWNLOAD_FAILED": "Failed to download asset '%s' (UID: %s)",
9-
"ASSET_WRITE_FAILED": "Failed to write asset file '%s' (UID: %s)",
10-
"ASSET_QUERY_FAILED": "Failed to query asset data from the API",
11-
"ASSET_VERSIONED_QUERY_FAILED": "Failed to query versioned asset data from the API",
12-
"ASSET_COUNT_QUERY_FAILED": "Failed to retrieve total asset count",
2+
"ASSET_EXPORT_COMPLETE": "Asset export process completed successfully",
3+
"ASSET_FOLDERS_EXPORT_COMPLETE": "Asset folder structure exported successfully",
4+
"ASSET_METADATA_EXPORT_COMPLETE": "Asset metadata exported successfully",
5+
"ASSET_VERSIONED_METADATA_EXPORT_COMPLETE": "Versioned asset metadata exported successfully",
6+
"ASSET_DOWNLOAD_COMPLETE": "Asset download completed successfully",
7+
"ASSET_DOWNLOAD_SUCCESS": "Asset '%s' (UID: %s) downloaded successfully",
8+
"ASSET_DOWNLOAD_FAILED": "Failed to download asset '%s' (UID: %s)",
9+
"ASSET_WRITE_FAILED": "Failed to write asset file '%s' (UID: %s)",
10+
"ASSET_QUERY_FAILED": "Failed to query asset data from the API",
11+
"ASSET_VERSIONED_QUERY_FAILED": "Failed to query versioned asset data from the API",
12+
"ASSET_COUNT_QUERY_FAILED": "Failed to retrieve total asset count",
1313

14-
"CONTENT_TYPE_EXPORT_COMPLETE": "Content types exported successfully",
15-
"CONTENT_TYPE_NO_TYPES": "No content types found",
16-
"CONTENT_TYPE_EXPORT_FAILED": "Failed to export content types",
17-
"CONTENT_TYPE_NO_TYPES_RETURNED": "API returned no content types for the given query",
14+
"CONTENT_TYPE_EXPORT_COMPLETE": "Content types exported successfully",
15+
"CONTENT_TYPE_NO_TYPES": "No content types found",
16+
"CONTENT_TYPE_EXPORT_FAILED": "Failed to export content types",
17+
"CONTENT_TYPE_NO_TYPES_RETURNED": "API returned no content types for the given query",
1818

19-
"ENVIRONMENT_EXPORT_COMPLETE": "Successfully exported %s environment(s)",
20-
"ENVIRONMENT_EXPORT_SUCCESS": "Environment '%s' exported successfully",
21-
"ENVIRONMENT_NOT_FOUND": "No environments found in the current stack",
19+
"ENVIRONMENT_EXPORT_COMPLETE": "Successfully exported %s environment(s)",
20+
"ENVIRONMENT_EXPORT_SUCCESS": "Environment '%s' exported successfully",
21+
"ENVIRONMENT_NOT_FOUND": "No environments found in the current stack",
2222

23-
"EXTENSION_EXPORT_COMPLETE": "Successfully exported %s extension(s)",
24-
"EXTENSION_EXPORT_SUCCESS": "Extension '%s' exported successfully",
25-
"EXTENSION_NOT_FOUND": "No extensions found in the current stack",
23+
"EXTENSION_EXPORT_COMPLETE": "Successfully exported %s extension(s)",
24+
"EXTENSION_EXPORT_SUCCESS": "Extension '%s' exported successfully",
25+
"EXTENSION_NOT_FOUND": "No extensions found in the current stack",
2626

27-
"GLOBAL_FIELDS_EXPORT_COMPLETE": "Successfully exported %s global field(s)",
27+
"GLOBAL_FIELDS_EXPORT_COMPLETE": "Successfully exported %s global field(s)",
2828

29-
"LABELS_EXPORT_COMPLETE": "Successfully exported %s label(s)",
30-
"LABEL_EXPORT_SUCCESS": "Label '%s' exported successfully",
31-
"LABELS_NOT_FOUND": "No labels found in the current stack",
29+
"LABELS_EXPORT_COMPLETE": "Successfully exported %s label(s)",
30+
"LABEL_EXPORT_SUCCESS": "Label '%s' exported successfully",
31+
"LABELS_NOT_FOUND": "No labels found in the current stack",
3232

33-
"LOCALES_EXPORT_COMPLETE": "Successfully exported %s locale(s) including %s master locale(s)",
33+
"LOCALES_EXPORT_COMPLETE": "Successfully exported %s locale(s) including %s master locale(s)",
3434

35-
"TAXONOMY_EXPORT_COMPLETE": "Successfully exported %s taxonomy entries",
36-
"TAXONOMY_EXPORT_SUCCESS": "Taxonomy '%s' exported successfully",
37-
"TAXONOMY_NOT_FOUND": "No taxonomies found in the current stack",
35+
"TAXONOMY_EXPORT_COMPLETE": "Successfully exported %s taxonomy entries",
36+
"TAXONOMY_EXPORT_SUCCESS": "Taxonomy '%s' exported successfully",
37+
"TAXONOMY_NOT_FOUND": "No taxonomies found in the current stack",
3838

39-
"WEBHOOK_EXPORT_COMPLETE": "Successfully exported %s webhook(s)",
40-
"WEBHOOK_EXPORT_SUCCESS": "Webhook '%s' exported successfully",
41-
"WEBHOOK_NOT_FOUND": "No webhooks found in the current stack",
39+
"WEBHOOK_EXPORT_COMPLETE": "Successfully exported %s webhook(s)",
40+
"WEBHOOK_EXPORT_SUCCESS": "Webhook '%s' exported successfully",
41+
"WEBHOOK_NOT_FOUND": "No webhooks found in the current stack",
4242

43-
"WORKFLOW_EXPORT_COMPLETE": "Successfully exported %s workflow(s)",
44-
"WORKFLOW_EXPORT_SUCCESS": "Workflow '%s' exported successfully",
45-
"WORKFLOW_NOT_FOUND": "No workflows found in the current stack",
43+
"WORKFLOW_EXPORT_COMPLETE": "Successfully exported %s workflow(s)",
44+
"WORKFLOW_EXPORT_SUCCESS": "Workflow '%s' exported successfully",
45+
"WORKFLOW_NOT_FOUND": "No workflows found in the current stack",
4646

47-
"PERSONALIZE_URL_NOT_SET": "Cannot export Personalize project: URL not configured",
48-
"PERSONALIZE_SKIPPING_WITH_MANAGEMENT_TOKEN": "Skipping Personalize project export: Management token not supported",
49-
"PERSONALIZE_MODULE_NOT_IMPLEMENTED": "Module '%s' implementation not found",
50-
"PERSONALIZE_NOT_ENABLED": "Personalize feature is not enabled for this organization",
47+
"PERSONALIZE_URL_NOT_SET": "Cannot export Personalize project: URL not configured",
48+
"PERSONALIZE_SKIPPING_WITH_MANAGEMENT_TOKEN": "Skipping Personalize project export: Management token not supported",
49+
"PERSONALIZE_MODULE_NOT_IMPLEMENTED": "Module '%s' implementation not found",
50+
"PERSONALIZE_NOT_ENABLED": "Personalize feature is not enabled for this organization",
5151

52-
"MARKETPLACE_APPS_EXPORT_COMPLETE": "Successfully exported %s marketplace app(s)",
53-
"MARKETPLACE_APP_CONFIG_EXPORT": "Exporting configuration for app '%s'",
54-
"MARKETPLACE_APP_CONFIG_SUCCESS": "Successfully exported configuration for app '%s'",
55-
"MARKETPLACE_APP_EXPORT_SUCCESS": "Successfully exported app '%s'",
56-
"MARKETPLACE_APPS_NOT_FOUND": "No marketplace apps found in the current stack",
57-
"MARKETPLACE_APP_CONFIG_EXPORT_FAILED": "Failed to export configuration for app '%s'",
58-
"MARKETPLACE_APP_MANIFEST_EXPORT_FAILED": "Failed to export manifest for app '%s'",
52+
"MARKETPLACE_APPS_EXPORT_COMPLETE": "Successfully exported %s marketplace app(s)",
53+
"MARKETPLACE_APP_CONFIG_EXPORT": "Exporting configuration for app '%s'",
54+
"MARKETPLACE_APP_CONFIG_SUCCESS": "Successfully exported configuration for app '%s'",
55+
"MARKETPLACE_APP_EXPORT_SUCCESS": "Successfully exported app '%s'",
56+
"MARKETPLACE_APPS_NOT_FOUND": "No marketplace apps found in the current stack",
57+
"MARKETPLACE_APP_CONFIG_EXPORT_FAILED": "Failed to export configuration for app '%s'",
58+
"MARKETPLACE_APP_MANIFEST_EXPORT_FAILED": "Failed to export manifest for app '%s'",
5959

60-
"COMPOSABLE_STUDIO_EXPORT_START": "Starting Composable Studio project export...",
61-
"COMPOSABLE_STUDIO_NOT_FOUND": "No Composable Studio project found for this stack",
62-
"COMPOSABLE_STUDIO_EXPORT_COMPLETE": "Successfully exported Composable Studio project '%s'",
63-
"COMPOSABLE_STUDIO_EXPORT_FAILED": "Failed to export Composable Studio project: %s",
64-
"COMPOSABLE_STUDIO_AUTH_REQUIRED": "To export Composable Studio projects, you must be logged in",
60+
"COMPOSABLE_STUDIO_EXPORT_START": "Starting Studio project export...",
61+
"COMPOSABLE_STUDIO_NOT_FOUND": "No Studio project found for this stack",
62+
"COMPOSABLE_STUDIO_EXPORT_COMPLETE": "Successfully exported Studio project '%s'",
63+
"COMPOSABLE_STUDIO_EXPORT_FAILED": "Failed to export Studio project: %s",
64+
"COMPOSABLE_STUDIO_AUTH_REQUIRED": "To export Studio projects, you must be logged in",
6565

66-
"ENTRIES_EXPORT_COMPLETE": "Successfully exported entries (Content Type: %s, Locale: %s)",
67-
"ENTRIES_EXPORT_SUCCESS": "All entries exported successfully",
68-
"ENTRIES_VERSIONED_EXPORT_SUCCESS": "Successfully exported versioned entry (Content Type: %s, UID: %s, Locale: %s)",
69-
"ENTRIES_EXPORT_VERSIONS_FAILED": "Failed to export versions for content type '%s' (UID: %s)",
66+
"ENTRIES_EXPORT_COMPLETE": "Successfully exported entries (Content Type: %s, Locale: %s)",
67+
"ENTRIES_EXPORT_SUCCESS": "All entries exported successfully",
68+
"ENTRIES_VERSIONED_EXPORT_SUCCESS": "Successfully exported versioned entry (Content Type: %s, UID: %s, Locale: %s)",
69+
"ENTRIES_EXPORT_VERSIONS_FAILED": "Failed to export versions for content type '%s' (UID: %s)",
7070

71-
"BRANCH_EXPORT_FAILED": "Failed to export contents from branch (UID: %s)",
71+
"BRANCH_EXPORT_FAILED": "Failed to export contents from branch (UID: %s)",
7272

73-
"ROLES_NO_CUSTOM_ROLES": "No custom roles found in the current stack",
74-
"ROLES_EXPORTING_ROLE": "Exporting role '%s'"
73+
"ROLES_NO_CUSTOM_ROLES": "No custom roles found in the current stack",
74+
"ROLES_EXPORTING_ROLE": "Exporting role '%s'"
7575
}

packages/contentstack-export/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@contentstack/cli-cm-export",
33
"description": "Contentstack CLI plugin to export content from stack",
4-
"version": "1.22.0",
4+
"version": "1.22.1",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {

packages/contentstack-export/src/commands/cm/stacks/export.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default class ExportCommand extends Command {
7777
module: flags.string({
7878
char: 'm',
7979
description:
80-
'[optional] Specific module name. If not specified, the export command will export all the modules to the stack. The available modules are assets, content-types, entries, environments, extensions, marketplace-apps, global-fields, labels, locales, webhooks, workflows, custom-roles, taxonomies, and composable-studio.',
80+
'[optional] Specific module name. If not specified, the export command will export all the modules to the stack. The available modules are assets, content-types, entries, environments, extensions, marketplace-apps, global-fields, labels, locales, webhooks, workflows, custom-roles, taxonomies, and studio.',
8181
parse: printFlagDeprecation(['-m'], ['--module']),
8282
}),
8383
'content-types': flags.string({

0 commit comments

Comments
 (0)