Просмотр исходного кода

close UserGroupUserModal after adding user

kaori 3 лет назад
Родитель
Сommit
f254aeedd3

+ 1 - 0
packages/app/src/components/Admin/UserGroupDetail/UserGroupDetailPage.tsx

@@ -175,6 +175,7 @@ const UserGroupDetailPage = (props: Props): JSX.Element => {
 
   const addUserByUsername = useCallback(async(username: string) => {
     await apiv3Post(`/user-groups/${currentUserGroupId}/users/${username}`);
+    setIsUserGroupUserModalShown(false);
     mutateUserGroupRelations();
   }, [currentUserGroupId, mutateUserGroupRelations]);
 

+ 1 - 4
packages/app/src/components/Admin/UserGroupDetail/UserGroupUserFormByInput.jsx

@@ -38,15 +38,13 @@ class UserGroupUserFormByInput extends React.Component {
   }
 
   async addUserBySubmit() {
-    const { userGroup, adminUserGroupDetailContainer, onClickAddUserBtn } = this.props;
+    const { userGroup, onClickAddUserBtn } = this.props;
 
     if (this.state.inputUser.length === 0) { return }
     const userName = this.state.inputUser[0].username;
 
     try {
       await onClickAddUserBtn(userName);
-      // await adminUserGroupDetailContainer.init();
-      await adminUserGroupDetailContainer.closeUserGroupUserModal();
       toastSuccess(`Added "${this.xss.process(userName)}" to "${this.xss.process(userGroup.name)}"`);
       this.setState({ inputUser: '' });
     }
@@ -69,7 +67,6 @@ class UserGroupUserFormByInput extends React.Component {
       this.setState({ applicableUsers: users, isLoading: false });
     }
     catch (err) {
-      console.log('searhApplicableUsers_err', err);
       toastError(err);
     }
   }

+ 6 - 3
packages/app/src/components/Admin/UserGroupDetail/UserGroupUserModal.tsx

@@ -5,7 +5,6 @@ import {
   Modal, ModalHeader, ModalBody,
 } from 'reactstrap';
 
-import AdminUserGroupDetailContainer from '~/client/services/AdminUserGroupDetailContainer';
 import { IUserGroupHasId } from '~/interfaces/user';
 import { SearchTypes, SearchType } from '~/interfaces/user-group';
 
@@ -15,7 +14,6 @@ import UserGroupUserFormByInput from './UserGroupUserFormByInput';
 
 type Props = {
   isOpen: boolean,
-  adminUserGroupDetailContainer: AdminUserGroupDetailContainer,
   userGroup: IUserGroupHasId,
   searchType: SearchType,
   isAlsoMailSearched: boolean,
@@ -52,7 +50,12 @@ export const UserGroupUserModal = (props: Props): JSX.Element => {
       <ModalBody>
         <p className="card well">{t('admin:user_group_management.add_modal.description')}</p>
         <div className="p-3">
-          <UserGroupUserFormByInput userGroup={userGroup} onClickAddUserBtn={onClickAddUserBtn} onSearchApplicableUsers={onSearchApplicableUsers} />
+          <UserGroupUserFormByInput
+            userGroup={userGroup}
+            onClickAddUserBtn={onClickAddUserBtn}
+            onSearchApplicableUsers={onSearchApplicableUsers}
+            onClose={onClose}
+          />
         </div>
         <h2 className="border-bottom">{t('admin:user_group_management.add_modal.search_option')}</h2>
         <div className="row mt-4">