From a9145183ae47bb6f7a40b2d3d8370b37e8606d97 Mon Sep 17 00:00:00 2001 From: Harshitha D Date: Wed, 28 Aug 2024 17:41:38 +0530 Subject: [PATCH 1/4] replaced personalize-url with getter methodcd --- packages/contentstack-variants/src/export/attributes.ts | 5 +++-- packages/contentstack-variants/src/export/audiences.ts | 5 +++-- packages/contentstack-variants/src/export/events.ts | 5 +++-- packages/contentstack-variants/src/export/experiences.ts | 5 +++-- packages/contentstack-variants/src/export/projects.ts | 5 +++-- packages/contentstack-variants/src/import/attribute.ts | 5 +++-- packages/contentstack-variants/src/import/audiences.ts | 5 +++-- packages/contentstack-variants/src/import/events.ts | 5 +++-- packages/contentstack-variants/src/import/experiences.ts | 5 +++-- packages/contentstack-variants/src/import/project.ts | 5 +++-- .../contentstack-variants/src/types/variant-api-adapter.ts | 2 +- 11 files changed, 31 insertions(+), 21 deletions(-) diff --git a/packages/contentstack-variants/src/export/attributes.ts b/packages/contentstack-variants/src/export/attributes.ts index 1c1192413b..5df1f0eb6d 100644 --- a/packages/contentstack-variants/src/export/attributes.ts +++ b/packages/contentstack-variants/src/export/attributes.ts @@ -3,6 +3,7 @@ import { resolve as pResolve } from 'node:path'; import { sanitizePath } from '@contentstack/cli-utilities'; import { formatError, fsUtil, PersonalizationAdapter, log } from '../utils'; import { PersonalizationConfig, ExportConfig, AttributesConfig, AttributeStruct } from '../types'; +import { Command } from '@contentstack/cli-command'; export default class ExportAttributes extends PersonalizationAdapter { private attributesConfig: AttributesConfig; @@ -10,10 +11,10 @@ export default class ExportAttributes extends PersonalizationAdapter[]; public personalizationConfig: PersonalizationConfig; - constructor(readonly exportConfig: ExportConfig) { + constructor(readonly exportConfig: ExportConfig, readonly command: Command) { super({ config: exportConfig, - baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name], + baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name] || command.personalizeUrl, headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id }, }); this.personalizationConfig = exportConfig.modules.personalization; diff --git a/packages/contentstack-variants/src/export/audiences.ts b/packages/contentstack-variants/src/export/audiences.ts index f63bf1c981..a73e71a061 100644 --- a/packages/contentstack-variants/src/export/audiences.ts +++ b/packages/contentstack-variants/src/export/audiences.ts @@ -3,6 +3,7 @@ import { resolve as pResolve } from 'node:path'; import { formatError, fsUtil, PersonalizationAdapter, log } from '../utils'; import { PersonalizationConfig, ExportConfig, AudienceStruct, AudiencesConfig } from '../types'; +import { Command } from '@contentstack/cli-command'; export default class ExportAudiences extends PersonalizationAdapter { private audiencesConfig: AudiencesConfig; @@ -10,10 +11,10 @@ export default class ExportAudiences extends PersonalizationAdapter[]; public personalizationConfig: PersonalizationConfig; - constructor(readonly exportConfig: ExportConfig) { + constructor(readonly exportConfig: ExportConfig, readonly command: Command) { super({ config: exportConfig, - baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name], + baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name] || command.personalizeUrl, headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id }, }); this.personalizationConfig = exportConfig.modules.personalization; diff --git a/packages/contentstack-variants/src/export/events.ts b/packages/contentstack-variants/src/export/events.ts index f125b0e41f..11ce2c217c 100644 --- a/packages/contentstack-variants/src/export/events.ts +++ b/packages/contentstack-variants/src/export/events.ts @@ -3,6 +3,7 @@ import { resolve as pResolve } from 'node:path'; import { formatError, fsUtil, PersonalizationAdapter, log } from '../utils'; import { PersonalizationConfig, ExportConfig, EventStruct, EventsConfig } from '../types'; +import { Command } from '@contentstack/cli-command'; export default class ExportEvents extends PersonalizationAdapter { private eventsConfig: EventsConfig; @@ -10,10 +11,10 @@ export default class ExportEvents extends PersonalizationAdapter { private events: Record[]; public personalizationConfig: PersonalizationConfig; - constructor(readonly exportConfig: ExportConfig) { + constructor(readonly exportConfig: ExportConfig, readonly command: Command) { super({ config: exportConfig, - baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name], + baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name] || command.personalizeUrl, headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id }, }); this.personalizationConfig = exportConfig.modules.personalization; diff --git a/packages/contentstack-variants/src/export/experiences.ts b/packages/contentstack-variants/src/export/experiences.ts index 0b65ef3076..72fc96f49e 100644 --- a/packages/contentstack-variants/src/export/experiences.ts +++ b/packages/contentstack-variants/src/export/experiences.ts @@ -2,15 +2,16 @@ import * as path from 'path'; import { sanitizePath } from '@contentstack/cli-utilities'; import { PersonalizationConfig, ExportConfig, ExperienceStruct } from '../types'; import { formatError, fsUtil, log, PersonalizationAdapter } from '../utils'; +import { Command } from '@contentstack/cli-command'; export default class ExportExperiences extends PersonalizationAdapter { private experiencesFolderPath: string; public exportConfig: ExportConfig; public personalizationConfig: PersonalizationConfig; - constructor(exportConfig: ExportConfig) { + constructor(exportConfig: ExportConfig, readonly command: Command) { super({ config: exportConfig, - baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name], + baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name] || command.personalizeUrl, headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id }, cmaConfig: { baseURL: exportConfig.region.cma + `/v3`, diff --git a/packages/contentstack-variants/src/export/projects.ts b/packages/contentstack-variants/src/export/projects.ts index 993d610dd8..281490e5ef 100644 --- a/packages/contentstack-variants/src/export/projects.ts +++ b/packages/contentstack-variants/src/export/projects.ts @@ -2,15 +2,16 @@ import * as path from 'path'; import { sanitizePath } from '@contentstack/cli-utilities'; import { ExportConfig, PersonalizationConfig } from '../types'; import { PersonalizationAdapter, log, fsUtil, formatError } from '../utils'; +import { Command } from '@contentstack/cli-command'; export default class ExportProjects extends PersonalizationAdapter { private projectFolderPath: string; public exportConfig: ExportConfig; public personalizationConfig: PersonalizationConfig; - constructor(exportConfig: ExportConfig) { + constructor(exportConfig: ExportConfig, readonly command: Command) { super({ config: exportConfig, - baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name], + baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name] || command.personalizeUrl, headers: { authtoken: exportConfig.auth_token, organization_uid: exportConfig.org_uid }, }); this.exportConfig = exportConfig; diff --git a/packages/contentstack-variants/src/import/attribute.ts b/packages/contentstack-variants/src/import/attribute.ts index 3d1e513bff..b79b8f6c7d 100644 --- a/packages/contentstack-variants/src/import/attribute.ts +++ b/packages/contentstack-variants/src/import/attribute.ts @@ -3,6 +3,7 @@ import { existsSync } from 'fs'; import { sanitizePath } from '@contentstack/cli-utilities'; import { PersonalizationAdapter, fsUtil } from '../utils'; import { APIConfig, AttributeStruct, ImportConfig, LogType } from '../types'; +import { Command } from '@contentstack/cli-command'; export default class Attribute extends PersonalizationAdapter { private mapperDirPath: string; @@ -12,10 +13,10 @@ export default class Attribute extends PersonalizationAdapter { private personalizationConfig: ImportConfig['modules']['personalization']; private attributeConfig: ImportConfig['modules']['personalization']['attributes']; - constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log) { + constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log, readonly command: Command) { const conf: APIConfig = { config, - baseURL: config.modules.personalization.baseURL[config.region.name], + baseURL: config.modules.personalization.baseURL[config.region.name] || command.personalizeUrl, headers: { 'X-Project-Uid': config.modules.personalization.project_id, authtoken: config.auth_token }, }; super(Object.assign(config, conf)); diff --git a/packages/contentstack-variants/src/import/audiences.ts b/packages/contentstack-variants/src/import/audiences.ts index 5812ad853a..a648698ace 100644 --- a/packages/contentstack-variants/src/import/audiences.ts +++ b/packages/contentstack-variants/src/import/audiences.ts @@ -3,6 +3,7 @@ import { existsSync } from 'fs'; import { sanitizePath } from '@contentstack/cli-utilities'; import { APIConfig, AudienceStruct, ImportConfig, LogType } from '../types'; import { PersonalizationAdapter, fsUtil, lookUpAttributes } from '../utils'; +import { Command } from '@contentstack/cli-command'; export default class Audiences extends PersonalizationAdapter { private mapperDirPath: string; @@ -14,10 +15,10 @@ export default class Audiences extends PersonalizationAdapter { private audienceConfig: ImportConfig['modules']['personalization']['audiences']; public attributeConfig: ImportConfig['modules']['personalization']['attributes']; - constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log) { + constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log, readonly command: Command) { const conf: APIConfig = { config, - baseURL: config.modules.personalization.baseURL[config.region.name], + baseURL: config.modules.personalization.baseURL[config.region.name] || command.personalizeUrl, headers: { 'X-Project-Uid': config.modules.personalization.project_id, authtoken: config.auth_token }, }; super(Object.assign(config, conf)); diff --git a/packages/contentstack-variants/src/import/events.ts b/packages/contentstack-variants/src/import/events.ts index d87d3b93fd..bdf5c909bb 100644 --- a/packages/contentstack-variants/src/import/events.ts +++ b/packages/contentstack-variants/src/import/events.ts @@ -3,6 +3,7 @@ import { existsSync } from 'fs'; import { sanitizePath } from '@contentstack/cli-utilities'; import { PersonalizationAdapter, fsUtil } from '../utils'; import { APIConfig, EventStruct, ImportConfig, LogType } from '../types'; +import { Command } from '@contentstack/cli-command'; export default class Events extends PersonalizationAdapter { private mapperDirPath: string; @@ -12,10 +13,10 @@ export default class Events extends PersonalizationAdapter { private personalizationConfig: ImportConfig['modules']['personalization']; private eventsConfig: ImportConfig['modules']['personalization']['events']; - constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log) { + constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log, readonly command: Command) { const conf: APIConfig = { config, - baseURL: config.modules.personalization.baseURL[config.region.name], + baseURL: config.modules.personalization.baseURL[config.region.name] || command.personalizeUrl, headers: { 'X-Project-Uid': config.modules.personalization.project_id, authtoken: config.auth_token }, }; super(Object.assign(config, conf)); diff --git a/packages/contentstack-variants/src/import/experiences.ts b/packages/contentstack-variants/src/import/experiences.ts index 2db2580e5b..39633d90db 100644 --- a/packages/contentstack-variants/src/import/experiences.ts +++ b/packages/contentstack-variants/src/import/experiences.ts @@ -5,6 +5,7 @@ import cloneDeep from 'lodash/cloneDeep'; import { sanitizePath } from '@contentstack/cli-utilities'; import { PersonalizationAdapter, fsUtil, lookUpAudiences, lookUpEvents } from '../utils'; import { APIConfig, ImportConfig, ExperienceStruct, CreateExperienceInput, LogType } from '../types'; +import { Command } from '@contentstack/cli-command'; export default class Experiences extends PersonalizationAdapter { private createdCTs: string[]; @@ -33,10 +34,10 @@ export default class Experiences extends PersonalizationAdapter { private audienceConfig: ImportConfig['modules']['personalization']['audiences']; private experienceConfig: ImportConfig['modules']['personalization']['experiences']; - constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log) { + constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log, readonly command: Command) { const conf: APIConfig = { config, - baseURL: config.modules.personalization.baseURL[config.region.name], + baseURL: config.modules.personalization.baseURL[config.region.name] || command.personalizeUrl, headers: { 'X-Project-Uid': config.modules.personalization.project_id, authtoken: config.auth_token }, cmaConfig: { baseURL: config.region.cma + `/v3`, diff --git a/packages/contentstack-variants/src/import/project.ts b/packages/contentstack-variants/src/import/project.ts index 5de48e851f..9b2d797278 100644 --- a/packages/contentstack-variants/src/import/project.ts +++ b/packages/contentstack-variants/src/import/project.ts @@ -3,13 +3,14 @@ import { existsSync, readFileSync } from 'fs'; import { sanitizePath } from '@contentstack/cli-utilities'; import { PersonalizationAdapter, askProjectName, fsUtil } from '../utils'; import { APIConfig, CreateProjectInput, ImportConfig, LogType, ProjectStruct } from '../types'; +import { Command } from '@contentstack/cli-command'; export default class Project extends PersonalizationAdapter { private projectMapperFolderPath: string; - constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log) { + constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log, readonly command: Command) { const conf: APIConfig = { config, - baseURL: config.modules.personalization.baseURL[config.region.name], + baseURL: config.modules.personalization.baseURL[config.region.name] || command.personalizeUrl, headers: { organization_uid: config.org_uid, authtoken: config.auth_token }, }; super(Object.assign(config, conf)); diff --git a/packages/contentstack-variants/src/types/variant-api-adapter.ts b/packages/contentstack-variants/src/types/variant-api-adapter.ts index bb1ea3ba28..f8e1d9220e 100644 --- a/packages/contentstack-variants/src/types/variant-api-adapter.ts +++ b/packages/contentstack-variants/src/types/variant-api-adapter.ts @@ -9,7 +9,7 @@ import { CreateVariantEntryDto, CreateVariantEntryOptions, VariantEntryStruct } export type APIConfig = HttpRequestConfig & { httpClient?: boolean; sharedConfig?: ExportConfig | Record | undefined; - personalizationURL?: string; + personalizeUrl?: string; config: ExportConfig | Record | undefined; baseURL?: string; cmaConfig?: HttpRequestConfig; From 223f80e6d5b2dc51dd9d0727c0ded84fd2664d2e Mon Sep 17 00:00:00 2001 From: Harshitha D Date: Thu, 29 Aug 2024 10:59:18 +0530 Subject: [PATCH 2/4] updated for personalize url in attributes --- .../contentstack-export/src/commands/cm/stacks/export.ts | 1 + packages/contentstack-variants/src/export/attributes.ts | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/contentstack-export/src/commands/cm/stacks/export.ts b/packages/contentstack-export/src/commands/cm/stacks/export.ts index 68c3ac9963..bdcc4ddb4c 100644 --- a/packages/contentstack-export/src/commands/cm/stacks/export.ts +++ b/packages/contentstack-export/src/commands/cm/stacks/export.ts @@ -107,6 +107,7 @@ export default class ExportCommand extends Command { exportConfig.host = this.cmaHost; exportConfig.region = this.region; exportConfig.developerHubBaseUrl = this.developerHubUrl; + exportConfig.modules.personalization.baseURL = { 'baseURL': 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-variants/src/export/attributes.ts b/packages/contentstack-variants/src/export/attributes.ts index 5df1f0eb6d..45a8583ffe 100644 --- a/packages/contentstack-variants/src/export/attributes.ts +++ b/packages/contentstack-variants/src/export/attributes.ts @@ -3,7 +3,6 @@ import { resolve as pResolve } from 'node:path'; import { sanitizePath } from '@contentstack/cli-utilities'; import { formatError, fsUtil, PersonalizationAdapter, log } from '../utils'; import { PersonalizationConfig, ExportConfig, AttributesConfig, AttributeStruct } from '../types'; -import { Command } from '@contentstack/cli-command'; export default class ExportAttributes extends PersonalizationAdapter { private attributesConfig: AttributesConfig; @@ -11,10 +10,10 @@ export default class ExportAttributes extends PersonalizationAdapter[]; public personalizationConfig: PersonalizationConfig; - constructor(readonly exportConfig: ExportConfig, readonly command: Command) { + constructor(readonly exportConfig: ExportConfig) { super({ config: exportConfig, - baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name] || command.personalizeUrl, + baseURL: exportConfig.modules.personalization.baseURL as unknown as string || exportConfig.modules.personalization.baseURL[exportConfig.region.name], headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id }, }); this.personalizationConfig = exportConfig.modules.personalization; From 01f2738af8b2fb1a19b15c5f4fed2ac58cef0b7e Mon Sep 17 00:00:00 2001 From: "harshitha.d" Date: Thu, 19 Sep 2024 18:25:41 +0530 Subject: [PATCH 3/4] updated personalizeUrl im import, export and variants --- .../contentstack-export/src/commands/cm/stacks/export.ts | 2 +- .../contentstack-import/src/commands/cm/stacks/import.ts | 1 + packages/contentstack-variants/src/export/attributes.ts | 2 +- packages/contentstack-variants/src/export/audiences.ts | 5 ++--- packages/contentstack-variants/src/export/events.ts | 5 ++--- packages/contentstack-variants/src/export/experiences.ts | 5 ++--- packages/contentstack-variants/src/export/projects.ts | 5 ++--- packages/contentstack-variants/src/import/attribute.ts | 5 ++--- packages/contentstack-variants/src/import/audiences.ts | 5 ++--- packages/contentstack-variants/src/import/events.ts | 5 ++--- packages/contentstack-variants/src/import/experiences.ts | 6 ++---- packages/contentstack-variants/src/import/project.ts | 5 ++--- 12 files changed, 21 insertions(+), 30 deletions(-) diff --git a/packages/contentstack-export/src/commands/cm/stacks/export.ts b/packages/contentstack-export/src/commands/cm/stacks/export.ts index bdcc4ddb4c..3f03203b27 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.personalization.baseURL = { 'baseURL': this.personalizeUrl }; + exportConfig.modules.personalization.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 8d42f024a7..64897f4509 100644 --- a/packages/contentstack-import/src/commands/cm/stacks/import.ts +++ b/packages/contentstack-import/src/commands/cm/stacks/import.ts @@ -136,6 +136,7 @@ export default class ImportCommand extends Command { importConfig.host = this.cmaHost; importConfig.region = this.region; importConfig.developerHubBaseUrl = this.developerHubUrl; + importConfig.modules.personalization.baseURL[importConfig.region.name] = this.personalizeUrl; backupDir = importConfig.cliLogsPath || importConfig.backupDir; const managementAPIClient: ContentstackClient = await managementSDKClient(importConfig); diff --git a/packages/contentstack-variants/src/export/attributes.ts b/packages/contentstack-variants/src/export/attributes.ts index 45a8583ffe..1c1192413b 100644 --- a/packages/contentstack-variants/src/export/attributes.ts +++ b/packages/contentstack-variants/src/export/attributes.ts @@ -13,7 +13,7 @@ export default class ExportAttributes extends PersonalizationAdapter { private audiencesConfig: AudiencesConfig; @@ -11,10 +10,10 @@ export default class ExportAudiences extends PersonalizationAdapter[]; public personalizationConfig: PersonalizationConfig; - constructor(readonly exportConfig: ExportConfig, readonly command: Command) { + constructor(readonly exportConfig: ExportConfig) { super({ config: exportConfig, - baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name] || command.personalizeUrl, + baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name], headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id }, }); this.personalizationConfig = exportConfig.modules.personalization; diff --git a/packages/contentstack-variants/src/export/events.ts b/packages/contentstack-variants/src/export/events.ts index 11ce2c217c..f125b0e41f 100644 --- a/packages/contentstack-variants/src/export/events.ts +++ b/packages/contentstack-variants/src/export/events.ts @@ -3,7 +3,6 @@ import { resolve as pResolve } from 'node:path'; import { formatError, fsUtil, PersonalizationAdapter, log } from '../utils'; import { PersonalizationConfig, ExportConfig, EventStruct, EventsConfig } from '../types'; -import { Command } from '@contentstack/cli-command'; export default class ExportEvents extends PersonalizationAdapter { private eventsConfig: EventsConfig; @@ -11,10 +10,10 @@ export default class ExportEvents extends PersonalizationAdapter { private events: Record[]; public personalizationConfig: PersonalizationConfig; - constructor(readonly exportConfig: ExportConfig, readonly command: Command) { + constructor(readonly exportConfig: ExportConfig) { super({ config: exportConfig, - baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name] || command.personalizeUrl, + baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name], headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id }, }); this.personalizationConfig = exportConfig.modules.personalization; diff --git a/packages/contentstack-variants/src/export/experiences.ts b/packages/contentstack-variants/src/export/experiences.ts index 72fc96f49e..0b65ef3076 100644 --- a/packages/contentstack-variants/src/export/experiences.ts +++ b/packages/contentstack-variants/src/export/experiences.ts @@ -2,16 +2,15 @@ import * as path from 'path'; import { sanitizePath } from '@contentstack/cli-utilities'; import { PersonalizationConfig, ExportConfig, ExperienceStruct } from '../types'; import { formatError, fsUtil, log, PersonalizationAdapter } from '../utils'; -import { Command } from '@contentstack/cli-command'; export default class ExportExperiences extends PersonalizationAdapter { private experiencesFolderPath: string; public exportConfig: ExportConfig; public personalizationConfig: PersonalizationConfig; - constructor(exportConfig: ExportConfig, readonly command: Command) { + constructor(exportConfig: ExportConfig) { super({ config: exportConfig, - baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name] || command.personalizeUrl, + baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name], headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id }, cmaConfig: { baseURL: exportConfig.region.cma + `/v3`, diff --git a/packages/contentstack-variants/src/export/projects.ts b/packages/contentstack-variants/src/export/projects.ts index 281490e5ef..993d610dd8 100644 --- a/packages/contentstack-variants/src/export/projects.ts +++ b/packages/contentstack-variants/src/export/projects.ts @@ -2,16 +2,15 @@ import * as path from 'path'; import { sanitizePath } from '@contentstack/cli-utilities'; import { ExportConfig, PersonalizationConfig } from '../types'; import { PersonalizationAdapter, log, fsUtil, formatError } from '../utils'; -import { Command } from '@contentstack/cli-command'; export default class ExportProjects extends PersonalizationAdapter { private projectFolderPath: string; public exportConfig: ExportConfig; public personalizationConfig: PersonalizationConfig; - constructor(exportConfig: ExportConfig, readonly command: Command) { + constructor(exportConfig: ExportConfig) { super({ config: exportConfig, - baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name] || command.personalizeUrl, + baseURL: exportConfig.modules.personalization.baseURL[exportConfig.region.name], headers: { authtoken: exportConfig.auth_token, organization_uid: exportConfig.org_uid }, }); this.exportConfig = exportConfig; diff --git a/packages/contentstack-variants/src/import/attribute.ts b/packages/contentstack-variants/src/import/attribute.ts index b79b8f6c7d..3d1e513bff 100644 --- a/packages/contentstack-variants/src/import/attribute.ts +++ b/packages/contentstack-variants/src/import/attribute.ts @@ -3,7 +3,6 @@ import { existsSync } from 'fs'; import { sanitizePath } from '@contentstack/cli-utilities'; import { PersonalizationAdapter, fsUtil } from '../utils'; import { APIConfig, AttributeStruct, ImportConfig, LogType } from '../types'; -import { Command } from '@contentstack/cli-command'; export default class Attribute extends PersonalizationAdapter { private mapperDirPath: string; @@ -13,10 +12,10 @@ export default class Attribute extends PersonalizationAdapter { private personalizationConfig: ImportConfig['modules']['personalization']; private attributeConfig: ImportConfig['modules']['personalization']['attributes']; - constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log, readonly command: Command) { + constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log) { const conf: APIConfig = { config, - baseURL: config.modules.personalization.baseURL[config.region.name] || command.personalizeUrl, + baseURL: config.modules.personalization.baseURL[config.region.name], headers: { 'X-Project-Uid': config.modules.personalization.project_id, authtoken: config.auth_token }, }; super(Object.assign(config, conf)); diff --git a/packages/contentstack-variants/src/import/audiences.ts b/packages/contentstack-variants/src/import/audiences.ts index a648698ace..5812ad853a 100644 --- a/packages/contentstack-variants/src/import/audiences.ts +++ b/packages/contentstack-variants/src/import/audiences.ts @@ -3,7 +3,6 @@ import { existsSync } from 'fs'; import { sanitizePath } from '@contentstack/cli-utilities'; import { APIConfig, AudienceStruct, ImportConfig, LogType } from '../types'; import { PersonalizationAdapter, fsUtil, lookUpAttributes } from '../utils'; -import { Command } from '@contentstack/cli-command'; export default class Audiences extends PersonalizationAdapter { private mapperDirPath: string; @@ -15,10 +14,10 @@ export default class Audiences extends PersonalizationAdapter { private audienceConfig: ImportConfig['modules']['personalization']['audiences']; public attributeConfig: ImportConfig['modules']['personalization']['attributes']; - constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log, readonly command: Command) { + constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log) { const conf: APIConfig = { config, - baseURL: config.modules.personalization.baseURL[config.region.name] || command.personalizeUrl, + baseURL: config.modules.personalization.baseURL[config.region.name], headers: { 'X-Project-Uid': config.modules.personalization.project_id, authtoken: config.auth_token }, }; super(Object.assign(config, conf)); diff --git a/packages/contentstack-variants/src/import/events.ts b/packages/contentstack-variants/src/import/events.ts index bdf5c909bb..d87d3b93fd 100644 --- a/packages/contentstack-variants/src/import/events.ts +++ b/packages/contentstack-variants/src/import/events.ts @@ -3,7 +3,6 @@ import { existsSync } from 'fs'; import { sanitizePath } from '@contentstack/cli-utilities'; import { PersonalizationAdapter, fsUtil } from '../utils'; import { APIConfig, EventStruct, ImportConfig, LogType } from '../types'; -import { Command } from '@contentstack/cli-command'; export default class Events extends PersonalizationAdapter { private mapperDirPath: string; @@ -13,10 +12,10 @@ export default class Events extends PersonalizationAdapter { private personalizationConfig: ImportConfig['modules']['personalization']; private eventsConfig: ImportConfig['modules']['personalization']['events']; - constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log, readonly command: Command) { + constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log) { const conf: APIConfig = { config, - baseURL: config.modules.personalization.baseURL[config.region.name] || command.personalizeUrl, + baseURL: config.modules.personalization.baseURL[config.region.name], headers: { 'X-Project-Uid': config.modules.personalization.project_id, authtoken: config.auth_token }, }; super(Object.assign(config, conf)); diff --git a/packages/contentstack-variants/src/import/experiences.ts b/packages/contentstack-variants/src/import/experiences.ts index 39633d90db..ea4a1c27e6 100644 --- a/packages/contentstack-variants/src/import/experiences.ts +++ b/packages/contentstack-variants/src/import/experiences.ts @@ -5,8 +5,6 @@ import cloneDeep from 'lodash/cloneDeep'; import { sanitizePath } from '@contentstack/cli-utilities'; import { PersonalizationAdapter, fsUtil, lookUpAudiences, lookUpEvents } from '../utils'; import { APIConfig, ImportConfig, ExperienceStruct, CreateExperienceInput, LogType } from '../types'; -import { Command } from '@contentstack/cli-command'; - export default class Experiences extends PersonalizationAdapter { private createdCTs: string[]; private mapperDirPath: string; @@ -34,10 +32,10 @@ export default class Experiences extends PersonalizationAdapter { private audienceConfig: ImportConfig['modules']['personalization']['audiences']; private experienceConfig: ImportConfig['modules']['personalization']['experiences']; - constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log, readonly command: Command) { + constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log) { const conf: APIConfig = { config, - baseURL: config.modules.personalization.baseURL[config.region.name] || command.personalizeUrl, + baseURL: config.modules.personalization.baseURL[config.region.name], headers: { 'X-Project-Uid': config.modules.personalization.project_id, authtoken: config.auth_token }, cmaConfig: { baseURL: config.region.cma + `/v3`, diff --git a/packages/contentstack-variants/src/import/project.ts b/packages/contentstack-variants/src/import/project.ts index 9b2d797278..5de48e851f 100644 --- a/packages/contentstack-variants/src/import/project.ts +++ b/packages/contentstack-variants/src/import/project.ts @@ -3,14 +3,13 @@ import { existsSync, readFileSync } from 'fs'; import { sanitizePath } from '@contentstack/cli-utilities'; import { PersonalizationAdapter, askProjectName, fsUtil } from '../utils'; import { APIConfig, CreateProjectInput, ImportConfig, LogType, ProjectStruct } from '../types'; -import { Command } from '@contentstack/cli-command'; export default class Project extends PersonalizationAdapter { private projectMapperFolderPath: string; - constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log, readonly command: Command) { + constructor(public readonly config: ImportConfig, private readonly log: LogType = console.log) { const conf: APIConfig = { config, - baseURL: config.modules.personalization.baseURL[config.region.name] || command.personalizeUrl, + baseURL: config.modules.personalization.baseURL[config.region.name], headers: { organization_uid: config.org_uid, authtoken: config.auth_token }, }; super(Object.assign(config, conf)); From e5b21384e552cb8c01bdc005dd47ef6fd02b4454 Mon Sep 17 00:00:00 2001 From: "harshitha.d" Date: Thu, 19 Sep 2024 19:11:25 +0530 Subject: [PATCH 4/4] reverting --- packages/contentstack-variants/src/types/variant-api-adapter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contentstack-variants/src/types/variant-api-adapter.ts b/packages/contentstack-variants/src/types/variant-api-adapter.ts index f8e1d9220e..bb1ea3ba28 100644 --- a/packages/contentstack-variants/src/types/variant-api-adapter.ts +++ b/packages/contentstack-variants/src/types/variant-api-adapter.ts @@ -9,7 +9,7 @@ import { CreateVariantEntryDto, CreateVariantEntryOptions, VariantEntryStruct } export type APIConfig = HttpRequestConfig & { httpClient?: boolean; sharedConfig?: ExportConfig | Record | undefined; - personalizeUrl?: string; + personalizationURL?: string; config: ExportConfig | Record | undefined; baseURL?: string; cmaConfig?: HttpRequestConfig;