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

added link back to ancestor group

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

+ 1 - 0
packages/app/resource/locales/en_US/admin/admin.json

@@ -469,6 +469,7 @@
     "group_list": "Group list",
     "child_group_list": "Child group list",
     "back_to_list": "Go back to group list",
+    "back_to_ancestor_group": "Go back to ancestor group",
     "basic_info": "Basic info",
     "user_list": "User list",
     "created_group": "Group was created",

+ 1 - 0
packages/app/resource/locales/ja_JP/admin/admin.json

@@ -468,6 +468,7 @@
     "group_list": "グループ一覧",
     "child_group_list": "子グループ一覧",
     "back_to_list": "グループ一覧に戻る",
+    "back_to_ancestor_group": "祖先グループに戻る",
     "basic_info": "基本情報",
     "user_list": "ユーザー一覧",
     "created_group": "グループを作成しました",

+ 1 - 0
packages/app/resource/locales/zh_CN/admin/admin.json

@@ -478,6 +478,7 @@
     "group_list": "组列表",
     "child_group_list": "儿童组名单",
     "back_to_list": "返回组列表",
+    "back_to_ancestor_group": "返回到祖先组",
     "basic_info": "基本信息",
     "user_list": "用户列表",
     "created_group": "已创建组",

+ 12 - 2
packages/app/src/components/Admin/UserGroupDetail/UserGroupDetailPage.tsx

@@ -21,7 +21,7 @@ import {
   IUserGroup, IUserGroupHasId,
 } from '~/interfaces/user';
 import {
-  useSWRxUserGroupPages, useSWRxUserGroupRelationList, useSWRxChildUserGroupList, useSWRxSelectableUserGroups,
+  useSWRxUserGroupPages, useSWRxUserGroupRelationList, useSWRxChildUserGroupList, useSWRxSelectableUserGroups, useSWRxAncestorUserGroup,
 } from '~/stores/user-group';
 import { useIsAclEnabled } from '~/stores/context';
 
@@ -56,6 +56,9 @@ const UserGroupDetailPage: FC = () => {
 
   const { data: selectableUserGroups, mutate: mutateSelectableUserGroups } = useSWRxSelectableUserGroups(userGroup._id);
 
+  const { data: ancestorUserGroup } = useSWRxAncestorUserGroup(userGroup._id);
+  const ancestorUserGroupId = ancestorUserGroup?._id;
+
   const { data: isAclEnabled } = useIsAclEnabled();
 
   /*
@@ -194,7 +197,14 @@ const UserGroupDetailPage: FC = () => {
         <i className="icon-fw ti-arrow-left" aria-hidden="true"></i>
         {t('admin:user_group_management.back_to_list')}
       </a>
-      {/* TODO 85062: Link to the ancestors group */}
+
+      {ancestorUserGroupId != null && (
+        <a href={`/admin/user-group-detail/${ancestorUserGroupId}`} className="btn btn-outline-secondary ml-2">
+          <i className="icon-fw ti-arrow-left" aria-hidden="true"></i>
+          {t('admin:user_group_management.back_to_ancestor_group')}
+        </a>
+      ) }
+
       <div className="mt-4 form-box">
         <UserGroupForm
           userGroup={userGroup}