haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-23 20:37:42 +00:00
Code Issues Releases Wiki Activity

refactor manage group member dialog (#8104)

Browse Source
This commit is contained in:
Michael An
2025-08-04 14:52:46 +08:00
committed by GitHub
parent a0db12b244
commit a69bc27c77
3 changed files with 67 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
frontend/src/components/dialog/manage-members-dialog.js
View File

@@ -1,39 +0,0 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Modal, ModalBody } from 'reactstrap';
import { gettext } from '../../utils/constants';
import ListAndAddGroupMembers from '../list-and-add-group-members';
import SeahubModalHeader from '@/components/common/seahub-modal-header';
import '../../css/manage-members-dialog.css';
const propTypes = {
groupID: PropTypes.number.isRequired,
isOwner: PropTypes.bool.isRequired,
toggleManageMembersDialog: PropTypes.func,
toggleDepartmentDetailDialog: PropTypes.func,
};
class ManageMembersDialog extends React.Component {
render() {
const { groupID, isOwner } = this.props;
return (
<Modal isOpen={true} toggle={this.props.toggleManageMembersDialog} className="group-manage-members-dialog">
<SeahubModalHeader toggle={this.props.toggleManageMembersDialog}>{gettext('Manage group members')}</SeahubModalHeader>
<ModalBody className="pb-0">
<ListAndAddGroupMembers
groupID={groupID}
isOwner={isOwner}
toggleManageMembersDialog={this.props.toggleManageMembersDialog}
toggleDepartmentDetailDialog={this.props.toggleDepartmentDetailDialog}
/>
</ModalBody>
</Modal>
);
}
}
ManageMembersDialog.propTypes = propTypes;
export default ManageMembersDialog;

24
frontend/src/components/list-and-add-group-members.js → frontend/src/components/manage-members-dialog.js
View File

@@ -1,6 +1,7 @@
import React, { Fragment } from 'react';
import PropTypes from 'prop-types';
import { Button, InputGroup, InputGroupText, Input } from 'reactstrap';
import { Button, InputGroup, InputGroupText, Input, Modal, ModalBody } from 'reactstrap';
import SeahubModalHeader from '@/components/common/seahub-modal-header';
import { Utils } from '../utils/utils';
import { gettext } from '../utils/constants';
import { seafileAPI } from '../utils/seafile-api';
@@ -11,6 +12,8 @@ import GroupMembers from './group-members';
import SelectUsersIcon from './select-members-to-share-with';
import { eventBus } from './common/event-bus';
import '../css/manage-members-dialog.css';
const propTypes = {
toggleManageMembersDialog: PropTypes.func,
toggleDepartmentDetailDialog: PropTypes.func,
@@ -166,12 +169,13 @@ class ManageMembersDialog extends React.Component {
render() {
const {
isLoading, hasNextPage, groupMembers,
keyword, membersFound,
searchActive
keyword, membersFound, errMessage, searchActive
} = this.state;
return (
<Fragment>
<Modal isOpen={true} toggle={this.props.toggleManageMembersDialog} className="group-manage-members-dialog">
<SeahubModalHeader toggle={this.props.toggleManageMembersDialog}>{gettext('Manage group members')}</SeahubModalHeader>
<ModalBody className="pb-0">
<p className="mb-2">{gettext('Add group member')}</p>
<div className='add-members'>
<div className="position-relative">
@@ -189,13 +193,8 @@ class ManageMembersDialog extends React.Component {
<Button color="primary" disabled>{gettext('Submit')}</Button>
}
</div>
{
this.state.errMessage.length > 0 &&
this.state.errMessage.map((item, index = 0) => {
return (
<div className="group-error error" key={index}>{item.error_msg}</div>
);
})
{errMessage.length > 0 &&
errMessage.map((item, index = 0) => <div className="group-error error" key={index}>{item.error_msg}</div>)
}
{groupMembers.length > 10 &&
<InputGroup className={`search-group-members rounded ${searchActive ? 'active' : ''}`}>
@@ -234,7 +233,8 @@ class ManageMembersDialog extends React.Component {
</Fragment>
)}
</div>
</Fragment>
</ModalBody>
</Modal>
);
}
}

2
frontend/src/pages/groups/group-op-menu.js
View File

@@ -11,7 +11,7 @@ import DismissGroupDialog from '../../components/dialog/dismiss-group-dialog';
import RenameGroupDialog from '../../components/dialog/rename-group-dialog';
import TransferGroupDialog from '../../components/dialog/transfer-group-dialog';
import ImportMembersDialog from '../../components/dialog/import-members-dialog';
import ManageMembersDialog from '../../components/dialog/manage-members-dialog';
import ManageMembersDialog from '../../components/manage-members-dialog';
import DepartmentDetailDialog from '../../components/dialog/department-detail-dialog';
import LeaveGroupDialog from '../../components/dialog/leave-group-dialog';
import SingleDropdownToolbar from '../../components/toolbar/single-dropdown-toolbar';