@contrail/documents 1.1.23 → 1.2.1

package/lib/util/dynamic-text/dynamic-text-util.d.ts

@@ -1,4 +1,4 @@
-import { TypeProperty } from '@contrail/types';
+import { PropertyLevel, TypeProperty } from '@contrail/types';
 import { DocumentElement } from '../../types/document-element';
 export declare enum DYNAMIC_TEXT_DATA_SOURCE {
     PROJECT = "project",
@@ -36,7 +36,7 @@ export declare const HARD_CODED_TEXT: {
     'frame.colorCount': string;
 };
 export declare class DynamicTextUtil {
-    static getDynamicTextValue(dynamicTextElement: DocumentElement, property: TypeProperty, frame: {
+    static getDynamicTextValue(dynamicTextElement: DocumentElement, property: TypeProperty, propertyLevel: PropertyLevel, frame: {
         name: string;
         id?: string;
     }, componentModels: any[], ownerReferenceModel?: any): string;

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

@@ -49,7 +49,7 @@ const frameProperties = [
     'frame.colorCount',
 ];
 class DynamicTextUtil {
-    static getDynamicTextValue(dynamicTextElement, property, frame, componentModels, ownerReferenceModel = null) {
+    static getDynamicTextValue(dynamicTextElement, property, propertyLevel, frame, componentModels, ownerReferenceModel = null) {
         var _a, _b, _c, _d;
         if (!dynamicTextElement.propertyBindings || !dynamicTextElement.propertyBindings.text) {
             return exports.CLICK_TO_CONFIGURE;
@@ -98,6 +98,11 @@ class DynamicTextUtil {
                         property = null;
                     }
                     const frameMemberValues = [];
+                    if (propertyLevel) {
+                        componentModels = Array.from(new Map(componentModels
+                            .filter((model) => { var _a, _b; return (_b = (_a = model[entityType]) === null || _a === void 0 ? void 0 : _a.roles) === null || _b === void 0 ? void 0 : _b.includes(propertyLevel); })
+                            .map((model) => { var _a; return [(_a = model[entityType]) === null || _a === void 0 ? void 0 : _a.id, model]; })).values());
+                    }
                     componentModels.forEach((elementModel) => {
                         frameMemberValues.push(util_1.ObjectUtil.getByPath(elementModel, bindingProperty));
                     });
@@ -167,8 +172,8 @@ class DynamicTextUtil {
         }
         const formatter = new types_1.PropertyValueFormatter();
         if (displayFunction === DynamicTextDisplayFunction.AVERAGE) {
-            memberValues = memberValues.filter(Number);
-            text = formatter.formatValueForProperty(memberValues.reduce((a, b) => a + b, 0) / memberValues.length, property);
+            const memberNumValues = memberValues.filter(Number);
+            text = formatter.formatValueForProperty(memberNumValues.reduce((a, b) => a + b, 0) / memberValues.length, property);
         }
         else if (displayFunction === DynamicTextDisplayFunction.SUM) {
             memberValues = memberValues.filter(Number);
@@ -190,8 +195,13 @@ class DynamicTextUtil {
             text = formatter.formatValueForProperty(memberValues[memberValues.length - 1], property);
         }
         else if (displayFunction === DynamicTextDisplayFunction.MIN) {
-            memberValues = memberValues.filter((e) => e !== null && e !== undefined);
-            text = formatter.formatValueForProperty(Math.min(...memberValues), property);
+            const minValue = Math.min(...memberValues.filter((e) => e !== null && e !== undefined));
+            if (minValue > 0 && (memberValues.includes(null) || memberValues.includes(undefined))) {
+                text = '';
+            }
+            else {
+                text = formatter.formatValueForProperty(minValue, property);
+            }
         }
         else if (displayFunction === DynamicTextDisplayFunction.MAX) {
             memberValues = memberValues.filter((e) => e !== null && e !== undefined);

package/package.json

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