Shun Miyazawa 4 лет назад
Родитель
Сommit
55dabfdc36

+ 3 - 3
packages/app/src/components/Admin/UserGroup/UserGroupModal.tsx

@@ -25,7 +25,7 @@ const UserGroupModal: FC<Props> = (props: Props) => {
   const { t } = useTranslation();
   const { t } = useTranslation();
 
 
   const {
   const {
-    userGroup, submitButtonLabel, onSubmit, isShow,
+    userGroup, submitButtonLabel, onSubmit, isShow, onHide,
   } = props;
   } = props;
 
 
   /*
   /*
@@ -58,8 +58,8 @@ const UserGroupModal: FC<Props> = (props: Props) => {
 
 
 
 
   return (
   return (
-    <Modal className="modal-md" isOpen={isShow}>
-      <ModalHeader tag="h4" className="bg-danger text-light">
+    <Modal className="modal-md" isOpen={isShow} toggle={onHide}>
+      <ModalHeader tag="h4" toggle={onHide} className="bg-danger text-light">
         Create user groups
         Create user groups
       </ModalHeader>
       </ModalHeader>
 
 

+ 5 - 0
packages/app/src/components/Admin/UserGroup/UserGroupPage.tsx

@@ -54,6 +54,10 @@ const UserGroupPage: FC<Props> = (props: Props) => {
     setCreateModalShown(true);
     setCreateModalShown(true);
   }, [setCreateModalShown]);
   }, [setCreateModalShown]);
 
 
+  const hideCreateModal = useCallback(() => {
+    setCreateModalShown(false);
+  }, [setCreateModalShown]);
+
   const syncUserGroupAndRelations = useCallback(async() => {
   const syncUserGroupAndRelations = useCallback(async() => {
     try {
     try {
       await mutateUserGroups();
       await mutateUserGroups();
@@ -132,6 +136,7 @@ const UserGroupPage: FC<Props> = (props: Props) => {
         submitButtonLabel={t('Create')}
         submitButtonLabel={t('Create')}
         onSubmit={createUserGroup}
         onSubmit={createUserGroup}
         isShow={isCreateModalShown}
         isShow={isCreateModalShown}
+        onHide={hideCreateModal}
       />
       />
       <>
       <>
         <UserGroupTable
         <UserGroupTable