cx 24.4.4 → 24.4.6

package/src/ui/adapter/GroupAdapter.js

@@ -1,141 +1,141 @@
-import { ArrayAdapter } from "./ArrayAdapter";
-import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
-import { Grouper } from "../../data/Grouper";
-import { isArray } from "../../util/isArray";
-import { isDefined } from "../../util/isDefined";
-import { getComparer } from "../../data/comparer";
-import { Culture } from "../Culture";
-import { isObject } from "../../util/isObject";
-
-export class GroupAdapter extends ArrayAdapter {
-   init() {
-      super.init();
-
-      if (this.groupRecordsAlias) this.groupRecordsName = this.groupRecordsAlias;
-
-      if (this.groupings) this.groupBy(this.groupings);
-   }
-
-   getRecords(context, instance, records, parentStore) {
-      let result = super.getRecords(context, instance, records, parentStore);
-
-      if (this.groupings) {
-         let groupedResults = [];
-         this.processLevel([], result, groupedResults, parentStore);
-         result = groupedResults;
-      }
-
-      return result;
-   }
-
-   processLevel(keys, records, result, parentStore) {
-      let level = keys.length;
-      let inverseLevel = this.groupings.length - level;
-
-      if (inverseLevel == 0) {
-         for (let i = 0; i < records.length; i++) {
-            records[i].store.setStore(parentStore);
-            result.push(records[i]);
-         }
-         return;
-      }
-
-      let grouping = this.groupings[level];
-      let { grouper } = grouping;
-      grouper.reset();
-      grouper.processAll(records);
-      let results = grouper.getResults();
-      if (grouping.comparer) results.sort(grouping.comparer);
-
-      results.forEach((gr) => {
-         keys.push(gr.key);
-
-         let key = keys.map(serializeKey).join("|");
-
-         let $group = {
-            ...gr.key,
-            ...gr.aggregates,
-            $name: gr.name,
-            $level: inverseLevel,
-            $records: gr.records || [],
-            $key: key,
-         };
-
-         let data = {
-            [this.recordName]: gr.records.length > 0 ? gr.records[0].data : null,
-            [this.groupName]: $group,
-         };
-
-         let groupStore = new ReadOnlyDataView({
-            store: parentStore,
-            data,
-            immutable: this.immutable,
-         });
-
-         let group = {
-            key,
-            data,
-            group: $group,
-            grouping,
-            store: groupStore,
-            level: inverseLevel,
-         };
-
-         if (grouping.includeHeader !== false)
-            result.push({
-               ...group,
-               type: "group-header",
-               key: "header:" + group.key,
-            });
-
-         this.processLevel(keys, gr.records, result, groupStore);
-
-         if (grouping.includeFooter !== false)
-            result.push({
-               ...group,
-               type: "group-footer",
-               key: "footer:" + group.key,
-            });
-
-         keys.pop();
-      });
-   }
-
-   groupBy(groupings) {
-      if (!groupings) this.groupings = null;
-      else if (isArray(groupings)) {
-         this.groupings = groupings;
-         this.groupings.forEach((g) => {
-            let groupSorters = [];
-            let key = {};
-            for (let name in g.key) {
-               if (!g.key[name] || !isDefined(g.key[name].direction) || !isDefined(g.key[name].value))
-                  g.key[name] = { value: g.key[name], direction: "ASC" };
-               key[name] = g.key[name].value;
-               groupSorters.push({
-                  field: name,
-                  direction: g.key[name].direction,
-               });
-            }
-            g.grouper = new Grouper(key, { ...this.aggregates, ...g.aggregates }, (r) => r.store.getData(), g.text);
-            g.comparer = null;
-            if (groupSorters.length > 0)
-               g.comparer = getComparer(
-                  groupSorters,
-                  (x) => x.key,
-                  this.sortOptions ? Culture.getComparer(this.sortOptions) : null,
-               );
-         });
-      } else throw new Error("Invalid grouping provided.");
-   }
-}
-
-GroupAdapter.prototype.groupName = "$group";
-
-function serializeKey(data) {
-   if (isObject(data))
-      return Object.keys(data)
-         .map((k) => serializeKey(data[k]))
-         .join(":");
-   return data?.toString() ?? "";
-}
+import { ArrayAdapter } from "./ArrayAdapter";
+import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
+import { Grouper } from "../../data/Grouper";
+import { isArray } from "../../util/isArray";
+import { isDefined } from "../../util/isDefined";
+import { getComparer } from "../../data/comparer";
+import { Culture } from "../Culture";
+import { isObject } from "../../util/isObject";
+
+export class GroupAdapter extends ArrayAdapter {
+   init() {
+      super.init();
+
+      if (this.groupRecordsAlias) this.groupRecordsName = this.groupRecordsAlias;
+
+      if (this.groupings) this.groupBy(this.groupings);
+   }
+
+   getRecords(context, instance, records, parentStore) {
+      let result = super.getRecords(context, instance, records, parentStore);
+
+      if (this.groupings) {
+         let groupedResults = [];
+         this.processLevel([], result, groupedResults, parentStore);
+         result = groupedResults;
+      }
+
+      return result;
+   }
+
+   processLevel(keys, records, result, parentStore) {
+      let level = keys.length;
+      let inverseLevel = this.groupings.length - level;
+
+      if (inverseLevel == 0) {
+         for (let i = 0; i < records.length; i++) {
+            records[i].store.setStore(parentStore);
+            result.push(records[i]);
+         }
+         return;
+      }
+
+      let grouping = this.groupings[level];
+      let { grouper } = grouping;
+      grouper.reset();
+      grouper.processAll(records);
+      let results = grouper.getResults();
+      if (grouping.comparer) results.sort(grouping.comparer);
+
+      results.forEach((gr) => {
+         keys.push(gr.key);
+
+         let key = keys.map(serializeKey).join("|");
+
+         let $group = {
+            ...gr.key,
+            ...gr.aggregates,
+            $name: gr.name,
+            $level: inverseLevel,
+            $records: gr.records || [],
+            $key: key,
+         };
+
+         let data = {
+            [this.recordName]: gr.records.length > 0 ? gr.records[0].data : null,
+            [this.groupName]: $group,
+         };
+
+         let groupStore = new ReadOnlyDataView({
+            store: parentStore,
+            data,
+            immutable: this.immutable,
+         });
+
+         let group = {
+            key,
+            data,
+            group: $group,
+            grouping,
+            store: groupStore,
+            level: inverseLevel,
+         };
+
+         if (grouping.includeHeader !== false)
+            result.push({
+               ...group,
+               type: "group-header",
+               key: "header:" + group.key,
+            });
+
+         this.processLevel(keys, gr.records, result, groupStore);
+
+         if (grouping.includeFooter !== false)
+            result.push({
+               ...group,
+               type: "group-footer",
+               key: "footer:" + group.key,
+            });
+
+         keys.pop();
+      });
+   }
+
+   groupBy(groupings) {
+      if (!groupings) this.groupings = null;
+      else if (isArray(groupings)) {
+         this.groupings = groupings;
+         this.groupings.forEach((g) => {
+            let groupSorters = [];
+            let key = {};
+            for (let name in g.key) {
+               if (!g.key[name] || !isDefined(g.key[name].direction) || !isDefined(g.key[name].value))
+                  g.key[name] = { value: g.key[name], direction: "ASC" };
+               key[name] = g.key[name].value;
+               groupSorters.push({
+                  field: name,
+                  direction: g.key[name].direction,
+               });
+            }
+            g.grouper = new Grouper(key, { ...this.aggregates, ...g.aggregates }, (r) => r.store.getData(), g.text);
+            g.comparer = null;
+            if (groupSorters.length > 0)
+               g.comparer = getComparer(
+                  groupSorters,
+                  (x) => x.key,
+                  this.sortOptions ? Culture.getComparer(this.sortOptions) : null,
+               );
+         });
+      } else throw new Error("Invalid grouping provided.");
+   }
+}
+
+GroupAdapter.prototype.groupName = "$group";
+
+function serializeKey(data) {
+   if (isObject(data))
+      return Object.keys(data)
+         .map((k) => serializeKey(data[k]))
+         .join(":");
+   return data?.toString() ?? "";
+}

