diff --git a/frontend/src/components/dialog/readme-dialog.js b/frontend/src/components/dialog/readme-dialog.js deleted file mode 100644 index 7cd23344f0..0000000000 --- a/frontend/src/components/dialog/readme-dialog.js +++ /dev/null @@ -1,69 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap'; -import { MarkdownViewer } from '@seafile/seafile-editor'; -import Loading from '../../components/loading'; -import { seafileAPI } from '../../utils/seafile-api'; -import { gettext, mediaUrl } from '../../utils/constants'; -import { Utils } from '../../utils/utils'; -import toaster from '../toast'; - -const propTypes = { - repoID: PropTypes.string.isRequired, - filePath: PropTypes.string.isRequired, - fileName: PropTypes.string.isRequired, - href: PropTypes.string, - toggleCancel: PropTypes.func.isRequired, -}; - -class ReadmeDialog extends React.Component { - - constructor(props) { - super(props); - this.state = { - readmeContent: null, - isLoading: true, - }; - } - - componentDidMount() { - seafileAPI.getFileDownloadLink(this.props.repoID, this.props.filePath).then(res => { - seafileAPI.getFileContent(res.data).then(res => { - this.setState({ - readmeContent: res.data, - isLoading: false, - }); - }); - }).catch(error => { - let errMessage = Utils.getErrorMsg(error); - toaster.danger(errMessage); - }); - } - - render() { - return ( - - {this.props.fileName} - - - - {this.state.isLoading ? - : - - } - - - - - - ); - } -} - -ReadmeDialog.propTypes = propTypes; - -export default ReadmeDialog; diff --git a/frontend/src/components/dir-view-mode/dir-column-view.js b/frontend/src/components/dir-view-mode/dir-column-view.js index 4d7f04ad35..716e196abe 100644 --- a/frontend/src/components/dir-view-mode/dir-column-view.js +++ b/frontend/src/components/dir-view-mode/dir-column-view.js @@ -40,7 +40,6 @@ const propTypes = { isRepoInfoBarShow: PropTypes.bool.isRequired, draftCounts: PropTypes.number.isRequired, usedRepoTags: PropTypes.array.isRequired, - readmeMarkdown: PropTypes.object, updateUsedRepoTags: PropTypes.func.isRequired, // list isDirentListLoading: PropTypes.bool.isRequired, @@ -201,7 +200,6 @@ class DirColumnView extends React.Component { enableDirPrivateShare={this.props.enableDirPrivateShare} isRepoInfoBarShow={this.props.isRepoInfoBarShow} usedRepoTags={this.props.usedRepoTags} - readmeMarkdown={this.props.readmeMarkdown} draftCounts={this.props.draftCounts} updateUsedRepoTags={this.props.updateUsedRepoTags} isDirentListLoading={this.props.isDirentListLoading} diff --git a/frontend/src/components/dir-view-mode/dir-grid-view.js b/frontend/src/components/dir-view-mode/dir-grid-view.js index 8dfb88ced6..e494ae8ad9 100644 --- a/frontend/src/components/dir-view-mode/dir-grid-view.js +++ b/frontend/src/components/dir-view-mode/dir-grid-view.js @@ -8,7 +8,6 @@ const propTypes = { path: PropTypes.string.isRequired, repoID: PropTypes.string.isRequired, currentRepoInfo: PropTypes.object.isRequired, - readmeMarkdown: PropTypes.object, draftCounts: PropTypes.number, usedRepoTags: PropTypes.array.isRequired, updateUsedRepoTags: PropTypes.func.isRequired, @@ -53,7 +52,6 @@ class DirGridView extends React.Component { { this.setState({ currentTag: currentTag, - isListTaggedFileShow: !this.state.isListTaggedFileShow, + isListTaggedFileShow: !this.state.isListTaggedFileShow }); }; @@ -53,25 +48,14 @@ class RepoInfoBar extends React.Component { }); }; - toggleReadme = () => { - this.setState({ - showReadmeDialog: !this.state.showReadmeDialog - }); - }; - render() { - let { repoID, currentPath, usedRepoTags, readmeMarkdown, draftCounts, className } = this.props; + let { repoID, usedRepoTags, draftCounts, className } = this.props; // to be compatible with the existing code - if (readmeMarkdown === undefined) { - readmeMarkdown = null; - } if (draftCounts === undefined) { draftCounts = 0; } - let href = readmeMarkdown !== null ? siteRoot + 'lib/' + repoID + '/file' + Utils.joinPath(currentPath, readmeMarkdown.name) + '?mode=edit' : ''; - let filePath = readmeMarkdown !== null ? currentPath + readmeMarkdown.name : ''; return (
{usedRepoTags.length > 0 && ( @@ -89,19 +73,7 @@ class RepoInfoBar extends React.Component { })} )} -
0 && readmeMarkdown) ? 'file-info-list mt-1' : 'file-info-list'}> - {(readmeMarkdown !== null && parseInt(readmeMarkdown.size) > 1) && - - - {readmeMarkdown.name} - - } - {(readmeMarkdown !== null && parseInt(readmeMarkdown.size) < 2) && - - - {readmeMarkdown.name} - - } +
0 ? 'file-info-list mt-1' : 'file-info-list'}> {draftCounts > 0 && @@ -136,17 +108,6 @@ class RepoInfoBar extends React.Component { )} - {this.state.showReadmeDialog && ( - - - - )}
); } diff --git a/frontend/src/pages/lib-content-view/lib-content-container.js b/frontend/src/pages/lib-content-view/lib-content-container.js index dc753ab001..ae5e0bf067 100644 --- a/frontend/src/pages/lib-content-view/lib-content-container.js +++ b/frontend/src/pages/lib-content-view/lib-content-container.js @@ -52,7 +52,6 @@ const propTypes = { // repo content draftCounts: PropTypes.number, usedRepoTags: PropTypes.array.isRequired, - readmeMarkdown: PropTypes.object, updateUsedRepoTags: PropTypes.func.isRequired, // list isDirentListLoading: PropTypes.bool.isRequired, @@ -164,10 +163,10 @@ class LibContentContainer extends React.Component { }; render() { - let { path, repoID, usedRepoTags, readmeMarkdown, draftCounts } = this.props; + let { path, repoID, usedRepoTags, draftCounts } = this.props; let isRepoInfoBarShow = false; if (path === '/') { - if (usedRepoTags.length !== 0 || readmeMarkdown !== null || draftCounts !== 0) { + if (usedRepoTags.length !== 0 || draftCounts !== 0) { isRepoInfoBarShow = true; } } @@ -213,7 +212,6 @@ class LibContentContainer extends React.Component { enableDirPrivateShare={this.props.enableDirPrivateShare} isRepoInfoBarShow={isRepoInfoBarShow} usedRepoTags={this.props.usedRepoTags} - readmeMarkdown={this.props.readmeMarkdown} draftCounts={this.props.draftCounts} updateUsedRepoTags={this.props.updateUsedRepoTags} isDirentListLoading={this.props.isDirentListLoading} @@ -255,7 +253,6 @@ class LibContentContainer extends React.Component { onRenameNode={this.props.onRenameNode} isRepoInfoBarShow={isRepoInfoBarShow} usedRepoTags={this.props.usedRepoTags} - readmeMarkdown={this.props.readmeMarkdown} draftCounts={this.props.draftCounts} updateUsedRepoTags={this.props.updateUsedRepoTags} isDirentListLoading={this.props.isDirentListLoading} @@ -308,7 +305,6 @@ class LibContentContainer extends React.Component { onLinkClick={this.props.onLinkClick} isRepoInfoBarShow={isRepoInfoBarShow} usedRepoTags={this.props.usedRepoTags} - readmeMarkdown={this.props.readmeMarkdown} draftCounts={this.props.draftCounts} updateUsedRepoTags={this.props.updateUsedRepoTags} isDirentListLoading={this.props.isDirentListLoading} diff --git a/frontend/src/pages/lib-content-view/lib-content-view.js b/frontend/src/pages/lib-content-view/lib-content-view.js index eadf9a4b23..542a991171 100644 --- a/frontend/src/pages/lib-content-view/lib-content-view.js +++ b/frontend/src/pages/lib-content-view/lib-content-view.js @@ -53,7 +53,6 @@ class LibContentView extends React.Component { draftID: '', draftCounts: 0, usedRepoTags: [], - readmeMarkdown: null, isTreeDataLoading: true, treeData: treeHelper.buildTree(), currentNode: null, @@ -279,17 +278,6 @@ class LibContentView extends React.Component { }); }; - updateReadmeMarkdown = (direntList) => { - this.setState({readmeMarkdown: null}); - direntList.forEach(item => { - let fileName = item.name.toLowerCase(); - if (fileName === 'readme.md' || fileName === 'readme.markdown') { - this.setState({readmeMarkdown: item}); - return true; - } - }); - }; - updateColumnMarkdownData = (filePath) => { let repoID = this.props.repoID; // update state @@ -482,12 +470,7 @@ class LibContentView extends React.Component { let repoID = this.props.repoID; seafileAPI.listDir(repoID, path, {'with_thumbnail': true}).then(res => { let direntList = []; - let markdownItem = null; res.data.dirent_list.forEach(item => { - let fileName = item.name.toLowerCase(); - if (fileName === 'readme.md' || fileName === 'readme.markdown') { - markdownItem = item; - } let dirent = new Dirent(item); direntList.push(dirent); }); @@ -498,7 +481,6 @@ class LibContentView extends React.Component { isDirentListLoading: false, direntList: Utils.sortDirents(direntList, this.state.sortBy, this.state.sortOrder), dirID: res.data.dir_id, - readmeMarkdown: markdownItem, path: path, isSessionExpired: false, }); @@ -1425,7 +1407,6 @@ class LibContentView extends React.Component { this.setState({direntList: [dirent, ...this.state.direntList]}); } else { this.setState({direntList: [...this.state.direntList, dirent]}); - this.updateReadmeMarkdown(this.state.direntList); } } }; @@ -1455,7 +1436,6 @@ class LibContentView extends React.Component { } } this.setState({direntList: direntList}); - this.updateReadmeMarkdown(direntList); }; renameDirent = (direntPath, newName) => { @@ -1480,7 +1460,6 @@ class LibContentView extends React.Component { return item; }); this.setState({ direntList: direntList }); - this.updateReadmeMarkdown(direntList); } else if (Utils.isAncestorPath(direntPath, this.state.path)) { // example: direntPath = /A/B, state.path = /A/B/C let newPath = Utils.renameAncestorPath(this.state.path, direntPath, newDirentPath); @@ -1508,7 +1487,6 @@ class LibContentView extends React.Component { this.recaculateSelectedStateAfterDirentDeleted(name, direntList); this.setState({direntList: direntList}); - this.updateReadmeMarkdown(direntList); } else if (Utils.isAncestorPath(direntPath, this.state.path)) { // the deleted item is ancester of the current item let parentPath = Utils.getDirName(direntPath); @@ -1527,7 +1505,6 @@ class LibContentView extends React.Component { this.recaculateSelectedStateAfterDirentDeleted(name, direntList); this.setState({direntList: direntList}); - this.updateReadmeMarkdown(direntList); }; moveDirent = (direntPath, moveToDirentPath = null) => { @@ -1544,7 +1521,6 @@ class LibContentView extends React.Component { this.recaculateSelectedStateAfterDirentDeleted(name, direntList); this.setState({direntList: direntList}); - this.updateReadmeMarkdown(direntList); }; // only one scence: The moved items are inside current path @@ -1562,7 +1538,6 @@ class LibContentView extends React.Component { isDirentSelected: false, isAllDirentSelected: false, }); - this.updateReadmeMarkdown(direntList); }; updateDirent = (dirent, paramKey, paramValue) => { @@ -2047,7 +2022,6 @@ class LibContentView extends React.Component { onDeleteNode={this.onDeleteTreeNode} draftCounts={this.state.draftCounts} usedRepoTags={this.state.usedRepoTags} - readmeMarkdown={this.state.readmeMarkdown} updateUsedRepoTags={this.updateUsedRepoTags} isDirentListLoading={this.state.isDirentListLoading} direntList={direntItemsList}