orc-shared 1.2.0-dev.10 → 1.2.0-dev.11

package/dist/selectors/metadata.js

@@ -93,9 +93,9 @@ var namedLookupSelector = (0, _utils.memoize)(function (moduleName, lookupName)
 });
 exports.namedLookupSelector = namedLookupSelector;
 var namedLookupValuesSelector = (0, _utils.memoize)(function (moduleName, lookupName) {
-  return (0, _reselect.createSelector)(namedLookupSelector(moduleName, lookupName), _locale.currentLocaleOrDefault, function (statuses, locale) {
-    return (statuses.get("values") || _immutable.default.Map()).map(function (status) {
-      return (0, _utils.setTranslation)(locale, status, "displayName");
+  return (0, _reselect.createSelector)(namedLookupSelector(moduleName, lookupName), _locale.currentLocaleOrDefault, function (lookup, locale) {
+    return (lookup.get("values") || _immutable.default.Map()).map(function (lookupValue) {
+      return (0, _setTranslationWithFallback.setTranslationWithFallbackField)(locale, lookupValue, "name", "displayName");
     });
   });
 });
@@ -230,6 +230,8 @@ var filterIsBuiltInAttributes = function filterIsBuiltInAttributes(isBuiltIn) {
   return function (attributes) {
     return attributes.filter(function (a) {
       return a.get("isBuiltIn") === isBuiltIn;
+    }).sortBy(function (x) {
+      return x.get("displayOrder");
     });
   };
 };
@@ -278,8 +280,12 @@ var groupedCustomAttributesDefinitionSelector = (0, _utils.memoize)(function (mo
         displayOrder: profileAttributeGroup == null ? void 0 : profileAttributeGroup.get("displayOrder")
       }).set("baseAttributes", group.filter(function (i) {
         return i.get("dataType") !== _constants.attributeDataType.entityReference;
+      }).sortBy(function (x) {
+        return x.get("displayOrder");
       })).set("profileAttributes", group.filter(function (i) {
         return i.get("dataType") === _constants.attributeDataType.entityReference;
+      }).sortBy(function (x) {
+        return x.get("displayOrder");
       }));
     }).sortBy(function (x) {
       return x.get("displayOrder");
@@ -291,9 +297,13 @@ var customAttributesDefinitionSelector = (0, _utils.memoize)(function (moduleNam
   return (0, _reselect.createSelector)(mappedDefinitionEntity(moduleName, profileEntityName), customAttributesSelector(moduleName, profileEntityName), function (definition, attributes) {
     var profileAttributes = attributes == null ? void 0 : attributes.filter(function (a) {
       return a.get("dataType") === _constants.attributeDataType.entityReference;
+    }).sortBy(function (x) {
+      return x.get("displayOrder");
     });
     var baseAttributes = attributes == null ? void 0 : attributes.filter(function (a) {
       return a.get("dataType") !== _constants.attributeDataType.entityReference;
+    }).sortBy(function (x) {
+      return x.get("displayOrder");
     });
     return definition.set("baseAttributes", baseAttributes).set("profileAttributes", profileAttributes);
   });

package/dist/selectors/scope.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.scopeGetter = exports.scopeDefaultCultureSelector = exports.localizedScopesSelectorByIds = exports.localizedScopeSelector = exports.isCurrentScopeAuthorizedSelector = exports.getScopesSelector = exports.currentScopeSelector = void 0;
+exports.scopeGetter = exports.scopeDefaultCultureSelector = exports.localizedScopesSelectorByIds = exports.localizedScopesSelector = exports.localizedScopeSelector = exports.isCurrentScopeAuthorizedSelector = exports.getScopesSelector = exports.currentScopeSelector = void 0;
 
 var _reselect = require("reselect");
 
@@ -52,6 +52,7 @@ var localizedScopesSelector = (0, _reselect.createSelector)(scopeData, _locale.c
     });
   });
 });
+exports.localizedScopesSelector = localizedScopesSelector;
 var currentScopeSelector = (0, _reselect.createSelector)(_navigation.getCurrentScope, localizedScopesSelector, function (id, scopes) {
   return scopes.get(id) || _immutable.default.Map();
 });

package/dist/utils/setTranslation.js

@@ -15,6 +15,12 @@ var _flatten = require("./flatten");
   enterModule && enterModule(module);
 })();
 
+function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
@@ -30,7 +36,27 @@ var setTranslation = function setTranslation(locale, obj) {
   }
 
   if (!obj || !obj.getIn((0, _flatten.flatten)([field]))) return obj;
