From fce1b53c5c6644ac4e16ba578c9a4bb191243b6a Mon Sep 17 00:00:00 2001 From: zhouwenxuan Date: Fri, 11 Oct 2024 13:47:29 +0800 Subject: [PATCH] clean up code --- frontend/src/metadata/components/gallery-details/index.js | 5 +++-- frontend/src/metadata/views/gallery/index.js | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/frontend/src/metadata/components/gallery-details/index.js b/frontend/src/metadata/components/gallery-details/index.js index a149c7f821..c3281834bf 100644 --- a/frontend/src/metadata/components/gallery-details/index.js +++ b/frontend/src/metadata/components/gallery-details/index.js @@ -19,6 +19,7 @@ const GalleryDetail = ({ currentRepoInfo, viewID, onClose }) => { const [repo, setRepo] = useState({}); const [direntDetail, setDirentDetail] = useState(null); const { viewsMap, currentImage } = useMetadata(); + const view = useMemo(() => viewsMap[viewID], [viewID, viewsMap]); const icon = useMemo(() => Utils.getFolderIconUrl(), []); const filesField = useMemo(() => ({ type: CellType.NUMBER, name: gettext('Files') }), []); @@ -89,8 +90,8 @@ const GalleryDetail = ({ currentRepoInfo, viewID, onClose }) => { }) : null; }, [currentImage]); - const smallIconUrl = dirent ? Utils.getDirentIcon(dirent) : ''; - const bigIconUrl = dirent ? `${siteRoot}thumbnail/${currentRepoInfo.repo_id}/${thumbnailSizeForGrid}` + Utils.encodePath(`${currentImage.path === '/' ? '' : currentImage.path}/${dirent.name}`) : ''; + const smallIconUrl = useMemo(() => dirent ? Utils.getDirentIcon(dirent) : '', [dirent]); + const bigIconUrl = useMemo(() => dirent ? `${siteRoot}thumbnail/${currentRepoInfo.repo_id}/${thumbnailSizeForGrid}${Utils.encodePath(`${currentImage.path === '/' ? '' : currentImage.path}/${dirent.name}`)}` : '', [dirent, currentRepoInfo.repo_id, currentImage]); const renderGalleryInfo = () => ( diff --git a/frontend/src/metadata/views/gallery/index.js b/frontend/src/metadata/views/gallery/index.js index e7fbcc48d9..b17ed8eacd 100644 --- a/frontend/src/metadata/views/gallery/index.js +++ b/frontend/src/metadata/views/gallery/index.js @@ -72,14 +72,12 @@ const Gallery = () => { let init = metadata.rows.filter(row => Utils.imageCheck(getFileNameFromRecord(row))) .reduce((_init, record) => { const id = record[PRIVATE_COLUMN_KEY.ID]; - const obj_id = record[PRIVATE_COLUMN_KEY.OBJ_ID]; const fileName = getFileNameFromRecord(record); const parentDir = getParentDirFromRecord(record); const path = Utils.encodePath(Utils.joinPath(parentDir, fileName)); const date = mode !== GALLERY_DATE_MODE.ALL ? getDateDisplayString(record[firstSort.column_key], dateMode) : ''; const img = { id, - obj_id, name: fileName, path: parentDir, url: `${siteRoot}lib/${repoID}/file${path}`,