qms-angular 1.1.41 → 1.1.42

package/bundles/qms-angular.umd.js

@@ -31835,25 +31835,27 @@
             this.execWithoutEmitNodeChangeEvent(function () {
                 var _b;
                 var selectedItems = [];
-                var reMapTreeNode = function (item) {
+                var reMapTreeNode = function (item, clearGroupId) {
+                    if (clearGroupId === void 0) { clearGroupId = false; }
                     var _a;
                     var node = _this.treeControl.dataNodes.find(function (x) { return x.id == item.id; });
                     var nestedNode = _this.convertToNestedNode(node);
                     node.groupId = item.groupId;
                     node.isGroup = item.isGroup;
                     _this.checkListSelection.select(node);
-                    return Object.assign(Object.assign({}, nestedNode), { groupId: item.groupId, isGroup: item.isGroup, childCount: (_a = nestedNode.childCount) !== null && _a !== void 0 ? _a : _this.getListChildrenOfNode(node).length, children: [] });
+                    return Object.assign(Object.assign({}, nestedNode), { groupId: clearGroupId ? null : item.groupId, isGroup: item.isGroup, childCount: (_a = nestedNode.childCount) !== null && _a !== void 0 ? _a : _this.getListChildrenOfNode(node).length, children: [] });
                 };
                 treeNodes.forEach(function (item) {
                     var node = _this.treeControl.dataNodes.find(function (x) { return x.id == item.id; });
                     if (!node)
                         return;
                     var nestedNode = _this.convertToNestedNode(node);
-                    selectedItems.push(Object.assign(Object.assign({}, reMapTreeNode(item)), { children: item.children.map(function (x) { return reMapTreeNode(x); }) }));
+                    selectedItems.push(Object.assign(Object.assign({}, reMapTreeNode(item, true)), { children: item.children.map(function (x) { return reMapTreeNode(x); }) }));
                 });
                 (_b = _this.resultSelected).push.apply(_b, __spreadArray([], __read(selectedItems)));
             });
             this.onValueChangeEvent.emit(this.resultSelected);
+            this._onSelectionNodeChangeEvent('added', this.resultSelected);
             this.cdRef.detectChanges();
         };
         SelectDepartmentTreeComponent.prototype._initListSelected = function () {
@@ -33632,6 +33634,9 @@
             configurable: true
         });
         ;
+        QMSSelectAccessDialogComponent.prototype.ngAfterContentChecked = function () {
+            this.cdRef.detectChanges();
+        };
         QMSSelectAccessDialogComponent.prototype.ngAfterContentInit = function () {
             this.cdRef.detectChanges();
         };
@@ -33691,8 +33696,23 @@
             this.resultAccess = ___namespace.cloneDeep(Object.assign(Object.assign({}, this.dialogData.data.selectedData), { departments: [] }));
             // init group selected department
             this._departmentSelected = ___namespace.cloneDeep(this.dialogData.data.selectedData.departments);
-            var groups = this._departmentSelected.filter(function (x) { return x.isGroup; }) || [];
-            var singleItem = this._departmentSelected.filter(function (x) { return !x.isGroup && !x.groupId; });
+            var groups = [];
+            var singleItem = [];
+            this._departmentSelected.forEach(function (item) {
+                if (item.isGroup) {
+                    groups.push(item);
+                    return;
+                }
+                if (!item.groupId) {
+                    singleItem.push(item);
+                    return;
+                }
+                if (!_this._departmentSelected.some(function (x) { return x.id == item.groupId; })) {
+                    item.groupId = null;
+                    singleItem.push(item);
+                    return;
+                }
+            });
             groups.forEach(function (group) {
                 var child = _this._departmentSelected.filter(function (item) { return item.groupId == group.id; });
                 group.children = child;
@@ -33988,9 +34008,11 @@
                                 _this.resultAccess.departments.splice(index, 1);
                         });
                 });
+                this.cdRef.detectChanges();
             }
             this.resultAccess.departments.forEach(function (item) {
-                item.children = item.children.filter(function (x, index) { return index === item.children.findIndex(function (_x) { return x.id === _x.id; }); });
+                if (!!item.children)
+                    item.children = item.children.filter(function (x, index) { return index === item.children.findIndex(function (_x) { return x.id === _x.id; }); });
             });
             this._departmentSelected = ___namespace.cloneDeep(this.resultAccess.departments);
             this.cdRef.detectChanges();