diff --git a/frontend/src/file-history.js b/frontend/src/file-history.js
index 4374468357..a76fc4da11 100644
--- a/frontend/src/file-history.js
+++ b/frontend/src/file-history.js
@@ -1,7 +1,7 @@
import React, { Fragment } from 'react';
import ReactDOM from 'react-dom';
import axios from 'axios';
-import { siteRoot, filePath, fileName, historyRepoID } from './utils/constants';
+import { fileName, historyRepoID } from './utils/constants';
import { Utils } from './utils/utils';
import CommonToolbar from './components/toolbar/common-toolbar';
import SidePanel from './pages/file-history/side-panel';
@@ -52,8 +52,8 @@ class FileHistory extends React.Component {
seafileAPI.getFileContent(res1.data)
]).then(axios.spread((content1, content2) => {
this.setDiffContent(content1.data, content2.data);
+ }));
}));
- }));
} else {
seafileAPI.getFileRevision(historyRepoID, item.commit_id, item.path).then((res) => {
axios.all([
@@ -61,7 +61,7 @@ class FileHistory extends React.Component {
]).then(axios.spread((content1) => {
this.setDiffContent(content1.data, '');
}));
- })
+ });
}
}
diff --git a/frontend/src/pages/data-grid/utils/editor-factory.js b/frontend/src/pages/data-grid/utils/editor-factory.js
index f68ad64819..3c17d2d7fd 100644
--- a/frontend/src/pages/data-grid/utils/editor-factory.js
+++ b/frontend/src/pages/data-grid/utils/editor-factory.js
@@ -1,4 +1,4 @@
-import React from 'react'
+import React from 'react';
import { Editors } from '@seafile/react-data-grid-addons';
const EDITOR_NUMBER = 'number';
@@ -9,7 +9,7 @@ class EditorFactory {
createEditor(editorType) {
switch(editorType) {
case EDITOR_NUMBER: {
- return
+ return
;
}
case EDITOR_TEXT: {
diff --git a/frontend/src/pages/my-libs/mylib-repo-menu.js b/frontend/src/pages/my-libs/mylib-repo-menu.js
index 820530fd52..edd955544b 100644
--- a/frontend/src/pages/my-libs/mylib-repo-menu.js
+++ b/frontend/src/pages/my-libs/mylib-repo-menu.js
@@ -56,7 +56,7 @@ class MylibRepoMenu extends React.Component {
operations.push('Change Password');
}
if (showResetPasswordMenuItem) {
- operations.push('Reset Password')
+ operations.push('Reset Password');
}
if (folderPermEnabled) {
operations.push('Folder Permission');
@@ -125,7 +125,7 @@ class MylibRepoMenu extends React.Component {
})}
- )
+ );
}
// mobile menu
diff --git a/frontend/src/pages/org-admin/org-links.js b/frontend/src/pages/org-admin/org-links.js
index b6c968b146..9ecd78775b 100644
--- a/frontend/src/pages/org-admin/org-links.js
+++ b/frontend/src/pages/org-admin/org-links.js
@@ -138,6 +138,7 @@ const propTypes = {
onFreezedItem: PropTypes.func.isRequired,
onUnfreezedItem: PropTypes.func.isRequired,
deleteOrgLink: PropTypes.func.isRequired,
+ openLinkDialog: PropTypes.func.isRequired,
};
class RepoItem extends React.Component {
diff --git a/frontend/src/pages/search/advanced-search.js b/frontend/src/pages/search/advanced-search.js
index b4e331ac82..b589baf7d8 100644
--- a/frontend/src/pages/search/advanced-search.js
+++ b/frontend/src/pages/search/advanced-search.js
@@ -154,7 +154,7 @@ class AdvancedSearch extends React.Component {
className="form-control search-input"
name="query"
autoComplete="off"
- placeholder={gettext("Input file extensions here, separate with ','")}
+ placeholder={gettext('Input file extensions here, separate with \',\'')}
onChange={this.props.handlerFileTypesInput}
value={stateAndValues.input_fexts}
onKeyDown={this.props.handleKeyDown}
diff --git a/frontend/src/pages/search/main-panel.js b/frontend/src/pages/search/main-panel.js
index 662c44136c..885d278a08 100644
--- a/frontend/src/pages/search/main-panel.js
+++ b/frontend/src/pages/search/main-panel.js
@@ -1,5 +1,4 @@
import React from 'react';
-import PropTypes from 'prop-types';
import moment from 'moment';
import { gettext } from '../../utils/constants';
import { seafileAPI } from '../../utils/seafile-api';
@@ -11,7 +10,7 @@ import Loading from '../../components/loading';
import '../../css/search.css';
const _ = require('lodash');
-const { q, repo_name, search_repo, search_ftypes } = window.search.pageOptions;
+const { q, search_repo, search_ftypes } = window.search.pageOptions;
class SearchViewPanel extends React.Component {
diff --git a/frontend/src/utils/url-decorator.js b/frontend/src/utils/url-decorator.js
index cd12ff24f0..a0e74f24f3 100644
--- a/frontend/src/utils/url-decorator.js
+++ b/frontend/src/utils/url-decorator.js
@@ -1,4 +1,4 @@
-import {siteRoot, historyRepoID, fileServerRoot } from './constants';
+import { siteRoot, historyRepoID } from './constants';
import { Utils } from './utils';
class URLDecorator {
diff --git a/frontend/src/view-file-cdoc.js b/frontend/src/view-file-cdoc.js
index 39d104b22a..b691f08e1c 100644
--- a/frontend/src/view-file-cdoc.js
+++ b/frontend/src/view-file-cdoc.js
@@ -40,7 +40,7 @@ class CDOCEditor extends React.Component {
constructor(props) {
super(props);
this.collabServer = seafileCollabServer ? seafileCollabServer : null;
- this.richEditorUtils = new RichEditorUtils(editorUtilities, this)
+ this.richEditorUtils = new RichEditorUtils(editorUtilities, this);
this.state = {
value: Value.create({}),
collabUsers: userInfo ?
@@ -57,7 +57,7 @@ class CDOCEditor extends React.Component {
contentChanged: false,
showShareLinkDialog: false,
isShowHistory: false,
- }
+ };
if (this.state.collabServer) {
const socket = io(this.state.collabServer);
@@ -262,11 +262,11 @@ class CDOCEditor extends React.Component {
/>
}
- )
+ );
}
}
-const TranslatedCDOCEditor = translate('translations')(CDOCEditor)
+const TranslatedCDOCEditor = translate('translations')(CDOCEditor);
ReactDOM.render(
From e7f3ef027a51d1ce000e306464bbd5821378e655 Mon Sep 17 00:00:00 2001
From: Michael An <1822852997@qq.com>
Date: Wed, 15 May 2019 15:58:52 +0800
Subject: [PATCH 2/2] fix org page warnings
---
.../src/components/dialog/org-add-department-dialog.js | 2 ++
frontend/src/components/dialog/org-add-member-dialog.js | 1 +
frontend/src/components/dialog/org-add-repo-dialog.js | 1 +
.../components/dialog/org-delete-department-dialog.js | 1 +
.../src/components/dialog/org-delete-member-dialog.js | 1 +
frontend/src/components/dialog/org-delete-repo-dialog.js | 1 +
frontend/src/pages/org-admin/org-department-item.js | 9 +++++++++
frontend/src/pages/org-admin/org-departments-list.js | 3 +--
8 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/frontend/src/components/dialog/org-add-department-dialog.js b/frontend/src/components/dialog/org-add-department-dialog.js
index dc3a7457a8..5e111b4b83 100644
--- a/frontend/src/components/dialog/org-add-department-dialog.js
+++ b/frontend/src/components/dialog/org-add-department-dialog.js
@@ -5,6 +5,8 @@ import { gettext, orgID } from '../../utils/constants';
import { seafileAPI } from '../../utils/seafile-api';
const propTypes = {
+ groupID: PropTypes.string,
+ parentGroupID: PropTypes.string,
toggle: PropTypes.func.isRequired,
onDepartChanged: PropTypes.func.isRequired,
};
diff --git a/frontend/src/components/dialog/org-add-member-dialog.js b/frontend/src/components/dialog/org-add-member-dialog.js
index 32cc386ff6..dd83f9c2a6 100644
--- a/frontend/src/components/dialog/org-add-member-dialog.js
+++ b/frontend/src/components/dialog/org-add-member-dialog.js
@@ -7,6 +7,7 @@ import UserSelect from '../user-select.js';
const propTypes = {
toggle: PropTypes.func.isRequired,
+ groupID: PropTypes.string.isRequired,
onMemberChanged: PropTypes.func.isRequired
};
diff --git a/frontend/src/components/dialog/org-add-repo-dialog.js b/frontend/src/components/dialog/org-add-repo-dialog.js
index 07eb3999ce..505b1e4ff5 100644
--- a/frontend/src/components/dialog/org-add-repo-dialog.js
+++ b/frontend/src/components/dialog/org-add-repo-dialog.js
@@ -6,6 +6,7 @@ import { seafileAPI } from '../../utils/seafile-api';
const propTypes = {
toggle: PropTypes.func.isRequired,
+ groupID: PropTypes.string.isRequired,
onRepoChanged: PropTypes.func.isRequired,
};
diff --git a/frontend/src/components/dialog/org-delete-department-dialog.js b/frontend/src/components/dialog/org-delete-department-dialog.js
index d2e19cfbf7..5fc967c18b 100644
--- a/frontend/src/components/dialog/org-delete-department-dialog.js
+++ b/frontend/src/components/dialog/org-delete-department-dialog.js
@@ -7,6 +7,7 @@ import { Utils } from '../../utils/utils';
const propTypes = {
groupName: PropTypes.string,
+ groupID: PropTypes.number.isRequired,
toggle: PropTypes.func.isRequired,
onDepartChanged: PropTypes.func.isRequired
};
diff --git a/frontend/src/components/dialog/org-delete-member-dialog.js b/frontend/src/components/dialog/org-delete-member-dialog.js
index b5e02dd7b3..ec9a3cdb80 100644
--- a/frontend/src/components/dialog/org-delete-member-dialog.js
+++ b/frontend/src/components/dialog/org-delete-member-dialog.js
@@ -7,6 +7,7 @@ import { Utils } from '../../utils/utils';
const propTypes = {
member: PropTypes.object.isRequired,
+ groupID: PropTypes.string.isRequired,
toggle: PropTypes.func.isRequired,
onMemberChanged: PropTypes.func.isRequired
};
diff --git a/frontend/src/components/dialog/org-delete-repo-dialog.js b/frontend/src/components/dialog/org-delete-repo-dialog.js
index 7dc0d45364..0e792a6724 100644
--- a/frontend/src/components/dialog/org-delete-repo-dialog.js
+++ b/frontend/src/components/dialog/org-delete-repo-dialog.js
@@ -41,6 +41,7 @@ class DeleteRepoDialog extends React.Component {
const propTypes = {
repo: PropTypes.object.isRequired,
toggle: PropTypes.func.isRequired,
+ groupID: PropTypes.string.isRequired,
onRepoChanged: PropTypes.func.isRequired
};
diff --git a/frontend/src/pages/org-admin/org-department-item.js b/frontend/src/pages/org-admin/org-department-item.js
index 3859482e1a..22d1b20ac4 100644
--- a/frontend/src/pages/org-admin/org-department-item.js
+++ b/frontend/src/pages/org-admin/org-department-item.js
@@ -420,6 +420,7 @@ class MemberItem extends React.Component {
}
const MemberItemPropTypes = {
+ groupID: PropTypes.string.isRequired,
member: PropTypes.object.isRequired,
isItemFreezed: PropTypes.bool.isRequired,
onMemberChanged: PropTypes.func.isRequired,
@@ -509,6 +510,7 @@ class GroupItem extends React.Component {
const GroupItemPropTypes = {
group: PropTypes.object.isRequired,
+ groupID: PropTypes.string,
showSetGroupQuotaDialog: PropTypes.func.isRequired,
showDeleteDepartDialog: PropTypes.func.isRequired,
isSubdepartChanged: PropTypes.bool,
@@ -516,4 +518,11 @@ const GroupItemPropTypes = {
GroupItem.propTypes = GroupItemPropTypes;
+
+const OrgDepartmentItemPropTypes = {
+ groupID: PropTypes.string,
+};
+
+OrgDepartmentItem.propTypes = OrgDepartmentItemPropTypes;
+
export default OrgDepartmentItem;
\ No newline at end of file
diff --git a/frontend/src/pages/org-admin/org-departments-list.js b/frontend/src/pages/org-admin/org-departments-list.js
index 26aaa69c20..06996bd97d 100644
--- a/frontend/src/pages/org-admin/org-departments-list.js
+++ b/frontend/src/pages/org-admin/org-departments-list.js
@@ -20,7 +20,7 @@ class OrgDepartmentsList extends React.Component {
super(props);
this.state = {
groups: null,
- groupID: -1,
+ groupID: '',
groupName: '',
showDeleteDepartDialog: false,
showSetGroupQuotaDialog: false,
@@ -71,7 +71,6 @@ class OrgDepartmentsList extends React.Component {