@smartbit4all/ng-client 3.1.62 → 3.1.64

package/fesm2020/smartbit4all-ng-client.mjs

@@ -9623,13 +9623,7 @@ var SmartGridType;
     SmartGridType["CARD1"] = "CARD1";
     SmartGridType["CARD2"] = "CARD2";
     SmartGridType["CUSTOM"] = "CUSTOM";
-})(SmartGridType || (SmartGridType = {}));
-// export type SmartGridTreeNode = {
-//   item: string;
-//   level: number;
-//   expandable: boolean;
-//   row: SmartGrid;
-// };
+})(SmartGridType || (SmartGridType = {}));
 
 class SmartGridCardComponent {
     constructor(cfService) {
@@ -10308,9 +10302,8 @@ class SmartGridService {
         this.gridModelChanged = new Subject();
     }
     async load(uuid, gridIdentifier) {
-        // let gridModelResult = await lastValueFrom(this.api.load(uuid, gridIdentifier));
-        // this.updateGrid(gridModelResult, 'load');
-        this.updateGrid(this.gridModel, 'load');
+        let gridModelResult = await lastValueFrom(this.api.load(uuid, gridIdentifier));
+        this.updateGrid(gridModelResult, 'load');
     }
     async setPage(uuid, gridIdentifier, offset, limit) {
         await lastValueFrom(this.api.setPage(uuid, gridIdentifier, offset, limit));
@@ -10329,14 +10322,9 @@ class SmartGridService {
     }
     async select(smartGrid, gridRow) {
         gridRow.selected = !gridRow.selected;
-        // return await this.api
-        //   .select(
-        //     smartGrid.gridModel.viewUuid!,
-        //     smartGrid.gridIdentifier,
-        //     gridRow.id!,
-        //     gridRow.selected
-        //   )
-        //   .toPromise();
+        return await this.api
+            .select(smartGrid.gridModel.viewUuid, smartGrid.gridIdentifier, gridRow.id, gridRow.selected)
+            .toPromise();
     }
     async selectAll(smartGrid, selected) {
         return await this.api
@@ -11229,23 +11217,43 @@ class SmartGridComponent {
     renderCards() {
         // TODO
     }
+    isMultipleSelection() {
+        const selectionMode = this.service.gridModel.view?.descriptor?.selectionMode;
+        return selectionMode === GridSelectionMode.Multiple;
+    }
     renderTree() {
         if (!this.treeDataSource) {
             this.treeFlattener = new MatTreeFlattener(this.transformer, this.getLevel, this.isExpandable, this.getChildren);
             this.treeControl = new FlatTreeControl(this.getLevel, this.isExpandable);
             this.treeDataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
-            const selectionMode = this.service.gridModel.view?.descriptor?.selectionMode;
-            const isMultiple = selectionMode === GridSelectionMode.Multiple;
-            this.treeChecklistSelection = new SelectionModel(isMultiple);
+            this.treeChecklistSelection = new SelectionModel(this.isMultipleSelection());
+        }
+        let nodes = this.treeControl?.dataNodes;
+        let expandedNodes;
+        if (nodes) {
+            expandedNodes = nodes
+                .filter((node) => this.treeControl?.isExpandable(node))
+                .filter((node) => this.treeControl?.isExpanded(node))
+                .map((node) => node.id);
+        }
+        else {
+            expandedNodes = [];
         }
+        this.smartGrid.gridModel.page.rows.forEach((row) => (row.level = undefined));
         this.treeDataSource.data = this.smartGrid.gridModel.page.rows.filter((row) => !row.parent);
-        // TODO handle and set selection..
         this.treeChecklistSelection?.clear();
         this.treeControl?.dataNodes.forEach((node) => {
             if (node.selected) {
                 this.treeChecklistSelection?.select(node);
             }
         });
+        this.treeControl?.collapseAll();
+        expandedNodes.forEach((rowId) => {
+            let row = this.treeControl?.dataNodes.find((row) => rowId === row.id);
+            if (row) {
+                this.treeControl?.expand(row);
+            }
+        });
     }
     getTreeItem(row) {
         let columns = this.smartGrid?.gridModel.view?.orderedColumnNames;
@@ -11262,20 +11270,25 @@ class SmartGridComponent {
         }
         let selectionBefore = this.treeChecklistSelection.selected.map((row) => row.id);
         this.treeChecklistSelection.toggle(node);
-        const descendants = this.treeControl.getDescendants(node);
-        this.treeChecklistSelection.isSelected(node)
-            ? this.treeChecklistSelection.select(...descendants)
-            : this.treeChecklistSelection.deselect(...descendants);
-        this.checkAllParentsSelection(node);
+        if (this.isMultipleSelection()) {
+            const descendants = this.treeControl.getDescendants(node);
+            this.treeChecklistSelection.isSelected(node)
+                ? this.treeChecklistSelection.select(...descendants)
+                : this.treeChecklistSelection.deselect(...descendants);
+            this.checkAllParentsSelection(node);
+        }
         let selectionAfter = this.treeChecklistSelection.selected.map((row) => row.id);
         let selectedIds = selectionAfter.filter((s) => !selectionBefore.includes(s));
         let unselectedIds = selectionBefore.filter((s) => !selectionAfter.includes(s));
-        this.service.gridModel.page.rows
-            ?.filter((row) => selectedIds.includes(row.id))
-            .forEach((row) => (row.selected = false)); // onSelect will toggle!
-        this.service.gridModel.page.rows
-            ?.filter((row) => unselectedIds.includes(row.id))
-            .forEach((row) => (row.selected = true)); // onSelect will toggle!
+        if (this.dev) {
+            // when service call is active (!dev), onSelect will toggle row.selected
+            this.service.gridModel.page.rows
+                ?.filter((row) => selectedIds.includes(row.id))
+                .forEach((row) => (row.selected = true));
+            this.service.gridModel.page.rows
+                ?.filter((row) => unselectedIds.includes(row.id))
+                .forEach((row) => (row.selected = false));
+        }
         let union = selectedIds.concat(unselectedIds);
         this.onSelectList(union);
     }
@@ -11510,22 +11523,23 @@ class SmartGridComponent {
     }
     async onSelect(rowId) {
         this.isBlocked = true;
-        this.onSelectInternal(rowId);
+        this.selectRowInternal(rowId);
         this.refresh();
     }
-    async onSelectInternal(rowId) {
+    async selectRowInternal(rowId) {
         const row = this.service.gridModel.page.rows?.find((gridRow) => gridRow.id === rowId);
         const viewContextChange = await this.service.select(this.smartGrid, row);
-        // this.smartGrid!.viewContextService.handleChanges(viewContextChange.changes);
+        this.smartGrid.viewContextService.handleChanges(viewContextChange.changes);
     }
     async onSelectList(rowIds) {
-        // remove
-        this.isBlocked = true;
-        this.refresh();
-        //
         this.isBlocked = true;
-        rowIds.forEach((rowId) => this.onSelectInternal(rowId));
-        this.refresh();
+        if (this.dev) {
+            this.render();
+        }
+        else {
+            rowIds.forEach((rowId) => this.selectRowInternal(rowId));
+            this.refresh();
+        }
     }
     async onSelectAll(selected) {
         this.isBlocked = true;