1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 18:29:23 +00:00

show metadata in image previewer (#7525)

Co-authored-by: zhouwenxuan <aries@Mac.local>
This commit is contained in:
Aries
2025-02-26 16:15:17 +08:00
committed by GitHub
parent d4b2e75b7e
commit 295f694baa
27 changed files with 377 additions and 161 deletions

View File

@@ -0,0 +1,101 @@
.lightbox-side-panel {
width: 10px;
height: calc(100% - 100px);
display: flex;
flex-direction: column;
top: 50px;
right: 0;
position: absolute;
font-size: 1rem;
color: #fff;
background-color: #333;
border: 1px solid #666;
transition: width 0.3s ease;
}
.lightbox-side-panel .cur-view-detail {
background-color: inherit;
border: none;
}
.lightbox-side-panel .side-panel-controller {
display: flex;
justify-content: center;
align-items: center;
position: absolute;
top: 30px;
left: -40px;
width: 40px;
height: 48px;
background-color: #333;
color: #fff;
border: 1px solid #666;
border-right: none;
border-top-left-radius: 50%;
border-bottom-left-radius: 50%;
margin-right: -1px;
cursor: pointer;
}
.lightbox-side-panel .side-panel-controller .expand-button {
width: 32px;
height: 32px;
opacity: 0.7;
border: none;
}
.lightbox-side-panel .side-panel-controller:hover .expand-button {
opacity: 1;
}
.lightbox-side-panel .detail-header {
width: 100%;
height: fit-content;
display: flex;
padding: 26px 16px;
border: none;
font-size: 1rem;
}
.lightbox-side-panel .detail-header .detail-title .name,
.lightbox-side-panel .file-details-collapse .file-details-collapse-header .file-details-collapse-header-title,
.lightbox-side-panel .dirent-detail-item .dirent-detail-item-name,
.lightbox-side-panel .sf-metadata-number-property-detail-editor {
color: #fff;
}
.lightbox-side-panel .detail-body {
scrollbar-color: #666 #333;
padding: 0 16px 8px;
}
.lightbox-side-panel .file-details-collapse+.dirent-detail-people {
margin-top: 20px;
}
.lightbox-side-panel .sf-metadata-ui.collaborator-item,
.lightbox-side-panel .sf-metadata-text-property-detail-editor:not(.formatter),
.lightbox-side-panel .sf-metadata-number-property-detail-editor:focus {
color: #212529;
}
.lightbox-side-panel .sf-metadata-text-property-detail-editor:not(.formatter) {
cursor: text;
}
.lightbox-side-panel .dirent-detail-item .dirent-detail-item-value:not(.editable) .sf-metadata-record-cell-empty:empty::before,
.lightbox-side-panel .sf-metadata-property-detail-editor:empty::before,
.lightbox-side-panel .sf-metadata-property-detail-capture-information-item .dirent-detail-item-value:empty::before,
.lightbox-side-panel .file-details-collapse .file-details-collapse-header .sf3-font-down,
.lightbox-side-panel .sf-metadata-number-property-detail-editor::placeholder {
color: #999;
}
.lightbox-side-panel .file-details-collapse .file-details-collapse-header .file-details-collapse-header-operation:hover,
.lightbox-side-panel .dirent-detail-item .dirent-detail-item-value:hover {
background-color: #666;
}
.lightbox-side-panel .dirent-detail-people {
border-top: 1px solid #999;
}

View File

@@ -1,13 +1,22 @@
import React, { useCallback } from 'react';
import React, { useCallback, useState } from 'react';
import PropTypes from 'prop-types';
import { gettext } from '../../utils/constants';
import { gettext } from '../../../utils/constants';
import Lightbox from '@seafile/react-image-lightbox';
import { useMetadataAIOperations } from '../../hooks/metadata-ai-operation';
import { SYSTEM_FOLDERS } from '../../constants';
import { useMetadataAIOperations } from '../../../hooks/metadata-ai-operation';
import EmbeddedFileDetails from '../../dirent-detail/embedded-file-details';
import { SYSTEM_FOLDERS } from '../../../constants';
import { Utils } from '../../../utils/utils';
import Icon from '../../icon';
import '@seafile/react-image-lightbox/style.css';
import './index.css';
const SIDE_PANEL_COLLAPSED_WIDTH = 10;
const SIDE_PANEL_EXPANDED_WIDTH = 300;
const ImageDialog = ({ repoID, repoInfo, enableRotate: oldEnableRotate = true, imageItems, imageIndex, closeImagePopup, moveToPrevImage, moveToNextImage, onDeleteImage, onRotateImage, isCustomPermission }) => {
const [expanded, setExpanded] = useState(false);
const ImageDialog = ({ enableRotate: oldEnableRotate = true, imageItems, imageIndex, closeImagePopup, moveToPrevImage, moveToNextImage, onDeleteImage, onRotateImage }) => {
const { enableOCR, enableMetadata, canModify, onOCR: onOCRAPI, OCRSuccessCallBack } = useMetadataAIOperations();
const downloadImage = useCallback((url) => {
@@ -18,8 +27,13 @@ const ImageDialog = ({ enableRotate: oldEnableRotate = true, imageItems, imageIn
window.open(imageItems[imageIndex].url, '_blank');
}, [imageItems, imageIndex]);
const onToggleSidePanel = useCallback(() => {
setExpanded(!expanded);
}, [expanded]);
const imageItemsLength = imageItems.length;
if (imageItemsLength === 0) return null;
const id = imageItems[imageIndex].id;
const name = imageItems[imageIndex].name;
const mainImg = imageItems[imageIndex];
const nextImg = imageItems[(imageIndex + 1) % imageItemsLength];
@@ -39,6 +53,25 @@ const ImageDialog = ({ enableRotate: oldEnableRotate = true, imageItems, imageIn
onOCR = () => onOCRAPI({ parentDir: mainImg.parentDir, fileName: mainImg.name }, { success_callback: OCRSuccessCallBack });
}
const renderSidePanel = () => {
const dirent = { id, name, type: 'file' };
const path = Utils.joinPath(mainImg.parentDir, name);
return (
<div
className="lightbox-side-panel"
style={{ width: expanded ? SIDE_PANEL_EXPANDED_WIDTH : SIDE_PANEL_COLLAPSED_WIDTH }}
aria-expanded={expanded}
>
<div className="side-panel-controller" onClick={onToggleSidePanel}>
<Icon className="expand-button" symbol={expanded ? 'right_arrow' : 'left_arrow'} />
</div>
{expanded && (<EmbeddedFileDetails repoID={repoID} repoInfo={repoInfo} path={path} dirent={dirent} />)}
</div>
);
};
return (
<Lightbox
wrapperClassName='custom-image-previewer'
@@ -64,6 +97,10 @@ const ImageDialog = ({ enableRotate: oldEnableRotate = true, imageItems, imageIn
onRotateImage={(onRotateImage && enableRotate) ? (angle) => onRotateImage(imageIndex, angle) : null}
onOCR={onOCR}
OCRLabel={gettext('OCR')}
sidePanel={!isCustomPermission ? {
render: renderSidePanel,
width: expanded ? SIDE_PANEL_EXPANDED_WIDTH : SIDE_PANEL_COLLAPSED_WIDTH,
} : null}
/>
);
};

View File

@@ -46,8 +46,8 @@ const LibSettingsDialog = ({ repoID, currentRepoInfo, toggleDialog, tab }) => {
const { encrypted, is_admin } = currentRepoInfo;
const { enableMetadataManagement } = window.app.pageOptions;
const { enableFaceRecognition, updateEnableFaceRecognition } = useMetadata();
const { enableMetadata, updateEnableMetadata, enableTags, tagsLang, updateEnableTags, enableOCR, updateEnableOCR } = useMetadataStatus();
const { updateEnableFaceRecognition } = useMetadata();
const { enableMetadata, updateEnableMetadata, enableTags, tagsLang, updateEnableTags, enableOCR, updateEnableOCR, enableFaceRecognition } = useMetadataStatus();
const enableHistorySetting = is_admin; // repo owner, admin of the department which the repo belongs to, and ...
const enableAutoDelSetting = is_admin && enableRepoAutoDel;
const enableExtendedPropertiesSetting = !encrypted && is_admin && enableMetadataManagement;

View File

@@ -257,6 +257,7 @@ class DirFiles extends React.Component {
thumbnail = `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`;
}
return {
id: item.object.id,
name,
parentDir: node.parentNode.path,
src,
@@ -364,12 +365,11 @@ class DirFiles extends React.Component {
render() {
const { repoID, currentRepoInfo, userPerm } = this.props;
const { encrypted: repoEncrypted } = currentRepoInfo;
const { isCustomPermission, customPermission } = Utils.getUserPermission(userPerm);
let canModifyFile = false;
if (['rw', 'cloud-edit'].indexOf(userPerm) != -1) {
canModifyFile = true;
} else {
const { isCustomPermission, customPermission } = Utils.getUserPermission(userPerm);
if (isCustomPermission) {
const { modify } = customPermission.permission;
canModifyFile = modify;
@@ -461,6 +461,8 @@ class DirFiles extends React.Component {
{this.state.isNodeImagePopupOpen && (
<ModalPortal>
<ImageDialog
repoID={repoID}
repoInfo={currentRepoInfo}
imageItems={this.state.imageNodeItems}
imageIndex={this.state.imageIndex}
closeImagePopup={this.closeNodeImagePopup}
@@ -469,6 +471,7 @@ class DirFiles extends React.Component {
onDeleteImage={this.deleteImage}
onRotateImage={this.rotateImage}
enableRotate={canModifyFile}
isCustomPermission={isCustomPermission}
/>
</ModalPortal>
)}

View File

@@ -10,12 +10,16 @@ const Header = ({ title, icon, iconSize = 32, onClose, children, component = {}
return (
<div className="detail-header">
<Title title={title} icon={icon} iconSize={iconSize} />
<div className="detail-control-container">
{children}
<div className="detail-control" onClick={onClose}>
{closeIcon ? closeIcon : <Icon symbol="close" className="detail-control-close" />}
{(children || onClose) && (
<div className="detail-control-container">
{children}
{onClose && (
<div className="detail-control" onClick={onClose}>
{closeIcon ? closeIcon : <Icon symbol="close" className="detail-control-close" />}
</div>
)}
</div>
</div>
)}
</div>
);
};
@@ -26,7 +30,7 @@ Header.propTypes = {
iconSize: PropTypes.number,
component: PropTypes.object,
children: PropTypes.any,
onClose: PropTypes.func.isRequired,
onClose: PropTypes.func,
};
export default Header;

View File

@@ -0,0 +1,61 @@
import React, { useCallback, useMemo, useState } from 'react';
import PropTypes from 'prop-types';
import { v4 as uuidV4 } from 'uuid';
import classnames from 'classnames';
import { getDirentPath } from '../utils';
import { gettext } from '../../../../utils/constants';
import EditFileTagPopover from '../../../popover/edit-filetag-popover';
import FileTagList from '../../../file-tag-list';
const FileTag = ({ repoID, dirent, path, repoTags, fileTagList, onFileTagChanged }) => {
const [isEditFileTagShow, setEditFileTagShow] = useState(false);
const direntPath = useMemo(() => getDirentPath(dirent, path), [dirent, path]);
const tagListTitleID = useMemo(() => `detail-list-view-tags-${uuidV4()}`, []);
const onEditFileTagToggle = useCallback(() => {
setEditFileTagShow(!isEditFileTagShow);
}, [isEditFileTagShow]);
const fileTagChanged = useCallback(() => {
onFileTagChanged(dirent, direntPath);
}, [dirent, direntPath, onFileTagChanged]);
return (
<>
<div
className={classnames('sf-metadata-property-detail-tags', { 'tags-empty': !Array.isArray(fileTagList) || fileTagList.length === 0 })}
id={tagListTitleID}
onClick={onEditFileTagToggle}
>
{Array.isArray(fileTagList) && fileTagList.length > 0 ? (
<FileTagList fileTagList={fileTagList} />
) : (
<span className="empty-tip-text">{gettext('Empty')}</span>
)}
</div>
{isEditFileTagShow &&
<EditFileTagPopover
repoID={repoID}
repoTags={repoTags}
filePath={direntPath}
fileTagList={fileTagList}
toggleCancel={onEditFileTagToggle}
onFileTagChanged={fileTagChanged}
target={tagListTitleID}
/>
}
</>
);
};
FileTag.propTypes = {
repoID: PropTypes.string,
dirent: PropTypes.object,
path: PropTypes.string,
direntDetail: PropTypes.object,
repoTags: PropTypes.array,
fileTagList: PropTypes.array,
onFileTagChanged: PropTypes.func,
};
export default FileTag;

View File

@@ -1,14 +1,9 @@
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import React, { useEffect, useMemo, useState } from 'react';
import PropTypes from 'prop-types';
import { v4 as uuidV4 } from 'uuid';
import { Formatter } from '@seafile/sf-metadata-ui-component';
import classnames from 'classnames';
import { getDirentPath } from '../utils';
import DetailItem from '../../detail-item';
import { CellType, PRIVATE_COLUMN_KEY } from '../../../../metadata/constants';
import { gettext } from '../../../../utils/constants';
import EditFileTagPopover from '../../../popover/edit-filetag-popover';
import FileTagList from '../../../file-tag-list';
import { Utils } from '../../../../utils/utils';
import { MetadataDetails, useMetadataDetails } from '../../../../metadata';
import ObjectUtils from '../../../../metadata/utils/object-utils';
@@ -16,6 +11,8 @@ import { getCellValueByColumn, getDateDisplayString, decimalToExposureTime } fro
import Collapse from './collapse';
import { useMetadataStatus } from '../../../../hooks';
import { CAPTURE_INFO_SHOW_KEY } from '../../../../constants';
import People from '../../people';
import FileTag from './file-tag';
import './index.css';
@@ -58,14 +55,11 @@ const getImageInfoValue = (key, value) => {
}
};
const FileDetails = React.memo(({ repoID, dirent, path, direntDetail, onFileTagChanged, repoTags, fileTagList }) => {
const [isEditFileTagShow, setEditFileTagShow] = useState(false);
const FileDetails = React.memo(({ repoID, dirent, path, direntDetail, isShowRepoTags = true, repoTags, fileTagList, onFileTagChanged }) => {
const [isCaptureInfoShow, setCaptureInfoShow] = useState(false);
const { enableMetadataManagement, enableMetadata } = useMetadataStatus();
const { enableFaceRecognition, enableMetadata } = useMetadataStatus();
const { record } = useMetadataDetails();
const direntPath = useMemo(() => getDirentPath(dirent, path), [dirent, path]);
const tagListTitleID = useMemo(() => `detail-list-view-tags-${uuidV4()}`, []);
const sizeField = useMemo(() => ({ type: 'size', name: gettext('Size') }), []);
const lastModifierField = useMemo(() => ({ type: CellType.LAST_MODIFIER, name: gettext('Last modifier') }), []);
const lastModifiedTimeField = useMemo(() => ({ type: CellType.MTIME, name: gettext('Last modified time') }), []);
@@ -76,14 +70,6 @@ const FileDetails = React.memo(({ repoID, dirent, path, direntDetail, onFileTagC
setCaptureInfoShow(savedValue);
}, []);
const onEditFileTagToggle = useCallback(() => {
setEditFileTagShow(!isEditFileTagShow);
}, [isEditFileTagShow]);
const fileTagChanged = useCallback(() => {
onFileTagChanged(dirent, direntPath);
}, [dirent, direntPath, onFileTagChanged]);
const dom = (
<>
<DetailItem field={sizeField} className="sf-metadata-property-detail-formatter">
@@ -104,22 +90,12 @@ const FileDetails = React.memo(({ repoID, dirent, path, direntDetail, onFileTagC
<DetailItem field={lastModifiedTimeField} className="sf-metadata-property-detail-formatter">
<Formatter field={lastModifiedTimeField} value={direntDetail.last_modified}/>
</DetailItem>
{window.app.pageOptions.enableFileTags && !enableMetadata && (
{isShowRepoTags && window.app.pageOptions.enableFileTags && !enableMetadata && (
<DetailItem field={tagsField} className="sf-metadata-property-detail-formatter">
<div
className={classnames('sf-metadata-property-detail-tags', { 'tags-empty': !Array.isArray(fileTagList) || fileTagList.length === 0 })}
id={tagListTitleID}
onClick={onEditFileTagToggle}
>
{Array.isArray(fileTagList) && fileTagList.length > 0 ? (
<FileTagList fileTagList={fileTagList} />
) : (
<span className="empty-tip-text">{gettext('Empty')}</span>
)}
</div>
<FileTag repoID={repoID} dirent={dirent} path={path} repoTags={repoTags} fileTagList={fileTagList} onFileTagChanged={onFileTagChanged} />
</DetailItem>
)}
{enableMetadataManagement && enableMetadata && (
{enableMetadata && (
<MetadataDetails />
)}
</>
@@ -154,22 +130,15 @@ const FileDetails = React.memo(({ repoID, dirent, path, direntDetail, onFileTagC
return (
<>
{component}
{isEditFileTagShow &&
<EditFileTagPopover
repoID={repoID}
repoTags={repoTags}
filePath={direntPath}
fileTagList={fileTagList}
toggleCancel={onEditFileTagToggle}
onFileTagChanged={fileTagChanged}
target={tagListTitleID}
/>
}
{enableFaceRecognition && Utils.imageCheck(dirent.name) && (
<People repoID={repoID} record={record} />
)}
</>
);
}, (props, nextProps) => {
const { repoID, repoInfo, dirent, path, direntDetail, repoTags, fileTagList } = props;
const { repoID, repoInfo, dirent, path, direntDetail, isShowRepoTags, repoTags, fileTagList } = props;
const isChanged = (
isShowRepoTags !== nextProps.isShowRepoTags ||
repoID !== nextProps.repoID ||
path !== nextProps.path ||
!ObjectUtils.isSameObject(repoInfo, nextProps.repoInfo) ||
@@ -182,11 +151,14 @@ const FileDetails = React.memo(({ repoID, dirent, path, direntDetail, onFileTagC
});
FileDetails.propTypes = {
isShowRepoTags: PropTypes.bool,
repoID: PropTypes.string,
repoInfo: PropTypes.object,
dirent: PropTypes.object,
path: PropTypes.string,
direntDetail: PropTypes.object,
repoTags: PropTypes.array,
fileTagList: PropTypes.array,
onFileTagChanged: PropTypes.func,
};

View File

@@ -1,49 +0,0 @@
import React, { useMemo } from 'react';
import PropTypes from 'prop-types';
import { Formatter } from '@seafile/sf-metadata-ui-component';
import DetailItem from '../detail-item';
import { CellType } from '../../../metadata/constants';
import { gettext } from '../../../utils/constants';
import { Utils } from '../../../utils/utils';
import { MetadataDetails } from '../../../metadata';
import { useMetadataStatus } from '../../../hooks';
const FileDetails = ({ direntDetail }) => {
const { enableMetadata } = useMetadataStatus();
const sizeField = useMemo(() => ({ type: 'size', name: gettext('Size') }), []);
const lastModifierField = useMemo(() => ({ type: CellType.LAST_MODIFIER, name: gettext('Last modifier') }), []);
const lastModifiedTimeField = useMemo(() => ({ type: CellType.MTIME, name: gettext('Last modified time') }), []);
return (
<>
<DetailItem field={sizeField} className="sf-metadata-property-detail-formatter">
<Formatter field={sizeField} value={Utils.bytesToSize(direntDetail.size)} />
</DetailItem>
<DetailItem field={lastModifierField} className="sf-metadata-property-detail-formatter">
<Formatter
field={lastModifierField}
value={direntDetail.last_modifier_email}
collaborators={[{
name: direntDetail.last_modifier_name,
contact_email: direntDetail.last_modifier_contact_email,
email: direntDetail.last_modifier_email,
avatar_url: direntDetail.last_modifier_avatar,
}]}
/>
</DetailItem >
<DetailItem field={lastModifiedTimeField} className="sf-metadata-property-detail-formatter">
<Formatter field={lastModifiedTimeField} value={direntDetail.last_modified}/>
</DetailItem>
{enableMetadata && (
<MetadataDetails />
)}
</>
);
};
FileDetails.propTypes = {
direntDetail: PropTypes.object,
};
export default FileDetails;

View File

@@ -1,11 +1,11 @@
import React, { useEffect, useState } from 'react';
import React, { useEffect, useState, useMemo } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import { seafileAPI } from '../../../utils/seafile-api';
import { Utils } from '../../../utils/utils';
import toaster from '../../toast';
import { Header, Body } from '../detail';
import FileDetails from './file-details';
import FileDetails from '../dirent-details/file-details';
import { MetadataContext } from '../../../metadata';
import { MetadataDetailsProvider } from '../../../metadata/hooks';
import { AI, Settings } from '../../../metadata/components/metadata-details';
@@ -16,20 +16,38 @@ const EmbeddedFileDetails = ({ repoID, repoInfo, dirent, path, onClose, width =
const { headerComponent } = component;
const [direntDetail, setDirentDetail] = useState('');
const isView = useMemo(() => {
const urlParams = new URLSearchParams(window.location.search);
return urlParams.has('view');
}, []);
const isTag = useMemo(() => {
const urlParams = new URLSearchParams(window.location.search);
return urlParams.has('tag');
}, []);
useEffect(() => {
// init context
const context = new MetadataContext();
window.sfMetadataContext = context;
window.sfMetadataContext.init({ repoID, repoInfo });
seafileAPI.getFileInfo(repoID, path).then(res => {
setDirentDetail(res.data);
}).catch(error => {
const errMessage = Utils.getErrorMsg(error);
toaster.danger(errMessage);
});
}, [repoID, path]);
useEffect(() => {
if (isView || isTag) return;
let isExistContext = true;
if (!window.sfMetadataContext) {
const context = new MetadataContext();
window.sfMetadataContext = context;
window.sfMetadataContext.init({ repoID, repoInfo });
isExistContext = false;
}
return () => {
if (window.sfMetadataContext) {
if (window.sfMetadataContext && !isExistContext) {
window.sfMetadataContext.destroy();
delete window['sfMetadataContext'];
}
@@ -53,14 +71,18 @@ const EmbeddedFileDetails = ({ repoID, repoInfo, dirent, path, onClose, width =
})}
style={{ width }}
>
<Header title={dirent?.name || ''} icon={Utils.getDirentIcon(dirent, true)} onClose={onClose} component={headerComponent} >
<AI />
<Settings />
<Header title={dirent?.name || ''} icon={Utils.getDirentIcon(dirent, true)} onClose={onClose} component={headerComponent}>
{onClose && (
<>
<AI />
<Settings />
</>
)}
</Header>
<Body>
{dirent && direntDetail && (
<div className="detail-content">
<FileDetails direntDetail={direntDetail} />
<FileDetails repoID={repoID} isShowRepoTags={false} dirent={dirent} direntDetail={direntDetail} />
</div>
)}
</Body>
@@ -75,7 +97,7 @@ EmbeddedFileDetails.propTypes = {
path: PropTypes.string.isRequired,
repoInfo: PropTypes.object.isRequired,
component: PropTypes.object,
onClose: PropTypes.func.isRequired,
onClose: PropTypes.func,
};
export default EmbeddedFileDetails;

View File

@@ -0,0 +1,15 @@
.dirent-detail-people {
display: flex;
flex-wrap: wrap;
gap: 12px;
margin-bottom: 20px;
border-top: 1px solid #eee;
padding-top: 20px;
}
.dirent-detail-people .dirent-detail-people-item {
width: 32px;
height: 32px;
border-radius: 50%;
overflow: hidden;
}

View File

@@ -0,0 +1,36 @@
import React, { useCallback, useMemo } from 'react';
import { PRIVATE_COLUMN_KEY } from '../../../metadata/constants';
import { gettext, mediaUrl, siteRoot, thumbnailDefaultSize } from '../../../utils/constants';
import { getCellValueByColumn } from '../../../metadata/utils/cell';
import './index.css';
const People = ({ repoID, record }) => {
const images = useMemo(() => {
if (!record) return [];
const faceLinks = getCellValueByColumn(record, { key: PRIVATE_COLUMN_KEY.FACE_LINKS });
if (!faceLinks) return [];
return faceLinks.map(item => ({
...item,
url: `${siteRoot}thumbnail/${repoID}/${thumbnailDefaultSize}/_Internal/Faces/${item.row_id}.jpg`
}));
}, [repoID, record]);
const onImgLoadError = useCallback((e) => {
e.target.src = `${mediaUrl}avatars/default.png`;
}, []);
if (!images.length) return null;
return (
<div className="dirent-detail-people">
{images.map(img => (
<div className="dirent-detail-people-item" key={img.row_id} title={img.display_value || gettext('Unknown people')}>
<img src={img.url} alt={img.display_value || gettext('Unknown people')} onError={onImgLoadError} height={32} width={32} />
</div>
))}
</div>
);
};
export default People;

View File

@@ -6,7 +6,7 @@ import { seafileAPI } from '../../utils/seafile-api';
import URLDecorator from '../../utils/url-decorator';
import Loading from '../loading';
import ModalPortal from '../modal-portal';
import ImageDialog from '../../components/dialog/image-dialog';
import ImageDialog from '../dialog/image-dialog';
import DirentGridItem from '../../components/dirent-grid-view/dirent-grid-item';
import ContextMenu from '../context-menu/context-menu';
import { hideMenu, showMenu } from '../context-menu/actions';
@@ -618,6 +618,7 @@ class DirentGridView extends React.Component {
}
return {
id: item.id,
name,
thumbnail,
src,
@@ -860,11 +861,11 @@ class DirentGridView extends React.Component {
let canModifyFile = false;
let canDeleteFile = false;
const { isCustomPermission, customPermission } = Utils.getUserPermission(userPerm);
if (['rw', 'cloud-edit'].indexOf(userPerm) != -1) {
canModifyFile = true;
canDeleteFile = true;
} else {
const { isCustomPermission, customPermission } = Utils.getUserPermission(userPerm);
if (isCustomPermission) {
const { modify, delete: canDelete } = customPermission.permission;
canModifyFile = modify;
@@ -1042,6 +1043,8 @@ class DirentGridView extends React.Component {
{this.state.isImagePopupOpen && this.state.imageItems.length && (
<ModalPortal>
<ImageDialog
repoID={this.props.repoID}
repoInfo={this.props.currentRepoInfo}
imageItems={this.state.imageItems}
imageIndex={this.state.imageIndex}
closeImagePopup={this.closeImagePopup}
@@ -1050,6 +1053,7 @@ class DirentGridView extends React.Component {
onDeleteImage={(canDeleteFile && this.deleteImage) ? this.deleteImage : null}
onRotateImage={this.rotateImage}
enableRotate={canModifyFile}
isCustomPermission={isCustomPermission}
/>
</ModalPortal>
)}

View File

@@ -205,6 +205,7 @@ class DirentListView extends React.Component {
}
return {
id: item.id,
name,
thumbnail,
src,
@@ -765,11 +766,11 @@ class DirentListView extends React.Component {
let canModifyFile = false;
let canDeleteFile = false;
const { isCustomPermission, customPermission } = Utils.getUserPermission(userPerm);
if (['rw', 'cloud-edit'].indexOf(userPerm) != -1) {
canModifyFile = true;
canDeleteFile = true;
} else {
const { isCustomPermission, customPermission } = Utils.getUserPermission(userPerm);
if (isCustomPermission) {
const { modify, delete: canDelete } = customPermission.permission;
canModifyFile = modify;
@@ -872,6 +873,8 @@ class DirentListView extends React.Component {
{this.state.isImagePopupOpen && (
<ModalPortal>
<ImageDialog
repoID={this.props.repoID}
repoInfo={this.props.currentRepoInfo}
imageItems={this.state.imageItems}
imageIndex={this.state.imageIndex}
closeImagePopup={this.closeImagePopup}
@@ -880,6 +883,7 @@ class DirentListView extends React.Component {
onDeleteImage={(canDeleteFile && this.deleteImage) ? this.deleteImage : null}
onRotateImage={this.rotateImage}
enableRotate={canModifyFile}
isCustomPermission={isCustomPermission}
/>
</ModalPortal>
)}