diff --git a/packages/contentstack-config/src/utils/region-handler.ts b/packages/contentstack-config/src/utils/region-handler.ts index c0fae7d353..4b63978112 100644 --- a/packages/contentstack-config/src/utils/region-handler.ts +++ b/packages/contentstack-config/src/utils/region-handler.ts @@ -24,7 +24,7 @@ const regions = { name: 'NA', 'developerHubUrl': 'https://developerhub-api.contentstack.com', 'launchHubUrl': 'https://launch-api.contentstack.com', - 'personalizeUrl': 'https://personalization-api.contentstack.com', + 'personalizeUrl': 'https://personalize-api.contentstack.com', }, EU: { cma: 'https://eu-api.contentstack.com', @@ -33,7 +33,7 @@ const regions = { name: 'EU', 'developerHubUrl': 'https://eu-developerhub-api.contentstack.com', 'launchHubUrl': 'https://eu-launch-api.contentstack.com', - 'personalizeUrl': 'Not available', + 'personalizeUrl': 'https://eu-personalize-api.contentstack.com', }, 'AZURE-NA': { cma: 'https://azure-na-api.contentstack.com', @@ -42,7 +42,7 @@ const regions = { name: 'AZURE-NA', 'developerHubUrl': 'https://azure-na-developerhub-api.contentstack.com', 'launchHubUrl': 'https://azure-na-launch-api.contentstack.com', - 'personalizeUrl': 'Not available', + 'personalizeUrl': 'https://azure-na-personalize-api.contentstack.com', }, 'AZURE-EU': { cma: 'https://azure-eu-api.contentstack.com', @@ -51,7 +51,7 @@ const regions = { name: 'AZURE-EU', 'developerHubUrl': 'https://azure-eu-developerhub-api.contentstack.com', 'launchHubUrl': 'https://azure-eu-launch-api.contentstack.com', - 'personalizeUrl': 'Not available', + 'personalizeUrl': 'https://azure-eu-personalize-api.contentstack.com', }, 'GCP-NA': { cma: 'https://gcp-na-api.contentstack.com', @@ -60,7 +60,7 @@ const regions = { name: 'GCP-NA', 'developerHubUrl': 'https://gcp-na-developerhub-api.contentstack.com', 'launchHubUrl': 'Not available', - 'personalizeUrl': 'Not available', + 'personalizeUrl': 'https://gcp-na-personalize-api.contentstack.com', }, }; diff --git a/packages/contentstack-export/src/commands/cm/stacks/export.ts b/packages/contentstack-export/src/commands/cm/stacks/export.ts index 622238cb33..79568c00bf 100644 --- a/packages/contentstack-export/src/commands/cm/stacks/export.ts +++ b/packages/contentstack-export/src/commands/cm/stacks/export.ts @@ -107,7 +107,7 @@ export default class ExportCommand extends Command { exportConfig.host = this.cmaHost; exportConfig.region = this.region; exportConfig.developerHubBaseUrl = this.developerHubUrl; - exportConfig.modules.personalize.baseURL[exportConfig.region.name] = this.personalizeUrl; + if (this.personalizeUrl) exportConfig.modules.personalize.baseURL[exportConfig.region.name] = this.personalizeUrl; exportDir = exportConfig.cliLogsPath || exportConfig.data || exportConfig.exportDir; const managementAPIClient: ContentstackClient = await managementSDKClient(exportConfig); const moduleExporter = new ModuleExporter(managementAPIClient, exportConfig); diff --git a/packages/contentstack-import/src/commands/cm/stacks/import.ts b/packages/contentstack-import/src/commands/cm/stacks/import.ts index 992586245c..19b20877f8 100644 --- a/packages/contentstack-import/src/commands/cm/stacks/import.ts +++ b/packages/contentstack-import/src/commands/cm/stacks/import.ts @@ -136,7 +136,7 @@ export default class ImportCommand extends Command { importConfig.host = this.cmaHost; importConfig.region = this.region; importConfig.developerHubBaseUrl = this.developerHubUrl; - importConfig.modules.personalize.baseURL[importConfig.region.name] = this.personalizeUrl; + if (this.personalizeUrl) importConfig.modules.personalize.baseURL[importConfig.region.name] = this.personalizeUrl; backupDir = importConfig.cliLogsPath || importConfig.backupDir; const managementAPIClient: ContentstackClient = await managementSDKClient(importConfig); diff --git a/packages/contentstack-import/src/config/index.ts b/packages/contentstack-import/src/config/index.ts index 1e81b84428..10082f2d39 100644 --- a/packages/contentstack-import/src/config/index.ts +++ b/packages/contentstack-import/src/config/index.ts @@ -153,7 +153,7 @@ const config: DefaultConfig = { }, personalize: { baseURL: { - NA: 'https://personalization-api.contentstack.com', + NA: 'https://personalize-api.contentstack.com', }, importData: true, dirName: 'personalize', diff --git a/packages/contentstack-variants/src/import/attribute.ts b/packages/contentstack-variants/src/import/attribute.ts index f5714632cf..fd21548232 100644 --- a/packages/contentstack-variants/src/import/attribute.ts +++ b/packages/contentstack-variants/src/import/attribute.ts @@ -52,6 +52,10 @@ export default class Attribute extends PersonalizationAdapter { for (const attribute of attributes) { const { key, name, description, uid } = attribute; + // skip creating preset attributes, as they are already present in the system + if (attribute.__type === 'PRESET') { + continue; + } try { const attributeRes = await this.createAttribute({ key, name, description }); //map old attribute uid to new attribute uid diff --git a/packages/contentstack-variants/src/import/experiences.ts b/packages/contentstack-variants/src/import/experiences.ts index a3a82f6b40..2021f5179b 100644 --- a/packages/contentstack-variants/src/import/experiences.ts +++ b/packages/contentstack-variants/src/import/experiences.ts @@ -275,8 +275,8 @@ export default class Experiences extends PersonalizationAdapter { Object.entries(this.experiencesUidMapper).map(async ([oldExpUid, newExpUid]) => { if (experienceCTsMap[oldExpUid]?.length) { // Filter content types that were created - const updatedContentTypes = experienceCTsMap[oldExpUid].filter((ct: any) => - this.createdCTs.includes(ct?.uid), + const updatedContentTypes = experienceCTsMap[oldExpUid].filter( + (ct: any) => this.createdCTs.includes(ct?.uid) && ct.status === 'linked', ); if (updatedContentTypes?.length) { const { variant_groups: [variantGroup] = [] } = diff --git a/packages/contentstack-variants/src/import/variant-entries.ts b/packages/contentstack-variants/src/import/variant-entries.ts index ce53af4661..c4f4c75176 100644 --- a/packages/contentstack-variants/src/import/variant-entries.ts +++ b/packages/contentstack-variants/src/import/variant-entries.ts @@ -463,7 +463,7 @@ export default class VariantEntries extends VariantAdapter= 0; index--) { const expVariations = experience.variants[index]; - if (expVariations['__type'] === 'AudienceBasedVariation' && expVariations?.audiences?.length) { + if (expVariations['__type'] === 'SegmentedVariant' && expVariations?.audiences?.length) { updateAudiences(expVariations.audiences, audiencesUid); if (!expVariations.audiences.length) { experience.variants.splice(index, 1); diff --git a/packages/contentstack-variants/src/utils/variant-api-adapter.ts b/packages/contentstack-variants/src/utils/variant-api-adapter.ts index 89d46c5c7f..9e25299576 100644 --- a/packages/contentstack-variants/src/utils/variant-api-adapter.ts +++ b/packages/contentstack-variants/src/utils/variant-api-adapter.ts @@ -184,6 +184,7 @@ export class VariantHttpClient extends AdapterHelper implement }); try { + this.apiClient.headers({ api_version: undefined }); const res = await this.apiClient.put(endpoint, { entry: input }); const data = this.handleVariantAPIRes(res); @@ -214,8 +215,7 @@ export class VariantHttpClient extends AdapterHelper implement const { entry_uid, content_type_uid } = options; let endpoint = `content_types/${content_type_uid}/entries/${entry_uid}/publish`; - const onSuccess = (response: any) => - resolve({ response, apiData: { entryUid: entry_uid, variantUid }, log }); + const onSuccess = (response: any) => resolve({ response, apiData: { entryUid: entry_uid, variantUid }, log }); const onReject = (error: any) => reject({ error,