Skip to content

Commit 815910b

Browse files
cs-rajcs-raj
authored
Merge pull request #1466 from contentstack/staging
Release
2 parents 0d72382 + f2626c8 commit 815910b

File tree

24 files changed

+203
-199
lines changed

24 files changed

+203
-199
lines changed

‎package-lock.json‎

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

‎packages/contentstack-branches/test/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"IS_TS": false,
33
"UNIT_EXECUTION_ORDER": [],
44
"INTEGRATION_EXECUTION_ORDER": [],
5-
"stackAPIKey": "sfgfdsg223",
5+
"stackAPIKey": "***REMOVED***",
66
"apiKey": "afdgaffsdg",
77
"stackAPIKey2": "abcdscdxx",
88
"api_key": "testString"

‎packages/contentstack-branches/test/unit/mock/data.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,19 +426,19 @@ const mockData = {
426426
flags: {
427427
'base-branch': 'main',
428428
'compare-branch': 'dev',
429-
'stack-api-key': 'sfgfdsg223',
429+
'stack-api-key': '***REMOVED***',
430430
module: 'content_type',
431431
format: 'compactfield',
432432
},
433433
withoutBaseFlag: {
434434
'compare-branch': 'dev',
435-
'stack-api-key': 'sfgfdsg223',
435+
'stack-api-key': '***REMOVED***',
436436
module: 'content_type',
437437
format: 'compactfield',
438438
},
439439
withoutCompareFlag: {
440440
'base-branch': 'main',
441-
'stack-api-key': 'sfgfdsg223',
441+
'stack-api-key': '***REMOVED***',
442442
module: 'content_type',
443443
format: 'compactfield',
444444
},
@@ -451,7 +451,7 @@ const mockData = {
451451
withoutModuleFlag: {
452452
'base-branch': 'main',
453453
'compare-branch': 'dev',
454-
'stack-api-key': 'sfgfdsg223',
454+
'stack-api-key': '***REMOVED***',
455455
format: 'compactfield',
456456
},
457457
branchCompareData: {

‎packages/contentstack-branches/test/unit/utils/interactive.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ describe('Interactive', () => {
117117
});
118118

119119
it('ask export merge summary path', async function () {
120-
const filePath = 'sfgfdsg223';
120+
const filePath = '***REMOVED***';
121121
inquireStub.callsFake(function () {
122122
return Promise.resolve(filePath);
123123
});

‎packages/contentstack-clone/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dependencies": {
88
"@colors/colors": "^1.5.0",
99
"@contentstack/cli-cm-export": "~1.11.5",
10-
"@contentstack/cli-cm-import": "~1.16.0",
10+
"@contentstack/cli-cm-import": "~1.16.1",
1111
"@contentstack/cli-command": "~1.2.18",
1212
"@contentstack/cli-utilities": "~1.6.3",
1313
"async": "^3.2.4",

‎packages/contentstack-export/test/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"INTEGRATION_EXECUTION_ORDER": [],
55
"ENABLE_PREREQUISITES": true,
66
"REGIONS": ["NA", "EU", "AZURE-NA", "AZURE-EU"],
7-
"apiKey": "jdgfhcbjx"
7+
"apiKey": "***REMOVED***"
88
}

‎packages/contentstack-import/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
4747
$ csdx COMMAND
4848
running command...
4949
$ csdx (--version)
50-
@contentstack/cli-cm-import/1.16.0 darwin-arm64 node-v22.2.0
50+
@contentstack/cli-cm-import/1.16.1 darwin-arm64 node-v22.2.0
5151
$ csdx --help [COMMAND]
5252
USAGE
5353
$ csdx COMMAND

‎packages/contentstack-import/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-import",
33
"description": "Contentstack CLI plugin to import content into stack",
4-
"version": "1.16.0",
4+
"version": "1.16.1",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {

‎packages/contentstack-import/src/utils/extension-helper.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export const lookupExtension = function (
2121
const fs = new FsUtility({ basePath: config.backupDir });
2222
const extensionPath = join(config.backupDir, 'mapper/extensions', 'uid-mapping.json');
2323
const globalfieldsPath = join(config.backupDir, 'mapper/globalfields', 'uid-mapping.json');
24+
const marketPlaceAppsPath = join(config.backupDir, 'mapper/marketplace_apps', 'uid-mapping.json');
2425

2526
for (let i in schema) {
2627
if (schema[i].data_type === 'group') {
@@ -72,9 +73,12 @@ export const lookupExtension = function (
7273
} else if (schema[i].data_type === 'json' && schema[i].hasOwnProperty('plugins') && schema[i].plugins.length > 0) {
7374
const newPluginUidsArray: any[] = [];
7475
const data = fs.readFile(extensionPath) as Record<string, unknown>;
76+
const marketPlaceAppsData = fs.readFile(marketPlaceAppsPath) as { extension_uid: Record<string, unknown> };
7577
schema[i].plugins.forEach((extension_key_value: string) => {
7678
if (data && data.hasOwnProperty(extension_key_value)) {
7779
newPluginUidsArray.push(data[extension_key_value]);
80+
} else if (marketPlaceAppsData && marketPlaceAppsData.extension_uid && marketPlaceAppsData.extension_uid.hasOwnProperty(extension_key_value)) {
81+
newPluginUidsArray.push(marketPlaceAppsData.extension_uid[extension_key_value]);
7882
}
7983
});
8084
schema[i].plugins = newPluginUidsArray;

‎packages/contentstack-migrate-rte/test/dummy/entriesResponse.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
"file_size": "344996",
261261
"tags": [],
262262
"filename": "image.png",
263-
"url": "http://localhost:8000/v3/assets/***REMOVED***/bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
263+
"url": "***REMOVED***bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
264264
"ACL": [],
265265
"is_dir": false,
266266
"parent_uid": null,
@@ -287,7 +287,7 @@
287287
"file_size": "7701",
288288
"tags": [],
289289
"filename": "48558898.jpeg",
290-
"url": "http://localhost:8000/v3/assets/***REMOVED***/bltb13b08635ebffdc4/6048c0c887ab224351aab15f/48558898.jpeg",
290+
"url": "***REMOVED***bltb13b08635ebffdc4/6048c0c887ab224351aab15f/48558898.jpeg",
291291
"ACL": [],
292292
"is_dir": false,
293293
"parent_uid": null,
@@ -309,7 +309,7 @@
309309
"file_size": "5403",
310310
"tags": [],
311311
"filename": "download.jpeg",
312-
"url": "http://localhost:8000/v3/assets/***REMOVED***/bltb85f710a4a984858/6049fa897477c27b7b34443d/download.jpeg",
312+
"url": "***REMOVED***bltb85f710a4a984858/6049fa897477c27b7b34443d/download.jpeg",
313313
"ACL": [],
314314
"is_dir": false,
315315
"parent_uid": null,
@@ -332,7 +332,7 @@
332332
"file_size": "5906",
333333
"tags": [],
334334
"filename": "download_(2).jpeg",
335-
"url": "http://localhost:8000/v3/assets/***REMOVED***/blt3d60320b8e0b9b0a/6040b819116a7015b467265e/download_(2).jpeg",
335+
"url": "***REMOVED***blt3d60320b8e0b9b0a/6040b819116a7015b467265e/download_(2).jpeg",
336336
"ACL": [],
337337
"is_dir": false,
338338
"parent_uid": null,
@@ -363,7 +363,7 @@
363363
"file_size": "344996",
364364
"tags": [],
365365
"filename": "image.png",
366-
"url": "http://localhost:8000/v3/assets/***REMOVED***/bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
366+
"url": "***REMOVED***bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
367367
"ACL": [],
368368
"is_dir": false,
369369
"parent_uid": null,
@@ -394,7 +394,7 @@
394394
"file_size": "344996",
395395
"tags": [],
396396
"filename": "image.png",
397-
"url": "http://localhost:8000/v3/assets/***REMOVED***/bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
397+
"url": "***REMOVED***bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
398398
"ACL": [],
399399
"is_dir": false,
400400
"parent_uid": null,
@@ -426,7 +426,7 @@
426426
"entries": [
427427
{
428428
"title": "Entry 2",
429-
"rich_text_editor": "<p></p><img asset_uid=\"bltfea8157ddfb8e776\" height=\"auto\" src=\"https://images.contentstack.io/v3/assets/***REMOVED***/bltfea8157ddfb8e776/6329f1106a7f7364973c028c/landscape-3.jpg\" width=\"194\" max-width=\"194\" style=\"width: 194px; height: auto;\"/> <img height=\"auto\" src=\"https://images.contentstack.io/v3/assets/***REMOVED***/bltfea8157ddfb8e776/6329f1106a7f7364973c028c/landscape-3.jpg\" width=\"194\" max-width=\"194\" style=\"width: 194px; height: auto;\"/>",
429+
"rich_text_editor": "<p></p><img asset_uid=\"bltfea8157ddfb8e776\" height=\"auto\" src=\"***REMOVED***8e12437ac2679e/bltfea8157ddfb8e776/6329f1106a7f7364973c028c/landscape-3.jpg\" width=\"194\" max-width=\"194\" style=\"width: 194px; height: auto;\"/> <img height=\"auto\" src=\"***REMOVED***8e12437ac2679e/bltfea8157ddfb8e776/6329f1106a7f7364973c028c/landscape-3.jpg\" width=\"194\" max-width=\"194\" style=\"width: 194px; height: auto;\"/>",
430430
"tags": [],
431431
"locale": "en-us",
432432
"uid": "blt6168b6493a122849",

0 commit comments

Comments
 (0)