Issue 52959: LKSM/LKB: Existing file not shown in Bulk Edit

Author: XingY

packages/components/releaseNotes/components.md

@@ -1,6 +1,12 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 6.X
+*Released*: X May 2025
+- Issue 52959: LKSM/LKB: Existing file not shown in Bulk Edit
+  - Update `getCommonDataValues` to retain full data map for file fields
+  - Update `FileInput` to set init value so diff can be generated correctly
+
 ### version 6.43.3
 *Released*: 26 May 2025
 - Migrate `isSetEqual` to `@labkey/components`. Extend with additional support for deep comparison.

packages/components/src/internal/components/forms/BulkUpdateForm.tsx

@@ -207,8 +207,9 @@ export class BulkUpdateForm extends PureComponent<Props, State> {
             includeCommentField,
             onSubmitForEdit,
         } = this.props;
+        const fileFields = queryInfo.columns.valueArray.filter(col => col.inputType === 'file').map(col => col.name);
         const fieldValues =
-            isLoadingDataForSelection || !dataForSelection ? undefined : getCommonDataValues(dataForSelection);
+            isLoadingDataForSelection || !dataForSelection ? undefined : getCommonDataValues(dataForSelection, fileFields);
 
         // if all selectedIds are from the same containerPath, use that for the lookups via QueryFormInputs > QuerySelect,
         // if selections are from multiple containerPaths, disable the lookup and file field inputs

packages/components/src/internal/components/forms/input/FileInput.tsx

@@ -92,6 +92,10 @@ class FileInputImpl extends DisableableInput<FileInputImplProps, State> {
             error: '',
             isDisabled: props.initiallyDisabled,
         };
+
+        if (Map.isMap(props.initialValue)) {
+            props.setValue?.(props.initialValue.get('value'));
+        }
     }
 
     getInputName(): string {

packages/components/src/internal/util/utils.test.ts

@@ -253,6 +253,11 @@ describe('getCommonDataForSelection', () => {
                 Other: {
                     value: 'other1',
                 },
+                Pdf: {
+                    value: '/root/lk/Sample%20Management/blood.pdf',
+                    displayValue: 'sampletype/blood.pdf',
+                    url: '/labkey/Sample%20Management/core-downloadFileLink.view?propertyId=552'
+                }
             },
             '447': {
                 RowId: {
@@ -275,6 +280,11 @@ describe('getCommonDataForSelection', () => {
                 Other: {
                     value: 'other2',
                 },
+                Pdf: {
+                    value: '/root/lk/Sample%20Management/blood.pdf',
+                    displayValue: 'sampletype/blood.pdf',
+                    url: '/labkey/Sample%20Management/core-downloadFileLink.view?propertyId=552'
+                }
             },
             '446': {
                 RowId: {
@@ -297,6 +307,11 @@ describe('getCommonDataForSelection', () => {
                 Other: {
                     value: 'other3',
                 },
+                Pdf: {
+                    value: '/root/lk/Sample%20Management/blood.pdf',
+                    displayValue: 'sampletype/blood.pdf',
+                    url: '/labkey/Sample%20Management/core-downloadFileLink.view?propertyId=552'
+                }
             },
             '445': {
                 RowId: {
@@ -319,6 +334,11 @@ describe('getCommonDataForSelection', () => {
                 Other: {
                     value: null,
                 },
+                Pdf: {
+                    value: '/root/lk/Sample%20Management/blood.pdf',
+                    displayValue: 'sampletype/blood.pdf',
+                    url: '/labkey/Sample%20Management/core-downloadFileLink.view?propertyId=552'
+                }
             },
             '367': {
                 RowId: {
@@ -341,11 +361,26 @@ describe('getCommonDataForSelection', () => {
                 Other: {
                     value: null,
                 },
+                Pdf: {
+                    value: '/root/lk/Sample%20Management/blood.pdf',
+                    displayValue: 'sampletype/blood.pdf',
+                    url: '/labkey/Sample%20Management/core-downloadFileLink.view?propertyId=552'
+                }
             },
         });
         expect(getCommonDataValues(data)).toEqual({
             AndAgain: 'again',
             Data: 'data1',
+            Pdf: '/root/lk/Sample%20Management/blood.pdf'
+        });
+        expect(getCommonDataValues(data, ['Pdf'])).toEqual({
+            AndAgain: 'again',
+            Data: 'data1',
+            Pdf: fromJS({
+                value: '/root/lk/Sample%20Management/blood.pdf',
+                displayValue: 'sampletype/blood.pdf',
+                url: '/labkey/Sample%20Management/core-downloadFileLink.view?propertyId=552'
+            })
         });
     });
 });

packages/components/src/internal/util/utils.ts

@@ -200,16 +200,18 @@ export function valueIsEmpty(value: any): boolean {
  *
  * @param data Map between ids and a map of data for the ids (i.e, a row of data for that id)
  */
-export function getCommonDataValues(data: Map<any, any>): any {
+export function getCommonDataValues(data: Map<any, any>, fileFields?: string[]): any {
     let valueMap = Map<string, any>(); // map from fields to the value shared by all rows
     let fieldsInConflict = ImmutableSet<string>();
     let emptyFields = ImmutableSet<string>(); // those fields that are empty
+    const fileMap = {};
     data.map((rowData, id) => {
         if (rowData) {
             rowData.forEach((data, key) => {
                 if (!fieldsInConflict.has(key)) {
                     // skip fields that are already in conflict
                     let value = data;
+                    let rawValue = data;
 
                     // Convert from immutable to regular JS
                     if (Iterable.isIterable(data)) {
@@ -233,6 +235,9 @@ export function getCommonDataValues(data: Map<any, any>): any {
                             fieldsInConflict = fieldsInConflict.add(key);
                         } else if (!havePreviousValue) {
                             valueMap = valueMap.set(key, value);
+                            if (fileFields?.indexOf(key) > -1) {
+                                fileMap[key] = rawValue;
+                            }
                         }
                         if (arrayNotEqual) {
                             fieldsInConflict = fieldsInConflict.add(key);
@@ -254,6 +259,13 @@ export function getCommonDataValues(data: Map<any, any>): any {
             console.error('Unable to find data for selection id ' + id);
         }
     });
+
+    // return full file data map (url, displayValue, value) for file fields
+    fileFields?.forEach(fileField => {
+        if (valueMap.has(fileField))
+            valueMap = valueMap.set(fileField, fileMap[fileField]);
+    });
+
     return valueMap.toObject();
 }