@trudb/tru-common-lib 0.0.913 → 0.0.915

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

@@ -1623,8 +1623,9 @@ class TruDetailViewBase {
             nextIndex = 0;
         return nextIndex;
     };
-    onAddEntity = () => {
-        let newEntity = this.dataContext.entityAccess().add(this.entityType);
+    onAddEntity = (newEntity) => {
+        if (!newEntity)
+            newEntity = this.dataContext.entityAccess().add(this.entityType);
         this.entities.splice(this.navigationIndex + 1, 0, newEntity);
         this.navigateTo(this.navigationIndex + 1);
     };
@@ -2818,6 +2819,7 @@ class TruDataChangeParser {
     dataContext;
     entity;
     tableName;
+    addEntity;
     getLatestResults;
     getLatestQuery;
     contextFilters;
@@ -2834,12 +2836,13 @@ class TruDataChangeParser {
     dataChanged(change) {
         this.dataChanged$.next(change);
     }
-    constructor(connection, appEnviroment, dataContext, globalDataContext, entity, tableName, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded, modelTypeLookup, modelPropertyLookup) {
+    constructor(connection, appEnviroment, dataContext, globalDataContext, entity, tableName, addEntity, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded, modelTypeLookup, modelPropertyLookup) {
         this.appEnvionment = appEnviroment;
         this.dataContext = dataContext;
         this.globalDataContext = globalDataContext;
         this.entity = entity;
         this.tableName = tableName;
+        this.addEntity = addEntity;
         this.getLatestResults = getLatestResults;
         this.getLatestQuery = getLatestQuery;
         this.contextFilters = contextFilters;
@@ -2971,7 +2974,7 @@ class TruDataChangeParser {
                             if (this.entityFoundByQuery(change)) {
                                 var entityAlreadyInResults = this.getEntityFromResults(results, change);
                                 if (!entityAlreadyInResults.length && this.isLoaded()) {
-                                    results.push(entity);
+                                    this.addEntity(entity);
                                 }
                                 reloadResults = true;
                             }
@@ -3002,20 +3005,17 @@ class TruDataChangeParser {
                                     newEntity[pkeyName] = change.tableRef;
                                     this.applyPropertyChanges(change, newEntity);
                                     if (this.isLoaded()) {
-                                        var results = this.getLatestResults();
-                                        results.push(newEntity);
+                                        this.addEntity(newEntity);
                                         reloadResults = true;
                                     }
                                 }
                                 else if (entity === localEntity) {
                                     this.applyPropertyChanges(change, entity);
-                                    var results = this.getLatestResults();
-                                    results.push(entity);
+                                    this.addEntity(entity);
                                     reloadResults = true;
                                 }
                             }
                             else if (!this.entityFoundByQuery(change) && entityAlreadyInResults.length) {
-                                var results = this.getLatestResults();
                                 var entityToDelete = this.getEntityFromResults(results, change);
                                 if (entityToDelete.length) {
                                     results.splice(results.indexOf(entityAlreadyInResults[0]), 1);
@@ -3043,9 +3043,8 @@ class TruDataChangeParser {
                 await this.getEntityFromServer(change).subscribe((entity) => {
                     if (entity) {
                         this.applyPropertyChanges(change, entity);
-                        var results = this.getLatestResults();
                         if (this.entityFoundByQuery(change) && this.isLoaded()) {
-                            results.push(entity);
+                            this.addEntity(newEntity);
                             reloadResults = true;
                         }
                     }
@@ -3062,8 +3061,7 @@ class TruDataChangeParser {
                     newEntity[pkeyName2] = change.tableRef;
                     this.applyPropertyChanges(change, newEntity);
                     if (this.entityFoundByQuery(change) && this.isLoaded()) {
-                        var results = this.getLatestResults();
-                        results.push(newEntity);
+                        this.addEntity(newEntity);
                         reloadResults = true;
                     }
                 }
@@ -3161,8 +3159,8 @@ class TruConnectionHub {
             console.log(`SignalR connection error: ${error}`);
         }
     };
-    subscribe = (dataContext, entity, tableName, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded) => {
-        return new TruDataChangeParser(this.connection, this.appEnvironment, dataContext, this.appEnvironment.globalDataContext, entity, tableName, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded, this.modelTypeLookup, this.modelPropertyLookup).onDataChanged();
+    subscribe = (dataContext, entity, tableName, addEntity, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded) => {
+        return new TruDataChangeParser(this.connection, this.appEnvironment, dataContext, this.appEnvironment.globalDataContext, entity, tableName, addEntity, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded, this.modelTypeLookup, this.modelPropertyLookup).onDataChanged();
     };
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.2", ngImport: i0, type: TruConnectionHub, deps: [{ token: TruDataContext }, { token: TruAppEnvironment }, { token: TruModelTypeLookup }, { token: TruModelPropertyLookup }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.2", ngImport: i0, type: TruConnectionHub, providedIn: 'root' });
@@ -3549,7 +3547,7 @@ class TruDataGrid {
             //  //this.addEntity(changeArgs.entity)
             //}
         }));
-        this.subs.push(this.connectionHub.subscribe(this.dataContext, this.config.resultConfig.entityType, this.config.resultConfig.entityType.name, () => { return this.loadedEntities; }, () => { return this.latestSetupQuery; }, this.config.resultConfig.expands, [], () => { return true; }).subscribe((dataChange) => {
+        this.subs.push(this.connectionHub.subscribe(this.dataContext, this.config.resultConfig.entityType, this.config.resultConfig.entityType.name, this.addEntity, () => { return this.loadedEntities; }, () => { return this.latestSetupQuery; }, this.config.resultConfig.expands, [], () => { return true; }).subscribe((dataChange) => {
             this.api.refreshCells({ force: true });
         }));
     };