package/src/ui/adapter/TreeAdapter.d.ts

@@ -1,24 +1,24 @@
-import { Prop, StringProp } from "../../core";
-import { ArrayAdapter } from "./ArrayAdapter";
-
-interface TreeAdapterConfig {
-   immutable?: boolean;
-   sealed?: boolean;
-   recordsBinding?: Prop<any[]>;
-   recordName?: StringProp;
-   indexName?: StringProp;
-   keyField?: string;
-   childrenField?: string;
-   expandedField?: string;
-   leafField?: string;
-   loadingField?: string;
-   loadedField?: string;
-   onLoadError?: (response: any) => void;
-   foldersFirst?: boolean;
-   hideRootNodes?: boolean;
-   restoreExpandedNodesOnLoad?: boolean;
-}
-
-export class TreeAdapter extends ArrayAdapter {
-   constructor(config: TreeAdapterConfig);
-}
+import { Prop, StringProp } from "../../core";
+import { ArrayAdapter } from "./ArrayAdapter";
+
+interface TreeAdapterConfig {
+   immutable?: boolean;
+   sealed?: boolean;
+   recordsBinding?: Prop<any[]>;
+   recordName?: StringProp;
+   indexName?: StringProp;
+   keyField?: string;
+   childrenField?: string;
+   expandedField?: string;
+   leafField?: string;
+   loadingField?: string;
+   loadedField?: string;
+   onLoadError?: (response: any) => void;
+   foldersFirst?: boolean;
+   hideRootNodes?: boolean;
+   restoreExpandedNodesOnLoad?: boolean;
+}
+
+export class TreeAdapter extends ArrayAdapter {
+   constructor(config: TreeAdapterConfig);
+}