-  var value = obj.getIn((0, _flatten.flatten)([field, locale])) || obj.getIn((0, _flatten.flatten)([field])).filter(function (i) {
+  var localeValue = obj.getIn((0, _flatten.flatten)([field, locale]));
+
+  if (!localeValue && locale.includes("-")) {
+    var fieldValue = obj.getIn((0, _flatten.flatten)([field]));
+    var fieldKeys = fieldValue.keys();
+    var language = locale.substring(0, locale.indexOf("-"));
+
+    for (var _iterator = _createForOfIteratorHelperLoose(fieldKeys), _step; !(_step = _iterator()).done;) {
+      var key = _step.value;
+
+      if (key !== locale && key.startsWith(language)) {
+        localeValue = obj.getIn((0, _flatten.flatten)([field, key]));
+
+        if (localeValue) {
+          break;
+        }
+      }
+    }
+  }
+
+  var value = localeValue || obj.getIn((0, _flatten.flatten)([field])).filter(function (i) {
     return i;
   }).first() || "";
   return obj.setIn((0, _flatten.flatten)([field]), value);

package/dist/utils/setTranslationWithFallback.js

@@ -15,6 +15,12 @@ var _flatten = require("./flatten");
   enterModule && enterModule(module);
 })();
 
+function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
@@ -30,7 +36,30 @@ var setTranslationWithFallbackValue = function setTranslationWithFallbackValue(l
     field[_key - 3] = arguments[_key];
   }
 
