fix rebase error

haiwen · Jan 17, 2025 · 83c061d · 83c061d
1 parent 3f0e9ef
commit 83c061d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/frontend/src/components/dialog/image-dialog/index.js b/frontend/src/components/dialog/image-dialog/index.js
@@ -59,7 +59,7 @@ const ImageDialog = ({ repoID, repoInfo, enableRotate: oldEnableRotate, imageIte
     return (
       <div
         className="lightbox-side-panel"
-        style={{ width: expanded ? `${SIDE_PANEL_EXPANDED_WIDTH}px` : `${SIDE_PANEL_COLLAPSED_WIDTH}px` }}
+        style={{ width: expanded ? SIDE_PANEL_EXPANDED_WIDTH : SIDE_PANEL_COLLAPSED_WIDTH }}
         aria-expanded={expanded}
       >
         <div className="side-panel-controller" onClick={onToggleSidePanel}>
@@ -111,7 +111,7 @@ const ImageDialog = ({ repoID, repoInfo, enableRotate: oldEnableRotate, imageIte
       OCRLabel={gettext('OCR')}
       sidePanel={!isCustomPermission ? {
         render: renderSidePanel,
-        width: expanded ? `${SIDE_PANEL_EXPANDED_WIDTH}px` : `${SIDE_PANEL_COLLAPSED_WIDTH}px`,
+        width: expanded ? SIDE_PANEL_EXPANDED_WIDTH : SIDE_PANEL_COLLAPSED_WIDTH,
       } : null}
     />
   );

diff --git a/frontend/src/components/dirent-detail/embedded-file-details/file-details.js b/frontend/src/components/dirent-detail/embedded-file-details/file-details.js
@@ -44,9 +44,6 @@ const FileDetails = ({ repoID, dirent, direntDetail }) => {
       {enableMetadataManagement && enableMetadata && enableFaceRecognition && Utils.imageCheck(dirent.name) && (
         <People repoID={repoID} record={record} />
       )}
-      {enableMetadataManagement && enableMetadata && enableFaceRecognition && Utils.imageCheck(dirent.name) && (
-        <People repoID={repoID} record={record} />
-      )}
     </>
   );
 };

diff --git a/frontend/src/components/dirent-detail/embedded-file-details/index.js b/frontend/src/components/dirent-detail/embedded-file-details/index.js
@@ -37,10 +37,12 @@ const EmbeddedFileDetails = ({ repoID, repoInfo, dirent, path, onClose, width =
 
   useEffect(() => {
     if (isView || isTag) return;
-    // init context
-    const context = new MetadataContext();
-    window.sfMetadataContext = context;
-    window.sfMetadataContext.init({ repoID, repoInfo });
+
+    if (!window.sfMetadataContext) {
+      const context = new MetadataContext();
+      window.sfMetadataContext = context;
+      window.sfMetadataContext.init({ repoID, repoInfo });
+    }
 
     return () => {
       if (window.sfMetadataContext) {

diff --git a/frontend/src/metadata/components/metadata-details/index.js b/frontend/src/metadata/components/metadata-details/index.js
@@ -1,5 +1,4 @@
 import React, { useMemo } from 'react';
-import PropTypes from 'prop-types';
 import CellFormatter from '../cell-formatter';
 import DetailEditor from '../detail-editor';
 import DetailItem from '../../../components/dirent-detail/detail-item';