Remove code to support Edit with Grid from Bulk Edit (Issue 52658 follow up) (#1784)

Author: labkey-susanh

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.38.1",
+  "version": "6.38.2",
   "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.38.2
+*Released*: 30 April 2025
+- Remove remnants of Edit with Grid from Bulk Edit modal
+  - Remove unneeded parameters for `EditableGridLoaderFromSelection` and `convertQueryDataToEditorData`
+
 ### version 6.38.1
 *Released*: 24 April 2025
 - Issue 52929: App hit selection summary grid doesn't render hit selection check icon if assay name ends with colon

packages/components/releaseNotes/components.md

@@ -36,12 +36,10 @@ export class EditableGridLoaderFromSelection implements EditableGridLoader {
     queryModel: QueryModel;
     queryInfo: QueryInfo;
     requiredColumns: string[];
-    updateData: Map<string, any>; // keys here are column fieldKey
 
     constructor(
         id: string,
         queryModel: QueryModel,
-        updateData: Map<string, any>,
         requiredColumns?: string[],
         omittedColumns?: string[],
         columns?: QueryColumn[],
@@ -56,7 +54,6 @@ export class EditableGridLoaderFromSelection implements EditableGridLoader {
         this.mode = EditorMode.Update;
         this.queryModel = queryModel;
         this.queryInfo = queryModel.queryInfo;
-        this.updateData = updateData || Map<string, any>();
         this.requiredColumns = requiredColumns || [];
         this.omittedColumns = omittedColumns || [];
         this.idsNotToUpdate = idsNotToUpdate || [];
@@ -81,13 +78,7 @@ export class EditableGridLoaderFromSelection implements EditableGridLoader {
         );
 
         return {
-            data: EditorModel.convertQueryDataToEditorData(
-                data,
-                this.queryInfo,
-                this.updateData,
-                this.idsNotToUpdate,
-                this.fieldsNotToUpdate
-            ),
+            data: EditorModel.convertQueryDataToEditorData(data),
             dataIds,
         };
     }

packages/components/src/internal/components/editable/EditableGridLoaderFromSelection.tsx

@@ -327,114 +327,7 @@ describe('EditorModel', () => {
             expect(EditorModel.getEditorDataFromQueryValueMap(data)).toEqual(undefined);
         });
 
-        test('convertQueryDataToEditorData with updates', () => {
-            const queryData = fromJS({
-                1: {
-                    noValue: {
-                        color: 'blue',
-                        displayValue: 'blue',
-                    },
-                    withValue: {
-                        value: 'orange',
-                        ignoreMe: 'nothing to see',
-                    },
-                    'withDisplay/Value': {
-                        value: 'b',
-                        displayValue: 'blue',
-                        otherField: 'irrelevant',
-                    },
-                    doNotChangeMe: {
-                        value: 'fred',
-                    },
-                },
-                2: {
-                    noValue: {
-                        color: 'blue',
-                        displayValue: 'blue',
-                    },
-                    withValue: {
-                        value: 'orangish',
-                        ignoreMe: 'nothing to see',
-                    },
-                    'withDisplay/Value': {
-                        value: 'b',
-                        displayValue: 'black',
-                        otherField: 'irrelevant',
-                    },
-                    doNotChangeMe: {
-                        value: 'maroon',
-                    },
-                },
-            });
-            const updates = Map<any, any>({
-                withValue: 'purple',
-                withDisplay$SValue: 'teal',
-            });
-            const queryInfo2 = new QueryInfo({
-                columns: new ExtendedMap({
-                    novalue: new QueryColumn({
-                        name: 'noValue',
-                        fieldKey: 'noValue',
-                    }),
-                    withvalue: new QueryColumn({
-                        name: 'withValue',
-                        fieldKey: 'withValue',
-                    }),
-                    withdisplay$svalue: new QueryColumn({
-                        name: 'withDisplay/Value',
-                        fieldKey: 'withDisplay$SValue',
-                    }),
-                    donotchangeme: new QueryColumn({
-                        name: 'doNotChangeMe',
-                        fieldKey: 'doNotChangeMe',
-                    }),
-                }),
-            });
-            const result = EditorModel.convertQueryDataToEditorData(queryData, queryInfo2, updates);
-            expect(result).toStrictEqual(
-                Map<string, any>({
-                    1: Map<string, any>({
-                        withValue: 'purple',
-                        'withDisplay/Value': 'teal',
-                        doNotChangeMe: 'fred',
-                    }),
-                    2: Map<string, any>({
-                        withValue: 'purple',
-                        'withDisplay/Value': 'teal',
-                        doNotChangeMe: 'maroon',
-                    }),
-                })
-            );
-
-            const result2 = EditorModel.convertQueryDataToEditorData(
-                queryData,
-                queryInfo2,
-                updates,
-                [1],
-                ['WithValue', 'WithDisplay$SValue']
-            );
-            expect(result2).toStrictEqual(
-                Map<string, any>({
-                    1: Map<string, any>({
-                        withValue: 'orange',
-                        'withDisplay/Value': List([
-                            {
-                                value: 'b',
-                                displayValue: 'blue',
-                            },
-                        ]),
-                        doNotChangeMe: 'fred',
-                    }),
-                    2: Map<string, any>({
-                        withValue: 'purple',
-                        'withDisplay/Value': 'teal',
-                        doNotChangeMe: 'maroon',
-                    }),
-                })
-            );
-        });
-
-        test('convertQueryDataToEditorData without updates', () => {
+        test('convertQueryDataToEditorData', () => {
             const queryData = fromJS({
                 1: {
                     noValue: {

packages/components/src/internal/components/editable/models.test.ts

@@ -691,38 +691,17 @@ export class EditorModel
 
     static convertQueryDataToEditorData(
         data: Map<string, any>, // this map is keyed by column name
-        queryInfo?: QueryInfo,
-        updates?: Map<string, any>, // this map is keyed by column fieldKey
-        idsNotToUpdate?: number[],
-        fieldsNotToUpdate?: string[] // keys here are column fieldKey
     ): Map<string, Map<string, any>> {
-        const fieldsNotToUpdateLower = fieldsNotToUpdate?.map(f => f.toLowerCase()) ?? [];
-
         return data
             .map((valueMap, id) => {
-                const returnMap = valueMap.reduce((m, valueMap_, key) => {
+                return valueMap.reduce((m, valueMap_, key) => {
                     const editorData = EditorModel.getEditorDataFromQueryValueMap(valueMap_);
                     if (editorData === undefined) {
                         return m;
                     }
 
                     return m.set(key, editorData);
                 }, Map<string, any>());
-
-                if (!queryInfo || !updates) {
-                    return returnMap;
-                }
-
-                let trimmedUpdates = Map<string, any>();
-                const isNotUpdateId = idsNotToUpdate && idsNotToUpdate.indexOf(parseInt(id, 10)) > -1;
-                updates.forEach((value, fieldKey) => {
-                    const col = queryInfo.getColumn(fieldKey);
-                    const isFieldNotToUpdate = fieldsNotToUpdateLower.indexOf(fieldKey.toLowerCase()) > -1;
-                    if (!isFieldNotToUpdate || !isNotUpdateId) {
-                        trimmedUpdates = trimmedUpdates.set(col.name, value);
-                    }
-                });
-                return returnMap.merge(trimmedUpdates);
             })
             .toMap();
     }