feat: optimize code

haiwen · Dec 27, 2024 · 5833f30 · 5833f30
1 parent 8ef8109
commit 5833f30
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/frontend/src/metadata/components/metadata-details/index.js b/frontend/src/metadata/components/metadata-details/index.js
@@ -5,7 +5,7 @@ import DetailItem from '../../../components/dirent-detail/detail-item';
 import { Utils } from '../../../utils/utils';
 import { getCellValueByColumn, getFileNameFromRecord } from '../../utils/cell';
 import { gettext } from '../../../utils/constants';
-import { PRIVATE_COLUMN_KEY } from '../../constants';
+import { PRIVATE_COLUMN_KEY, IMAGE_PRIVATE_COLUMN_KEYS } from '../../constants';
 import Location from './location';
 import { useMetadataDetails } from '../../hooks';
 import { checkIsDir } from '../../utils/row';
@@ -24,26 +24,23 @@ const MetadataDetails = () => {
   if (!record._id) return null;
 
   const fileName = getFileNameFromRecord(record);
-  const isImage = record && (Utils.imageCheck(fileName) || Utils.videoCheck(fileName));
-  const isDir = record && checkIsDir(record);
+  const isImage = Utils.imageCheck(fileName) || Utils.videoCheck(fileName);
+  const isDir = checkIsDir(record);
 
   return (
     <>
       {displayColumns.map(field => {
-        if (field.key === PRIVATE_COLUMN_KEY.LOCATION && isImage) {
-          return (<Location key={field.key} position={getCellValueByColumn(record, field)} />);
+        const value = getCellValueByColumn(record, field);
+        if (field.key === PRIVATE_COLUMN_KEY.LOCATION && isImage && value) {
+          return (<Location key={field.key} position={value} />);
         }
 
         let canEdit = canModifyRecord && field.editable;
-        if (!isImage && canEdit && field.key === PRIVATE_COLUMN_KEY.CAPTURE_TIME) {
-          canEdit = false;
-        } else if (field.key === PRIVATE_COLUMN_KEY.LOCATION && !isImage) {
+        if (!isImage && IMAGE_PRIVATE_COLUMN_KEYS.includes(field.key)) {
           canEdit = false;
         } else if (field.key === PRIVATE_COLUMN_KEY.TAGS && isDir) {
           canEdit = false;
         }
-
-        const value = getCellValueByColumn(record, field);
         return (
           <DetailItem key={field.key} field={field} readonly={!canEdit}>
             {canEdit ? (

diff --git a/frontend/src/metadata/constants/column/index.js b/frontend/src/metadata/constants/column/index.js
@@ -37,6 +37,7 @@ export {
   EDITABLE_PRIVATE_COLUMN_KEYS,
   EDITABLE_DATA_PRIVATE_COLUMN_KEYS,
   DELETABLE_PRIVATE_COLUMN_KEY,
+  IMAGE_PRIVATE_COLUMN_KEYS,
 } from './private';
 
 export {

diff --git a/frontend/src/metadata/constants/column/private.js b/frontend/src/metadata/constants/column/private.js
@@ -112,3 +112,8 @@ export const DELETABLE_PRIVATE_COLUMN_KEY = [
   PRIVATE_COLUMN_KEY.OWNER,
   PRIVATE_COLUMN_KEY.FILE_RATE,
 ];
+
+export const IMAGE_PRIVATE_COLUMN_KEYS = [
+  PRIVATE_COLUMN_KEY.CAPTURE_TIME,
+  PRIVATE_COLUMN_KEY.LOCATION,
+];