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
18 changes: 2 additions & 16 deletions .talismanrc
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
fileignoreconfig:
- filename: pnpm-lock.yaml
checksum: 264c0294416c2aa2028c8283831aa7ed17d63e8c69553a7b2b9774336bc0811f
- filename: packages/contentstack-bootstrap/test/bootstrap.test.js
checksum: 37b502482fc32831c39091dd1755e8b0a9f6f8bac89e5eb9d397c6af1f213d83
- filename: packages/contentstack-bootstrap/test/utils.test.js
checksum: e0ca2eb58ab1c3ac3b4d9c14a17bb8f4788678074dd65f6acc128a8a8f51997f
- filename: packages/contentstack-export-to-csv/test/unit/base-command.test.ts
checksum: 4c2befce053135453c1db31f21351bf3f797ff2f15723ca52e183ed6ed9e48e4
- filename: packages/contentstack-export-to-csv/test/unit/utils/teams-export.functional.test.ts
checksum: 17cdae91c22a935309bf4514b6616f1aea91fd0166fede182e673ade43667a36
- filename: packages/contentstack-export-to-csv/test/unit/utils/interactive.test.ts
checksum: 72c1e719e5c51a42debc817a5fe5bb1adee63b2d823df2e9ee36d0b970db7886
- filename: packages/contentstack-export-to-csv/test/unit/utils/api-client.functional.test.ts
checksum: 6d6638919ef7260f642d32cf730e2654d159d2d3582714fb2d7a9c209b9c6eeb
- filename: packages/contentstack-export-to-csv/test/unit/commands/export-to-csv.test.ts
checksum: 9621a9d013796e99a25e894404c4d7c6799bd33bde77852f09d5e32b4d1c1c49
- filename: packages/contentstack-import/src/import/modules/assets.ts
checksum: 8d6d1cadf9178f79aeae508f157c019342e1899f9c3f8116bd25b4ec27e593be
version: '1.0'
16 changes: 16 additions & 0 deletions packages/contentstack-import/src/import/module-importer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ class ModuleImporter {
const stackDetails: Record<string, unknown> = await this.stackAPIClient.fetch();
this.importConfig.stackName = stackDetails.name as string;
this.importConfig.org_uid = stackDetails.org_uid as string;

const assetScanningEnabled = await this.detectAssetScanning(this.importConfig.org_uid);
if (assetScanningEnabled) {
this.importConfig.assetScanningEnabled = true;
this.importConfig.skipAssetsPublish = true;
}
}

await this.resolveImportPath();
Expand Down Expand Up @@ -194,6 +200,16 @@ class ModuleImporter {
log.error(`Audit failed with following error. ${error}`, this.importConfig.context);
}
}

private async detectAssetScanning(orgUid: string): Promise<boolean> {
try {
const orgDetails = await this.managementAPIClient.organization(orgUid).fetch({ include_plan: true });
const features: Array<{ uid: string; enabled?: boolean }> = orgDetails?.plan?.features || [];
return features.some((f) => (f.uid === 'assetsScan' || f.uid === 'amAssetsScan') && f.enabled === true);
} catch {
return false;
}
}
}

export default ModuleImporter;
7 changes: 7 additions & 0 deletions packages/contentstack-import/src/import/modules/assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,13 @@ export default class ImportAssets extends BaseClass {

this.completeProgress(true);
log.success('Assets imported successfully!', this.importConfig.context);

if (this.importConfig.assetScanningEnabled) {
log.info('ℹ Asset Scanning is enabled for this stack.', this.importConfig.context);
log.info(' Assets cannot be published immediately — scanning must complete first.', this.importConfig.context);
log.info(' Once scanning is done, publish your assets using:', this.importConfig.context);
log.info(' csdx cm:stacks:bulk-assets --data-dir ./content --stack-api-key <key>', this.importConfig.context);
}
} catch (error) {
this.completeProgress(false, error?.message || 'Asset import failed');
handleAndLogError(error, { ...this.importConfig.context });
Expand Down
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;
assetScanningEnabled?: boolean;
cliLogsPath: string;
canCreatePrivateApp: boolean;
contentDir: string;
Expand Down
Loading