Fix issue 53192 (#1803)

- QueryModel: add isQueryInfoLoaded
- withQueryModels: be more defensive when loading rows and total count

Author: labkey-alan

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.44.3",
+  "version": "6.44.4",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

packages/components/package.json

@@ -1,6 +1,11 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 6.44.4
+*Released*: 2 June 2025
+- QueryModel: add isQueryInfoLoaded
+- withQueryModels: be more defensive when loading rows and total count
+
 ### version 6.44.3
 *Released*: 28 May 2025
 - Issue 52925: App export to csv/tsv ignores filter with column containing double quote

packages/components/releaseNotes/components.md

@@ -77,6 +77,17 @@ describe('QueryModel', () => {
         expect(model.isLoading).toEqual(false);
     });
 
+    test('isQueryInfoLoaded', () => {
+        let model = new QueryModel({ schemaQuery: SCHEMA_QUERY });
+        expect(model.isQueryInfoLoaded).toEqual(false);
+        model = model.mutate({ queryInfoLoadingState: LoadingState.LOADING });
+        expect(model.isQueryInfoLoaded).toEqual(false);
+        model = model.mutate({ queryInfoLoadingState: LoadingState.LOADED });
+        expect(model.isQueryInfoLoaded).toEqual(true);
+        model = model.mutate({ queryInfoError: 'Oh no!' });
+        expect(model.isQueryInfoLoaded).toEqual(false);
+    });
+
     test('Pagination', () => {
         let model = new QueryModel({ schemaQuery: SCHEMA_QUERY }).mutate({
             maxRows: 20,

packages/components/src/public/QueryModel/QueryModel.test.ts

@@ -1044,6 +1044,13 @@ export class QueryModel {
         return GRID_CHECKBOX_OPTIONS.NONE;
     }
 
+    /**
+     * Returns true if the QueryInfo is loaded and there is not an error
+     */
+    get isQueryInfoLoaded(): boolean {
+        return this.queryInfoError === undefined && !isLoading(this.queryInfoLoadingState);
+    }
+
     /**
      * True if either the query info or rows of the QueryModel are still loading.
      */

packages/components/src/public/QueryModel/QueryModel.ts

@@ -691,7 +691,8 @@ export function withQueryModels<Props>(
         loadRows = async (id: string, loadSelections = false, selectionsForReplace?: string[]): Promise<void> => {
             const { loadRows } = this.props.modelLoader;
 
-            if (isLoading(this.state.queryModels[id].queryInfoLoadingState)) {
+            // Issue 53192
+            if (!this.state.queryModels[id].isQueryInfoLoaded) {
                 return;
             }
 
@@ -777,7 +778,8 @@ export function withQueryModels<Props>(
         };
 
         loadTotalCount = async (id: string, reloadTotalCount = false): Promise<void> => {
-            if (isLoading(this.state.queryModels[id].queryInfoLoadingState)) {
+            // Issue 53192
+            if (!this.state.queryModels[id].isQueryInfoLoaded) {
                 return;
             }