@trudb/tru-common-lib 0.2.329 → 0.2.330

package/fesm2022/trudb-tru-common-lib.mjs

@@ -7414,7 +7414,7 @@ class TruDataChangeParser {
                             if (this.entityFoundByQuery(change)) {
                                 var entityAlreadyInResults = this.getEntityFromResults(results, change);
                                 if (!entityAlreadyInResults.length && this.isLoaded()) {
-                                    this.addEntity(entity, true);
+                                    this.addEntity(entity);
                                 }
                                 reloadResults = true;
                             }
@@ -7445,13 +7445,13 @@ class TruDataChangeParser {
                                     newEntity[pkeyName] = change.tableRef;
                                     this.applyPropertyChanges(change, newEntity);
                                     if (this.isLoaded()) {
-                                        this.addEntity(newEntity, true);
+                                        this.addEntity(newEntity);
                                         reloadResults = true;
                                     }
                                 }
                                 else if (entity === localEntity) {
                                     this.applyPropertyChanges(change, entity);
-                                    this.addEntity(entity, true);
+                                    this.addEntity(entity);
                                     reloadResults = true;
                                 }
                             }
@@ -7484,7 +7484,7 @@ class TruDataChangeParser {
                     if (entity) {
                         this.applyPropertyChanges(change, entity);
                         if (this.entityFoundByQuery(change) && this.isLoaded()) {
-                            this.addEntity(newEntity, true);
+                            this.addEntity(newEntity);
                             reloadResults = true;
                         }
                     }
@@ -7501,7 +7501,7 @@ class TruDataChangeParser {
                     newEntity[pkeyName2] = change.tableRef;
                     this.applyPropertyChanges(change, newEntity);
                     if (this.entityFoundByQuery(change) && this.isLoaded()) {
-                        this.addEntity(newEntity, true);
+                        this.addEntity(newEntity);
                         reloadResults = true;
                     }
                 }
@@ -7818,7 +7818,7 @@ class TruDataGrid {
                 if (change.changeOperation === 'D') {
                     this.api.forEachNode((rowNode) => {
                         if (rowNode.data.$entity.Ref === change.tableRef) {
-                            rowNodesToRemove.push(rowNode.data);
+                            rowNodesToRemove.push({ id: rowNode.data.$entity.Ref.toString() });
                         }
                     });
                 }
@@ -7827,7 +7827,7 @@ class TruDataGrid {
                         if (rowNode.data.$entity.Ref === change.tableRef) {
                             let results = this.dataContext.entityAccess().searchByRefArrayCacheOnly(this.config.resultConfig.entityType, this.latestSetupQuery, [rowNode.data.$entity.Ref]);
                             if (!results)
-                                rowNodesToRemove.push(rowNode.data);
+                                rowNodesToRemove.push({ id: rowNode.data.$entity.Ref.toString() });
                         }
                     });
                 }
@@ -7835,7 +7835,6 @@ class TruDataGrid {
             if (rowNodesToRemove.length) {
                 this.api.applyTransaction({ remove: rowNodesToRemove });
             }
-            this.api.refreshCells({ force: true });
         }));
         // Listen for entities added elsewhere in the app
         // Merge this logic with addEntity() logic below
