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

check null of the value obtained by SWR

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

+ 23 - 22
packages/app/src/components/Admin/UserGroupDetail/UserGroupDetailPage.tsx

@@ -44,13 +44,16 @@ const UserGroupDetailPage: FC = () => {
    * Fetch
    */
   const { data: userGroupPages } = useSWRxUserGroupPages(userGroup._id, 10, 0);
-  const { data: userGroupRelations, mutate: mutateUserGroupRelations } = useSWRxUserGroupRelations(userGroup._id);
-  const { data: childUserGroupsList, mutate: mutateChildUserGroups } = useSWRxChildUserGroupList([userGroup._id], true);
-  const { data: selectableUserGroups, mutate: mutateSelectableUserGroups } = useSWRxSelectableUserGroups(userGroup._id);
 
+  const { data: userGroupRelationList, mutate: mutateUserGroupRelations } = useSWRxUserGroupRelations(userGroup._id);
+  const userGroupRelations = userGroupRelationList != null ? userGroupRelationList : [];
+
+  const { data: childUserGroupsList, mutate: mutateChildUserGroups } = useSWRxChildUserGroupList([userGroup._id], true);
   const childUserGroups = childUserGroupsList != null ? childUserGroupsList.childUserGroups : [];
   const grandChildUserGroups = childUserGroupsList != null ? childUserGroupsList.grandChildUserGroups : [];
 
+  const { data: selectableUserGroups, mutate: mutateSelectableUserGroups } = useSWRxSelectableUserGroups(userGroup._id);
+
   /*
    * Function
    */
@@ -195,25 +198,23 @@ const UserGroupDetailPage: FC = () => {
         onClickCreateUserGroupButtonHandler={() => onClickCreateChildGroupButtonHandler()}
       />
 
-      { userGroupRelations && (
-        <>
-          <UserGroupTable
-            userGroups={childUserGroups}
-            childUserGroups={grandChildUserGroups}
-            isAclEnabled
-            onDelete={showDeleteModal}
-            userGroupRelations={userGroupRelations}
-          />
-          <UserGroupDeleteModal
-            userGroups={childUserGroups}
-            deleteUserGroup={selectedUserGroup}
-            onDelete={deleteUserGroupById}
-            isShow={isDeleteModalShown}
-            onShow={showDeleteModal}
-            onHide={hideDeleteModal}
-          />
-        </>
-      )}
+      <>
+        <UserGroupTable
+          userGroups={childUserGroups}
+          childUserGroups={grandChildUserGroups}
+          isAclEnabled
+          onDelete={showDeleteModal}
+          userGroupRelations={userGroupRelations}
+        />
+        <UserGroupDeleteModal
+          userGroups={childUserGroups}
+          deleteUserGroup={selectedUserGroup}
+          onDelete={deleteUserGroupById}
+          isShow={isDeleteModalShown}
+          onShow={showDeleteModal}
+          onHide={hideDeleteModal}
+        />
+      </>
 
       <h2 className="admin-setting-header mt-4">{t('Page')}</h2>
       <div className="page-list">