haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-10 19:29:56 +00:00
Code Issues Releases Wiki Activity

feat: metadata insert property permission bug (#7283)

Browse Source 
Co-authored-by: 杨国璇 <ygx@Hello-word.local>
This commit is contained in:
杨国璇
2024-12-30 19:00:50 +08:00
committed by GitHub
parent 5d5f2c31f0
commit 324d981420
7 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/file-view/file-view.js
View File

@@ -157,7 +157,7 @@ class FileView extends React.Component {
} }
{this.props.content} {this.props.content}
{isDetailsPanelOpen && ( {isDetailsPanelOpen && (
<MetadataStatusProvider repoID={repoID} currentRepoInfo={repoInfo}> <MetadataStatusProvider repoID={repoID} repoInfo={repoInfo}>
<CollaboratorsProvider repoID={repoID}> <CollaboratorsProvider repoID={repoID}>
<TagsProvider repoID={repoID} repoInfo={repoInfo}> <TagsProvider repoID={repoID} repoInfo={repoInfo}>
<EmbeddedFileDetails <EmbeddedFileDetails

8
frontend/src/hooks/metadata-status.js
View File

@@ -7,12 +7,12 @@ import { MetadataAIOperationsProvider } from './metadata-ai-operation';
// This hook provides content related to seahub interaction, such as whether to enable extended attributes // This hook provides content related to seahub interaction, such as whether to enable extended attributes
const MetadataStatusContext = React.createContext(null); const MetadataStatusContext = React.createContext(null);
export const MetadataStatusProvider = ({ repoID, currentRepoInfo, hideMetadataView, children }) => { export const MetadataStatusProvider = ({ repoID, repoInfo, hideMetadataView, children }) => {
const enableMetadataManagement = useMemo(() => { const enableMetadataManagement = useMemo(() => {
if (currentRepoInfo?.encrypted) return false; if (repoInfo?.encrypted) return false;
return window.app.pageOptions.enableMetadataManagement; return window.app.pageOptions.enableMetadataManagement;
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [window.app.pageOptions.enableMetadataManagement, currentRepoInfo]); }, [window.app.pageOptions.enableMetadataManagement, repoInfo]);
const [isLoading, setLoading] = useState(true); const [isLoading, setLoading] = useState(true);
const [enableMetadata, setEnableMetadata] = useState(false); const [enableMetadata, setEnableMetadata] = useState(false);
@@ -125,7 +125,7 @@ export const MetadataStatusProvider = ({ repoID, currentRepoInfo, hideMetadataVi
enableOCR={enableOCR} enableOCR={enableOCR}
enableTags={enableTags} enableTags={enableTags}
tagsLang={tagsLang} tagsLang={tagsLang}
repoInfo={currentRepoInfo} repoInfo={repoInfo}
> >
{children} {children}
</MetadataAIOperationsProvider> </MetadataAIOperationsProvider>

2
frontend/src/index.js
View File

@@ -15,7 +15,7 @@ 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} currentRepoInfo={{ permission: filePerm, encrypted: repoEncrypted }}> <MetadataStatusProvider repoID={repoID} repoInfo={{ permission: filePerm, encrypted: repoEncrypted }}>
<CollaboratorsProvider repoID={repoID}> <CollaboratorsProvider repoID={repoID}>
<MarkdownEditor /> <MarkdownEditor />
</CollaboratorsProvider> </CollaboratorsProvider>

5
frontend/src/metadata/context.js
View File

@@ -126,6 +126,11 @@ class Context {
return viewId !== FACE_RECOGNITION_VIEW_ID; return viewId !== FACE_RECOGNITION_VIEW_ID;
}; };
canInsertColumn = () => {
if (this.permission === 'r') return false;
return true;
};
canModifyColumn = (column) => { canModifyColumn = (column) => {
if (this.permission === 'r') return false; if (this.permission === 'r') return false;
const { editable } = column; const { editable } = column;

4
frontend/src/metadata/views/table/table-main/records-header/index.js
View File

@@ -66,6 +66,8 @@ const RecordsHeader = ({
return value; return value;
}, [isGroupView, columnMetrics, height]); }, [isGroupView, columnMetrics, height]);
const canInsertColumn = window.sfMetadataContext.canInsertColumn();
const modifyLocalColumnWidth = useCallback((column, width) => { const modifyLocalColumnWidth = useCallback((column, width) => {
setResizingColumnMetrics(recalculateColumnMetricsByResizeColumn(propsColumnMetrics, column.key, Math.max(width, 50))); setResizingColumnMetrics(recalculateColumnMetricsByResizeColumn(propsColumnMetrics, column.key, Math.max(width, 50)));
}, [propsColumnMetrics]); }, [propsColumnMetrics]);
@@ -162,7 +164,7 @@ const RecordsHeader = ({
/> />
); );
})} })}
{insertColumn && ( {canInsertColumn && insertColumn && (
<InsertColumn <InsertColumn
lastColumn={columnMetrics.columns[columnMetrics.columns.length - 1]} lastColumn={columnMetrics.columns[columnMetrics.columns.length - 1]}
groupOffsetLeft={groupOffsetLeft} groupOffsetLeft={groupOffsetLeft}

2
frontend/src/pages/lib-content-view/lib-content-view.js
View File

@@ -2214,7 +2214,7 @@ class LibContentView extends React.Component {
} }
return ( return (
<MetadataStatusProvider repoID={repoID} currentRepoInfo={currentRepoInfo} hideMetadataView={this.hideMetadataView}> <MetadataStatusProvider repoID={repoID} repoInfo={currentRepoInfo} hideMetadataView={this.hideMetadataView}>
<TagsProvider repoID={repoID} currentPath={path} repoInfo={currentRepoInfo} selectTagsView={this.onTreeNodeClick}> <TagsProvider repoID={repoID} currentPath={path} repoInfo={currentRepoInfo} selectTagsView={this.onTreeNodeClick}>
<MetadataProvider repoID={repoID} currentPath={path} repoInfo={currentRepoInfo} selectMetadataView={this.onTreeNodeClick} hideMetadataView={this.hideMetadataView} > <MetadataProvider repoID={repoID} currentPath={path} repoInfo={currentRepoInfo} selectMetadataView={this.onTreeNodeClick} hideMetadataView={this.hideMetadataView} >
<CollaboratorsProvider repoID={repoID}> <CollaboratorsProvider repoID={repoID}>

2
frontend/src/view-file-sdoc.js
View File

@@ -59,7 +59,7 @@ const repoInfo = { encrypted: repoEncrypted, permission: filePerm, is_admin: isR
ReactDom.render( ReactDom.render(
<I18nextProvider i18n={ i18n } > <I18nextProvider i18n={ i18n } >
<Suspense fallback={<Loading />}> <Suspense fallback={<Loading />}>
<MetadataStatusProvider repoID={repoID} currentRepoInfo={repoInfo}> <MetadataStatusProvider repoID={repoID} repoInfo={repoInfo}>
<CollaboratorsProvider repoID={repoID}> <CollaboratorsProvider repoID={repoID}>
<TagsProvider repoID={repoID} repoInfo={repoInfo}> <TagsProvider repoID={repoID} repoInfo={repoInfo}>
{filePerm === 'rw' ? <SdocEditor /> : <SimpleViewer />} {filePerm === 'rw' ? <SdocEditor /> : <SimpleViewer />}