From a5953c51d6f6e698b344c45503973df8a8c1a334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=9B=BD=E7=92=87?= <37972689+YangGuoXuan-0503@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:37:50 +0800 Subject: [PATCH] fix: face recognition toolbar (#6927) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 杨国璇 --- frontend/src/components/cur-dir-path/dir-tool.js | 2 ++ frontend/src/metadata/constants/view.js | 2 ++ frontend/src/metadata/hooks/metadata.js | 7 ++++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/cur-dir-path/dir-tool.js b/frontend/src/components/cur-dir-path/dir-tool.js index e4c2822a40..e0584ff3d7 100644 --- a/frontend/src/components/cur-dir-path/dir-tool.js +++ b/frontend/src/components/cur-dir-path/dir-tool.js @@ -11,6 +11,7 @@ import ReposSortMenu from '../../components/repos-sort-menu'; import MetadataViewToolBar from '../../metadata/components/view-toolbar'; import { PRIVATE_FILE_TYPE } from '../../constants'; import { DIRENT_DETAIL_MODE } from '../dir-view-mode/constants'; +import { FACE_RECOGNITION_VIEW_ID } from '../../metadata/constants'; const propTypes = { repoID: PropTypes.string.isRequired, @@ -117,6 +118,7 @@ class DirTool extends React.Component { }); if (isFileExtended) { + if (viewId === FACE_RECOGNITION_VIEW_ID) return null; return (
diff --git a/frontend/src/metadata/constants/view.js b/frontend/src/metadata/constants/view.js index 319c8f168c..035877d52e 100644 --- a/frontend/src/metadata/constants/view.js +++ b/frontend/src/metadata/constants/view.js @@ -9,6 +9,8 @@ export const VIEW_TYPE = { GALLERY: 'gallery', }; +export const FACE_RECOGNITION_VIEW_ID = '_face_recognition'; + export const VIEW_TYPE_ICON = { [VIEW_TYPE.TABLE]: 'table', [VIEW_TYPE.GALLERY]: 'image', diff --git a/frontend/src/metadata/hooks/metadata.js b/frontend/src/metadata/hooks/metadata.js index 7c572b7e8b..7ba5ba995e 100644 --- a/frontend/src/metadata/hooks/metadata.js +++ b/frontend/src/metadata/hooks/metadata.js @@ -4,6 +4,7 @@ import { Utils } from '../../utils/utils'; import toaster from '../../components/toast'; import { gettext } from '../../utils/constants'; import { PRIVATE_FILE_TYPE } from '../../constants'; +import { FACE_RECOGNITION_VIEW_ID } from '../constants'; // This hook provides content related to seahub interaction, such as whether to enable extended attributes, views data, etc. const MetadataContext = React.createContext(null); @@ -82,8 +83,8 @@ export const MetadataProvider = ({ repoID, hideMetadataView, selectMetadataView, viewsMap.current[view._id] = view; }); } - viewsMap.current['_face_recognition'] = { - _id: '_face_recognition', + viewsMap.current[FACE_RECOGNITION_VIEW_ID] = { + _id: FACE_RECOGNITION_VIEW_ID, name: gettext('Photos - classfied by people'), type: PRIVATE_FILE_TYPE.FACE_RECOGNITION, }; @@ -119,7 +120,7 @@ export const MetadataProvider = ({ repoID, hideMetadataView, selectMetadataView, setStaticView([]); return; } - setStaticView([{ _id: '_face_recognition', type: 'view' }]); + setStaticView([{ _id: FACE_RECOGNITION_VIEW_ID, type: 'view' }]); }, [enableFaceRecognition]); const selectView = useCallback((view, isSelected) => {