1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 10:26:17 +00:00

Refactor draft (#3018)

* refactor draft

* update
This commit is contained in:
陈钦亮
2019-03-01 16:49:35 +08:00
committed by Daniel Pan
parent b25c2752a7
commit 6137e720f0
47 changed files with 497 additions and 2942 deletions

View File

@@ -29,8 +29,6 @@ const propTypes = {
isDraft: PropTypes.bool.isRequired,
hasDraft: PropTypes.bool.isRequired,
goDraftPage: PropTypes.func.isRequired,
reviewStatus: PropTypes.string,
goReviewPage: PropTypes.func.isRequired,
isFileLoading: PropTypes.bool.isRequired,
filePermission: PropTypes.bool.isRequired,
content: PropTypes.string,
@@ -50,7 +48,6 @@ const propTypes = {
onAddFolderNode: PropTypes.func.isRequired,
// repo content
draftCounts: PropTypes.number,
reviewCounts: PropTypes.number,
usedRepoTags: PropTypes.array.isRequired,
readmeMarkdown: PropTypes.object,
updateUsedRepoTags: PropTypes.func.isRequired,
@@ -116,10 +113,10 @@ class LibContentContainer extends React.Component {
}
render() {
let { path, repoID, usedRepoTags, readmeMarkdown, draftCounts, reviewCounts } = this.props;
let { path, repoID, usedRepoTags, readmeMarkdown, draftCounts } = this.props;
let isRepoInfoBarShow = false;
if (path === '/') {
if (usedRepoTags.length !== 0 || readmeMarkdown !== null || draftCounts !== 0 || reviewCounts !== 0) {
if (usedRepoTags.length !== 0 || readmeMarkdown !== null || draftCounts !== 0) {
isRepoInfoBarShow = true;
}
}
@@ -154,7 +151,6 @@ class LibContentContainer extends React.Component {
usedRepoTags={this.props.usedRepoTags}
readmeMarkdown={this.props.readmeMarkdown}
draftCounts={this.props.draftCounts}
reviewCounts={this.props.draftCounts}
updateUsedRepoTags={this.props.updateUsedRepoTags}
isDirentListLoading={this.props.isDirentListLoading}
direntList={this.props.direntList}
@@ -204,8 +200,6 @@ class LibContentContainer extends React.Component {
isDraft={this.props.isDraft}
hasDraft={this.props.hasDraft}
goDraftPage={this.props.goDraftPage}
reviewStatus={this.props.reviewStatus}
goReviewPage={this.props.goReviewPage}
filePermission={this.props.filePermission}
content={this.props.content}
lastModified={this.props.lastModified}
@@ -215,7 +209,6 @@ class LibContentContainer extends React.Component {
usedRepoTags={this.props.usedRepoTags}
readmeMarkdown={this.props.readmeMarkdown}
draftCounts={this.props.draftCounts}
reviewCounts={this.props.draftCounts}
updateUsedRepoTags={this.props.updateUsedRepoTags}
isDirentListLoading={this.props.isDirentListLoading}
direntList={this.props.direntList}

View File

@@ -48,9 +48,6 @@ class LibContentView extends React.Component {
hasDraft: false,
draftFilePath: '',
draftCounts: 0,
reviewID: '',
reviewStatus: '',
reviewCounts: 0,
usedRepoTags: [],
readmeMarkdown: null,
isTreeDataLoading: true,
@@ -213,10 +210,9 @@ class LibContentView extends React.Component {
this.updateUsedRepoTags();
// list draft counts and revierw counts
seafileAPI.getRepoDraftReviewCounts(repoID).then(res => {
seafileAPI.getRepoDraftCounts(repoID).then(res => {
this.setState({
draftCounts: res.data.draft_counts,
reviewCounts: res.data.review_counts
});
});
@@ -300,8 +296,7 @@ class LibContentView extends React.Component {
// update data
seafileAPI.getFileInfo(repoID, filePath).then((res) => {
let { mtime, permission, last_modifier_name, is_draft, has_draft,
review_status, review_id, draft_file_path } = res.data;
let { mtime, permission, last_modifier_name, is_draft, has_draft, draft_file_path } = res.data;
seafileAPI.getFileDownloadLink(repoID, filePath).then((res) => {
seafileAPI.getFileContent(res.data).then((res) => {
this.setState({
@@ -313,8 +308,6 @@ class LibContentView extends React.Component {
isFileLoadedErr: false,
isDraft: is_draft,
hasDraft: has_draft,
reviewStatus: review_status,
reviewID: review_id,
draftFilePath: draft_file_path
});
});
@@ -1132,10 +1125,6 @@ class LibContentView extends React.Component {
this.setState({libNeedDecrypt: false});
this.loadDirData(this.state.path);
}
goReviewPage = () => {
window.location.href = siteRoot + 'drafts/review/' + this.state.reviewID;
}
goDraftPage = () => {
let repoID = this.props.repoID;
@@ -1255,8 +1244,6 @@ class LibContentView extends React.Component {
isDraft={this.state.isDraft}
hasDraft={this.state.hasDraft}
goDraftPage={this.goDraftPage}
reviewStatus={this.state.reviewStatus}
goReviewPage={this.goReviewPage}
isFileLoading={this.state.isFileLoading}
isFileLoadedErr={this.state.isFileLoadedErr}
filePermission={this.state.filePermission}
@@ -1275,7 +1262,6 @@ class LibContentView extends React.Component {
onRenameNode={this.onRenameTreeNode}
onDeleteNode={this.onDeleteTreeNode}
draftCounts={this.state.draftCounts}
reviewCounts={this.state.reviewCounts}
usedRepoTags={this.state.usedRepoTags}
readmeMarkdown={this.state.readmeMarkdown}
updateUsedRepoTags={this.updateUsedRepoTags}