@contrail/documents 2.4.0-alpha.ce67280 → 2.4.0-alpha.e27d364

package/CHANGELOG.md

@@ -64,6 +64,12 @@ Also shipped on the 1.x line as 1.21.0.
   `n/a`. `calculateSize` no longer throws on an element that reaches it without a `size`, which on
   the server failed the read for the whole document.
 
+- `min` and `max` over a date property rendered nothing at all. `Number` of a date string is `NaN`,
+  so every member was dropped; they now order by the instant each date names.
+- `uniqueArray` sorted the rendered text rather than the value, so `11/20/2026` came after
+  `01/15/2027` and `100` before `9`. It now orders by value, falling back to text order for values
+  that are neither a date nor a number.
+
 ### Changed
 
 - `anchorFor` and the index measure through the same factory call, so a caller holding an element

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

@@ -52,6 +52,7 @@ export declare const HARD_CODED_TEXT: {
 };
 export declare function isContainerBinding(bindingProperty: string | null | undefined): boolean;
 export declare class DynamicTextUtil {
+    static componentsBoundTo(componentElements: DocumentElement[], entityType: string): DocumentElement[];
     static isDynamicText(documentElement: DocumentElement): boolean;
     static takesValueFromContainer(bindingProperty: string | null | undefined): boolean;
     static getDynamicTextValue(dynamicTextElement: DocumentElement, property: TypeProperty, propertyLevel: PropertyLevel, container: DynamicTextContainer | null, componentModels: any[], ownerReferenceModel?: any): string;
@@ -59,6 +60,7 @@ export declare class DynamicTextUtil {
         width: number;
         height: number;
     };
+    private static rankValue;
     static getTextFromFrameMemberValues(displayFunction: string, property: any, memberValues: any[]): string;
     private static getItemCount;
 }

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

@@ -63,6 +63,12 @@ function isContainerBinding(bindingProperty) {
     return DynamicTextUtil.takesValueFromContainer(bindingProperty);
 }
 class DynamicTextUtil {
+    static componentsBoundTo(componentElements, entityType) {
+        if (CONTAINER_SOURCES.includes(entityType)) {
+            return componentElements;
+        }
+        return (componentElements !== null && componentElements !== void 0 ? componentElements : []).filter((element) => { var _a; return Object.keys((_a = element === null || element === void 0 ? void 0 : element.modelBindings) !== null && _a !== void 0 ? _a : {}).includes(entityType); });
+    }
     static isDynamicText(documentElement) {
         var _a;
         return ((documentElement === null || documentElement === void 0 ? void 0 : documentElement.type) === 'text' &&
@@ -204,6 +210,9 @@ class DynamicTextUtil {
         catch (e) { }
         return size;
     }
+    static rankValue(value, property) {
+        return (property === null || property === void 0 ? void 0 : property.propertyType) === types_1.PropertyType.Date ? Date.parse(value) : Number(value);
+    }
     static getTextFromFrameMemberValues(displayFunction, property, memberValues) {
         let text = '';
         if (memberValues.length === 0) {
@@ -219,11 +228,16 @@ class DynamicTextUtil {
             text = formatter.formatValueForProperty(memberValues.reduce((a, b) => a + b, 0), property);
         }
         else if (displayFunction === DynamicTextDisplayFunction.UNIQUE_ARRAY) {
-            text = Array.from(new Set(memberValues
-                .filter((e) => e !== null && e !== undefined && e !== '')
-                .flat()
-                .map((e) => formatter.formatValueForProperty(e, property))))
-                .sort()
+            const byValue = new Map();
+            for (const value of memberValues.filter((e) => e !== null && e !== undefined && e !== '').flat()) {
+                const formatted = formatter.formatValueForProperty(value, property);
+                if (!byValue.has(formatted)) {
+                    byValue.set(formatted, DynamicTextUtil.rankValue(value, property));
+                }
+            }
+            text = Array.from(byValue)
+                .sort(([leftText, leftRank], [rightText, rightRank]) => Number.isNaN(leftRank) || Number.isNaN(rightRank) ? leftText.localeCompare(rightText) : leftRank - rightRank)
+                .map(([formatted]) => formatted)
                 .join(', ');
         }
         else if (!displayFunction ||
@@ -235,15 +249,17 @@ class DynamicTextUtil {
         }
         else if (displayFunction === DynamicTextDisplayFunction.MIN ||
             displayFunction === DynamicTextDisplayFunction.MAX) {
-            const present = memberValues
+            const isDate = (property === null || property === void 0 ? void 0 : property.propertyType) === types_1.PropertyType.Date;
+            const ranked = memberValues
                 .filter((e) => e !== null && e !== undefined && e !== '')
-                .map(Number)
-                .filter((e) => !Number.isNaN(e));
-            if (!present.length) {
+                .map((value) => ({ value, rank: DynamicTextUtil.rankValue(value, property) }))
+                .filter(({ rank }) => !Number.isNaN(rank));
+            if (!ranked.length) {
                 return '';
             }
-            const extreme = displayFunction === DynamicTextDisplayFunction.MIN ? Math.min(...present) : Math.max(...present);
-            text = formatter.formatValueForProperty(extreme, property);
+            const wantsLower = displayFunction === DynamicTextDisplayFunction.MIN;
+            const extreme = ranked.reduce((best, candidate) => (wantsLower ? candidate.rank < best.rank : candidate.rank > best.rank) ? candidate : best);
+            text = formatter.formatValueForProperty(isDate ? extreme.value : extreme.rank, property);
         }
         return text;
     }

package/package.json

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