Skip to content

Fix/back merge 2 #2007

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.

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
merged 13 commits into from
Jul 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .talismanrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
fileignoreconfig:
- filename: pnpm-lock.yaml
checksum: 612695c9e9d0a57c0996600c22ed44dc7929e926a619d30e753ab06310b22548
checksum: f207dfb0198bc78f647a0a9456142fba670d49dc1b456bcf73de5e79ca0ec5d5
- filename: packages/contentstack-import/test/integration/auth-token-modules/environments.test.js
checksum: bc6f06b75d082aaf99e2f2f4b932b143765e2f14086967fb8973fe1b2ca6c03e
- filename: packages/contentstack-import/test/integration/environments.test.js
checksum: e71f033dad8944ffeafdf22d0514bda1d20c43e8fea0d62c96e774f3414beb31
- filename: package-lock.json
checksum: 132bc404a7a90c907ac439d94289a1b83a0a0df56d617b3f697fc219a5b555a5
checksum: 52bdeb0247e4b4e19510cd289f0baf1392000fbc64f06661291ffe08f440c89b
- filename: packages/contentstack-auth/test/unit/tokens-validation.test.ts
checksum: 676052e30d31a771ce68302d89b050d176bbef50f3abc7e9cdd4384f0e274e10
- filename: packages/contentstack-import/test/integration/auth-token.test.js
Expand Down
869 changes: 436 additions & 433 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/contentstack-clone/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-clone/1.14.2 darwin-x64 node-v22.17.0
@contentstack/cli-cm-clone/1.14.3 darwin-arm64 node-v22.14.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-clone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@colors/colors": "^1.6.0",
"@contentstack/cli-cm-export": "~1.17.0",
"@contentstack/cli-cm-import": "~1.25.0",
"@contentstack/cli-cm-import": "~1.25.1",
"@contentstack/cli-command": "~1.5.0",
"@contentstack/cli-utilities": "~1.12.0",
"@oclif/core": "^4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-import/README.md
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.24.0 darwin-x64 node-v22.17.0
@contentstack/cli-cm-import/1.25.1 darwin-arm64 node-v22.14.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-import/package.json
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.25.0",
"version": "1.25.1",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
Expand Down
25 changes: 16 additions & 9 deletions packages/contentstack-import/src/import/modules/base-class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { RoleData } from '@contentstack/management/types/stack/role';

import { log } from '../../utils';
import { ImportConfig, ModuleClassParams } from '../../types';
import cloneDeep from 'lodash/cloneDeep';

