Skip to content

Commit f0696af

Browse files
aman19Kaman19K
authored
Merge pull request #1634 from contentstack/staging
DX | CLI | Hotfix Release 21-10-2024
2 parents 59f262c + 39ee0be commit f0696af

File tree

14 files changed

+56
-45
lines changed

14 files changed

+56
-45
lines changed

‎package-lock.json‎

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

‎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.14.1",
10-
"@contentstack/cli-cm-import": "~1.19.1",
10+
"@contentstack/cli-cm-import": "~1.19.2",
1111
"@contentstack/cli-command": "~1.3.2",
1212
"@contentstack/cli-utilities": "~1.8.0",
1313
"async": "^3.2.4",

‎packages/contentstack-export/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
88
"@contentstack/cli-command": "~1.3.2",
9-
"@contentstack/cli-variants": "~1.1.1",
9+
"@contentstack/cli-variants": "~1.1.2",
1010
"@contentstack/cli-utilities": "~1.8.0",
1111
"@oclif/core": "^3.26.5",
1212
"async": "^3.2.4",

‎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.19.1 darwin-arm64 node-v22.2.0
50+
@contentstack/cli-cm-import/1.19.2 darwin-arm64 node-v22.2.0
5151
$ csdx --help [COMMAND]
5252
USAGE
5353
$ csdx COMMAND

‎packages/contentstack-import/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "@contentstack/cli-cm-import",
33
"description": "Contentstack CLI plugin to import content into stack",
4-
"version": "1.19.1",
4+
"version": "1.19.2",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
88
"@contentstack/cli-audit": "~1.7.2",
99
"@contentstack/cli-command": "~1.3.2",
1010
"@contentstack/cli-utilities": "~1.8.0",
1111
"@contentstack/management": "~1.17.0",
12-
"@contentstack/cli-variants": "~1.1.1",
12+
"@contentstack/cli-variants": "~1.1.2",
1313
"@oclif/core": "^3.26.5",
1414
"big-json": "^3.2.0",
1515
"bluebird": "^3.7.2",

‎packages/contentstack-import/src/import/modules/entries.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,9 @@ export default class EntriesImport extends BaseClass {
356356
const contentType = find(this.cTs, { uid: cTUid });
357357

358358
const onSuccess = ({ response, apiData: entry, additionalInfo }: any) => {
359-
this.entriesForVariant.push({ content_type: cTUid, entry_uid: entry.uid, locale });
360359
if (additionalInfo[entry.uid]?.isLocalized) {
361360
let oldUid = additionalInfo[entry.uid].entryOldUid;
361+
this.entriesForVariant.push({ content_type: cTUid, entry_uid: oldUid, locale });
362362
log(
363363
this.importConfig,
364364
`Localized entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`,
@@ -370,6 +370,7 @@ export default class EntriesImport extends BaseClass {
370370
entriesCreateFileHelper.writeIntoFile({ [oldUid]: entry } as any, { mapKeyVal: true });
371371
} else {
372372
log(this.importConfig, `Created entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, 'info');
373+
this.entriesForVariant.push({ content_type: cTUid, entry_uid: entry.uid, locale });
373374
// This is for creating localized entries that do not have a counterpart in master locale.
374375
// For example : To create entry1 in fr-fr, where en-us is the master locale
375376
// entry1 will get created in en-us first, then fr-fr version will be created

‎packages/contentstack-seed/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
8-
"@contentstack/cli-cm-import": "~1.19.1",
8+
"@contentstack/cli-cm-import": "~1.19.2",
99
"@contentstack/cli-command": "~1.3.2",
1010
"@contentstack/cli-utilities": "~1.8.0",
1111
"inquirer": "8.2.4",

‎packages/contentstack-variants/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@contentstack/cli-variants",
3-
"version": "1.1.1",
3+
"version": "1.1.2",
44
"description": "Variants plugin",
55
"main": "lib/index.js",
66
"types": "lib/index.d.ts",

‎packages/contentstack-variants/src/import/variant-entries.ts‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,9 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
5454
},
5555
};
5656
super(Object.assign(omit(config, ['helpers']), conf));
57-
this.entriesMapperPath = resolve(
58-
sanitizePath(config.backupDir),
59-
'mapper',
60-
'entries',
61-
);
57+
this.entriesMapperPath = resolve(sanitizePath(config.backupDir), 'mapper', 'entries');
6258
this.personalizeConfig = this.config.modules.personalize;
63-
this.entriesDirPath = resolve(
64-
sanitizePath(config.backupDir),
65-
sanitizePath(config.modules.entries.dirName),
66-
);
59+
this.entriesDirPath = resolve(sanitizePath(config.backupDir), sanitizePath(config.modules.entries.dirName));
6760
this.failedVariantPath = resolve(sanitizePath(this.entriesMapperPath), 'failed-entry-variants.json');
6861
this.failedVariantEntries = new Map();
6962
}
@@ -169,7 +162,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
169162
sanitizePath(variantEntry.dirName),
170163
sanitizePath(entry_uid),
171164
);
172-
const fs = new FsUtility({ basePath: variantEntryBasePath });
165+
const fs = new FsUtility({ basePath: variantEntryBasePath, createDirIfNotExist: false });
173166

174167
for (const _ in fs.indexFileContent) {
175168
try {
@@ -217,13 +210,21 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
217210

218211
for (let [, variantEntry] of entries(batch)) {
219212
const onSuccess = ({ response, apiData: { entryUid, variantUid }, log }: any) => {
220-
log(this.config, `Created entry variant: '${variantUid}' of entry uid ${entryUid}`, 'info');
213+
log(
214+
this.config,
215+
`Created entry variant: '${variantUid}' of entry uid ${entryUid} locale '${locale}'`,
216+
'info',
217+
);
221218
};
222219

223220
const onReject = ({ error, apiData, log }: any) => {
224221
const { entryUid, variantUid } = apiData;
225222
this.failedVariantEntries.set(variantUid, apiData);
226-
log(this.config, `Failed to create entry variant: '${variantUid}' of entry uid ${entryUid}`, 'error');
223+
log(
224+
this.config,
225+
`Failed to create entry variant: '${variantUid}' of entry uid ${entryUid} locale '${locale}'`,
226+
'error',
227+
);
227228
log(this.config, error, 'error');
228229
};
229230
// NOTE Find new variant Id by old Id
@@ -440,10 +441,18 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
440441
}
441442

442443
const onSuccess = ({ response, apiData: { entryUid, variantUid }, log }: any) => {
443-
log(this.config, `Entry variant: '${variantUid}' of entry uid ${entryUid} published successfully!`, 'info');
444+
log(
445+
this.config,
446+
`Entry variant: '${variantUid}' of entry '${entryUid}' published on locales '${locales.join(',')}'`,
447+
'info',
448+
);
444449
};
445450
const onReject = ({ error, apiData: { entryUid, variantUid }, log }: any) => {
446-
log(this.config, `Failed to publish entry variant: '${variantUid}' of entry uid ${entryUid}`, 'error');
451+
log(
452+
this.config,
453+
`Failed to publish entry variant: '${variantUid}' of entry uid ${entryUid} on locales '${locales.join(',')}'`,
454+
'error',
455+
);
447456
log(this.config, formatError(error), 'error');
448457
};
449458

‎packages/contentstack-variants/src/types/variant-entry.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export type PublishVariantEntryDto = {
5454
uid: string;
5555
version?: number;
5656
}[];
57-
}
57+
};
5858
locale: string;
5959
version?: number;
60-
} & AnyProperty;
60+
} & AnyProperty;

0 commit comments

Comments
 (0)