package/src/ui/adapter/TreeAdapter.js

@@ -1,100 +1,100 @@
-import { getAccessor } from "../../data/getAccessor";
-import { isArray } from "../../util/isArray";
-import { ArrayAdapter } from "./ArrayAdapter";
-
-export class TreeAdapter extends ArrayAdapter {
-   init() {
-      super.init();
-      this.childrenAccessor = getAccessor({ bind: `${this.recordName}.${this.childrenField}` });
-
-      if (this.restoreExpandedNodesOnLoad) {
-         if (!this.keyField)
-            throw new Error(
-               "Stateful tree adapter requires keyField property to be specified on either Grid or data adapter."
-            );
-
-         this.expandedState = {
-            next: new Set(),
-         };
-      }
-   }
-
-   mapRecords(context, instance, data, parentStore, recordsAccessor) {
-      let nodes = super.mapRecords(context, instance, data, parentStore, recordsAccessor);
-      let result = [];
-
-      if (this.restoreExpandedNodesOnLoad) {
-         this.expandedState = {
-            current: this.expandedState.next,
-            next: new Set(),
-         };
-      }
-
-      this.processList(context, instance, 0, "", nodes, result);
-
-      return result;
-   }
-
-   processList(context, instance, level, parentKey, nodes, result) {
-      nodes.forEach((record) => {
-         record.key = parentKey + record.key;
-         this.processNode(context, instance, level, result, record);
-      });
-   }
-
-   processNode(context, instance, level, result, record) {
-      let isHiddenRootNode = level == 0 && this.hideRootNodes;
-      if (!isHiddenRootNode) result.push(record);
-      let { data, store } = record;
-      data.$level = this.hideRootNodes ? level - 1 : level;
-      if (!data[this.leafField]) {
-         if (this.restoreExpandedNodesOnLoad && data[this.expandedField] == null)
-            data[this.expandedField] = this.expandedState.current.has(data[this.keyField]);
-
-         if (data[this.expandedField] || isHiddenRootNode) {
-            if (this.restoreExpandedNodesOnLoad) this.expandedState.next.add(data[this.keyField]);
-
-            if (data[this.childrenField]) {
-               let childNodes = super.mapRecords(
-                  context,
-                  instance,
-                  data[this.childrenField],
-                  store,
-                  this.childrenAccessor
-               );
-               this.processList(context, instance, level + 1, record.key + ":", childNodes, result);
-            } else if (this.load && !data[this.loadedField] && !data[this.loadingField]) {
-               store.set(`${this.recordName}.${this.loadingField}`, true);
-               let response = this.load(context, instance, data);
-               Promise.resolve(response)
-                  .then((children) => {
-                     store.set(`${this.recordName}.${this.childrenField}`, children);
-                     store.set(`${this.recordName}.${this.loadedField}`, true);
-                     store.set(`${this.recordName}.${this.loadingField}`, false);
-                  })
-                  .catch((response) => {
-                     store.set(`${this.recordName}.${this.loadingField}`, false);
-                     if (this.onLoadError) this.onLoadError(response);
-                  });
-            }
-         } else data[this.expandedField] = false;
-      }
-   }
-
-   sort(sorters) {
-      if (this.foldersFirst) {
-         if (!sorters || !isArray(sorters)) sorters = [];
-         sorters = [{ field: this.leafField, direction: "ASC" }, ...sorters];
-      }
-      super.sort(sorters);
-   }
-}
-
-TreeAdapter.prototype.childrenField = "$children";
-TreeAdapter.prototype.expandedField = "$expanded";
-TreeAdapter.prototype.leafField = "$leaf";
-TreeAdapter.prototype.loadingField = "$loading";
-TreeAdapter.prototype.loadedField = "$loaded";
-TreeAdapter.prototype.foldersFirst = true;
-TreeAdapter.prototype.isTreeAdapter = true;
-TreeAdapter.prototype.hideRootNodes = false;
+import { getAccessor } from "../../data/getAccessor";
+import { isArray } from "../../util/isArray";
+import { ArrayAdapter } from "./ArrayAdapter";
+
+export class TreeAdapter extends ArrayAdapter {
+   init() {
+      super.init();
+      this.childrenAccessor = getAccessor({ bind: `${this.recordName}.${this.childrenField}` });
+
+      if (this.restoreExpandedNodesOnLoad) {
+         if (!this.keyField)
+            throw new Error(
+               "Stateful tree adapter requires keyField property to be specified on either Grid or data adapter."
+            );
+
+         this.expandedState = {
+            next: new Set(),
+         };
+      }
+   }
+
+   mapRecords(context, instance, data, parentStore, recordsAccessor) {
+      let nodes = super.mapRecords(context, instance, data, parentStore, recordsAccessor);
+      let result = [];
+
+      if (this.restoreExpandedNodesOnLoad) {
+         this.expandedState = {
+            current: this.expandedState.next,
+            next: new Set(),
+         };
+      }
+
+      this.processList(context, instance, 0, "", nodes, result);
+
+      return result;
+   }
+
+   processList(context, instance, level, parentKey, nodes, result) {
+      nodes.forEach((record) => {
+         record.key = parentKey + record.key;
+         this.processNode(context, instance, level, result, record);
+      });
+   }
+
+   processNode(context, instance, level, result, record) {
+      let isHiddenRootNode = level == 0 && this.hideRootNodes;
+      if (!isHiddenRootNode) result.push(record);
+      let { data, store } = record;
+      data.$level = this.hideRootNodes ? level - 1 : level;
+      if (!data[this.leafField]) {
+         if (this.restoreExpandedNodesOnLoad && data[this.expandedField] == null)
+            data[this.expandedField] = this.expandedState.current.has(data[this.keyField]);
+
+         if (data[this.expandedField] || isHiddenRootNode) {
+            if (this.restoreExpandedNodesOnLoad) this.expandedState.next.add(data[this.keyField]);
+
+            if (data[this.childrenField]) {
+               let childNodes = super.mapRecords(
+                  context,
+                  instance,
+                  data[this.childrenField],
+                  store,
+                  this.childrenAccessor
+               );
+               this.processList(context, instance, level + 1, record.key + ":", childNodes, result);
+            } else if (this.load && !data[this.loadedField] && !data[this.loadingField]) {
+               store.set(`${this.recordName}.${this.loadingField}`, true);
+               let response = this.load(context, instance, data);
+               Promise.resolve(response)
+                  .then((children) => {
+                     store.set(`${this.recordName}.${this.childrenField}`, children);
+                     store.set(`${this.recordName}.${this.loadedField}`, true);
+                     store.set(`${this.recordName}.${this.loadingField}`, false);
+                  })
+                  .catch((response) => {
+                     store.set(`${this.recordName}.${this.loadingField}`, false);
+                     if (this.onLoadError) this.onLoadError(response);
+                  });
+            }
+         } else data[this.expandedField] = false;
+      }
+   }
+
+   sort(sorters) {
+      if (this.foldersFirst) {
+         if (!sorters || !isArray(sorters)) sorters = [];
+         sorters = [{ field: this.leafField, direction: "ASC" }, ...sorters];
+      }
+      super.sort(sorters);
+   }
+}
+
+TreeAdapter.prototype.childrenField = "$children";
+TreeAdapter.prototype.expandedField = "$expanded";
+TreeAdapter.prototype.leafField = "$leaf";
+TreeAdapter.prototype.loadingField = "$loading";
+TreeAdapter.prototype.loadedField = "$loaded";
+TreeAdapter.prototype.foldersFirst = true;
+TreeAdapter.prototype.isTreeAdapter = true;
+TreeAdapter.prototype.hideRootNodes = false;

