@trudb/tru-common-lib 0.0.506 → 0.0.511

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

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { Directive, Input, Injectable, Component, Inject, HostListener, NgModule, EventEmitter, ViewEncapsulation, Output, APP_INITIALIZER, InjectionToken } from '@angular/core';
-import { EntityAspect, MetadataStore, EntityManager, DataService, EntityQuery, FetchStrategy, EntityState, BinaryPredicate, AndOrPredicate, breeze } from 'breeze-client';
+import { EntityAspect, MetadataStore, EntityManager, DataService, EntityQuery, Predicate, FetchStrategy, EntityState, BinaryPredicate, AndOrPredicate, breeze } from 'breeze-client';
 import { BehaviorSubject, defer, from, of, Observable, Subject, skip, forkJoin, throwError } from 'rxjs';
 import * as _ from 'underscore';
 import * as i1$2 from '@angular/common/http';
@@ -275,6 +275,7 @@ class TruAppEnvironment {
         this._saveComplete = new BehaviorSubject(null);
         this._revertComplete = new BehaviorSubject(null);
         this._deleteComplete = new BehaviorSubject(null);
+        this._globalDataContext = null;
         this.onSavingChanged$ = this._isSaving.asObservable();
         this.onSaveComplete$ = this._saveComplete.asObservable();
         this.onRevertComplete$ = this._revertComplete.asObservable();
@@ -337,6 +338,12 @@ class TruAppEnvironment {
     set maxRecordCount(maxRecordCount) {
         this._maxRecordCount = maxRecordCount;
     }
+    get globalDataContext() {
+        return this._globalDataContext;
+    }
+    set globalDataContext(context) {
+        this._globalDataContext = context;
+    }
     get isMac() {
         return navigator.platform.toUpperCase().indexOf('MAC') >= 0;
     }
@@ -412,6 +419,9 @@ class TruBreezeContext {
         return (x) => { return new EntityQuery(x); };
     }
     ;
+    get createPredicate() {
+        return (...args) => { return new Predicate(args); };
+    }
     get entityManager() {
         return this._entityManager;
     }
@@ -700,6 +710,44 @@ class TruEntityAccessor {
                 return result;
             return null;
         };
+        this.searchByRefArrayCacheOnly = (entity, setupQuery = null, refs, includeDeleted = false) => {
+            if (!includeDeleted)
+                includeDeleted = false;
+            var queryOptions = this._entityManager.queryOptions.using({
+                includeDeleted: includeDeleted,
+                fetchStrategy: FetchStrategy.FromLocalCache
+            });
+            var query = this._breezeContext.createQuery(this.getQueryServiceName(entity)).using(queryOptions);
+            if (setupQuery)
+                query = setupQuery(query);
+            if (query === null) //setupQuery() returned null to select no rows
+                return [];
+            if (refs.length > 0) {
+                const pkeyName = entity.name + 'Ref';
+                var predicate = this._breezeContext.createPredicate(pkeyName, '==', refs[0]);
+                _.rest(refs, 1).forEach(function (ref) {
+                    predicate = predicate.or(pkeyName, '==', ref);
+                });
+                query = query.where(predicate);
+            }
+            var results = this._entityManager.executeQueryLocally(query);
+            if (results && results.length)
+                return results;
+            return null;
+        };
+        this.searchByRefWithQuery = (entity, setupQuery, ref) => {
+            var query = this._breezeContext.createQuery(this.getQueryServiceName(entity));
+            query = setupQuery(query);
+            const pkeyName = entity.name + 'Ref';
+            var predicate = this._breezeContext.createPredicate(pkeyName, '==', ref);
+            query = query.where(predicate);
+            var localResults = this._entityManager.executeQueryLocally(query);
+            if (localResults.length)
+                return of(localResults);
+            return defer(() => from(this._entityManager.executeQuery(query).then((queryData) => {
+                return queryData.results;
+            })));
+        };
         this.export = (entity, gridSpec, setupQuery, entityRefs, options) => {
             options = options || {};
             var args = {
@@ -2011,16 +2059,16 @@ class TruDataChangeParser {
     dataChanged(change) {
         this.dataChanged$.next(change);
     }
-    constructor(connection, dataContext, entity, tableName, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded, modelPropertyLookup) {
+    constructor(connection, dataContext, globalDataContext, entity, tableName, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded, modelPropertyLookup) {
         this.waitingEntities = [];
         this.dataChanged$ = new Subject();
         this.findEntityInCache = (change) => {
-            var entityAccessor = this.dataContext.entityAccess(change.tableName);
+            var entityAccessor = this.dataContext.entityAccess();
             return entityAccessor.searchByRefCacheOnly(this.entity, parseInt(change.tableRef, 10), true);
         };
         this.findEntityInGlobalCache = (change) => {
-            var entityAccessor = this.globalDataContext.entityAccess(change.tableName);
-            return entityAccessor.getByRefCacheOnly(parseInt(change.tableRef, 10), true);
+            var entityAccessor = this.globalDataContext.entityAccess();
+            return entityAccessor.searchByRefCacheOnly(this.entity, parseInt(change.tableRef, 10), true);
         };
         this.checkIfDateTime = (newValue, currentValue, typeName) => {
             if (typeName === 'date-time' || typeName === 'date') {
@@ -2100,17 +2148,17 @@ class TruDataChangeParser {
             });
         };
         this.entityFoundByQuery = (change) => {
-            var entityAccessor = this.dataContext.entityAccess(this.tableName);
-            var entities = entityAccessor.subsearch(this.getLatestQuery(), [change.tableRef]);
-            if (!entities.length) {
-                var entityAccessor = this.globalDataContext.entityAccess(this.tableName);
-                entities = entityAccessor.subsearch(this.getLatestQuery(), [change.tableRef]);
+            var entityAccessor = this.dataContext.entityAccess();
+            var entities = entityAccessor.searchByRefArrayCacheOnly(this.entity, this.getLatestQuery(), [change.tableRef]);
+            if (entities !== null && !entities.length) {
+                var entityAccessor = this.globalDataContext.entityAccess();
+                entities = entityAccessor.searchByRefArrayCacheOnly(this.entity, this.getLatestQuery(), [change.tableRef]);
             }
-            return entities.length;
+            return entities === null ? 0 : entities.length;
         };
         this.getEntityFromServer = (change) => {
-            var entityAccessor = this.dataContext.entityAccess(this.tableName);
-            var entitiy = entityAccessor.customSearchByRef(this.getLatestQuery(), change.tableRef);
+            var entityAccessor = this.dataContext.entityAccess();
+            var entitiy = entityAccessor.searchByRefWithQuery(this.entity, this.getLatestQuery(), change.tableRef);
             return entitiy;
         };
         this.getEntityFromResults = (results, change) => {
@@ -2172,8 +2220,9 @@ class TruDataChangeParser {
                                 var entityAlreadyInResults = this.getEntityFromResults(results, change);
                                 if (this.entityFoundByQuery(change) && !entityAlreadyInResults.length && this.isLoaded()) {
                                     if (!localEntity) {
-                                        var newEntity = this.dataContext.entityAccess(change.tableName).add(this.contextFilters);
-                                        newEntity[change.tableName + 'Ref'] = change.tableRef;
+                                        var newEntity = this.dataContext.entityAccess().add(this.entity, this.contextFilters);
+                                        const pkeyName = change.tableName + 'Ref';
+                                        newEntity[pkeyName] = change.tableRef;
                                         this.applyPropertyChanges(change, newEntity);
                                         if (this.isLoaded()) {
                                             var results = this.getLatestResults();
@@ -2197,8 +2246,9 @@ class TruDataChangeParser {
                                     }
                                 }
                                 else if (!globalEntity) {
-                                    var newEntity = this.globalDataContext.entityAccess(change.tableName).add(this.contextFilters);
-                                    newEntity[change.tableName + 'Ref'] = change.tableRef;
+                                    var newEntity = this.globalDataContext.entityAccess().add(this.entity, this.contextFilters);
+                                    const pkeyName = change.tableName + 'Ref';
+                                    newEntity[pkeyName] = change.tableRef;
                                     this.applyPropertyChanges(change, newEntity);
                                     reloadResults = true;
                                 }
@@ -2213,7 +2263,7 @@ class TruDataChangeParser {
                     });
                 }
                 else if (change.changeOperation === 'U' && change.tableName === this.tableName) {
-                    await this.getEntityFromServer(change).then((entity) => {
+                    await this.getEntityFromServer(change).subscribe((entity) => {
                         if (entity) {
                             this.applyPropertyChanges(change, entity);
                             var results = this.getLatestResults();
@@ -2226,11 +2276,13 @@ class TruDataChangeParser {
                 }
                 else {
                     if (change.changeOperation === 'I' && change.tableName === this.tableName) {
-                        var newEntity = this.globalDataContext.entityAccess(change.tableName).add(this.contextFilters);
-                        newEntity[change.tableName + 'Ref'] = change.tableRef;
+                        var newEntity = this.globalDataContext.entityAccess().add(this.entity, this.contextFilters);
+                        const pkeyName1 = change.tableName + 'Ref';
+                        newEntity[pkeyName1] = change.tableRef;
                         this.applyPropertyChanges(change, newEntity);
-                        newEntity = this.dataContext.entityAccess(change.tableName).add(this.contextFilters);
-                        newEntity[this.tableName + 'Ref'] = change.tableRef;
+                        newEntity = this.dataContext.entityAccess().add(this.entity, this.contextFilters);
+                        const pkeyName2 = change.tableName + 'Ref';
+                        newEntity[pkeyName2] = change.tableRef;
                         this.applyPropertyChanges(change, newEntity);
                         if (this.entityFoundByQuery(change) && this.isLoaded()) {
                             var results = this.getLatestResults();
@@ -2239,11 +2291,13 @@ class TruDataChangeParser {
                         }
                     }
                     else if (change.changeOperation === 'I') {
-                        var newEntity = this.globalDataContext.entityAccess(change.tableName).add(this.contextFilters);
-                        newEntity[change.tableName + 'Ref'] = change.tableRef;
+                        var newEntity = this.globalDataContext.entityAccess().add(this.entity, this.contextFilters);
+                        const pkeyName1 = change.tableName + 'Ref';
+                        newEntity[pkeyName1] = change.tableRef;
                         this.applyPropertyChanges(change, newEntity);
-                        newEntity = this.dataContext.entityAccess(change.tableName).add(this.contextFilters);
-                        newEntity[change.tableName + 'Ref'] = change.tableRef;
+                        newEntity = this.dataContext.entityAccess().add(this.entity, this.contextFilters);
+                        const pkeyName2 = change.tableName + 'Ref';
+                        newEntity[pkeyName2] = change.tableRef;
                         this.applyPropertyChanges(change, newEntity);
                     }
                 }
@@ -2256,6 +2310,7 @@ class TruDataChangeParser {
             this.dataChanged(dataChangeArgs);
         };
         this.dataContext = dataContext;
+        this.globalDataContext = globalDataContext;
         this.entity = entity;
         this.tableName = tableName;
         this.getLatestResults = getLatestResults;
@@ -2312,7 +2367,7 @@ class TruConnectionHub {
             }
         };
         this.subscribe = (dataContext, entity, tableName, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded) => {
-            return new TruDataChangeParser(this.connection, dataContext, entity, tableName, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded, this.modelPropertyLookup).onDataChanged();
+            return new TruDataChangeParser(this.connection, dataContext, this.appEnvironment.globalDataContext, entity, tableName, getLatestResults, getLatestQuery, contextFilters, expandPaths, isLoaded, this.modelPropertyLookup).onDataChanged();
         };
         this.connection = new signalR.HubConnectionBuilder()
             .withUrl(`${this.appEnvironment.appUri}/notificationhub`, {