@contrail/documents 1.1.24 → 1.1.25

package/lib/document-element-property-binding-handler.js

@@ -6,7 +6,7 @@ const common_1 = require("./types/common");
 const util_1 = require("@contrail/util");
 class DocumentElementPropertyBindingHandler {
     static bindPropertiesToElements(elements, model) {
-        elements.map((el) => {
+        elements.map(el => {
             this.bindPropertiesToElement(el, model);
         });
     }
@@ -20,7 +20,12 @@ class DocumentElementPropertyBindingHandler {
         }
         for (const propertyKey of Object.keys(element.propertyBindings)) {
             const modelIndex = element.propertyBindings[propertyKey];
+            const pathParts = modelIndex.split('.');
+            const isNestedPropertyAccess = pathParts.length > 2;
             let propertyValue = util_1.ObjectUtil.getByPath(localModel, modelIndex);
+            if ((propertyValue === null || propertyValue === void 0 ? void 0 : propertyValue.name) && !isNestedPropertyAccess) {
+                propertyValue = propertyValue.name;
+            }
             if (propertyValue === null || propertyValue === undefined) {
                 propertyValue = '';
             }
@@ -34,7 +39,7 @@ class DocumentElementPropertyBindingHandler {
             let viewableObject;
             const content = (_e = model === null || model === void 0 ? void 0 : model.viewable) === null || _e === void 0 ? void 0 : _e.content;
             if ((content === null || content === void 0 ? void 0 : content.length) > 0) {
-                const primaryContent = content.find((c) => { var _a; return (c === null || c === void 0 ? void 0 : c.id) === ((_a = model === null || model === void 0 ? void 0 : model.viewable) === null || _a === void 0 ? void 0 : _a.primaryViewableId); });
+                const primaryContent = content.find(c => { var _a; return (c === null || c === void 0 ? void 0 : c.id) === ((_a = model === null || model === void 0 ? void 0 : model.viewable) === null || _a === void 0 ? void 0 : _a.primaryViewableId); });
                 viewableObject = primaryContent;
             }
             else {

package/lib/util/dynamic-text/dynamic-text-util.js

@@ -98,7 +98,7 @@ class DynamicTextUtil {
                         property = null;
                     }
                     const frameMemberValues = [];
-                    componentModels.forEach(elementModel => {
+                    componentModels.forEach((elementModel) => {
                         frameMemberValues.push(util_1.ObjectUtil.getByPath(elementModel, bindingProperty));
                     });
                     if (frameMemberValues.length > 0) {
@@ -179,9 +179,9 @@ class DynamicTextUtil {
         }
         else if (displayFunction === DynamicTextDisplayFunction.UNIQUE_ARRAY) {
             text = Array.from(new Set(memberValues
-                .filter(e => e !== null && e !== undefined)
+                .filter((e) => e !== null && e !== undefined)
                 .flat()
-                .map(e => formatter.formatValueForProperty(e, property))))
+                .map((e) => formatter.formatValueForProperty(e, property))))
                 .sort()
                 .join(', ');
         }
@@ -193,31 +193,31 @@ class DynamicTextUtil {
             text = formatter.formatValueForProperty(memberValues[memberValues.length - 1], property);
         }
         else if (displayFunction === DynamicTextDisplayFunction.MIN) {
-            memberValues = memberValues.filter(e => e !== null && e !== undefined);
+            memberValues = memberValues.filter((e) => e !== null && e !== undefined);
             text = formatter.formatValueForProperty(Math.min(...memberValues), property);
         }
         else if (displayFunction === DynamicTextDisplayFunction.MAX) {
-            memberValues = memberValues.filter(e => e !== null && e !== undefined);
+            memberValues = memberValues.filter((e) => e !== null && e !== undefined);
             text = formatter.formatValueForProperty(Math.max(...memberValues), property);
         }
         return text;
     }
     static getItemCount(countType, componentModels) {
-        const elementModels = componentModels.map(elementModel => {
+        const elementModels = componentModels.map((elementModel) => {
             return elementModel.item || elementModel.color;
         });
         let count = 0;
         if (countType === 'itemFamilyCount') {
-            count = new Set(elementModels.filter(model => model.entityType === 'item').map(model => model === null || model === void 0 ? void 0 : model.itemFamilyId))
+            count = new Set(elementModels.filter((model) => model.entityType === 'item').map((model) => model === null || model === void 0 ? void 0 : model.itemFamilyId))
                 .size;
         }
         else if (countType === 'itemOptionCount') {
             count = new Set(elementModels
-                .filter(model => model.entityType === 'item' && model.roles.includes('option'))
-                .map(model => model === null || model === void 0 ? void 0 : model.id)).size;
+                .filter((model) => model.entityType === 'item' && model.roles.includes('option'))
+                .map((model) => model === null || model === void 0 ? void 0 : model.id)).size;
         }
         else if (countType === 'colorCount') {
-            count = new Set(elementModels.filter(model => model.entityType === 'color').map(model => model === null || model === void 0 ? void 0 : model.id)).size;
+            count = new Set(elementModels.filter((model) => model.entityType === 'color').map((model) => model === null || model === void 0 ? void 0 : model.id)).size;
         }
         return count.toString();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/documents",
-  "version": "1.1.24",
+  "version": "1.1.25",
   "description": "Documents library for contrail platform",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",