diff --git a/frontend/src/components/main-side-nav-folded.js b/frontend/src/components/main-side-nav-folded.js index 6213baa507..5d9f66e4ea 100644 --- a/frontend/src/components/main-side-nav-folded.js +++ b/frontend/src/components/main-side-nav-folded.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import ModalPortal from './modal-portal'; import { Link } from '@gatsbyjs/reach-router'; import { gettext, siteRoot, canInvitePeople, enableTC, sideNavFooterCustomHtml, showWechatSupportGroup, - isDocs, isPro, isDBSqlite3, customNavItems, mediaUrl, curNoteMsg, enableShowAbout } from '../utils/constants'; + isPro, isDBSqlite3, customNavItems, mediaUrl, curNoteMsg, enableShowAbout } from '../utils/constants'; import { SIDE_PANEL_FOLDED_WIDTH, SUB_NAV_ITEM_HEIGHT } from '../constants'; import Tip from './side-nav-icon-tip'; import FilesSubNav from '../components/files-sub-nav'; @@ -110,7 +110,7 @@ class MainSideNavFolded extends React.Component { }; render() { - let showActivity = isDocs || isPro || !isDBSqlite3; + let showActivity = isPro || !isDBSqlite3; const { groupItems, isFilesSubNavShown } = this.state; return ( diff --git a/frontend/src/components/main-side-nav.js b/frontend/src/components/main-side-nav.js index 3a38f2c3b3..57aebaa852 100644 --- a/frontend/src/components/main-side-nav.js +++ b/frontend/src/components/main-side-nav.js @@ -6,7 +6,7 @@ import { gettext, siteRoot, canAddGroup, canAddRepo, canShareRepo, canGenerateShareLink, canGenerateUploadLink, canInvitePeople, enableTC, sideNavFooterCustomHtml, enableShowAbout, showWechatSupportGroup, - canViewOrg, isDocs, isPro, isDBSqlite3, customNavItems, mediaUrl + canViewOrg, isPro, isDBSqlite3, customNavItems, mediaUrl } from '../utils/constants'; import { seafileAPI } from '../utils/seafile-api'; import { Utils } from '../utils/utils'; @@ -224,7 +224,7 @@ class MainSideNav extends React.Component { }; render() { - let showActivity = isDocs || isPro || !isDBSqlite3; + let showActivity = isPro || !isDBSqlite3; const { filesNavUnfolded, groupItems } = this.state; return ( 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 b410f4878f..ba90c75833 100644 --- a/frontend/src/pages/lib-content-view/lib-content-view.js +++ b/frontend/src/pages/lib-content-view/lib-content-view.js @@ -10,7 +10,6 @@ import { navigate } from '@gatsbyjs/reach-router'; import { gettext, siteRoot, username } from '../../utils/constants'; import { seafileAPI } from '../../utils/seafile-api'; import { Utils } from '../../utils/utils'; -import collabServer from '../../utils/collab-server'; import { Dirent, FileTag, RepoTag, RepoInfo } from '../../models'; import TreeNode from '../../components/tree-view/tree-node'; import treeHelper from '../../components/tree-view/tree-helper'; @@ -254,7 +253,6 @@ class LibContentView extends React.Component { componentWillUnmount() { window.onpopstate = this.oldonpopstate; - collabServer.unwatchRepo(this.props.repoID, this.onRepoUpdateEvent); this.unsubscribeEvent(); this.unsubscribeEventBus && this.unsubscribeEventBus(); this.props.eventBus.dispatch(EVENT_BUS_TYPE.CURRENT_LIBRARY_CHANGED, { @@ -393,11 +391,6 @@ class LibContentView extends React.Component { // load data loadDirData = (path) => { - let repoID = this.props.repoID; - - // listen current repo - collabServer.watchRepo(repoID, this.onRepoUpdateEvent); - // list used FileTags this.updateUsedRepoTags(); diff --git a/frontend/src/pages/markdown-editor/header-toolbar/header-toolbar.js b/frontend/src/pages/markdown-editor/header-toolbar/header-toolbar.js index 7f23efd285..a534a7dd47 100644 --- a/frontend/src/pages/markdown-editor/header-toolbar/header-toolbar.js +++ b/frontend/src/pages/markdown-editor/header-toolbar/header-toolbar.js @@ -4,7 +4,6 @@ import { EXTERNAL_EVENTS, EventBus } from '@seafile/seafile-editor'; import { gettext, canGenerateShareLink, isPro, mediaUrl, canLockUnlockFile } from '../../../utils/constants'; import ButtonGroup from './button-group'; import ButtonItem from './button-item'; -import CollabUsersButton from './collab-users-button'; import MoreMenu from './more-menu'; import FileInfo from './file-info'; import Icon from '../../../components/icon'; @@ -16,7 +15,6 @@ import Dirent from '../../../../src/models/dirent'; import '../css/header-toolbar.css'; -const { seafileCollabServer } = window.app.config; const { canDownloadFile, repoID, filePath, isRepoAdmin } = window.app.pageOptions; const propTypes = { @@ -140,13 +138,6 @@ class HeaderToolbar extends React.Component { isStarred={this.props.fileInfo.isStarred} />
- {(seafileCollabServer && this.props.collabUsers.length > 0) && - - } {(canLockUnlockFile && !isLocked) && (
- {(seafileCollabServer && this.props.collabUsers.length > 0) && - - } {saving ?