package/src/ui/adapter/TreeAdapter.spec.js

@@ -1,67 +1,67 @@
-import { RenderingContext } from '../RenderingContext';
-import { Instance } from '../Instance';
-import { TreeAdapter } from './TreeAdapter';
-import assert from "assert";
-import { Store } from '../../data';
-
-describe('TreeAdapter', () => {
-
-   it('properly expands records', () => {
-
-      let tree = new TreeAdapter({
-         childrenField: 'children',
-         expandedField: 'expanded'
-      });
-
-      let data = [{
-         id: 1,
-         text: '1',
-         expanded: false,
-         children: [{
-            id: 4,
-            text: '4'
-         }]
-      }, {
-         id: 2,
-         text: '2',
-         expanded: true,
-         children: [{
-            id: 3,
-            text: '3',
-            expanded: true,
-            children: [{
-               id: 5,
-               text: '5',
-               expanded: true,
-               children: [{
-                  id: 6,
-                  text: '6',
-               }]
-            }]
-         }]
-      }, {
-         id: 7,
-         text: '7',
-         expanded: false
-      }]
-
-      let store = new Store();
-
-      let records = tree.mapRecords(new RenderingContext(), new Instance(null, 1, null, store), data, store, null);
-
-      assert.equal(records.length, 6);
-      assert.equal(records[0].data.id, 1);
-      assert.equal(records[1].data.id, 2);
-      assert.equal(records[2].data.id, 3);
-      assert.equal(records[3].data.id, 5);
-      assert.equal(records[4].data.id, 6);
-      assert.equal(records[5].data.id, 7);
-      assert.equal(records[5].store.get('$record.id'), 7);
-      assert.equal(records[2].store.get('$record.id'), 3);
-      assert.equal(records[3].store.get('$record.id'), 5);
-      assert.equal(records[2].store.get('$record.id'), 3);
-      assert.equal(records[0].store.get('$record.id'), 1);
-      assert.equal(records[1].store.get('$record.id'), 2);
-   });
-});
-
+import { RenderingContext } from '../RenderingContext';
+import { Instance } from '../Instance';
+import { TreeAdapter } from './TreeAdapter';
+import assert from "assert";
+import { Store } from '../../data';
+
+describe('TreeAdapter', () => {
+
+   it('properly expands records', () => {
+
+      let tree = new TreeAdapter({
+         childrenField: 'children',
+         expandedField: 'expanded'
+      });
+
+      let data = [{
+         id: 1,
+         text: '1',
+         expanded: false,
+         children: [{
+            id: 4,
+            text: '4'
+         }]
+      }, {
+         id: 2,
+         text: '2',
+         expanded: true,
+         children: [{
+            id: 3,
+            text: '3',
+            expanded: true,
+            children: [{
+               id: 5,
+               text: '5',
+               expanded: true,
+               children: [{
+                  id: 6,
+                  text: '6',
+               }]
+            }]
+         }]
+      }, {
+         id: 7,
+         text: '7',
+         expanded: false
+      }]
+
+      let store = new Store();
+
+      let records = tree.mapRecords(new RenderingContext(), new Instance(null, 1, null, store), data, store, null);
+
+      assert.equal(records.length, 6);
+      assert.equal(records[0].data.id, 1);
+      assert.equal(records[1].data.id, 2);
+      assert.equal(records[2].data.id, 3);
+      assert.equal(records[3].data.id, 5);
+      assert.equal(records[4].data.id, 6);
+      assert.equal(records[5].data.id, 7);
+      assert.equal(records[5].store.get('$record.id'), 7);
+      assert.equal(records[2].store.get('$record.id'), 3);
+      assert.equal(records[3].store.get('$record.id'), 5);
+      assert.equal(records[2].store.get('$record.id'), 3);
+      assert.equal(records[0].store.get('$record.id'), 1);
+      assert.equal(records[1].store.get('$record.id'), 2);
+   });
+});
+