Merge pull request #7592 from haiwen/fix-metadata-modify-record-bug

Fix metadata modify record bug

Author: YangGuoXuan-0503

frontend/src/metadata/components/cell-formatter/file-tags/index.js

@@ -35,7 +35,7 @@ const FileTagsFormatter = ({ tagsData, value: oldValue, className, children: emp
 
 FileTagsFormatter.propTypes = {
   value: PropTypes.array,
-  tagsData: PropTypes.array,
+  tagsData: PropTypes.object,
   className: PropTypes.string,
   showName: PropTypes.bool,
 };

frontend/src/metadata/hooks/metadata-view.js

@@ -343,7 +343,7 @@ export const MetadataViewProvider = ({
             idOriginalRecordUpdates[updateRecordId][locationColumnKey] = detail[locationColumnKey];
           }
         });
-        modifyRecords({ recordIds, idRecordUpdates, idOriginalRecordUpdates, idOldRecordData, idOriginalOldRecordData });
+        modifyRecords(recordIds, idRecordUpdates, idOriginalRecordUpdates, idOldRecordData, idOriginalOldRecordData);
       }
     });
   }, [metadata, extractFilesDetails, modifyRecords]);
@@ -366,7 +366,7 @@ export const MetadataViewProvider = ({
         let idOriginalRecordUpdates = {};
         idRecordUpdates[updateRecordId] = { [descriptionColumnKey]: description };
         idOriginalRecordUpdates[updateRecordId] = { [descriptionColumnKey]: description };
-        modifyRecords({ recordIds, idRecordUpdates, idOriginalRecordUpdates, idOldRecordData, idOriginalOldRecordData });
+        modifyRecords(recordIds, idRecordUpdates, idOriginalRecordUpdates, idOldRecordData, idOriginalOldRecordData);
       }
     });
   }, [modifyRecords, generateDescription]);
@@ -388,7 +388,7 @@ export const MetadataViewProvider = ({
         let idOriginalRecordUpdates = {};
         idRecordUpdates[updateRecordId] = { [ocrResultColumnKey]: ocrResult ? JSON.stringify(ocrResult) : null };
         idOriginalRecordUpdates[updateRecordId] = { [ocrResultColumnKey]: ocrResult ? JSON.stringify(ocrResult) : null };
-        modifyRecords({ recordIds, idRecordUpdates, idOriginalRecordUpdates, idOldRecordData, idOriginalOldRecordData });
+        modifyRecords(recordIds, idRecordUpdates, idOriginalRecordUpdates, idOldRecordData, idOriginalOldRecordData);
       },
     });
   }, [modifyRecords, onOCR]);

frontend/src/metadata/views/table/masks/interaction-masks/index.js

@@ -562,11 +562,7 @@ class InteractionMasks extends React.Component {
     }
 
     if (updateRecordIds.length > 0) {
-      const isCopyPaste = true;
-      this.props.updateRecords({
-        recordIds: updateRecordIds, idRecordUpdates, idOriginalRecordUpdates,
-        idOldRecordData, idOriginalOldRecordData, isCopyPaste,
-      });
+      this.props.modifyRecords(updateRecordIds, idRecordUpdates, idOriginalRecordUpdates, idOldRecordData, idOriginalOldRecordData);
     }
   };
 
@@ -1025,10 +1021,11 @@ class InteractionMasks extends React.Component {
   };
 
   handleDragCopy = (draggedRange) => {
-    const { columns, groupMetrics, table: { rows, id_row_map }, gridUtils, updateRecords } = this.props;
+    const { columns, groupMetrics, table: { rows, id_row_map }, gridUtils, modifyRecords } = this.props;
     // compute the new records
     const newRecords = gridUtils.getUpdateDraggedRecords(draggedRange, columns, rows, id_row_map, groupMetrics);
-    updateRecords({ ...newRecords, isCopyPaste: true });
+    const { recordIds, idRecordUpdates, idOriginalRecordUpdates, idOriginalOldRecordData, idOldRecordData } = newRecords;
+    modifyRecords(recordIds, idRecordUpdates, idOriginalRecordUpdates, idOldRecordData, idOriginalOldRecordData);
   };
 
   handleDragStart = (e) => {
@@ -1216,7 +1213,7 @@ InteractionMasks.propTypes = {
   modifyRecord: PropTypes.func.isRequired,
   recordGetterByIndex: PropTypes.func,
   recordGetterById: PropTypes.func,
-  updateRecords: PropTypes.func,
+  modifyRecords: PropTypes.func.isRequired,
   deleteRecordsLinks: PropTypes.func,
   paste: PropTypes.func,
   editMobileCell: PropTypes.func,

frontend/src/metadata/views/table/table-main/index.js

@@ -77,6 +77,7 @@ const TableMain = ({
         modifyColumnData={modifyColumnData}
         insertColumn={handelInsertColumn}
         updateFileTags={updateFileTags}
+        modifyRecords={modifyRecords}
         {...props}
       />
     </div>

frontend/src/metadata/views/table/table-main/records/body.js

@@ -543,7 +543,7 @@ class RecordsBody extends Component {
             modifyRecord={this.props.modifyRecord}
             recordGetterByIndex={this.props.recordGetterByIndex}
             recordGetterById={this.props.recordGetterById}
-            updateRecords={this.props.updateRecords}
+            modifyRecords={this.props.modifyRecords}
             paste={this.props.paste}
             editMobileCell={this.props.editMobileCell}
             frozenColumnsWidth={this.props.frozenColumnsWidth}
@@ -611,7 +611,7 @@ RecordsBody.propTypes = {
   onCellClick: PropTypes.func,
   onCellRangeSelectionUpdated: PropTypes.func,
   onSelectRecord: PropTypes.func,
-  updateRecords: PropTypes.func,
+  modifyRecords: PropTypes.func.isRequired,
   deleteRecordsLinks: PropTypes.func,
   paste: PropTypes.func,
   searchResult: PropTypes.object,

frontend/src/metadata/views/table/table-main/records/group-body/index.js

@@ -899,7 +899,7 @@ class GroupBody extends Component {
             modifyRecord={this.props.modifyRecord}
             recordGetterByIndex={this.props.recordGetterByIndex}
             recordGetterById={this.props.recordGetterById}
-            updateRecords={this.props.updateRecords}
+            modifyRecords={this.props.modifyRecords}
             paste={this.props.paste}
             editMobileCell={this.props.editMobileCell}
             frozenColumnsWidth={this.props.frozenColumnsWidth}
@@ -967,7 +967,7 @@ GroupBody.propTypes = {
   modifyRecord: PropTypes.func,
   recordGetterByIndex: PropTypes.func,
   recordGetterById: PropTypes.func,
-  updateRecords: PropTypes.func,
+  modifyRecords: PropTypes.func.isRequired,
   paste: PropTypes.func,
   selectNone: PropTypes.func,
   onSelectRecord: PropTypes.func,