diff --git a/frontend/src/components/search/wiki2-search.js b/frontend/src/components/search/wiki2-search.js index 6fa1ac8c83..0f98c77629 100644 --- a/frontend/src/components/search/wiki2-search.js +++ b/frontend/src/components/search/wiki2-search.js @@ -150,14 +150,14 @@ function Wiki2Search({ setCurrentPage, config, getCurrentPageId, wikiId }) { return ( <>
setIsModalOpen(true)}> - + {gettext('Search')}
{isModalOpen &&
- + - +
+
); } diff --git a/frontend/src/pages/wiki2/custom-icon.js b/frontend/src/pages/wiki2/custom-icon.js index ed0c090df0..3d3e47b22a 100644 --- a/frontend/src/pages/wiki2/custom-icon.js +++ b/frontend/src/pages/wiki2/custom-icon.js @@ -3,7 +3,7 @@ import ProtoTypes from 'prop-types'; const CustomIcon = ({ icon }) => { return ( - {icon} + ); }; diff --git a/frontend/src/pages/wiki2/main-panel.js b/frontend/src/pages/wiki2/main-panel.js index 6317b9c29a..c02377f041 100644 --- a/frontend/src/pages/wiki2/main-panel.js +++ b/frontend/src/pages/wiki2/main-panel.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { SdocWikiEditor, DocInfo } from '@seafile/sdoc-editor'; -import { gettext, username, wikiPermission } from '../../utils/constants'; +import { gettext, username, wikiPermission, wikiId, siteRoot } from '../../utils/constants'; import Loading from '../../components/loading'; import { Utils } from '../../utils/utils'; import Account from '../../components/common/account'; @@ -57,14 +57,8 @@ class MainPanel extends Component { return { ...props, docUuid: window.seafile.docUuid, currentPageConfig }; } - handleClickHistory = () => { - const { wikiId, permission } = window.wiki.config; - if (permission !== 'rw') return; - - const { siteRoot } = window.app.config; - const { currentPageConfig } = this.state; - const historyUrl = `${siteRoot}wiki/file_revisions/${wikiId}/?page_id=${currentPageConfig.id}`; - window.location.href = historyUrl; + openHistory = () => { + window.location.href = `${siteRoot}wiki/file_revisions/${wikiId}/?page_id=${this.state.currentPageConfig.id}`; }; render() { @@ -94,9 +88,9 @@ class MainPanel extends Component {
- {wikiPermission === 'rw' && -
- + {(wikiPermission === 'rw' && this.state.currentPageConfig) && +
+