export type AdditionalKeys = {
backupDir: string;
Expand Down Expand Up @@ -321,17 +322,23 @@ export default abstract class BaseClass {
case 'update-cts':
return apiData.update().then(onSuccess).catch(onReject);
case 'create-gfs':
return this.stack.globalField({api_version: '3.2'}).create(apiData).then(onSuccess).catch(onReject);
return this.stack.globalField({ api_version: '3.2' }).create(apiData).then(onSuccess).catch(onReject);
case 'update-gfs':
let globalFieldUid = apiData.uid ?? apiData.global_field?.uid;
return this.stack
.globalField(globalFieldUid, {api_version: '3.2'})
.fetch()
.then(async (response) => {
response.parent = apiData?.uid ? apiData : apiData.global_field;
await response.update().then(onSuccess).catch(onReject);
})
.catch(onReject);
return this.stack
.globalField(globalFieldUid, { api_version: '3.2' })
.fetch()
.then(async (gf) => {
const { uid, ...updatePayload } = cloneDeep(apiData);
Object.assign(gf, updatePayload);
try {
const response = await gf.update();
return onSuccess(response);
} catch (error) {
return onReject(error);
}
})
.catch(onReject);
case 'create-environments':
return this.stack
.environment()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@ export default class ContentTypesImport extends BaseClass {
if (this.isExtensionsUpdate) {
log(this.importConfig, 'Successfully updated the extensions.', 'success');
}
this.pendingGFs = fsUtil.readFile(this.gFsPendingPath) as any;
if (!this.pendingGFs || isEmpty(this.pendingGFs)) {
log(this.importConfig, 'No pending global fields found to update', 'info');
return;
}
await this.updatePendingGFs().catch((error) => {
log(this.importConfig, `Error while updating pending global field ${formatError(error)}`, 'error');
});
Expand Down Expand Up @@ -227,8 +232,9 @@ export default class ContentTypesImport extends BaseClass {

async updatePendingGFs(): Promise<any> {
this.pendingGFs = fsUtil.readFile(this.gFsPendingPath) as any;
log(this.importConfig, `Found ${this.pendingGFs.length} pending global fields to update`, 'info');
this.gFs = fsUtil.readFile(path.resolve(this.gFsFolderPath, this.gFsConfig.fileName)) as Record<string, unknown>[];
const onSuccess = ({ response: globalField, apiData: { uid } = undefined }: any) => {
const onSuccess = ({ response, apiData: { uid } = undefined }: any) => {
log(this.importConfig, `Updated the global field ${uid} with content type references`, 'info');
};
const onReject = ({ error, apiData: { uid } = undefined }: any) => {
Expand Down Expand Up @@ -266,9 +272,7 @@ export default class ContentTypesImport extends BaseClass {
this.importConfig.preserveStackVersion,
this.installedExtensions,
);
const globalFieldPayload = this.stack.globalField(
uid, { api_version: '3.2' },
);
const globalFieldPayload = this.stack.globalField(uid, { api_version: '3.2' });
Object.assign(globalFieldPayload, cloneDeep(globalField));
apiOptions.apiData = globalFieldPayload;
return apiOptions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ export default class ImportGlobalFields extends BaseClass {
).extension_uid;

await this.seedGFs();
if (this.seedGFs?.length) fsUtil.writeFile(this.gFsPendingPath, this.pendingGFs);
log(this.importConfig, 'Created Global Fields', 'success');

await this.updateGFs();
if (this.pendingGFs?.length) fsUtil.writeFile(this.gFsPendingPath, this.pendingGFs);
log(this.importConfig, 'Updated Global Fields', 'success');

if (this.importConfig.replaceExisting && this.existingGFs.length > 0) {
Expand Down Expand Up @@ -178,6 +178,8 @@ export default class ImportGlobalFields extends BaseClass {
await removeReferenceFields(globalField.schema, flag, this.stack);
if (flag.supressed) {
this.pendingGFs.push(globalField.uid);
log(this.importConfig, `Global field '${globalField.uid}' will be updated later`, 'info');
return resolve(true);
}
return this.stack
.globalField(globalField.uid, { api_version: '3.2' })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ export const gfSchemaTemplate = {
"multiple": false
}
],
"description": "Seed "
"description": ""
}
};
2 changes: 1 addition & 1 deletion packages/contentstack-seed/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-cm-import": "~1.25.0",
"@contentstack/cli-cm-import": "~1.25.1",
"@contentstack/cli-command": "~1.5.0",
"@contentstack/cli-utilities": "~1.12.0",
"@contentstack/management": "~1.22.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/contentstack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
$ csdx COMMAND
running command...
$ csdx (--version|-v)
@contentstack/cli/1.42.0 darwin-x64 node-v22.17.0
@contentstack/cli/1.43.1 darwin-arm64 node-v22.14.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down Expand Up @@ -3774,8 +3774,8 @@ USAGE
$ csdx launch:functions [-p <value>] [-d <value>]

FLAGS
-d, --data-dir=<value> [default: /Users/netraj.patel/netraj/projects/contentstack/cli/cli/packages/contentstack]
Current working directory
-d, --data-dir=<value> [default: /cli/packages/contentstack] Current
working directory
-p, --port=<value> [default: 3000] Port number

DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@contentstack/cli-cm-clone": "~1.14.3",
"@contentstack/cli-cm-export": "~1.17.0",
"@contentstack/cli-cm-export-to-csv": "~1.8.2",
"@contentstack/cli-cm-import": "~1.25.0",
"@contentstack/cli-cm-import": "~1.25.1",
"@contentstack/cli-cm-import-setup": "1.3.0",
"@contentstack/cli-cm-migrate-rte": "~1.5.2",
"@contentstack/cli-cm-seed": "~1.11.3",
Expand Down
59 changes: 13 additions & 46 deletions pnpm-lock.yaml

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

Loading