udp-stencil-component-library 26.2.0-beta.0 → 26.2.0-beta.1

package/dist/cjs/ag-grid-base_63.cjs.entry.js

@@ -3,10 +3,10 @@
 var index = require('./index-G1ccGqOs.js');
 var agGridEnterpriseV33 = require('ag-grid-enterprise-v33');
 var apiUtils = require('./apiUtils-ELzOoTQ0.js');
-var getCurrentApiCatalogId = require('./getCurrentApiCatalogId-D7xHCEzs.js');
+var lookupHelper = require('./lookupHelper-fokGJbeb.js');
 var tenantUtils = require('./tenantUtils-BCKSE0vq.js');
 var statusRenderer = require('./status-renderer-9CQ-hhq8.js');
-var configureUdpColumnMods = require('./configureUdpColumnMods-MGNO-bXn.js');
+var configureUdpColumnMods = require('./configureUdpColumnMods-DtsJ11YI.js');
 var lodashEs = require('lodash-es');
 var makeApiCall = require('./makeApiCall-CFfg9gI0.js');
 var configService = require('./configService-BqiLnW8G.js');
@@ -624,7 +624,7 @@ class SavedViews {
                 },
             ];
             try {
-                await apiUtils.updateViewAndConfigurations(view.gridViewId, getUserId(), context === null || context === void 0 ? void 0 : context.gridId, getCurrentApiCatalogId.getCurrentApiCatalogId(), view.name, saveState, view.isDefault ? 1 : 0, context === null || context === void 0 ? void 0 : context.entityName, (_a = view.gridViewVisibilityTypeId) !== null && _a !== void 0 ? _a : 1, () => null);
+                await apiUtils.updateViewAndConfigurations(view.gridViewId, getUserId(), context === null || context === void 0 ? void 0 : context.gridId, lookupHelper.getCurrentApiCatalogId(), view.name, saveState, view.isDefault ? 1 : 0, context === null || context === void 0 ? void 0 : context.entityName, (_a = view.gridViewVisibilityTypeId) !== null && _a !== void 0 ? _a : 1, () => null);
                 await this.fetchViews();
                 const updated = this.filteredViews.find(v => v.gridViewId === view.gridViewId);
                 if (updated)
@@ -786,7 +786,7 @@ class SavedViews {
             },
         ];
         try {
-            await apiUtils.saveView(getUserId(), context === null || context === void 0 ? void 0 : context.gridId, getCurrentApiCatalogId.getCurrentApiCatalogId(), name, context === null || context === void 0 ? void 0 : context.entityName, saveState, visibilityTypeId, 0, // not set as default
+            await apiUtils.saveView(getUserId(), context === null || context === void 0 ? void 0 : context.gridId, lookupHelper.getCurrentApiCatalogId(), name, context === null || context === void 0 ? void 0 : context.entityName, saveState, visibilityTypeId, 0, // not set as default
             () => null);
             await this.fetchViews();
             const newView = this.filteredViews.find(v => v.name === name);
@@ -806,7 +806,7 @@ class SavedViews {
         this.refresh();
         const context = this.api.getGridOption('context');
         try {
-            await apiUtils.updateView(view.gridViewId, getUserId(), context === null || context === void 0 ? void 0 : context.gridId, getCurrentApiCatalogId.getCurrentApiCatalogId(), name, view.isDefault ? 1 : 0, context === null || context === void 0 ? void 0 : context.entityName, visibilityTypeId, () => null);
+            await apiUtils.updateView(view.gridViewId, getUserId(), context === null || context === void 0 ? void 0 : context.gridId, lookupHelper.getCurrentApiCatalogId(), name, view.isDefault ? 1 : 0, context === null || context === void 0 ? void 0 : context.entityName, visibilityTypeId, () => null);
             await this.fetchViews();
         }
         catch (err) {
@@ -824,12 +824,12 @@ class SavedViews {
         const context = this.api.getGridOption('context');
         const isCurrentlyDefault = view.isDefault;
         try {
-            await apiUtils.updateView(view.gridViewId, getUserId(), context === null || context === void 0 ? void 0 : context.gridId, getCurrentApiCatalogId.getCurrentApiCatalogId(), view.name, isCurrentlyDefault ? 0 : 1, context === null || context === void 0 ? void 0 : context.entityName, (_a = view.gridViewVisibilityTypeId) !== null && _a !== void 0 ? _a : 1, () => null);
+            await apiUtils.updateView(view.gridViewId, getUserId(), context === null || context === void 0 ? void 0 : context.gridId, lookupHelper.getCurrentApiCatalogId(), view.name, isCurrentlyDefault ? 0 : 1, context === null || context === void 0 ? void 0 : context.entityName, (_a = view.gridViewVisibilityTypeId) !== null && _a !== void 0 ? _a : 1, () => null);
             if (!isCurrentlyDefault) {
                 // Unset the previous default if there was one
                 const currentDefault = this.filteredViews.find(v => v.isDefault);
                 if (currentDefault) {
-                    await apiUtils.updateView(currentDefault.gridViewId, getUserId(), context === null || context === void 0 ? void 0 : context.gridId, getCurrentApiCatalogId.getCurrentApiCatalogId(), currentDefault.name, 0, context === null || context === void 0 ? void 0 : context.entityName, (_b = currentDefault.gridViewVisibilityTypeId) !== null && _b !== void 0 ? _b : 1, () => null).catch(err => console.log(err));
+                    await apiUtils.updateView(currentDefault.gridViewId, getUserId(), context === null || context === void 0 ? void 0 : context.gridId, lookupHelper.getCurrentApiCatalogId(), currentDefault.name, 0, context === null || context === void 0 ? void 0 : context.entityName, (_b = currentDefault.gridViewVisibilityTypeId) !== null && _b !== void 0 ? _b : 1, () => null).catch(err => console.log(err));
                 }
             }
             await this.fetchViews();

package/dist/cjs/api-method-instance-grid.cjs.entry.js

@@ -4,10 +4,15 @@ var index = require('./index-G1ccGqOs.js');
 var makeApiCall = require('./makeApiCall-CFfg9gI0.js');
 var searchObject = require('./searchObject-DeDFFGcx.js');
 var lodashEs = require('lodash-es');
-var apiMethodInstance = require('./apiMethodInstance-B_zfUIFl.js');
+var apiMethodInstance = require('./apiMethodInstance-DymTfku4.js');
 var configService = require('./configService-BqiLnW8G.js');
 require('axios');
-require('./configureUdpColumnMods-MGNO-bXn.js');
+require('./configureUdpColumnMods-DtsJ11YI.js');
+require('./lookupHelper-fokGJbeb.js');
+require('./apiUtils-ELzOoTQ0.js');
+require('deep-equal');
+require('@stencil/store');
+require('./tenantUtils-BCKSE0vq.js');
 
 function mergeSearchObjects(baseSearchObject, searchObjectOverrides) {
     var _a, _b, _c, _d, _e, _f, _g;

package/dist/cjs/{apiMethodInstance-B_zfUIFl.js → apiMethodInstance-DymTfku4.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var configureUdpColumnMods = require('./configureUdpColumnMods-MGNO-bXn.js');
+var configureUdpColumnMods = require('./configureUdpColumnMods-DtsJ11YI.js');
 
 function mapDotNetTypeToAgGridType(type) {
     const normalized = type.replace(/\?$/, '').trim().toLowerCase();

package/dist/cjs/{configureUdpColumnMods-MGNO-bXn.js → configureUdpColumnMods-DtsJ11YI.js}

@@ -1,5 +1,7 @@
 'use strict';
 
+var lookupHelper = require('./lookupHelper-fokGJbeb.js');
+
 /**
  * Finds an existing 'actions' column in an array of ColDefs and applies
  * a dynamic fixed width and right pinning.
@@ -28,9 +30,22 @@ function configureUdpColumnMods(columnDefs, disableColumnFiltering = false) {
             // Return a new object with the original properties plus our overrides
             return Object.assign(Object.assign({}, colDef), { pinned: 'right', width: calculatedWidth, minWidth: calculatedWidth, maxWidth: calculatedWidth, sortable: false, filter: false, suppressHeaderMenuButton: true, suppressMovable: true });
         }
-        // If a column contains a lookup id, set a valuegetter on the column def and disable filtering and sorting
+        // Lookup columns: display the resolved label, but filter against the underlying key.
+        // The set filter values + dropdown labels come from the cached lookup table, so the
+        // filter model holds keys (server-side IN clause works unchanged). Sort is left off
+        // because the backend can only order by the stored key, not the resolved label.
         if ((_e = colDef === null || colDef === void 0 ? void 0 : colDef.context) === null || _e === void 0 ? void 0 : _e.lookupId) {
-            return Object.assign(Object.assign({}, colDef), { valueGetter: (params) => params.data[(colDef === null || colDef === void 0 ? void 0 : colDef.field) + 'LookupValue'], filter: false, sortable: false });
+            const lookupId = colDef.context.lookupId;
+            const field = colDef.field;
+            return Object.assign(Object.assign({}, colDef), { valueGetter: (params) => params.data[field + 'LookupValue'], filterValueGetter: (params) => { var _a; return (_a = params.data) === null || _a === void 0 ? void 0 : _a[field]; }, filter: 'agSetColumnFilter', filterParams: Object.assign({ values: (params) => {
+                        lookupHelper.getLookupTable(lookupId).then(table => {
+                            params.success(Array.from(table.valueMap.keys()));
+                        });
+                    }, valueFormatter: (params) => {
+                        var _a, _b;
+                        const key = params.value == null ? '' : String(params.value);
+                        return (_b = (_a = lookupHelper.getLookupTableSync(lookupId)) === null || _a === void 0 ? void 0 : _a.valueMap.get(key)) !== null && _b !== void 0 ? _b : key;
+                    } }, colDef.filterParams), sortable: false });
         }
         if (disableColumnFiltering) {
             return Object.assign(Object.assign({}, colDef), { filter: false });

package/dist/cjs/index.cjs.js

@@ -8,7 +8,7 @@ var SearchBuilder = require('./SearchBuilder-BsB_257b.js');
 var searchObject = require('./searchObject-DeDFFGcx.js');
 var catalogTree = require('./catalogTree-CnzW15ah.js');
 var configService = require('./configService-BqiLnW8G.js');
-var apiMethodInstance = require('./apiMethodInstance-B_zfUIFl.js');
+var apiMethodInstance = require('./apiMethodInstance-DymTfku4.js');
 var webComponents = require('@fluentui/web-components');
 var tokens = require('@fluentui/tokens');
 var agGridEnterpriseV33 = require('ag-grid-enterprise-v33');
@@ -17,7 +17,8 @@ require('./apiUtils-ELzOoTQ0.js');
 require('deep-equal');
 require('./makeApiCall-CFfg9gI0.js');
 require('./tenantUtils-BCKSE0vq.js');
-require('./configureUdpColumnMods-MGNO-bXn.js');
+require('./configureUdpColumnMods-DtsJ11YI.js');
+require('./lookupHelper-fokGJbeb.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 

package/dist/cjs/lookupHelper-fokGJbeb.js

@@ -0,0 +1,86 @@
+'use strict';
+
+var apiUtils = require('./apiUtils-ELzOoTQ0.js');
+
+function getCurrentApiCatalogId() {
+    return sessionStorage.getItem('current-api-catalog-id');
+}
+
+const resolvedLookups = new Map();
+const pendingLookups = new Map();
+async function getLookupTable(lookupId) {
+    const cached = resolvedLookups.get(lookupId);
+    if (cached)
+        return cached;
+    const inFlight = pendingLookups.get(lookupId);
+    if (inFlight)
+        return inFlight;
+    const promise = (async () => {
+        var _a, _b;
+        const lookupApiMethodId = (_b = (_a = (await apiUtils.getPromotedLookupMethod(getCurrentApiCatalogId()))) === null || _a === void 0 ? void 0 : _a.unityBaseGetDataMethod) === null || _b === void 0 ? void 0 : _b.apiMethodId;
+        const empty = { keyName: '', valueName: '', valueMap: new Map() };
+        if (!lookupApiMethodId)
+            return empty;
+        try {
+            const response = await apiUtils.executeQueryWithParameters({ data: { id: lookupId } }, lookupApiMethodId);
+            const { keyName, valueName, data } = response !== null && response !== void 0 ? response : {};
+            if (!data || !keyName || !valueName)
+                return empty;
+            const valueMap = new Map(data.map((item) => [String(item[keyName]), item[valueName]]));
+            const table = { keyName, valueName, valueMap };
+            resolvedLookups.set(lookupId, table);
+            return table;
+        }
+        catch (_c) {
+            return empty;
+        }
+        finally {
+            pendingLookups.delete(lookupId);
+        }
+    })();
+    pendingLookups.set(lookupId, promise);
+    return promise;
+}
+function getLookupTableSync(lookupId) {
+    return resolvedLookups.get(lookupId);
+}
+async function processLookupsInData(rowData, columnDefs) {
+    if (!(rowData === null || rowData === void 0 ? void 0 : rowData.length)) {
+        return rowData;
+    }
+    const lookupsByField = new Map();
+    const uniqueLookupIds = new Set();
+    columnDefs.forEach(col => {
+        var _a;
+        const lookupId = (_a = col === null || col === void 0 ? void 0 : col.context) === null || _a === void 0 ? void 0 : _a.lookupId;
+        if (lookupId && typeof lookupId === 'string' && col.field) {
+            lookupsByField.set(col.field, lookupId);
+            uniqueLookupIds.add(lookupId);
+        }
+    });
+    if (uniqueLookupIds.size === 0) {
+        return rowData;
+    }
+    await Promise.all(Array.from(uniqueLookupIds).map(id => getLookupTable(id)));
+    return rowData.map(row => {
+        var _a;
+        const newRow = Object.assign({}, row);
+        for (const [field, lookupId] of lookupsByField.entries()) {
+            if (newRow[field] === null || newRow[field] === undefined)
+                continue;
+            const valueMap = (_a = resolvedLookups.get(lookupId)) === null || _a === void 0 ? void 0 : _a.valueMap;
+            if (!valueMap)
+                continue;
+            const key = String(newRow[field]);
+            if (valueMap.has(key)) {
+                newRow[field + 'LookupValue'] = valueMap.get(key);
+            }
+        }
+        return newRow;
+    });
+}
+
+exports.getCurrentApiCatalogId = getCurrentApiCatalogId;
+exports.getLookupTable = getLookupTable;
+exports.getLookupTableSync = getLookupTableSync;
+exports.processLookupsInData = processLookupsInData;

package/dist/cjs/search-method-grid.cjs.entry.js

@@ -3,7 +3,7 @@
 var index = require('./index-G1ccGqOs.js');
 var apiUtils = require('./apiUtils-ELzOoTQ0.js');
 var searchObject = require('./searchObject-DeDFFGcx.js');
-var getCurrentApiCatalogId = require('./getCurrentApiCatalogId-D7xHCEzs.js');
+var lookupHelper = require('./lookupHelper-fokGJbeb.js');
 var makeApiCall = require('./makeApiCall-CFfg9gI0.js');
 var configService = require('./configService-BqiLnW8G.js');
 var isEqual = require('lodash-es/isEqual');
@@ -16,73 +16,6 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var isEqual__default = /*#__PURE__*/_interopDefault(isEqual);
 
-async function processLookupsInData(rowData, columnDefs) {
-    var _a, _b;
-    if (!(rowData === null || rowData === void 0 ? void 0 : rowData.length)) {
-        return rowData;
-    }
-    // Step 1: Build a map of lookups needed (simpler now)
-    const lookupsToFetch = new Map();
-    columnDefs.forEach(col => {
-        var _a;
-        const lookupId = (_a = col === null || col === void 0 ? void 0 : col.context) === null || _a === void 0 ? void 0 : _a.lookupId;
-        if (lookupId && typeof lookupId === 'string' && col.field) {
-            const existing = lookupsToFetch.get(lookupId);
-            if (existing) {
-                // If this lookupId is already tracked, add the new field to its list
-                existing.columnFields.push(col.field);
-            }
-            else {
-                // Otherwise, create a new entry for this lookupId
-                lookupsToFetch.set(lookupId, { columnFields: [col.field] });
-            }
-        }
-    });
-    if (lookupsToFetch.size === 0) {
-        return rowData;
-    }
-    // Step 2: Fetch the method ID and then the lookup data
-    const lookupApiMethodId = (_b = (_a = (await apiUtils.getPromotedLookupMethod(getCurrentApiCatalogId.getCurrentApiCatalogId()))) === null || _a === void 0 ? void 0 : _a.unityBaseGetDataMethod) === null || _b === void 0 ? void 0 : _b.apiMethodId;
-    if (!lookupApiMethodId) {
-        return rowData;
-    }
-    const lookupPromises = Array.from(lookupsToFetch.keys()).map(lookupId => {
-        // 2. If not in cache, make the API call.
-        return apiUtils.executeQueryWithParameters({ data: { id: lookupId } }, lookupApiMethodId)
-            .then(response => {
-            return Object.assign({ lookupId }, response);
-        })
-            .catch(() => ({ lookupId, data: [] }));
-    });
-    const lookupResults = await Promise.all(lookupPromises);
-    // Step 3: Create a fast-access map using the keyName and valueName from the response
-    const lookupsMap = new Map();
-    lookupResults.forEach(result => {
-        const config = lookupsToFetch.get(result.lookupId);
-        const keyName = result.keyName;
-        const valueName = result.valueName;
-        if (result.data && keyName && valueName) {
-            const valueMap = new Map(result.data.map(item => [String(item[keyName]), item[valueName]]));
-            for (const field of config.columnFields) {
-                lookupsMap.set(field, valueMap);
-            }
-        }
-    });
-    // Step 4: Map the original rowData (unchanged)
-    return rowData.map(row => {
-        const newRow = Object.assign({}, row);
-        for (const [field, valueMap] of lookupsMap.entries()) {
-            if (newRow[field] !== null && newRow[field] !== undefined) {
-                const key = String(newRow[field]);
-                if (valueMap.has(key)) {
-                    newRow[field + 'LookupValue'] = valueMap.get(key);
-                }
-            }
-        }
-        return newRow;
-    });
-}
-
 const FilterOperators = {
     equals: searchObject.SearchOperators.EQUALS,
     contains: searchObject.SearchOperators.LIKE,
@@ -321,7 +254,7 @@ const createSearchMethodDataSource = (options) => {
                     }
                     else {
                         const columnDefs = params.api.getColumnDefs();
-                        finalRowData = await processLookupsInData(response.pageList, columnDefs);
+                        finalRowData = await lookupHelper.processLookupsInData(response.pageList, columnDefs);
                     }
                     params.success({
                         rowData: finalRowData,

package/dist/collection/components/grid/new-grid/helperFunctions/configureUdpColumnMods.js

@@ -1,3 +1,4 @@
+import { getLookupTable, getLookupTableSync } from "./lookupHelper";
 /**
  * Finds an existing 'actions' column in an array of ColDefs and applies
  * a dynamic fixed width and right pinning.
@@ -26,9 +27,22 @@ export function configureUdpColumnMods(columnDefs, disableColumnFiltering = fals
             // Return a new object with the original properties plus our overrides
             return Object.assign(Object.assign({}, colDef), { pinned: 'right', width: calculatedWidth, minWidth: calculatedWidth, maxWidth: calculatedWidth, sortable: false, filter: false, suppressHeaderMenuButton: true, suppressMovable: true });
         }
-        // If a column contains a lookup id, set a valuegetter on the column def and disable filtering and sorting
+        // Lookup columns: display the resolved label, but filter against the underlying key.
+        // The set filter values + dropdown labels come from the cached lookup table, so the
+        // filter model holds keys (server-side IN clause works unchanged). Sort is left off
+        // because the backend can only order by the stored key, not the resolved label.
         if ((_e = colDef === null || colDef === void 0 ? void 0 : colDef.context) === null || _e === void 0 ? void 0 : _e.lookupId) {
-            return Object.assign(Object.assign({}, colDef), { valueGetter: (params) => params.data[(colDef === null || colDef === void 0 ? void 0 : colDef.field) + 'LookupValue'], filter: false, sortable: false });
+            const lookupId = colDef.context.lookupId;
+            const field = colDef.field;
+            return Object.assign(Object.assign({}, colDef), { valueGetter: (params) => params.data[field + 'LookupValue'], filterValueGetter: (params) => { var _a; return (_a = params.data) === null || _a === void 0 ? void 0 : _a[field]; }, filter: 'agSetColumnFilter', filterParams: Object.assign({ values: (params) => {
+                        getLookupTable(lookupId).then(table => {
+                            params.success(Array.from(table.valueMap.keys()));
+                        });
+                    }, valueFormatter: (params) => {
+                        var _a, _b;
+                        const key = params.value == null ? '' : String(params.value);
+                        return (_b = (_a = getLookupTableSync(lookupId)) === null || _a === void 0 ? void 0 : _a.valueMap.get(key)) !== null && _b !== void 0 ? _b : key;
+                    } }, colDef.filterParams), sortable: false });
         }
         if (disableColumnFiltering) {
             return Object.assign(Object.assign({}, colDef), { filter: false });

package/dist/collection/components/grid/new-grid/helperFunctions/lookupHelper.js

@@ -1,66 +1,73 @@
 import { executeQueryWithParameters, getPromotedLookupMethod, } from "../../../../udp-utilities/api-udp/apiUtils";
 import { getCurrentApiCatalogId } from "../../../../udp-utilities/catalog/getCurrentApiCatalogId";
+const resolvedLookups = new Map();
+const pendingLookups = new Map();
+export async function getLookupTable(lookupId) {
+    const cached = resolvedLookups.get(lookupId);
+    if (cached)
+        return cached;
+    const inFlight = pendingLookups.get(lookupId);
+    if (inFlight)
+        return inFlight;
+    const promise = (async () => {
+        var _a, _b;
+        const lookupApiMethodId = (_b = (_a = (await getPromotedLookupMethod(getCurrentApiCatalogId()))) === null || _a === void 0 ? void 0 : _a.unityBaseGetDataMethod) === null || _b === void 0 ? void 0 : _b.apiMethodId;
+        const empty = { keyName: '', valueName: '', valueMap: new Map() };
+        if (!lookupApiMethodId)
+            return empty;
+        try {
+            const response = await executeQueryWithParameters({ data: { id: lookupId } }, lookupApiMethodId);
+            const { keyName, valueName, data } = response !== null && response !== void 0 ? response : {};
+            if (!data || !keyName || !valueName)
+                return empty;
+            const valueMap = new Map(data.map((item) => [String(item[keyName]), item[valueName]]));
+            const table = { keyName, valueName, valueMap };
+            resolvedLookups.set(lookupId, table);
+            return table;
+        }
+        catch (_c) {
+            return empty;
+        }
+        finally {
+            pendingLookups.delete(lookupId);
+        }
+    })();
+    pendingLookups.set(lookupId, promise);
+    return promise;
+}
+export function getLookupTableSync(lookupId) {
+    return resolvedLookups.get(lookupId);
+}
 export async function processLookupsInData(rowData, columnDefs) {
-    var _a, _b;
     if (!(rowData === null || rowData === void 0 ? void 0 : rowData.length)) {
         return rowData;
     }
-    // Step 1: Build a map of lookups needed (simpler now)
-    const lookupsToFetch = new Map();
+    const lookupsByField = new Map();
+    const uniqueLookupIds = new Set();
     columnDefs.forEach(col => {
         var _a;
         const lookupId = (_a = col === null || col === void 0 ? void 0 : col.context) === null || _a === void 0 ? void 0 : _a.lookupId;
         if (lookupId && typeof lookupId === 'string' && col.field) {
-            const existing = lookupsToFetch.get(lookupId);
-            if (existing) {
-                // If this lookupId is already tracked, add the new field to its list
-                existing.columnFields.push(col.field);
-            }
-            else {
-                // Otherwise, create a new entry for this lookupId
-                lookupsToFetch.set(lookupId, { columnFields: [col.field] });
-            }
+            lookupsByField.set(col.field, lookupId);
+            uniqueLookupIds.add(lookupId);
         }
     });
-    if (lookupsToFetch.size === 0) {
+    if (uniqueLookupIds.size === 0) {
         return rowData;
     }
-    // Step 2: Fetch the method ID and then the lookup data
-    const lookupApiMethodId = (_b = (_a = (await getPromotedLookupMethod(getCurrentApiCatalogId()))) === null || _a === void 0 ? void 0 : _a.unityBaseGetDataMethod) === null || _b === void 0 ? void 0 : _b.apiMethodId;
-    if (!lookupApiMethodId) {
-        return rowData;
-    }
-    const lookupPromises = Array.from(lookupsToFetch.keys()).map(lookupId => {
-        // 2. If not in cache, make the API call.
-        return executeQueryWithParameters({ data: { id: lookupId } }, lookupApiMethodId)
-            .then(response => {
-            return Object.assign({ lookupId }, response);
-        })
-            .catch(() => ({ lookupId, data: [] }));
-    });
-    const lookupResults = await Promise.all(lookupPromises);
-    // Step 3: Create a fast-access map using the keyName and valueName from the response
-    const lookupsMap = new Map();
-    lookupResults.forEach(result => {
-        const config = lookupsToFetch.get(result.lookupId);
-        const keyName = result.keyName;
-        const valueName = result.valueName;
-        if (result.data && keyName && valueName) {
-            const valueMap = new Map(result.data.map(item => [String(item[keyName]), item[valueName]]));
-            for (const field of config.columnFields) {
-                lookupsMap.set(field, valueMap);
-            }
-        }
-    });
-    // Step 4: Map the original rowData (unchanged)
+    await Promise.all(Array.from(uniqueLookupIds).map(id => getLookupTable(id)));
     return rowData.map(row => {
+        var _a;
         const newRow = Object.assign({}, row);
-        for (const [field, valueMap] of lookupsMap.entries()) {
-            if (newRow[field] !== null && newRow[field] !== undefined) {
-                const key = String(newRow[field]);
-                if (valueMap.has(key)) {
-                    newRow[field + 'LookupValue'] = valueMap.get(key);
-                }
+        for (const [field, lookupId] of lookupsByField.entries()) {
+            if (newRow[field] === null || newRow[field] === undefined)
+                continue;
+            const valueMap = (_a = resolvedLookups.get(lookupId)) === null || _a === void 0 ? void 0 : _a.valueMap;
+            if (!valueMap)
+                continue;
+            const key = String(newRow[field]);
+            if (valueMap.has(key)) {
+                newRow[field + 'LookupValue'] = valueMap.get(key);
             }
         }
         return newRow;