@@ -7843,30 +7842,7 @@ class TruDataGrid {
         this.subs.push(this.dataContext.onEntityAdded().subscribe((changeArgs) => {
             if (!changeArgs.entity)
                 return;
-            let results;
-            if (this.gridType === TruDataGridTypes.DetailManyToMany)
-                results = this.dataContext.entityAccess().searchByRefArrayCacheOnly(this.config.resultConfig.entityManyToManyType, this.latestSetupQuery, [changeArgs.entity.Ref]);
-            else
-                results = this.dataContext.entityAccess().searchByRefArrayCacheOnly(this.config.resultConfig.entityType, this.latestSetupQuery, [changeArgs.entity.Ref]);
-            if (results) {
-                let entityAlreadyInGrid = null;
-                this.api?.forEachNodeAfterFilter((rowNode) => {
-                    if (rowNode.data.$entity.Ref === changeArgs.entity.Ref)
-                        entityAlreadyInGrid = changeArgs.entity;
-                });
-                if (!entityAlreadyInGrid) {
-                    let enhancedEntity = this.enhanceRowDataForEntity(results[0]);
-                    if (changeArgs.entity.Ref < 0) {
-                        this.applyRelationships(results[0]);
-                        this.rowData.push(enhancedEntity);
-                        this.api.applyTransaction({ add: [enhancedEntity], addIndex: 0 });
-                    }
-                    else {
-                        this.rowData.unshift(enhancedEntity);
-                        this.api.applyTransaction({ add: [enhancedEntity] });
-                    }
-                }
-            }
+            this.addEntity(changeArgs.entity);
         }));
         this.subs.push(fromEvent(document, 'keydown').subscribe((event) => {
             if (this.config.view.active && this.config.view.window.active) {
@@ -7987,48 +7963,29 @@ class TruDataGrid {
         }
         return false;
     };
-    //Can possibly merge with similar logic in onEntityAdded() observable above
-    addEntity = (newEntity, dataNotification = false) => {
-        let entityAlreadyInGrid = false;
-        this.api?.forEachNodeAfterFilter((rowNode) => {
-            if (rowNode.data.$entity.Ref === newEntity.Ref)
-                entityAlreadyInGrid = true;
-        });
-        if (this.entity && dataNotification || entityAlreadyInGrid)
-            return;
-        if (this.entity) {
-            newEntity[this.config.parentTableRelationshipRefName] = this.entity[this.config.parentTableRefName];
-        }
-        if (this.gridType === TruDataGridTypes.DetailManyToMany) {
-            //let parentName = this.entity.constructor.name;
-            let unassociatedType = this.config.resultConfig.entityManyToManyType;
-            let ref = this.selectedUnassociatedChoice.value.$;
-            let childToAssociate = this.dataContext.entityAccess().searchByRefCacheOnly(unassociatedType, ref, true);
-            if (childToAssociate) {
-                let enhancedEntity = this.enhanceRowDataForEntity(newEntity);
-                enhancedEntity.$entity[unassociatedType.name + 'Ref'] = childToAssociate[unassociatedType.name + 'Ref'];
-                enhancedEntity.$entity[this.config.parentTableRelationshipRefName] = this.entity[this.config.parentTableRefName];
-                // remove item from the add dropdown control
-                let itemIndex = this.unassociatedChoices.findIndex((choice) => {
-                    return choice[unassociatedType.name + 'Ref'] === childToAssociate[unassociatedType.name + 'Ref'];
-                });
-                this.unassociatedChoices.splice(itemIndex, 1);
-                // clear add selection
-                this.selectedUnassociatedChoice = undefined;
-                // add row to grid
-                this.unsavedEntities.push(enhancedEntity);
-                this.api.applyTransaction({ add: [enhancedEntity], addIndex: 0 });
-            }
-        }
-        else {
-            let enhancedEntity = this.enhanceRowDataForEntity(newEntity);
-            if (dataNotification) {
-                this.rowData.unshift(enhancedEntity);
-                this.api.applyTransaction({ add: [enhancedEntity] });
-            }
-            else {
-                this.rowData.push(enhancedEntity);
-                this.api.applyTransaction({ add: [enhancedEntity], addIndex: 0 });
+    addEntity = (newEntity) => {
+        let results;
+        if (this.gridType === TruDataGridTypes.DetailManyToMany)
+            results = this.dataContext.entityAccess().searchByRefArrayCacheOnly(this.config.resultConfig.entityManyToManyType, this.latestSetupQuery, [newEntity.Ref]);
+        else
+            results = this.dataContext.entityAccess().searchByRefArrayCacheOnly(this.config.resultConfig.entityType, this.latestSetupQuery, [newEntity.Ref]);
+        if (results) {
+            let entityAlreadyInGrid = null;
+            this.api?.forEachNodeAfterFilter((rowNode) => {
+                if (rowNode.data.$entity.Ref === newEntity.Ref)
+                    entityAlreadyInGrid = newEntity;
+            });
+            if (!entityAlreadyInGrid) {
+                let enhancedEntity = this.enhanceRowDataForEntity(results[0]);
+                if (newEntity.Ref < 0) {
+                    this.applyRelationships(results[0]);
+                    this.rowData.push(enhancedEntity);
+                    this.api.applyTransaction({ add: [enhancedEntity], addIndex: 0 });
+                }
+                else {
+                    this.rowData.unshift(enhancedEntity);
+                    this.api.applyTransaction({ add: [enhancedEntity] });
+                }
             }
         }
     };