WNomunomu 2 лет назад
Родитель
Сommit
95a85e4873
1 измененных файлов с 5 добавлено и 7 удалено
  1. 5 7
      apps/app/src/components/Admin/UserGroup/UserGroupForm.tsx

+ 5 - 7
apps/app/src/components/Admin/UserGroup/UserGroupForm.tsx

@@ -7,7 +7,7 @@ import { IUserGroupHasId } from '~/interfaces/user';
 
 
 type Props = {
 type Props = {
   userGroup: IUserGroupHasId,
   userGroup: IUserGroupHasId,
-  parentUserGroup: IUserGroupHasId | undefined,
+  parentUserGroup?: IUserGroupHasId,
   selectableParentUserGroups?: IUserGroupHasId[],
   selectableParentUserGroups?: IUserGroupHasId[],
   submitButtonLabel: string;
   submitButtonLabel: string;
   onSubmit?: (targetGroup: IUserGroupHasId, userGroupData: Partial<IUserGroupHasId>) => Promise<void> | void
   onSubmit?: (targetGroup: IUserGroupHasId, userGroupData: Partial<IUserGroupHasId>) => Promise<void> | void
@@ -43,9 +43,7 @@ export const UserGroupForm: FC<Props> = (props: Props) => {
     }
     }
   }, [selectedParent, setSelectedParent]);
   }, [selectedParent, setSelectedParent]);
 
 
-  const nullAndEmptyArrayChecks = (userGroups: IUserGroupHasId[] | undefined) => {
-    return userGroups != null && userGroups.length > 0;
-  };
+  const isSelectableParentUserGroups = selectableParentUserGroups != null && selectableParentUserGroups.length > 0;
 
 
   return (
   return (
     <form onSubmit={(e) => {
     <form onSubmit={(e) => {
@@ -106,17 +104,17 @@ export const UserGroupForm: FC<Props> = (props: Props) => {
               id="dropdownMenuButton"
               id="dropdownMenuButton"
               data-toggle="dropdown"
               data-toggle="dropdown"
               className={`
               className={`
-                btn btn-outline-secondary dropdown-toggle mb-3 ${nullAndEmptyArrayChecks(selectableParentUserGroups) ? '' : 'disabled'}
+                btn btn-outline-secondary dropdown-toggle mb-3 ${isSelectableParentUserGroups ? '' : 'disabled'}
               `}
               `}
             >
             >
               {selectedParent?.name ?? t('user_group_management.select_parent_group')}
               {selectedParent?.name ?? t('user_group_management.select_parent_group')}
             </button>
             </button>
             <div className="dropdown-menu" aria-labelledby="dropdownMenuButton">
             <div className="dropdown-menu" aria-labelledby="dropdownMenuButton">
               {
               {
-                (nullAndEmptyArrayChecks(selectableParentUserGroups)) && (
+                (isSelectableParentUserGroups) && (
                   <>
                   <>
                     {
                     {
-                      selectableParentUserGroups?.map(userGroup => (
+                      selectableParentUserGroups.map(userGroup => (
                         <button
                         <button
                           key={userGroup._id}
                           key={userGroup._id}
                           type="button"
                           type="button"