From e4fde3d7a86eedb2e31468c5b4b7dc24f99728b4 Mon Sep 17 00:00:00 2001 From: Michael An <1822852997@qq.com> Date: Tue, 4 Jun 2019 17:59:54 +0800 Subject: [PATCH] fix warnings --- frontend/src/components/common/notice-item.js | 2 +- .../src/components/context-menu/actions.js | 2 +- .../dialog/change-repo-password-dialog.js | 38 +++++++++---------- .../components/file-chooser/repo-list-item.js | 2 +- .../components/file-chooser/tree-list-item.js | 24 ++++++------ frontend/src/components/main-side-nav.js | 2 +- .../src/components/wiki-markdown-viewer.js | 2 +- frontend/src/pages/data-grid/app-main.js | 2 +- frontend/src/pages/groups/group-view.js | 4 +- .../src/pages/my-libs/mylib-repo-list-item.js | 4 +- frontend/src/pages/share-admin/share-links.js | 6 +-- frontend/src/pages/shared-libs/shared-libs.js | 6 +-- frontend/src/pages/sys-admin/index.js | 4 +- .../sys-admin/work-weixin-departments.js | 4 +- .../work-weixin-department-members-list.js | 2 +- .../work-weixin-departments-tree-node.js | 2 +- 16 files changed, 53 insertions(+), 53 deletions(-) diff --git a/frontend/src/components/common/notice-item.js b/frontend/src/components/common/notice-item.js index 75afcec786..0722840990 100644 --- a/frontend/src/components/common/notice-item.js +++ b/frontend/src/components/common/notice-item.js @@ -210,7 +210,7 @@ class NoticeItem extends React.Component {
  • - +

    {moment(noticeItem.time).fromNow()}

    diff --git a/frontend/src/components/context-menu/actions.js b/frontend/src/components/context-menu/actions.js index 19ed703abe..4fbca00514 100644 --- a/frontend/src/components/context-menu/actions.js +++ b/frontend/src/components/context-menu/actions.js @@ -7,7 +7,7 @@ export const MENU_HIDE = 'REACT_CONTEXTMENU_HIDE'; export function dispatchGlobalEvent(eventName, opts, target = window) { - // Compatibale with IE + // Compatibale with IE // @see http://stackoverflow.com/questions/26596123/internet-explorer-9-10-11-event-constructor-doesnt-work let event; diff --git a/frontend/src/components/dialog/change-repo-password-dialog.js b/frontend/src/components/dialog/change-repo-password-dialog.js index 6284452924..4f1b946a29 100644 --- a/frontend/src/components/dialog/change-repo-password-dialog.js +++ b/frontend/src/components/dialog/change-repo-password-dialog.js @@ -1,4 +1,4 @@ -import React, { Fragment } from 'react'; +import React from 'react'; import PropTypes from 'prop-types'; import { Modal, ModalHeader, ModalBody, ModalFooter, Alert } from 'reactstrap'; import { gettext, repoPasswordMinLength } from '../../utils/constants'; @@ -79,30 +79,30 @@ class ChangeRepoPasswordDialog extends React.Component { submitBtnDisabled: true }); seafileAPI.changeEncryptedRepoPassword(this.props.repoID, oldPassword, newPassword) - .then(() => { - this.props.toggleDialog(); - toaster.success(gettext('Successfully changed library password.')); - }).catch((error) => { - let errorMsg = ''; - if (error.response) { - if (error.response.data) { + .then(() => { + this.props.toggleDialog(); + toaster.success(gettext('Successfully changed library password.')); + }).catch((error) => { + let errorMsg = ''; + if (error.response) { + if (error.response.data) { errorMsg = error.response.data.error_msg; - } else { + } else { errorMsg = gettext('Error'); - } - } else { + } + } else { errorMsg = gettext('Please check the network.'); - } - this.setState({ - errorMsg: errorMsg, - submitBtnDisabled: false - }); - }); + } + this.setState({ + errorMsg: errorMsg, + submitBtnDisabled: false + }); + }); } render() { - const { repoID, repoName, toggleDialog } = this.props; + const { repoName, toggleDialog } = this.props; return ( @@ -121,7 +121,7 @@ class ChangeRepoPasswordDialog extends React.Component { - + ); diff --git a/frontend/src/components/file-chooser/repo-list-item.js b/frontend/src/components/file-chooser/repo-list-item.js index bd9fa2f1cb..8b00924cea 100644 --- a/frontend/src/components/file-chooser/repo-list-item.js +++ b/frontend/src/components/file-chooser/repo-list-item.js @@ -162,7 +162,7 @@ class RepoListItem extends React.Component {
    - + {this.state.isShowChildren && (
    -
    - {node.object && node.object.name} +
    + {node.object && node.object.name} +
    +
    + { + node.object.type !== 'file' && + + } + + + +
    -
    - { - node.object.type !== 'file' && - - } - - - -
    -
    {node.isExpanded && this.renderChildren()} diff --git a/frontend/src/components/main-side-nav.js b/frontend/src/components/main-side-nav.js index 1c6cd0ac78..d2843e2ccd 100644 --- a/frontend/src/components/main-side-nav.js +++ b/frontend/src/components/main-side-nav.js @@ -224,7 +224,7 @@ class MainSideNav extends React.Component {
    • {canInvitePeople && -
  • +
  • this.tabItemClick('invitations')}> {gettext('Invite People')} diff --git a/frontend/src/components/wiki-markdown-viewer.js b/frontend/src/components/wiki-markdown-viewer.js index a6cc0c4103..1dfca1aa27 100644 --- a/frontend/src/components/wiki-markdown-viewer.js +++ b/frontend/src/components/wiki-markdown-viewer.js @@ -235,7 +235,7 @@ class WikiMarkdownViewer extends React.Component { return ; } // In dir-column-file repoID is one of props, width is 100%; In wiki-viewer repoID is not props, width isn't 100% - let contentClassName = `${this.props.repoID ? contentClass + ' w-100' : contentClass}` + let contentClassName = `${this.props.repoID ? contentClass + ' w-100' : contentClass}`; return (
    diff --git a/frontend/src/pages/data-grid/app-main.js b/frontend/src/pages/data-grid/app-main.js index 18c02a54e4..1510ddedf5 100644 --- a/frontend/src/pages/data-grid/app-main.js +++ b/frontend/src/pages/data-grid/app-main.js @@ -23,7 +23,7 @@ const DEFAULT_DATA = { } ], rows: [{name: 'name_' + 0}] -} +}; class AppMain extends React.Component { diff --git a/frontend/src/pages/groups/group-view.js b/frontend/src/pages/groups/group-view.js index 45bfa67b69..bd317d342f 100644 --- a/frontend/src/pages/groups/group-view.js +++ b/frontend/src/pages/groups/group-view.js @@ -221,11 +221,11 @@ class GroupView extends React.Component { }); this.setState({repoList: repoList}); let name = repo.repo_name; - var msg = gettext("Successfully deleted {name}.").replace('{name}', name); + var msg = gettext('Successfully deleted {name}.').replace('{name}', name); toaster.success(msg); }).catch(() => { let name = repo.repo_name; - var msg = gettext("Failed to delete {name}.").replace('{name}', name); + var msg = gettext('Failed to delete {name}.').replace('{name}', name); toaster.danger(msg); }); } diff --git a/frontend/src/pages/my-libs/mylib-repo-list-item.js b/frontend/src/pages/my-libs/mylib-repo-list-item.js index 7f0b5032de..d26ecc26ca 100644 --- a/frontend/src/pages/my-libs/mylib-repo-list-item.js +++ b/frontend/src/pages/my-libs/mylib-repo-list-item.js @@ -196,11 +196,11 @@ class MylibRepoListItem extends React.Component { seafileAPI.deleteRepo(repo.repo_id).then((res) => { this.props.onDeleteRepo(repo); let name = repo.repo_name; - var msg = gettext("Successfully deleted {name}.").replace('{name}', name); + var msg = gettext('Successfully deleted {name}.').replace('{name}', name); toaster.success(msg); }).catch(() => { let name = repo.repo_name; - var msg = gettext("Failed to delete {name}.").replace('{name}', name); + var msg = gettext('Failed to delete {name}.').replace('{name}', name); toaster.danger(msg); }); } diff --git a/frontend/src/pages/share-admin/share-links.js b/frontend/src/pages/share-admin/share-links.js index 99dba98931..30db270162 100644 --- a/frontend/src/pages/share-admin/share-links.js +++ b/frontend/src/pages/share-admin/share-links.js @@ -26,7 +26,7 @@ class Content extends Component { this.props.sortItems(sortBy, sortOrder); } - constructor(props) { + constructor(props) { super(props); this.state = { modalOpen: false, @@ -120,7 +120,7 @@ class Item extends Component { constructor(props) { super(props); - let item = this.props.item + let item = this.props.item; this.state = { currentPermission: item.permissions.can_download ? 'Preview and download' : 'Preview only', showOpIcon: false, @@ -209,7 +209,7 @@ class Item extends Component { let deleteIconClassName = 'sf2-icon-delete action-icon' + iconVisibility; return ( - + {item.is_dir ? {item.obj_name} : diff --git a/frontend/src/pages/shared-libs/shared-libs.js b/frontend/src/pages/shared-libs/shared-libs.js index aebda087f5..1343a18d43 100644 --- a/frontend/src/pages/shared-libs/shared-libs.js +++ b/frontend/src/pages/shared-libs/shared-libs.js @@ -179,7 +179,7 @@ class Item extends Component { }); // TODO: show feedback msg }).catch((error) => { - // TODO: show feedback msg + // TODO: show feedback msg }); } @@ -195,7 +195,7 @@ class Item extends Component { } else { seafileAPI.starItem(this.props.data.repo_id, '/').then(() => { this.setState({isStarred: !this.state.isStarred}); - }) + }); } } @@ -265,7 +265,7 @@ class Item extends Component { {(isPro && data.is_admin) && } - + {this.state.isShowSharedDialog && ( diff --git a/frontend/src/pages/sys-admin/index.js b/frontend/src/pages/sys-admin/index.js index 5b0263de7e..49bfe21a91 100644 --- a/frontend/src/pages/sys-admin/index.js +++ b/frontend/src/pages/sys-admin/index.js @@ -1,11 +1,11 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { Router } from '@reach/router'; -import { siteRoot, gettext } from '../../utils/constants'; +import { siteRoot } from '../../utils/constants'; import SidePanel from './side-panel'; import MainPanel from './main-panel'; import FileScanRecords from './file-scan-records'; -import WorkWeixinDepartments from './work-weixin-departments' +import WorkWeixinDepartments from './work-weixin-departments'; import '../../assets/css/fa-solid.css'; import '../../assets/css/fa-regular.css'; diff --git a/frontend/src/pages/sys-admin/work-weixin-departments.js b/frontend/src/pages/sys-admin/work-weixin-departments.js index b313a96108..d7383023b9 100644 --- a/frontend/src/pages/sys-admin/work-weixin-departments.js +++ b/frontend/src/pages/sys-admin/work-weixin-departments.js @@ -231,8 +231,8 @@ class WorkWeixinDepartments extends Component {
    - - + +
    diff --git a/frontend/src/pages/sys-admin/work-weixin/work-weixin-department-members-list.js b/frontend/src/pages/sys-admin/work-weixin/work-weixin-department-members-list.js index 9999583a22..afefbdc030 100644 --- a/frontend/src/pages/sys-admin/work-weixin/work-weixin-department-members-list.js +++ b/frontend/src/pages/sys-admin/work-weixin/work-weixin-department-members-list.js @@ -70,7 +70,7 @@ class WorkWeixinDepartmentMembersList extends Component { } {!isMembersListLoading && this.props.membersList.length === 0 &&
    - +

    {'成员列表为空'}

    } diff --git a/frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js b/frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js index 5ebeecb2a7..1d54a8c3b4 100644 --- a/frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js +++ b/frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js @@ -55,7 +55,7 @@ class WorkWeixinDepartmentsTreeNode extends Component { let toggleClass = classNames({ 'folder-toggle-icon fa fa-caret-down': department.children && this.state.isChildrenShow, 'folder-toggle-icon fa fa-caret-right': department.children && !this.state.isChildrenShow, - }) + }); let nodeInnerClass = classNames({ 'tree-node-inner': true, 'tree-node-hight-light': checkedDepartmentId === department.id