@trudb/tru-common-lib 0.0.911 → 0.0.912

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

@@ -2818,6 +2818,7 @@ class TruMergeData {
 }
 
 class TruDataChangeParser {
+    appEnvionment;
     dataContext;
     entity;
     tableName;
@@ -2837,7 +2838,8 @@ class TruDataChangeParser {
     dataChanged(change) {
         this.dataChanged$.next(change);
     }
-    constructor(connection, dataContext, globalDataContext, entity, tableName, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded, modelTypeLookup, modelPropertyLookup) {
+    constructor(connection, appEnviroment, dataContext, globalDataContext, entity, tableName, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded, modelTypeLookup, modelPropertyLookup) {
+        this.appEnvionment = appEnviroment;
         this.dataContext = dataContext;
         this.globalDataContext = globalDataContext;
         this.entity = entity;
@@ -2946,15 +2948,15 @@ class TruDataChangeParser {
     isSaving = async () => {
         return new Promise((resolve, reject) => {
             var interval = setInterval(() => {
-                //if (!$rootScope['isSaving']) {
-                //  clearInterval(interval);
-                //  resolve();
-                //}
+                if (!this.appEnvionment.isSaving) {
+                    clearInterval(interval);
+                    resolve();
+                }
             }, 1000);
         });
     };
     update = async (payload) => {
-        //await this.isSaving();
+        await this.isSaving();
         var reloadResults = false;
         payload.changes.forEach(async (change) => {
             var foundEntities = [];
@@ -3164,7 +3166,7 @@ class TruConnectionHub {
         }
     };
     subscribe = (dataContext, entity, tableName, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded) => {
-        return new TruDataChangeParser(this.connection, dataContext, this.appEnvironment.globalDataContext, entity, tableName, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded, this.modelTypeLookup, this.modelPropertyLookup).onDataChanged();
+        return new TruDataChangeParser(this.connection, this.appEnvironment, dataContext, this.appEnvironment.globalDataContext, entity, tableName, 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' });
@@ -3542,13 +3544,14 @@ class TruDataGrid {
             this.onSearch(setupQuery);
         }));
         this.subs.push(this.dataContext.onPropertyChanged().subscribe((changeArgs) => {
-            const pkeyName = changeArgs.entity?.entityType.shortName + 'Ref';
-            if (changeArgs.entityAction === EntityAction.Attach &&
-                changeArgs.entity[pkeyName] > -1 &&
-                this.config.resultConfig.entityType.name === changeArgs.entity?.constructor.name &&
-                this.config.resultConfig.entityType.name !== 'TruDbReport') {
-                //this.addEntity(changeArgs.entity)
-            }
+            //type ObjectKey = keyof typeof changeArgs.entity;
+            //const pkeyName = changeArgs.entity?.entityType.shortName + 'Ref' as ObjectKey;
+            //if (changeArgs.entityAction === EntityAction.Attach &&
+            //  changeArgs.entity![pkeyName] > -1 &&
+            //  this.config.resultConfig.entityType.name === changeArgs.entity?.constructor.name &&
+            //  this.config.resultConfig.entityType.name !== 'TruDbReport') {
+            //  //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.api.refreshCells({ force: true });