Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ export default class ImportCommand extends Command {
description: 'Skips entry publishing during the import process',
default: false,
}),
'skip-taxonomy-publish': flags.boolean({
description: 'Skips taxonomy publishing during the import process.',
default: true,
}),
};

static usage: string =
Expand Down
1 change: 1 addition & 0 deletions packages/contentstack-import/src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,7 @@ const config: DefaultConfig = {
//'taxonomies', 'environments', 'marketplace_apps', workflows, custom-roles --> Add this incase need to extend to the other global modules
globalModules: ['webhooks'],
entriesPublish: true,
skipTaxonomyPublish: true,
};
export const PUBLISHING_RULES_APPROVERS_SKIP_MSG =
'Skipping import of publish rule approver(s) (roles/users); reconfigure approvers on the target stack.';
Expand Down
11 changes: 7 additions & 4 deletions packages/contentstack-import/src/import/modules/taxonomies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export default class ImportTaxonomies extends BaseClass {

progress.completeProcess(PROCESS_NAMES.TAXONOMIES_IMPORT, true);

if (publishJobCount > 0) {
if (this.importConfig.skipTaxonomyPublish === false && publishJobCount > 0) {
progress
.startProcess(PROCESS_NAMES.TAXONOMIES_PUBLISH)
.updateStatus(
Expand Down Expand Up @@ -389,7 +389,7 @@ export default class ImportTaxonomies extends BaseClass {
*/
initializeTaxonomiesProgress(progress: CLIProgressManager, taxonomyCount: number, publishJobCount: number): void {
progress.addProcess(PROCESS_NAMES.TAXONOMIES_IMPORT, taxonomyCount);
if (publishJobCount > 0) {
if (this.importConfig.skipTaxonomyPublish === false && publishJobCount > 0) {
progress.addProcess(PROCESS_NAMES.TAXONOMIES_PUBLISH, publishJobCount);
}
}
Expand Down Expand Up @@ -570,8 +570,11 @@ export default class ImportTaxonomies extends BaseClass {
this.isLocaleBasedStructure = this.detectAndScanLocaleStructure();

const taxonomyCount = Object.keys(this.taxonomies || {}).length;
const envMapper = readEnvUidMapperSync(this.envUidMapperPath, this.importConfig.context);
const publishJobCount = this.countPublishEligibleTaxonomies(envMapper);
let publishJobCount = 0;
if (this.importConfig.skipTaxonomyPublish === false) {
const envMapper = readEnvUidMapperSync(this.envUidMapperPath, this.importConfig.context);
publishJobCount = this.countPublishEligibleTaxonomies(envMapper);
}

log.debug(
`Loaded ${taxonomyCount} taxonomy items; ${publishJobCount} eligible for publish (mapped environments).`,
Expand Down
1 change: 1 addition & 0 deletions packages/contentstack-import/src/types/default-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -227,5 +227,6 @@ export default interface DefaultConfig {
globalModules: string[];
skipAssetsPublish?: boolean;
skipEntriesPublish?: boolean;
skipTaxonomyPublish?: boolean;
entriesPublish: boolean;
}
1 change: 1 addition & 0 deletions packages/contentstack-import/src/types/import-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
authenticationMethod?: string;
skipAssetsPublish?: boolean;
skipEntriesPublish?: boolean;
skipTaxonomyPublish?: boolean;
cliLogsPath: string;
canCreatePrivateApp: boolean;
contentDir: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
config.skipEntriesPublish = importCmdFlags['skip-entries-publish'];
}

config.skipTaxonomyPublish = importCmdFlags['skip-taxonomy-publish'] ?? true;

config.replaceExisting = importCmdFlags['replace-existing'];
config.skipExisting = importCmdFlags['skip-existing'];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ describe('ImportLocales', () => {
overwriteSupportedModules: [],
globalModules: [],
entriesPublish: false,
skipTaxonomyPublish: true,
cliLogsPath: '/test/logs',
canCreatePrivateApp: false,
forceStopMarketplaceAppsPrompt: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,27 @@ describe('Import Config Handler', () => {
expect(result.skipEntriesPublish).to.be.true;
});

it('should set skipTaxonomyPublish to true by default', async () => {
const importCmdFlags = {
data: '/test/content',
};

const result = await setupConfig(importCmdFlags);

expect(result.skipTaxonomyPublish).to.be.true;
});

it('should allow skipTaxonomyPublish to be overridden to false', async () => {
const importCmdFlags = {
data: '/test/content',
'skip-taxonomy-publish': false,
};

const result = await setupConfig(importCmdFlags);

expect(result.skipTaxonomyPublish).to.be.false;
});

it('should set replaceExisting from replace-existing flag', async () => {
const importCmdFlags = {
data: '/test/content',
Expand Down
Loading