@trudb/tru-common-lib 0.2.354 → 0.2.356

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

@@ -1730,6 +1730,15 @@ class TruEntityAccessor {
             return result;
         return null;
     };
+    searchByRefServerOnly = (entity, ref) => {
+        var queryOptions = this._entityManager.queryOptions.using({
+            fetchStrategy: FetchStrategy.FromServer
+        });
+        var query = this._breezeContext.createQuery(this.getQueryServiceName(entity)).where(entity.name + 'Ref', '==', ref).using(queryOptions);
+        return defer(() => from(this._entityManager.executeQuery(query).then((queryData) => {
+            return queryData.results[0];
+        })));
+    };
     searchByRefArrayCacheOnly = (entity, setupQuery = null, refs, includeDeleted = false) => {
         if (!includeDeleted)
             includeDeleted = false;
@@ -7740,23 +7749,24 @@ class TruDataGrid {
             //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)
-                childToAssociate = this.appEnvironment.globalDataContext?.entityAccess().searchByRefCacheOnly(unassociatedType, ref, true);
-            if (childToAssociate) {
-                let enhancedEntity = this.enhanceRowDataForEntity(newEntity);
-                enhancedEntity.$entity[this.config.resultConfig.entityManyToManyTypeNameWithPrefix + '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.value.$ === childToAssociate[unassociatedType.name + 'Ref'];
-                });
-                this.unassociatedChoices.splice(itemIndex, 1);
-                // clear add selection
-                this.selectedUnassociatedChoice = undefined;
-                // add row to grid
-                this.unsavedEntities.push(enhancedEntity);
-            }
+            this.dataContext.entityAccess().searchByRefServerOnly(unassociatedType, ref).subscribe((childToAssociate) => {
+                if (!childToAssociate)
+                    childToAssociate = this.appEnvironment.globalDataContext?.entityAccess().searchByRefCacheOnly(unassociatedType, ref, true);
+                if (childToAssociate) {
+                    let enhancedEntity = this.enhanceRowDataForEntity(newEntity);
+                    enhancedEntity.$entity[this.config.resultConfig.entityManyToManyTypeNameWithPrefix + '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.value.$ === childToAssociate[unassociatedType.name + 'Ref'];
+                    });
+                    this.unassociatedChoices.splice(itemIndex, 1);
+                    // clear add selection
+                    this.selectedUnassociatedChoice = undefined;
+                    // add row to grid
+                    this.unsavedEntities.push(enhancedEntity);
+                }
+            });
         }
     };
     subscribeTo = () => {
@@ -8341,8 +8351,14 @@ class TruDataGrid {
         const headerHeight = 25;
         const minRows = this.config.minimumRows ?? 0;
         const maxRows = this.config.maximumRows;
-        const minPx = (minRows * rowHeight) + headerHeight;
-        const maxPx = typeof maxRows === 'number' ? (maxRows * rowHeight) + headerHeight : undefined;
+        const gridTopOffset = this.label ? 48 : 28;
+        const gridBottomOffset = 23; // status bar height/bottom offset
+        const gridChromePx = gridTopOffset + gridBottomOffset;
+        // Ensure space for either the minimum rows or the overlay box (50px high).
+        const overlayMinPx = 50;
+        const contentMinPx = Math.max((minRows * rowHeight) + headerHeight, overlayMinPx);
+        const minPx = contentMinPx + gridChromePx;
+        const maxPx = typeof maxRows === 'number' ? ((maxRows * rowHeight) + headerHeight + gridChromePx) : undefined;
         let targetHeight = distributedHeight;
         if (!this.config.fill) {
             if (maxPx !== undefined && maxPx < targetHeight)