diff --git a/frontend/src/pages/org-admin/departments/department-list.js b/frontend/src/pages/org-admin/departments/department-list.js index 2fa27af8b0..d1041fece4 100644 --- a/frontend/src/pages/org-admin/departments/department-list.js +++ b/frontend/src/pages/org-admin/departments/department-list.js @@ -1,5 +1,4 @@ import React, { Fragment } from 'react'; -import PropTypes from 'prop-types'; import moment from 'moment'; import { seafileAPI } from '../../../utils/seafile-api'; import MainPanelTopbar from '../main-panel-topbar'; diff --git a/frontend/src/pages/wiki2/index.js b/frontend/src/pages/wiki2/index.js index ac730ee8f6..1956541c5d 100644 --- a/frontend/src/pages/wiki2/index.js +++ b/frontend/src/pages/wiki2/index.js @@ -581,12 +581,10 @@ class Wiki extends Component { permission={this.state.permission} lastModified={this.state.lastModified} latestContributor={this.state.latestContributor} - direntList={this.state.direntList} onLinkClick={this.onLinkClick} onMenuClick={this.onMenuClick} onSearchedClick={this.onSearchedClick} onMainNavBarClick={this.onMainNavBarClick} - onDirentClick={this.onDirentClick} /> diff --git a/frontend/src/pages/wiki2/main-panel.js b/frontend/src/pages/wiki2/main-panel.js index 2cf7c807b0..ac0c260651 100644 --- a/frontend/src/pages/wiki2/main-panel.js +++ b/frontend/src/pages/wiki2/main-panel.js @@ -1,11 +1,10 @@ import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; -import { gettext, repoID, siteRoot, username, isPro, isEditWiki } from '../../utils/constants'; +import { gettext, repoID, siteRoot, username, isEditWiki } from '../../utils/constants'; import SeafileMarkdownViewer from '../../components/seafile-markdown-viewer'; -import WikiDirListView from '../../components/wiki-dir-list-view/wiki-dir-list-view'; import Loading from '../../components/loading'; import { Utils } from '../../utils/utils'; -import Search from '../../components/search/search'; +// import Search from '../../components/search/search'; import Notification from '../../components/common/notification'; import Account from '../../components/common/account'; import SdocWikiPageViewer from '../../components/sdoc-wiki-page-viewer'; @@ -19,11 +18,9 @@ const propTypes = { permission: PropTypes.string, lastModified: PropTypes.string, latestContributor: PropTypes.string, - direntList: PropTypes.array.isRequired, onMenuClick: PropTypes.func.isRequired, onSearchedClick: PropTypes.func.isRequired, onMainNavBarClick: PropTypes.func.isRequired, - onDirentClick: PropTypes.func.isRequired, onLinkClick: PropTypes.func.isRequired, }; @@ -78,7 +75,7 @@ class MainPanel extends Component { render() { - let { onSearchedClick } = this.props; + // let { onSearchedClick } = this.props; const errMessage = (
{gettext('Folder does not exist.')}
); const isViewingFile = this.props.pathExist && !this.props.isDataLoading && this.props.isViewFile; return ( @@ -91,9 +88,9 @@ class MainPanel extends Component {
- {isPro && ( + {/* {isPro && ( - )} + )} */}
} @@ -108,9 +105,9 @@ class MainPanel extends Component { )}
- {isPro && ( + {/* {isPro && ( - )} + )} */}
@@ -145,13 +142,6 @@ class MainPanel extends Component { onLinkClick={this.props.onLinkClick} /> )} - {(!this.props.isDataLoading && !this.props.isViewFile) && ( - - )} diff --git a/frontend/src/pages/wiki2/side-panel.js b/frontend/src/pages/wiki2/side-panel.js index ff09f54908..991de5ab89 100644 --- a/frontend/src/pages/wiki2/side-panel.js +++ b/frontend/src/pages/wiki2/side-panel.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import deepCopy from 'deep-copy'; -import { gettext, siteRoot, repoID, username, permission, isEditWiki } from '../../utils/constants'; +import { gettext, repoID, isEditWiki } from '../../utils/constants'; import toaster from '../../components/toast'; import Loading from '../../components/loading'; // import TreeView from '../../components/tree-view/tree-view'; @@ -100,7 +100,7 @@ class SidePanel extends Component { const { pages, navigation } = config; const index = PageUtils.getPageIndexById(pageId, pages); const pageIndex = pages.findIndex(item => item.id === pageId); - let path = pages[pageIndex].path + let path = pages[pageIndex].path; config.pages.splice(index, 1); PageUtils.deletePage(navigation, pageId); @@ -395,17 +395,10 @@ class SidePanel extends Component {
{src && } -

{wiki_name}

+

{wiki_name}

); diff --git a/seahub/templates/wiki/wiki_edit.html b/seahub/templates/wiki/wiki_edit.html index 4baa5992b4..fa16da53aa 100644 --- a/seahub/templates/wiki/wiki_edit.html +++ b/seahub/templates/wiki/wiki_edit.html @@ -12,7 +12,7 @@ {% endblock %} {% block extra_style %} -{% render_bundle 'wiki' 'css' %} +{% render_bundle 'wiki2' 'css' %} {% endblock %} {% block wiki_title %} {{h1_head_content}} - {{repo_name}}{% endblock %}