-  var value = obj.getIn((0, _flatten.flatten)([field, locale])) || fallbackValue || "";
+  var localeValue = obj.getIn((0, _flatten.flatten)([field, locale]));
+
+  if (!localeValue && locale.includes("-")) {
+    var fieldValue = obj.getIn((0, _flatten.flatten)([field]));
+
+    if (fieldValue) {
+      var fieldKeys = fieldValue.keys();
+      var language = locale.substring(0, locale.indexOf("-"));
+
+      for (var _iterator = _createForOfIteratorHelperLoose(fieldKeys), _step; !(_step = _iterator()).done;) {
+        var key = _step.value;
+
+        if (key !== locale && key.startsWith(language)) {
+          localeValue = obj.getIn((0, _flatten.flatten)([field, key]));
+
+          if (localeValue) {
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  var value = localeValue || fallbackValue || "";
   return obj.setIn((0, _flatten.flatten)([field]), value);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "1.2.0-dev.10",
+	"version": "1.2.0-dev.11",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {

package/src/selectors/metadata.js

@@ -46,8 +46,10 @@ export const namedLookupSelector = memoize((moduleName, lookupName) =>
 );
 
 export const namedLookupValuesSelector = memoize((moduleName, lookupName) =>
-	createSelector(namedLookupSelector(moduleName, lookupName), currentLocaleOrDefault, (statuses, locale) =>
-		(statuses.get("values") || Immutable.Map()).map(status => setTranslation(locale, status, "displayName")),
+	createSelector(namedLookupSelector(moduleName, lookupName), currentLocaleOrDefault, (lookup, locale) =>
+		(lookup.get("values") || Immutable.Map()).map(lookupValue =>
+			setTranslationWithFallbackField(locale, lookupValue, "name", "displayName"),
+		),
 	),
 );
 
@@ -157,7 +159,8 @@ const definitionEntityAttributes = memoize((moduleName, entityName) =>
 	),
 );
 
-const filterIsBuiltInAttributes = isBuiltIn => attributes => attributes.filter(a => a.get("isBuiltIn") === isBuiltIn);
+const filterIsBuiltInAttributes = isBuiltIn => attributes =>
+	attributes.filter(a => a.get("isBuiltIn") === isBuiltIn).sortBy(x => x.get("displayOrder"));
 
 export const definitionEntityCustomAttributesSelector = memoize((moduleName, entityName) =>
 	createSelector(definitionEntityAttributes(moduleName, entityName), filterIsBuiltInAttributes(false)),
@@ -204,11 +207,15 @@ export const groupedCustomAttributesDefinitionSelector = memoize((moduleName, en
 					})
 						.set(
 							"baseAttributes",
-							group.filter(i => i.get("dataType") !== attributeDataType.entityReference),
+							group
+								.filter(i => i.get("dataType") !== attributeDataType.entityReference)
+								.sortBy(x => x.get("displayOrder")),
 						)
 						.set(
 							"profileAttributes",
-							group.filter(i => i.get("dataType") === attributeDataType.entityReference),
+							group
+								.filter(i => i.get("dataType") === attributeDataType.entityReference)
+								.sortBy(x => x.get("displayOrder")),
 						);
 				})
 				.sortBy(x => x.get("displayOrder")),
@@ -220,8 +227,12 @@ export const customAttributesDefinitionSelector = memoize((moduleName, profileEn
 		mappedDefinitionEntity(moduleName, profileEntityName),
 		customAttributesSelector(moduleName, profileEntityName),
 		(definition, attributes) => {
-			const profileAttributes = attributes?.filter(a => a.get("dataType") === attributeDataType.entityReference);
-			const baseAttributes = attributes?.filter(a => a.get("dataType") !== attributeDataType.entityReference);
+			const profileAttributes = attributes
+				?.filter(a => a.get("dataType") === attributeDataType.entityReference)
+				.sortBy(x => x.get("displayOrder"));
+			const baseAttributes = attributes
+				?.filter(a => a.get("dataType") !== attributeDataType.entityReference)
+				.sortBy(x => x.get("displayOrder"));
 			return definition.set("baseAttributes", baseAttributes).set("profileAttributes", profileAttributes);
 		},
 	),

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/utils/setTranslation.js

@@ -3,8 +3,23 @@ import { flatten } from "./flatten";
 /* Replaces a locale string structure with the string for the given locale. */
 const setTranslation = (locale, obj, ...field) => {
 	if (!obj || !obj.getIn(flatten([field]))) return obj;
+	let localeValue = obj.getIn(flatten([field, locale]));
+	if (!localeValue && locale.includes("-")) {
+		let fieldValue = obj.getIn(flatten([field]));
+		let fieldKeys = fieldValue.keys();
+		let language = locale.substring(0, locale.indexOf("-"));
+
+		for (let key of fieldKeys) {
+			if (key !== locale && key.startsWith(language)) {
+				localeValue = obj.getIn(flatten([field, key]));
+				if (localeValue) {
+					break;
+				}
+			}
+		}
+	}
 	const value =
-		obj.getIn(flatten([field, locale])) ||
+		localeValue ||
 		obj
 			.getIn(flatten([field]))
 			.filter(i => i)

package/src/utils/setTranslation.test.js

@@ -96,4 +96,28 @@ describe("setTranslation", () => {
 				hat: { name: "it-name" },
 			}),
 		));
+
+	it("returns first not empty match by language if language-culture not found", () =>
+		expect(
+			setTranslation,
+			"when called with",
+			[
+				"en-US",
+				Immutable.fromJS({
+					hat: {
+						name: {
+							"en-CA": "",
+							"fr-CA": "fr CA name",
+							"en-GB": "en GB name",
+							"it-IT": "it-name",
+						},
+					},
+				}),
+				["hat", "name"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: "en GB name" },
+			}),
+		));
 });

package/src/utils/setTranslationWithFallback.js

@@ -2,7 +2,24 @@ import { flatten } from "./flatten";
 
 export const setTranslationWithFallbackValue = (locale, obj, fallbackValue, ...field) => {
 	if (!obj) return obj;
-	const value = obj.getIn(flatten([field, locale])) || fallbackValue || "";
+	let localeValue = obj.getIn(flatten([field, locale]));
+	if (!localeValue && locale.includes("-")) {
+		let fieldValue = obj.getIn(flatten([field]));
+		if (fieldValue) {
+			let fieldKeys = fieldValue.keys();
+			let language = locale.substring(0, locale.indexOf("-"));
+
+			for (let key of fieldKeys) {
+				if (key !== locale && key.startsWith(language)) {
+					localeValue = obj.getIn(flatten([field, key]));
+					if (localeValue) {
+						break;
+					}
+				}
+			}
+		}
+	}
+	const value = localeValue || fallbackValue || "";
 	return obj.setIn(flatten([field]), value);
 };
 

package/src/utils/setTranslationWithFallback.test.js

@@ -147,4 +147,112 @@ describe("setTranslationWithFallbackValue", () => {
 			"to equal",
 			null,
 		));
+
+	it("returns value matched by language-culture when exist", () =>
+		expect(
+			setTranslationWithFallbackValue,
+			"when called with",
+			[
+				"en-US",
+				Immutable.fromJS({
+					hat: { name: { "en-US": "en-US Name", "en-GB": "en-GB Name" } },
+				}),
+				"fallbakValue",
+				["hat", "name"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: "en-US Name" },
+			}),
+		));
+
+	it("returns value matched by language when match by language-culture does not exist", () =>
+		expect(
+			setTranslationWithFallbackValue,
+			"when called with",
+			[
+				"en-US",
+				Immutable.fromJS({
+					hat: { name: { "en-GB": "en-GB Name" } },
+				}),
+				"fallbakValue",
+				["hat", "name"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: "en-GB Name" },
+			}),
+		));
+
+	it("returns first not empty value matched by language when match by language-culture does not exist", () =>
+		expect(
+			setTranslationWithFallbackValue,
+			"when called with",
+			[
+				"en-US",
+				Immutable.fromJS({
+					hat: { name: { "en-GB": "", "en-CA": "en-CA Name" } },
+				}),
+				"fallbakValue",
+				["hat", "name"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: "en-CA Name" },
+			}),
+		));
+
+	it("returns value fallback value  when match by language-culture and language does not exist", () =>
+		expect(
+			setTranslationWithFallbackValue,
+			"when called with",
+			[
+				"en-GB",
+				Immutable.fromJS({
+					hat: { name: { "fr-CA": "fr-CA Name" } },
+				}),
+				"fallbakValue",
+				["hat", "name"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: "fallbakValue" },
+			}),
+		));
+
+	it("returns fallbak Value when field value is empty ", () =>
+		expect(
+			setTranslationWithFallbackValue,
+			"when called with",
+			[
+				"en-GB",
+				Immutable.fromJS({
+					hat: { name: {} },
+				}),
+				"fallbakValue",
+				["hat", "name"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: "fallbakValue" },
+			}),
+		));
+
+	it("returns fallbakValue when field is undefined ", () =>
+		expect(
+			setTranslationWithFallbackValue,
+			"when called with",
+			[
+				"en-GB",
+				Immutable.fromJS({
+					hat: { name: {} },
+				}),
+				"fallbakValue",
+				["hat", "name2"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: {}, name2: "fallbakValue" },
+			}),
+		));
 });