1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-31 22:54:11 +00:00

fix: encrypted repo metadata (#7157)

Co-authored-by: 杨国璇 <ygx@192.168.1.6>
This commit is contained in:
杨国璇
2024-12-07 17:40:43 +08:00
committed by GitHub
parent 87a9cd0731
commit 5e6d6e860c
4 changed files with 17 additions and 9 deletions

View File

@@ -31,7 +31,7 @@ const propTypes = {
const { isStarred, isLocked, lockedByMe, const { isStarred, isLocked, lockedByMe,
repoID, filePath, filePerm, enableWatermark, userNickName, repoID, filePath, filePerm, enableWatermark, userNickName,
fileName fileName, repoEncrypted
} = window.app.pageOptions; } = window.app.pageOptions;
class FileView extends React.Component { class FileView extends React.Component {
@@ -114,6 +114,10 @@ class FileView extends React.Component {
render() { render() {
const { isOnlyofficeFile = false } = this.props; const { isOnlyofficeFile = false } = this.props;
const { isDetailsPanelOpen, isHeaderShown } = this.state; const { isDetailsPanelOpen, isHeaderShown } = this.state;
const repoInfo = {
permission: filePerm,
encrypted: repoEncrypted
};
return ( return (
<I18nextProvider i18n={ i18n }> <I18nextProvider i18n={ i18n }>
<Suspense fallback={<Loading />}> <Suspense fallback={<Loading />}>
@@ -152,14 +156,14 @@ class FileView extends React.Component {
} }
{this.props.content} {this.props.content}
{isDetailsPanelOpen && ( {isDetailsPanelOpen && (
<MetadataStatusProvider repoID={repoID} > <MetadataStatusProvider repoID={repoID} currentRepoInfo={repoInfo}>
<CollaboratorsProvider repoID={repoID}> <CollaboratorsProvider repoID={repoID}>
<TagsProvider repoID={repoID} repoInfo={{ permission: filePerm }}> <TagsProvider repoID={repoID} repoInfo={repoInfo}>
<EmbeddedFileDetails <EmbeddedFileDetails
repoID={repoID} repoID={repoID}
path={filePath} path={filePath}
dirent={{ 'name': fileName, type: 'file' }} dirent={{ 'name': fileName, type: 'file' }}
repoInfo={{ permission: filePerm }} repoInfo={repoInfo}
onClose={this.toggleDetailsPanel} onClose={this.toggleDetailsPanel}
/> />
</TagsProvider> </TagsProvider>

View File

@@ -10,12 +10,12 @@ import { CollaboratorsProvider } from './metadata';
import './index.css'; import './index.css';
const { repoID } = window.app.pageOptions; const { repoID, repoEncrypted, filePerm } = window.app.pageOptions;
ReactDom.render( ReactDom.render(
<I18nextProvider i18n={ i18n } > <I18nextProvider i18n={ i18n } >
<Suspense fallback={<Loading />}> <Suspense fallback={<Loading />}>
<MetadataStatusProvider repoID={repoID}> <MetadataStatusProvider repoID={repoID} currentRepoInfo={{ permission: filePerm, encrypted: repoEncrypted }}>
<CollaboratorsProvider repoID={repoID}> <CollaboratorsProvider repoID={repoID}>
<MarkdownEditor /> <MarkdownEditor />
</CollaboratorsProvider> </CollaboratorsProvider>

View File

@@ -12,7 +12,7 @@ import { TagsProvider } from './tag/hooks';
const { serviceURL, avatarURL, siteRoot, lang, mediaUrl, isPro } = window.app.config; const { serviceURL, avatarURL, siteRoot, lang, mediaUrl, isPro } = window.app.config;
const { username, name } = window.app.userInfo; const { username, name } = window.app.userInfo;
const { const {
repoID, repoName, parentDir, filePerm, repoID, repoName, repoEncrypted, parentDir, filePerm,
docPath, docName, docUuid, seadocAccessToken, seadocServerUrl, assetsUrl, docPath, docName, docUuid, seadocAccessToken, seadocServerUrl, assetsUrl,
isSdocRevision, isPublished, originFilename, revisionCreatedAt, originFileVersion, isSdocRevision, isPublished, originFilename, revisionCreatedAt, originFileVersion,
originFilePath, originDocUuid, revisionId, isFreezed, mobileLogin originFilePath, originDocUuid, revisionId, isFreezed, mobileLogin
@@ -52,12 +52,14 @@ window.seafile = {
mobileLogin, mobileLogin,
}; };
const repoInfo = { encrypted: repoEncrypted, permission: filePerm };
ReactDom.render( ReactDom.render(
<I18nextProvider i18n={ i18n } > <I18nextProvider i18n={ i18n } >
<Suspense fallback={<Loading />}> <Suspense fallback={<Loading />}>
<MetadataStatusProvider repoID={repoID}> <MetadataStatusProvider repoID={repoID} currentRepoInfo={repoInfo}>
<CollaboratorsProvider repoID={repoID}> <CollaboratorsProvider repoID={repoID}>
<TagsProvider repoID={repoID} repoInfo={{ permission: filePerm }}> <TagsProvider repoID={repoID} repoInfo={repoInfo}>
<SdocEditor /> <SdocEditor />
</TagsProvider> </TagsProvider>
</CollaboratorsProvider> </CollaboratorsProvider>

View File

@@ -38,8 +38,10 @@
pageOptions: { pageOptions: {
repoID: '{{ repo.id }}', repoID: '{{ repo.id }}',
repoName: '{{ repo.name|escapejs }}', repoName: '{{ repo.name|escapejs }}',
repoEncrypted: {% if repo.encrypted %}true{% else %}false{% endif %},
filePath: '{{ path|escapejs }}', filePath: '{{ path|escapejs }}',
fileName: '{{ filename|escapejs }}', fileName: '{{ filename|escapejs }}',
filePerm: '{{ file_perm }}',
rawPath: '{{ raw_path|escapejs }}', rawPath: '{{ raw_path|escapejs }}',
domain: '{{ domain }}', domain: '{{ domain }}',
protocol: '{{ protocol }}', protocol: '{{ protocol }}',