orc-shared 1.2.0-dev.7 → 1.3.0-dev.2

package/src/selectors/metadata.test.js

@@ -848,6 +848,143 @@ describe("definitions", () => {
 		description: "InnaCustom2",
 	};
 
+	let baseBuitInAttribute1 = {
+		maximum: 256,
+		dataType: "Text",
+		isRequired: false,
+		name: "Username",
+		displayOrder: 1,
+		isSearchable: true,
+		displayName: {
+			"en-CA": "User name",
+			"en-US": "User name",
+			"fr-CA": "User name",
+		},
+		minimum: 1,
+		multilingual: false,
+		isBuiltIn: true,
+		groupId: "Default",
+		allowMultipleValues: false,
+	};
+
+	let baseBuitInAttribute2 = {
+		maximum: 256,
+		dataType: "Text",
+		isRequired: false,
+		name: "Email",
+		displayOrder: 2,
+		isSearchable: true,
+		displayName: {
+			"en-CA": "Email",
+			"en-US": "Email",
+			"fr-CA": "Email",
+		},
+		minimum: 0,
+		multilingual: false,
+		isBuiltIn: true,
+		groupId: "Default",
+		allowMultipleValues: false,
+	};
+
+	let baseBuitInAttribute3 = {
+		maximum: 64,
+		dataType: "Text",
+		isRequired: false,
+		name: "LastName",
+		displayOrder: 3,
+		isSearchable: true,
+		displayName: {
+			"en-CA": "Last name",
+			"en-US": "Last name",
+			"fr-CA": "Last name",
+			"it-IT": "Cognome",
+		},
+		minimum: 0,
+		multilingual: false,
+		isBuiltIn: true,
+		groupId: "Default",
+		allowMultipleValues: false,
+	};
+
+	let baseBuitInAttribute4 = {
+		maximum: 64,
+		dataType: "Text",
+		isRequired: false,
+		name: "FirstName",
+		displayOrder: 4,
+		isSearchable: true,
+		displayName: {
+			"ar-JO": "",
+			"en-CA": "First Name",
+			"en-US": "First Name",
+			"es-ES": "",
+			"fr-CA": "First Name",
+			"it-IT": "Nome",
+		},
+		minimum: 0,
+		multilingual: false,
+		isBuiltIn: true,
+		groupId: "Default",
+		allowMultipleValues: false,
+	};
+
+	let baseCustomAttribute1 = {
+		maximum: 64,
+		dataType: "Text",
+		isRequired: false,
+		name: "BaseAttribute1",
+		displayOrder: 1,
+		isSearchable: true,
+		displayName: {
+			"en-CA": "Base Attribute1",
+			"en-US": "Base Attribute1",
+			"fr-CA": "Base Attribute1",
+		},
+		minimum: 0,
+		multilingual: false,
+		isBuiltIn: false,
+		groupId: "Default",
+		allowMultipleValues: false,
+	};
+
+	let baseCustomAttribute2 = {
+		maximum: 64,
+		dataType: "Text",
+		isRequired: false,
+		name: "BaseAttribute2",
+		displayOrder: 2,
+		isSearchable: true,
+		displayName: {
+			"en-CA": "Base Attribute 2",
+			"en-US": "Base Attribute 2",
+			"fr-CA": "Base Attribute 2",
+		},
+		minimum: 0,
+		multilingual: false,
+		isBuiltIn: false,
+		groupId: "Default",
+		allowMultipleValues: false,
+	};
+
+	let baseCustomAttribute3 = {
+		maximum: 64,
+		dataType: "Text",
+		isRequired: false,
+		name: "BaseAttribute3",
+		displayOrder: 3,
+		isSearchable: true,
+		displayName: {
+			"en-CA": "Base Attribute 3",
+			"en-US": "Base Attribute 3",
+			"fr-CA": "Base Attribute 3",
+		},
+		minimum: 0,
+		multilingual: false,
+		isBuiltIn: false,
+		groupId: "Default",
+		allowMultipleValues: false,
+	};
+
 	beforeEach(() => {
 		state = Immutable.fromJS({
 			locale: {
@@ -978,90 +1115,15 @@ describe("definitions", () => {
 							entityTypeName: "CUSTOMER",
 							isBuiltIn: true,
 							attributes: [
-								{
-									maximum: 256,
-									dataType: "Text",
-									isRequired: false,
-									name: "Username",
-									displayOrder: 0,
-									isSearchable: true,
-									displayName: {
-										"ar-JO": "",
-										"en-CA": "User name",
-										"en-US": "User name",
-										"es-ES": "",
-										"fr-CA": "User name",
-										"it-IT": "Nome utente",
-									},
-									minimum: 1,
-									multilingual: false,
-									isBuiltIn: true,
-									groupId: "Default",
-									allowMultipleValues: false,
-								},
-								{
-									maximum: 256,
-									dataType: "Text",
-									isRequired: false,
-									name: "Email",
-									displayOrder: 0,
-									isSearchable: true,
-									displayName: {
-										"ar-JO": "",
-										"en-CA": "Email",
-										"en-US": "Email",
-										"es-ES": "",
-										"fr-CA": "Email",
-										"it-IT": "Email",
-									},
-									minimum: 0,
-									multilingual: false,
-									isBuiltIn: true,
-									groupId: "Default",
-									allowMultipleValues: false,
-								},
+								baseBuitInAttribute1,
+								baseBuitInAttribute2,
 								customProfileAttribute1,
 								customProfileAttribute2,
-								{
-									maximum: 64,
-									dataType: "Text",
-									isRequired: false,
-									name: "LastName",
-									displayOrder: 0,
-									isSearchable: true,
-									displayName: {
-										"en-CA": "Last name",
-										"en-US": "Last name",
-										"fr-CA": "Last name",
-										"it-IT": "Cognome",
-									},
-									minimum: 0,
-									multilingual: false,
-									isBuiltIn: true,
-									groupId: "Default",
-									allowMultipleValues: false,
-								},
-								{
-									maximum: 64,
-									dataType: "Text",
-									isRequired: false,
-									name: "FirstName",
-									displayOrder: 0,
-									isSearchable: true,
-									displayName: {
-										"ar-JO": "",
-										"en-CA": "First Name",
-										"en-US": "First Name",
-										"es-ES": "",
-										"fr-CA": "First Name",
-										"it-IT": "Nome",
-									},
-									minimum: 0,
-									multilingual: false,
-									isBuiltIn: true,
-									groupId: "Default",
-									allowMultipleValues: false,
-								},
+								baseBuitInAttribute4,
+								baseBuitInAttribute3,
+								baseCustomAttribute1,
+								baseCustomAttribute3,
+								baseCustomAttribute2,
 							],
 							isSharedEntity: true,
 						},
@@ -1359,7 +1421,7 @@ describe("definitions", () => {
 			{},
 		));
 
-	it("will return correct custom profile attributes definition", () => {
+	it("will return correct custom profile attributes definition in correct order", () => {
 		const expectedGroup1 = customProfileAttribute1.groupId;
 		const expectedGroup2 = customProfileAttribute2.groupId;
 		const expectedItem1 = {
@@ -1371,11 +1433,26 @@ describe("definitions", () => {
 			...{ displayName: customProfileAttribute2.displayName["en-US"] },
 		};
 
+		const expectedBaseCustomWithOrder1 = {
+			...baseCustomAttribute1,
+			...{ displayName: baseCustomAttribute1.displayName["en-US"] },
+		};
+
+		const expectedBaseCustomWithOrder2 = {
+			...baseCustomAttribute2,
+			...{ displayName: baseCustomAttribute2.displayName["en-US"] },
+		};
+
+		const expectedBaseCustomWithOrder3 = {
+			...baseCustomAttribute3,
+			...{ displayName: baseCustomAttribute3.displayName["en-US"] },
+		};
+
 		const expected = Immutable.fromJS({
 			[expectedGroup1]: {
 				id: expectedGroup1,
 				name: "Default en-US",
-				baseAttributes: [],
+				baseAttributes: [expectedBaseCustomWithOrder1, expectedBaseCustomWithOrder2, expectedBaseCustomWithOrder3],
 				profileAttributes: [expectedItem1],
 			},
 			[expectedGroup2]: {
@@ -1397,90 +1474,12 @@ describe("definitions", () => {
 		);
 	});
 
-	it("will return correct full base customer definition attributes", () => {
+	it("will return correct full base (built in) customer definition attributes", () => {
 		const expected = Immutable.fromJS([
-			{
-				maximum: 256,
-				dataType: "Text",
-				isRequired: false,
-				name: "Username",
-				displayOrder: 0,
-				isSearchable: true,
-				displayName: {
-					"ar-JO": "",
-					"en-CA": "User name",
-					"en-US": "User name",
-					"es-ES": "",
-					"fr-CA": "User name",
-					"it-IT": "Nome utente",
-				},
-				minimum: 1,
-				multilingual: false,
-				isBuiltIn: true,
-				groupId: "Default",
-				allowMultipleValues: false,
-			},
-			{
-				maximum: 256,
-				dataType: "Text",
-				isRequired: false,
-				name: "Email",
-				displayOrder: 0,
-				isSearchable: true,
-				displayName: {
-					"ar-JO": "",
-					"en-CA": "Email",
-					"en-US": "Email",
-					"es-ES": "",
-					"fr-CA": "Email",
-					"it-IT": "Email",
-				},
-				minimum: 0,
-				multilingual: false,
-				isBuiltIn: true,
-				groupId: "Default",
-				allowMultipleValues: false,
-			},
-			{
-				maximum: 64,
-				dataType: "Text",
-				isRequired: false,
-				name: "LastName",
-				displayOrder: 0,
-				isSearchable: true,
-				displayName: {
-					"en-CA": "Last name",
-					"en-US": "Last name",
-					"fr-CA": "Last name",
-					"it-IT": "Cognome",
-				},
-				minimum: 0,
-				multilingual: false,
-				isBuiltIn: true,
-				groupId: "Default",
-				allowMultipleValues: false,
-			},
-			{
-				maximum: 64,
-				dataType: "Text",
-				isRequired: false,
-				name: "FirstName",
-				displayOrder: 0,
-				isSearchable: true,
-				displayName: {
-					"ar-JO": "",
-					"en-CA": "First Name",
-					"en-US": "First Name",
-					"es-ES": "",
-					"fr-CA": "First Name",
-					"it-IT": "Nome",
-				},
-				minimum: 0,
-				multilingual: false,
-				isBuiltIn: true,
-				groupId: "Default",
-				allowMultipleValues: false,
-			},
+			baseBuitInAttribute1,
+			baseBuitInAttribute2,
+			baseBuitInAttribute3,
+			baseBuitInAttribute4,
 		]);
 		expect(
 			definitionEntityBaseAttributesSelector,
@@ -1495,34 +1494,11 @@ describe("definitions", () => {
 
 	it("will return correct full custom customer definition attributes", () => {
 		const expected = Immutable.fromJS([
-			{
-				dataType: "EntityReference",
-				isRequired: false,
-				name: "InnaCustom1",
-				displayOrder: 0,
-				isSearchable: false,
-				displayName: { "en-CA": "attribute en-CA", "en-US": "attribute en-US", "fr-CA": "" },
-				referenceTypeName: "CustomProfile1",
-				multilingual: false,
-				isBuiltIn: false,
-				groupId: "Default",
-				allowMultipleValues: true,
-				description: "InnaCustomer",
-			},
-			{
-				dataType: "EntityReference",
-				isRequired: false,
-				name: "InnaCustom2",
-				displayOrder: 0,
-				isSearchable: false,
-				displayName: { "en-CA": "attribute en-CA", "en-US": "attribute en-UA", "fr-CA": "" },
-				referenceTypeName: "CustomProfile2",
-				multilingual: false,
-				isBuiltIn: false,
-				groupId: "CustomGroup",
-				allowMultipleValues: true,
-				description: "InnaCustom2",
-			},
+			customProfileAttribute1,
+			customProfileAttribute2,
+			baseCustomAttribute1,
+			baseCustomAttribute2,
+			baseCustomAttribute3,
 		]);
 		expect(
 			definitionEntityCustomAttributesSelector,
@@ -1535,64 +1511,30 @@ describe("definitions", () => {
 		);
 	});
 
-	it("will return correct customer attributes", () => {
+	it("will return correct customer base (build in) attributes in correct order", () => {
+		const locale = "en-US";
+		const expectedBaseBuitInAttribute1 = {
+			...baseBuitInAttribute1,
+			...{ displayName: baseBuitInAttribute1.displayName[locale] },
+		};
+		const expectedBaseBuitInAttribute2 = {
+			...baseBuitInAttribute2,
+			...{ displayName: baseBuitInAttribute2.displayName[locale] },
+		};
+		const expectedBaseBuitInAttribute3 = {
+			...baseBuitInAttribute3,
+			...{ displayName: baseBuitInAttribute3.displayName[locale] },
+		};
+		const expectedBaseBuitInAttribute4 = {
+			...baseBuitInAttribute4,
+			...{ displayName: baseBuitInAttribute4.displayName[locale] },
+		};
+
 		const expected = Immutable.fromJS([
-			{
-				maximum: 256,
-				dataType: "Text",
-				isRequired: false,
-				name: "Username",
-				displayOrder: 0,
-				isSearchable: true,
-				displayName: "User name",
-				minimum: 1,
-				multilingual: false,
-				isBuiltIn: true,
-				groupId: "Default",
-				allowMultipleValues: false,
-			},
-			{
-				maximum: 256,
-				dataType: "Text",
-				isRequired: false,
-				name: "Email",
-				displayOrder: 0,
-				isSearchable: true,
-				displayName: "Email",
-				minimum: 0,
-				multilingual: false,
-				isBuiltIn: true,
-				groupId: "Default",
-				allowMultipleValues: false,
-			},
-			{
-				maximum: 64,
-				dataType: "Text",
-				isRequired: false,
-				name: "LastName",
-				displayOrder: 0,
-				isSearchable: true,
-				displayName: "Last name",
-				minimum: 0,
-				multilingual: false,
-				isBuiltIn: true,
-				groupId: "Default",
-				allowMultipleValues: false,
-			},
-			{
-				maximum: 64,
-				dataType: "Text",
-				isRequired: false,
-				name: "FirstName",
-				displayOrder: 0,
-				isSearchable: true,
-				displayName: "First Name",
-				minimum: 0,
-				multilingual: false,
-				isBuiltIn: true,
-				groupId: "Default",
-				allowMultipleValues: false,
-			},
+			expectedBaseBuitInAttribute1,
+			expectedBaseBuitInAttribute2,
+			expectedBaseBuitInAttribute3,
+			expectedBaseBuitInAttribute4,
 		]);
 		expect(
 			baseAttributesSelector,
@@ -1606,41 +1548,37 @@ describe("definitions", () => {
 	});
 
 	it("will return correct customer attributes definition", () => {
+		const locale = "en-US";
+		const expectedProfileAttribute1 = {
+			...customProfileAttribute1,
+			...{ displayName: customProfileAttribute1.displayName[locale] },
+		};
+		const expectedProfileAttribute2 = {
+			...customProfileAttribute2,
+			...{ displayName: customProfileAttribute2.displayName[locale] },
+		};
+
+		const expectedBase1 = {
+			...baseCustomAttribute1,
+			...{ displayName: baseCustomAttribute1.displayName[locale] },
+		};
+
+		const expectedBase2 = {
+			...baseCustomAttribute2,
+			...{ displayName: baseCustomAttribute2.displayName[locale] },
+		};
+
+		const expectedBase3 = {
+			...baseCustomAttribute3,
+			...{ displayName: baseCustomAttribute3.displayName[locale] },
+		};
+
 		const expected = Immutable.fromJS({
 			displayName: "Customer",
 			entityTypeName: "CUSTOMER",
 			isBuiltIn: true,
-			baseAttributes: [],
-			profileAttributes: [
-				{
-					dataType: "EntityReference",
-					isRequired: false,
-					name: "InnaCustom1",
-					displayOrder: 0,
-					isSearchable: false,
-					displayName: "attribute en-US",
-					referenceTypeName: "CustomProfile1",
-					multilingual: false,
-					isBuiltIn: false,
-					groupId: "Default",
-					allowMultipleValues: true,
-					description: "InnaCustomer",
-				},
-				{
-					dataType: "EntityReference",
-					isRequired: false,
-					name: "InnaCustom2",
-					displayOrder: 0,
-					isSearchable: false,
-					displayName: "attribute en-UA",
-					referenceTypeName: "CustomProfile2",
-					multilingual: false,
-					isBuiltIn: false,
-					groupId: "CustomGroup",
-					allowMultipleValues: true,
-					description: "InnaCustom2",
-				},
-			],
+			baseAttributes: [expectedBase1, expectedBase2, expectedBase3],
+			profileAttributes: [expectedProfileAttribute1, expectedProfileAttribute2],
 			isSharedEntity: true,
 		});
 		expect(

package/src/selectors/scope.js

@@ -15,7 +15,7 @@ const scopeData = state => state.get("scopes");
 
 export const getScopesSelector = createSelector(scopeData, scopes => scopes);
 
-const localizedScopesSelector = createSelector(scopeData, currentLocaleOrDefault, (scopes, locale) =>
+export const localizedScopesSelector = createSelector(scopeData, currentLocaleOrDefault, (scopes, locale) =>
 	scopes.map(scope =>
 		scope.withMutations(s => {
 			setTranslationWithFallbackField(locale, s, "id", "name");

package/src/translations/en-US.json

@@ -12,7 +12,7 @@
 	"orc-shared.ccVersion": "Commerce Cloud {version}",
 	"orc-shared.close": "Close",
 	"orc-shared.confirmation": "Confirmation",
-	"orc-shared.copyright": "© 2021 Orckestra Technologies Inc.",
+	"orc-shared.copyright": "© {year} Orckestra Technologies Inc.",
 	"orc-shared.copyrightTermsNotice": "This computer program is protected by copyright laws and international treaties. Unauthorized reproduction or redistribution of this program, or any portion of it, may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under the law. Orckestra is a trademark of Orckestra Technologies Inc. All other trademarks are property of the respective owners.",
 	"orc-shared.defaultApp": "Default application",
 	"orc-shared.delete": "Delete",

package/src/translations/fr-CA.json

@@ -12,7 +12,7 @@
 	"orc-shared.ccVersion": "Commerce Cloud {version}",
 	"orc-shared.close": "Fermer",
 	"orc-shared.confirmation": "Confirmation",
-	"orc-shared.copyright": "© 2021 Technologies Orckestra Inc.",
+	"orc-shared.copyright": "© {year} Technologies Orckestra Inc.",
 	"orc-shared.copyrightTermsNotice": "Avertissement: Ce programme est protégé par la loi relative au droit d'auteur et par les conventions internationales. Toute reproduction ou distribution partielle ou totale du logiciel, par quelque moyen que ce soit, est strictement interdite. Toute personne ne respectant pas ces dispositions se rendra coupable du délit de contrefaçon et sera passible des sanctions pénales prévues par la loi. Orckestra est une marque de commerce déposée et détenue par Technologies Orckestra Inc. Toutes les autres marques de commerce sont la propriété de leurs détenteurs respectifs.",
 	"orc-shared.defaultApp": "Application par défaut",
 	"orc-shared.delete": "Supprimer",

package/src/utils/localizationHelper.js

@@ -22,7 +22,19 @@ export function getNotLocalizedString(value) {
 	return value && `[${value}]`;
 }
 
+export function findCorrespondingLocale(locales, language) {
+	return (
+		locales[language] ??
+		locales[language.replace(/-/g, "")] ??
+		locales[language.toLowerCase()] ??
+		locales[language.toLowerCase().replace(/-/g, "")] ??
+		locales[language.substring(0, 2).toLowerCase()] ??
+		null
+	);
+}
+
 export default {
 	getLocalization,
 	getNotLocalizedString,
+	findCorrespondingLocale,
 };

package/src/utils/localizationHelper.test.js

@@ -76,3 +76,67 @@ describe("<localizationHelper.getLocalization>", () => {
 		expect(localizationHelper.getLocalization(defaultLocalizations, "it", "fallback"), "to equal", fallbackValue);
 	});
 });
+
+describe("findCorrespondingLocale", () => {
+	const locales = {
+		fr: "FR",
+		enGB: "GB",
+		enNZ: "NZ",
+		"en-in": "IN",
+		enau: "AU",
+		"en-IE": "IE",
+		frCa: "CA",
+	};
+
+	it("findCorrespondingLocale should return null for en-US", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "en-US"), "to equal", null);
+	});
+
+	it("findCorrespondingLocale should return FR for fr-FR", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "fr-FR"), "to equal", "FR");
+	});
+
+	it("findCorrespondingLocale should return FR for fr-fr", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "fr-fr"), "to equal", "FR");
+	});
+
+	it("findCorrespondingLocale should return FR for frFR", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "frFR"), "to equal", "FR");
+	});
+
+	it("findCorrespondingLocale should return FR for frfr", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "frfr"), "to equal", "FR");
+	});
+
+	it("findCorrespondingLocale should return IE for en-IE", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "en-IE"), "to equal", "IE");
+	});
+
+	it("findCorrespondingLocale should return GB for en-GB", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "en-GB"), "to equal", "GB");
+	});
+
+	it("findCorrespondingLocale should return GB for en-NZ", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "en-NZ"), "to equal", "NZ");
+	});
+
+	it("findCorrespondingLocale should return AU for en-AU", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "en-AU"), "to equal", "AU");
+	});
+
+	it("findCorrespondingLocale should return AU for en-au", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "en-au"), "to equal", "AU");
+	});
+
+	it("findCorrespondingLocale should return AU for enAU", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "enAU"), "to equal", "AU");
+	});
+
+	it("findCorrespondingLocale should return IN for en-IN", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "en-IN"), "to equal", "IN");
+	});
+
+	it("findCorrespondingLocale should return CA for frCa", () => {
+		expect(localizationHelper.findCorrespondingLocale(locales, "frCa"), "to equal", "CA");
+	});
+});