Skip to content

Release #1466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cs-raj merged 4 commits into from
Jul 22, 2024
Merged

Release #1466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fc606b
Merge pull request #1459 from contentstack/main
cs-raj Jul 4, 2024
c9ce93c
fix: fixed missing plugin id in ct schema
Jul 1, 2024
3cb8cd0
Release
Jul 1, 2024
1518aa0
Merge pull request #1465 from contentstack/release/722
cs-raj Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/contentstack-branches/test/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"IS_TS": false,
"UNIT_EXECUTION_ORDER": [],
"INTEGRATION_EXECUTION_ORDER": [],
"stackAPIKey": "sfgfdsg223",
"stackAPIKey": "***REMOVED***",
"apiKey": "afdgaffsdg",
"stackAPIKey2": "abcdscdxx",
"api_key": "testString"
Expand Down
8 changes: 4 additions & 4 deletions packages/contentstack-branches/test/unit/mock/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,19 +426,19 @@ const mockData = {
flags: {
'base-branch': 'main',
'compare-branch': 'dev',
'stack-api-key': 'sfgfdsg223',
'stack-api-key': '***REMOVED***',
module: 'content_type',
format: 'compactfield',
},
withoutBaseFlag: {
'compare-branch': 'dev',
'stack-api-key': 'sfgfdsg223',
'stack-api-key': '***REMOVED***',
module: 'content_type',
format: 'compactfield',
},
withoutCompareFlag: {
'base-branch': 'main',
'stack-api-key': 'sfgfdsg223',
'stack-api-key': '***REMOVED***',
module: 'content_type',
format: 'compactfield',
},
Expand All @@ -451,7 +451,7 @@ const mockData = {
withoutModuleFlag: {
'base-branch': 'main',
'compare-branch': 'dev',
'stack-api-key': 'sfgfdsg223',
'stack-api-key': '***REMOVED***',
format: 'compactfield',
},
branchCompareData: {
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-branches/test/unit/utils/interactive.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ describe('Interactive', () => {
});

it('ask export merge summary path', async function () {
const filePath = 'sfgfdsg223';
const filePath = '***REMOVED***';
inquireStub.callsFake(function () {
return Promise.resolve(filePath);
});
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-clone/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@colors/colors": "^1.5.0",
"@contentstack/cli-cm-export": "~1.11.5",
"@contentstack/cli-cm-import": "~1.16.0",
"@contentstack/cli-cm-import": "~1.16.1",
"@contentstack/cli-command": "~1.2.18",
"@contentstack/cli-utilities": "~1.6.3",
"async": "^3.2.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-export/test/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"INTEGRATION_EXECUTION_ORDER": [],
"ENABLE_PREREQUISITES": true,
"REGIONS": ["NA", "EU", "AZURE-NA", "AZURE-EU"],
"apiKey": "jdgfhcbjx"
"apiKey": "***REMOVED***"
}
2 changes: 1 addition & 1 deletion packages/contentstack-import/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-import/1.16.0 darwin-arm64 node-v22.2.0
@contentstack/cli-cm-import/1.16.1 darwin-arm64 node-v22.2.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-import/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@contentstack/cli-cm-import",
"description": "Contentstack CLI plugin to import content into stack",
"version": "1.16.0",
"version": "1.16.1",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
Expand Down
4 changes: 4 additions & 0 deletions packages/contentstack-import/src/utils/extension-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const lookupExtension = function (
const fs = new FsUtility({ basePath: config.backupDir });
const extensionPath = join(config.backupDir, 'mapper/extensions', 'uid-mapping.json');
const globalfieldsPath = join(config.backupDir, 'mapper/globalfields', 'uid-mapping.json');
const marketPlaceAppsPath = join(config.backupDir, 'mapper/marketplace_apps', 'uid-mapping.json');

for (let i in schema) {
if (schema[i].data_type === 'group') {
Expand Down Expand Up @@ -72,9 +73,12 @@ export const lookupExtension = function (
} else if (schema[i].data_type === 'json' && schema[i].hasOwnProperty('plugins') && schema[i].plugins.length > 0) {
const newPluginUidsArray: any[] = [];
const data = fs.readFile(extensionPath) as Record<string, unknown>;
const marketPlaceAppsData = fs.readFile(marketPlaceAppsPath) as { extension_uid: Record<string, unknown> };
schema[i].plugins.forEach((extension_key_value: string) => {
if (data && data.hasOwnProperty(extension_key_value)) {
newPluginUidsArray.push(data[extension_key_value]);
} else if (marketPlaceAppsData && marketPlaceAppsData.extension_uid && marketPlaceAppsData.extension_uid.hasOwnProperty(extension_key_value)) {
newPluginUidsArray.push(marketPlaceAppsData.extension_uid[extension_key_value]);
}
});
schema[i].plugins = newPluginUidsArray;
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-launch/tsconfig.tsbuildinfo
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions packages/contentstack-migrate-rte/test/dummy/entriesResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"file_size": "344996",
"tags": [],
"filename": "image.png",
"url": "http://localhost:8000/v3/assets/***REMOVED***/bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
"url": "***REMOVED***bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
"ACL": [],
"is_dir": false,
"parent_uid": null,
Expand All @@ -287,7 +287,7 @@
"file_size": "7701",
"tags": [],
"filename": "48558898.jpeg",
"url": "http://localhost:8000/v3/assets/***REMOVED***/bltb13b08635ebffdc4/6048c0c887ab224351aab15f/48558898.jpeg",
"url": "***REMOVED***bltb13b08635ebffdc4/6048c0c887ab224351aab15f/48558898.jpeg",
"ACL": [],
"is_dir": false,
"parent_uid": null,
Expand All @@ -309,7 +309,7 @@
"file_size": "5403",
"tags": [],
"filename": "download.jpeg",
"url": "http://localhost:8000/v3/assets/***REMOVED***/bltb85f710a4a984858/6049fa897477c27b7b34443d/download.jpeg",
"url": "***REMOVED***bltb85f710a4a984858/6049fa897477c27b7b34443d/download.jpeg",
"ACL": [],
"is_dir": false,
"parent_uid": null,
Expand All @@ -332,7 +332,7 @@
"file_size": "5906",
"tags": [],
"filename": "download_(2).jpeg",
"url": "http://localhost:8000/v3/assets/***REMOVED***/blt3d60320b8e0b9b0a/6040b819116a7015b467265e/download_(2).jpeg",
"url": "***REMOVED***blt3d60320b8e0b9b0a/6040b819116a7015b467265e/download_(2).jpeg",
"ACL": [],
"is_dir": false,
"parent_uid": null,
Expand Down Expand Up @@ -363,7 +363,7 @@
"file_size": "344996",
"tags": [],
"filename": "image.png",
"url": "http://localhost:8000/v3/assets/***REMOVED***/bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
"url": "***REMOVED***bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
"ACL": [],
"is_dir": false,
"parent_uid": null,
Expand Down Expand Up @@ -394,7 +394,7 @@
"file_size": "344996",
"tags": [],
"filename": "image.png",
"url": "http://localhost:8000/v3/assets/***REMOVED***/bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
"url": "***REMOVED***bltab83acc0e405b6f8/60fe92d4fe65cc54a3e7e5c3/image.png",
"ACL": [],
"is_dir": false,
"parent_uid": null,
Expand Down Expand Up @@ -426,7 +426,7 @@
"entries": [
{
"title": "Entry 2",
"rich_text_editor": "<p></p><img asset_uid=\"bltfea8157ddfb8e776\" height=\"auto\" src=\"https://images.contentstack.io/v3/assets/blt858e12437ac2679e/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/blt858e12437ac2679e/bltfea8157ddfb8e776/6329f1106a7f7364973c028c/landscape-3.jpg\" width=\"194\" max-width=\"194\" style=\"width: 194px; height: auto;\"/>",
"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;\"/>",
"tags": [],
"locale": "en-us",
"uid": "blt6168b6493a122849",
Expand Down
Loading