From c9555766155bf92504bd4901661c746c0c7f46bb Mon Sep 17 00:00:00 2001 From: kazuto Date: Wed, 29 May 2024 07:42:10 +0000 Subject: [PATCH 01/32] edit-icon-add --- .../components/Admin/UserGroup/UserGroupTable.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 9c5006ba8bc..cd859bf620d 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -71,6 +71,8 @@ export const UserGroupTable: FC = ({ /* * State */ + const onMouseEnterHandler = () => setIsHovered(true); + const onMouseLeaveHandler = () => setIsHovered(false); const [groupIdToUsersMap, setGroupIdToUsersMap] = useState(generateGroupIdToUsersMap(userGroupRelations)); const [groupIdToChildGroupsMap, setGroupIdToChildGroupsMap] = useState(generateGroupIdToChildGroupsMap(childUserGroups)); @@ -136,7 +138,7 @@ export const UserGroupTable: FC = ({ setGroupIdToUsersMap(generateGroupIdToUsersMap(userGroupRelations)); setGroupIdToChildGroupsMap(generateGroupIdToChildGroupsMap(childUserGroups)); }, [userGroupRelations, childUserGroups]); - + const [isHovered, setIsHovered] = useState(false); return (

{headerLabel}

@@ -168,6 +170,14 @@ export const UserGroupTable: FC = ({ href={`/admin/user-group-detail/${group._id}?isExternalGroup=${isExternalGroup}`} > {group.name} + ) From 63f0905e2efaf70ba7294eb19d44c1eef96dc8af Mon Sep 17 00:00:00 2001 From: kazuto Date: Fri, 31 May 2024 09:28:33 +0000 Subject: [PATCH 02/32] undar-line-add --- apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index cd859bf620d..893ffe62bba 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -165,8 +165,9 @@ export const UserGroupTable: FC = ({ {isAclEnabled ? ( + group {group.name} @@ -175,7 +176,7 @@ export const UserGroupTable: FC = ({ type="button" onMouseEnter={onMouseEnterHandler} onMouseLeave={onMouseLeaveHandler} - > {(isHovered) && (edit + > {(isHovered) && (edit )} From 7b11933da09fa95c834843bf263ab553873d1bd8 Mon Sep 17 00:00:00 2001 From: kazuto Date: Mon, 3 Jun 2024 06:42:01 +0000 Subject: [PATCH 03/32] mt-add --- apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 893ffe62bba..ac1f22a88c2 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -165,9 +165,9 @@ export const UserGroupTable: FC = ({ {isAclEnabled ? ( - group + group {group.name} From a3cfa091de94e075e0f6ec7763359603bc535dcd Mon Sep 17 00:00:00 2001 From: kazuto Date: Mon, 3 Jun 2024 08:16:54 +0000 Subject: [PATCH 04/32] mt-delete --- apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index ac1f22a88c2..116c4ea33c0 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -167,7 +167,7 @@ export const UserGroupTable: FC = ({ group {group.name} @@ -176,7 +176,7 @@ export const UserGroupTable: FC = ({ type="button" onMouseEnter={onMouseEnterHandler} onMouseLeave={onMouseLeaveHandler} - > {(isHovered) && (edit + > {(isHovered) && (edit )} From e645f7db0199622d89b706d4c951482fd3616833 Mon Sep 17 00:00:00 2001 From: kazuto Date: Mon, 3 Jun 2024 08:18:16 +0000 Subject: [PATCH 05/32] .gap-delete --- apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 116c4ea33c0..6a1ee9cc4aa 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -167,7 +167,7 @@ export const UserGroupTable: FC = ({ group {group.name} From f910cb2b930f8980593377d9d864a652562166e2 Mon Sep 17 00:00:00 2001 From: kazuto Date: Wed, 5 Jun 2024 07:12:51 +0000 Subject: [PATCH 06/32] py-0-add-fs-delete --- apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 6a1ee9cc4aa..954a6383860 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -165,18 +165,18 @@ export const UserGroupTable: FC = ({ {isAclEnabled ? ( - group + group {group.name} From e092a5a84a545470fe5e0ca0fd57b192607a7743 Mon Sep 17 00:00:00 2001 From: kazuto Date: Mon, 10 Jun 2024 07:53:34 +0000 Subject: [PATCH 07/32] hover-add --- .../components/Admin/UserGroup/UserGroupTable.tsx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 954a6383860..8dfa44bdefb 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -71,8 +71,6 @@ export const UserGroupTable: FC = ({ /* * State */ - const onMouseEnterHandler = () => setIsHovered(true); - const onMouseLeaveHandler = () => setIsHovered(false); const [groupIdToUsersMap, setGroupIdToUsersMap] = useState(generateGroupIdToUsersMap(userGroupRelations)); const [groupIdToChildGroupsMap, setGroupIdToChildGroupsMap] = useState(generateGroupIdToChildGroupsMap(childUserGroups)); @@ -138,7 +136,8 @@ export const UserGroupTable: FC = ({ setGroupIdToUsersMap(generateGroupIdToUsersMap(userGroupRelations)); setGroupIdToChildGroupsMap(generateGroupIdToChildGroupsMap(childUserGroups)); }, [userGroupRelations, childUserGroups]); - const [isHovered, setIsHovered] = useState(false); + const [hoveredIndex, setHoveredIndex] = useState(undefined); + return (

{headerLabel}

@@ -156,7 +155,7 @@ export const UserGroupTable: FC = ({ - {userGroups.map((group) => { + {userGroups.map((group, index) => { const users = groupIdToUsersMap[group._id]; return ( @@ -174,9 +173,11 @@ export const UserGroupTable: FC = ({ From c595598f08b1f43f145483eb075652d0c333c33e Mon Sep 17 00:00:00 2001 From: kazuto Date: Mon, 10 Jun 2024 08:57:00 +0000 Subject: [PATCH 08/32] span-tab-add --- .../src/components/Admin/UserGroup/UserGroupTable.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 8dfa44bdefb..7820baca88d 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -165,11 +165,9 @@ export const UserGroupTable: FC = ({ ? ( - group - {group.name} From cf5e96489be650a847c0011909a43040e055f243 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Wed, 12 Jun 2024 06:12:03 +0000 Subject: [PATCH 09/32] change-grou-id --- apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 7820baca88d..40417855880 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -171,8 +171,7 @@ export const UserGroupTable: FC = ({ + ) : ( From 7be985499cc25be52a7fa52aa9f2822be880b12c Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Mon, 17 Jun 2024 06:52:31 +0000 Subject: [PATCH 11/32] change-merge --- apps/app/next-env.d.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/app/next-env.d.ts b/apps/app/next-env.d.ts index fd36f9494e2..4f11a03dc6c 100644 --- a/apps/app/next-env.d.ts +++ b/apps/app/next-env.d.ts @@ -1,6 +1,5 @@ /// /// -/// // NOTE: This file should not be edited // see https://nextjs.org/docs/basic-features/typescript for more information. From 78131e1d1542a3514904771d0b63742e00acbebc Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Mon, 17 Jun 2024 07:49:03 +0000 Subject: [PATCH 12/32] div-tag-add --- .../Admin/UserGroup/UserGroupTable.tsx | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 27e43d21be5..2afc225bc4b 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -164,23 +164,25 @@ export const UserGroupTable: FC = ({ {isAclEnabled ? ( - - - +
+ + + +
) : ( From 0c33bc18ff3304af850002533669dc2c972b2bf7 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Mon, 17 Jun 2024 09:21:28 +0000 Subject: [PATCH 13/32] index-delete --- apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 2afc225bc4b..a9b5ec5eb0d 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -179,7 +179,7 @@ export const UserGroupTable: FC = ({ > group {group.name} - {(hoveredIndex === index) && (edit + { hoveredIndex && (edit )}
From 22c292ccfa975b5cc36dcf80cc28635912ac0c02 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Mon, 17 Jun 2024 09:39:44 +0000 Subject: [PATCH 14/32] Revert "index-delete" This reverts commit 0c33bc18ff3304af850002533669dc2c972b2bf7. --- apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index a9b5ec5eb0d..2afc225bc4b 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -179,7 +179,7 @@ export const UserGroupTable: FC = ({ > group {group.name} - { hoveredIndex && (edit + {(hoveredIndex === index) && (edit )}
From 011662121c878daf4e261b1091ebab250cc718c6 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Mon, 17 Jun 2024 11:07:06 +0000 Subject: [PATCH 15/32] onmouse-code-move-up --- apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 2afc225bc4b..3afdcaff6f1 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -164,7 +164,10 @@ export const UserGroupTable: FC = ({ {isAclEnabled ? ( -
+
setHoveredIndex(index)} + onMouseLeave={() => setHoveredIndex(undefined)} + > = ({ className="btn btn-link btn-edit-groups text-secondary py-0" type="button" key={group._id} - onMouseEnter={() => setHoveredIndex(index)} - onMouseLeave={() => setHoveredIndex(undefined)} > group {group.name} From f558ae640789d85bcd25c964834a4ffd9359a44e Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Wed, 19 Jun 2024 05:13:43 +0000 Subject: [PATCH 16/32] revert changes --- apps/app/next-env.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/app/next-env.d.ts b/apps/app/next-env.d.ts index 4f11a03dc6c..fd36f9494e2 100644 --- a/apps/app/next-env.d.ts +++ b/apps/app/next-env.d.ts @@ -1,5 +1,6 @@ /// /// +/// // NOTE: This file should not be edited // see https://nextjs.org/docs/basic-features/typescript for more information. From 497a2b72f7d9c259d10c8640ae4c24421edaab90 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Wed, 19 Jun 2024 06:48:55 +0000 Subject: [PATCH 17/32] edit-code-move --- .../Admin/UserGroup/UserGroupTable.tsx | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 3afdcaff6f1..c61b3d90efd 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -163,27 +163,26 @@ export const UserGroupTable: FC = ({ {isExternalGroup && {(group as IExternalUserGroupHasId).provider}} {isAclEnabled ? ( - -
setHoveredIndex(index)} - onMouseLeave={() => setHoveredIndex(undefined)} + setHoveredIndex(undefined)} + onMouseEnter={() => setHoveredIndex(index)} + > + + + - - - -
+ + ) : ( From 8d029c600b4a63deb706caae07040aaa8e563757 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Wed, 19 Jun 2024 09:12:25 +0000 Subject: [PATCH 18/32] enter-leave-chaange --- apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index c61b3d90efd..66735815555 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -164,8 +164,8 @@ export const UserGroupTable: FC = ({ {isAclEnabled ? ( setHoveredIndex(undefined)} onMouseEnter={() => setHoveredIndex(index)} + onMouseLeave={() => setHoveredIndex(undefined)} > From ce54fe0cedfc2d68d5cf7fc1aa843236155a8bf9 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Wed, 19 Jun 2024 09:21:37 +0000 Subject: [PATCH 19/32] index-item-change --- apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 66735815555..54175e07eaa 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -155,7 +155,7 @@ export const UserGroupTable: FC = ({ - {userGroups.map((group, index) => { + {userGroups.map((group, item) => { const users = groupIdToUsersMap[group._id]; return ( @@ -164,7 +164,7 @@ export const UserGroupTable: FC = ({ {isAclEnabled ? ( setHoveredIndex(index)} + onMouseEnter={() => setHoveredIndex(item)} onMouseLeave={() => setHoveredIndex(undefined)} > @@ -181,7 +181,7 @@ export const UserGroupTable: FC = ({ > group {group.name} - edit + edit ) From a2133c7a2d0aa6f65de3bf3875b3e18cc837495e Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Mon, 24 Jun 2024 06:34:08 +0000 Subject: [PATCH 20/32] index-change-item --- .../app/src/components/Admin/UserGroup/UserGroupTable.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 54175e07eaa..b0ecd17dd96 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -136,7 +136,7 @@ export const UserGroupTable: FC = ({ setGroupIdToUsersMap(generateGroupIdToUsersMap(userGroupRelations)); setGroupIdToChildGroupsMap(generateGroupIdToChildGroupsMap(childUserGroups)); }, [userGroupRelations, childUserGroups]); - const [hoveredIndex, setHoveredIndex] = useState(undefined); + const [hovereditem, setHoveredItem] = useState(undefined); return (
@@ -164,8 +164,8 @@ export const UserGroupTable: FC = ({ {isAclEnabled ? ( setHoveredIndex(item)} - onMouseLeave={() => setHoveredIndex(undefined)} + onMouseEnter={() => setHoveredItem(item)} + onMouseLeave={() => setHoveredItem(undefined)} > @@ -181,7 +181,7 @@ export const UserGroupTable: FC = ({ > group {group.name} - edit + edit ) From 0c79a970486db8996c156615586c349e3e671a09 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Mon, 24 Jun 2024 11:20:39 +0000 Subject: [PATCH 21/32] const-add --- .../Admin/UserGroup/UserGroupTable.tsx | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index b0ecd17dd96..6c27ccd6424 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -136,7 +136,19 @@ export const UserGroupTable: FC = ({ setGroupIdToUsersMap(generateGroupIdToUsersMap(userGroupRelations)); setGroupIdToChildGroupsMap(generateGroupIdToChildGroupsMap(childUserGroups)); }, [userGroupRelations, childUserGroups]); - const [hovereditem, setHoveredItem] = useState(undefined); + const ButtonForUserGroupTable = () => { + return ( + + ); + }; + const [hoveredindex, setHoveredIdex] = useState(undefined); return (
@@ -155,7 +167,7 @@ export const UserGroupTable: FC = ({ - {userGroups.map((group, item) => { + {userGroups.map((group, index) => { const users = groupIdToUsersMap[group._id]; return ( @@ -164,8 +176,8 @@ export const UserGroupTable: FC = ({ {isAclEnabled ? ( setHoveredItem(item)} - onMouseLeave={() => setHoveredItem(undefined)} + onMouseEnter={() => setHoveredIdex(index)} + onMouseLeave={() => setHoveredIdex(undefined)} > @@ -181,7 +193,7 @@ export const UserGroupTable: FC = ({ > group {group.name} - edit + edit ) From 7e835fb3a23edf2f0e5d0a94ff99618ba449990b Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Mon, 24 Jun 2024 11:55:28 +0000 Subject: [PATCH 22/32] group-delete --- apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx index 6c27ccd6424..ee4e8b78def 100644 --- a/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx @@ -142,8 +142,6 @@ export const UserGroupTable: FC = ({ className="btn btn-link btn-edit-groups text-secondary py-0" type="button" > - group - edit ); From 92d3ce6dc03ddc3c08f6c216a4bb84ac6d5d958a Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Mon, 1 Jul 2024 10:41:43 +0000 Subject: [PATCH 23/32] button-for-code-move --- .../client/components/Admin/UserGroup/UserGroupTable.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx index ee4e8b78def..5cf50a2809b 100644 --- a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx @@ -136,17 +136,17 @@ export const UserGroupTable: FC = ({ setGroupIdToUsersMap(generateGroupIdToUsersMap(userGroupRelations)); setGroupIdToChildGroupsMap(generateGroupIdToChildGroupsMap(childUserGroups)); }, [userGroupRelations, childUserGroups]); - const ButtonForUserGroupTable = () => { + const [hoveredindex, setHoveredIdex] = useState(undefined); + const ButtonForUserGroupedit = (index) => { return ( ); }; - const [hoveredindex, setHoveredIdex] = useState(undefined); return (
From 0d48a1b3c3f507f114b9fe717292d0c96caf4ce5 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Wed, 3 Jul 2024 06:56:48 +0000 Subject: [PATCH 24/32] code-delete --- .../client/components/Admin/UserGroup/UserGroupTable.tsx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx index 5cf50a2809b..fcbade342a8 100644 --- a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx @@ -137,14 +137,9 @@ export const UserGroupTable: FC = ({ setGroupIdToChildGroupsMap(generateGroupIdToChildGroupsMap(childUserGroups)); }, [userGroupRelations, childUserGroups]); const [hoveredindex, setHoveredIdex] = useState(undefined); - const ButtonForUserGroupedit = (index) => { + const ButtonForUserGroupedit = async(index) => { return ( - + edit ); }; From a1c92bb6f6e70bf8358352c36fa5f7933d60e6b4 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Wed, 3 Jul 2024 10:50:14 +0000 Subject: [PATCH 25/32] button-tag-delete --- .../client/components/Admin/UserGroup/UserGroupTable.tsx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx index fcbade342a8..ca82a63dd59 100644 --- a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx @@ -177,17 +177,11 @@ export const UserGroupTable: FC = ({ - - + ) : ( From 422b330fdbb7ef043df32cd6710cbda36cf1e60d Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Mon, 8 Jul 2024 09:20:25 +0000 Subject: [PATCH 26/32] props-code-add --- .../src/client/components/Admin/UserGroup/UserGroupTable.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx index ca82a63dd59..e6a0064426e 100644 --- a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx @@ -5,6 +5,7 @@ import type { IUserGroupHasId, IUserGroupRelation, IUserHasId } from '@growi/cor import { format as dateFnsFormat } from 'date-fns/format'; import { useTranslation } from 'next-i18next'; import Link from 'next/link'; +import { Item } from 'yjs'; import type { IExternalUserGroupHasId } from '~/features/external-user-group/interfaces/external-user-group'; @@ -137,7 +138,7 @@ export const UserGroupTable: FC = ({ setGroupIdToChildGroupsMap(generateGroupIdToChildGroupsMap(childUserGroups)); }, [userGroupRelations, childUserGroups]); const [hoveredindex, setHoveredIdex] = useState(undefined); - const ButtonForUserGroupedit = async(index) => { + const ButtonForUserGroupedit = (index) => { return ( edit ); @@ -180,7 +181,7 @@ export const UserGroupTable: FC = ({ > group {group.name} - edit + ) From 5bce4f95ca7894df17fea20660d2511fa61b3c4b Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Wed, 10 Jul 2024 09:57:27 +0000 Subject: [PATCH 27/32] button-tag-add --- .../Admin/UserGroup/UserGroupTable.tsx | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx index e6a0064426e..530aecbbff9 100644 --- a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx @@ -5,7 +5,6 @@ import type { IUserGroupHasId, IUserGroupRelation, IUserHasId } from '@growi/cor import { format as dateFnsFormat } from 'date-fns/format'; import { useTranslation } from 'next-i18next'; import Link from 'next/link'; -import { Item } from 'yjs'; import type { IExternalUserGroupHasId } from '~/features/external-user-group/interfaces/external-user-group'; @@ -140,7 +139,15 @@ export const UserGroupTable: FC = ({ const [hoveredindex, setHoveredIdex] = useState(undefined); const ButtonForUserGroupedit = (index) => { return ( - edit + ); }; @@ -161,7 +168,7 @@ export const UserGroupTable: FC = ({ - {userGroups.map((group, index) => { + {userGroups.map((group) => { const users = groupIdToUsersMap[group._id]; return ( @@ -169,11 +176,7 @@ export const UserGroupTable: FC = ({ {isExternalGroup && {(group as IExternalUserGroupHasId).provider}} {isAclEnabled ? ( - setHoveredIdex(index)} - onMouseLeave={() => setHoveredIdex(undefined)} - > - + = ({ > group {group.name} - + {hoveredindex ? '' : 'opacity-0'} ) From 05be1dc62eebf5a4846061f4f9c17243e8b6cc30 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Thu, 11 Jul 2024 07:04:42 +0000 Subject: [PATCH 28/32] class-name-add --- .../client/components/Admin/UserGroup/UserGroupTable.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx index 530aecbbff9..c692dcf8681 100644 --- a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx @@ -136,15 +136,13 @@ export const UserGroupTable: FC = ({ setGroupIdToUsersMap(generateGroupIdToUsersMap(userGroupRelations)); setGroupIdToChildGroupsMap(generateGroupIdToChildGroupsMap(childUserGroups)); }, [userGroupRelations, childUserGroups]); - const [hoveredindex, setHoveredIdex] = useState(undefined); + const [hoveredindex, setHoveredIndex] = useState(undefined); const ButtonForUserGroupedit = (index) => { return ( @@ -184,7 +182,7 @@ export const UserGroupTable: FC = ({ > group {group.name} - {hoveredindex ? '' : 'opacity-0'} + ) From b0b3a8c8a2d85688a3da7f72e1cb93fc6181cee4 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Thu, 11 Jul 2024 10:00:15 +0000 Subject: [PATCH 29/32] hovered-delete --- .../src/client/components/Admin/UserGroup/UserGroupTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx index c692dcf8681..1425f7958af 100644 --- a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx @@ -182,7 +182,7 @@ export const UserGroupTable: FC = ({ > group {group.name} - + ) From ac69f6d2924f48869da64beeda7a30f32e413f03 Mon Sep 17 00:00:00 2001 From: kazutoweseek Date: Wed, 17 Jul 2024 10:13:33 +0000 Subject: [PATCH 30/32] props-code-add --- .../Admin/UserGroup/UserGroupTable.tsx | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx index 1425f7958af..3e831c445fc 100644 --- a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx @@ -54,6 +54,29 @@ const generateGroupIdToChildGroupsMap = (childUserGroups: IUserGroupHasId[]): Re return map; }; +type UserGroupEditLinkProps = { + group:IUserGroupHasId, + isExternalGroup:boolean, +} + +const UserGroupEditLink = (props: UserGroupEditLinkProps): JSX.Element => { + const [isHover, setHover] = useState(false); + + return ( +
setHover(true)} + onMouseLeave={() => setHover(false)} + > + + group + {props.group.name} + edit + +
+ ); +}; export const UserGroupTable: FC = ({ headerLabel, @@ -136,18 +159,6 @@ export const UserGroupTable: FC = ({ setGroupIdToUsersMap(generateGroupIdToUsersMap(userGroupRelations)); setGroupIdToChildGroupsMap(generateGroupIdToChildGroupsMap(childUserGroups)); }, [userGroupRelations, childUserGroups]); - const [hoveredindex, setHoveredIndex] = useState(undefined); - const ButtonForUserGroupedit = (index) => { - return ( - - ); - }; return (
@@ -175,15 +186,7 @@ export const UserGroupTable: FC = ({ {isAclEnabled ? ( - - - group - {group.name} - - + ) : ( From 73dce9c65ed1a680cc834990ed4719677e1c385a Mon Sep 17 00:00:00 2001 From: Yuki Takei Date: Wed, 24 Jul 2024 09:51:08 +0000 Subject: [PATCH 31/32] implement without state management --- .../UserGroup/UserGroupTable.module.scss | 19 ++++++++++++++ .../Admin/UserGroup/UserGroupTable.tsx | 25 +++++++++---------- 2 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 apps/app/src/client/components/Admin/UserGroup/UserGroupTable.module.scss diff --git a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.module.scss b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.module.scss new file mode 100644 index 00000000000..031cfa31aab --- /dev/null +++ b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.module.scss @@ -0,0 +1,19 @@ +.user-group-edit-link { + text-decoration: underline; +} + +.user-group-edit-link { + :global { + .grw-edit-icon { + visibility: hidden; + } + } + + &:global { + &:hover { + .grw-edit-icon { + visibility: visible; + } + } + } +} diff --git a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx index 3e831c445fc..74b3652bc72 100644 --- a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx @@ -9,6 +9,11 @@ import Link from 'next/link'; import type { IExternalUserGroupHasId } from '~/features/external-user-group/interfaces/external-user-group'; +import styles from './UserGroupTable.module.scss'; + +const userGroupEditLinkStyle = styles['user-group-edit-link'] ?? ''; + + type Props = { headerLabel?: string, userGroups: IUserGroupHasId[], @@ -60,21 +65,15 @@ type UserGroupEditLinkProps = { } const UserGroupEditLink = (props: UserGroupEditLinkProps): JSX.Element => { - const [isHover, setHover] = useState(false); - return ( -
setHover(true)} - onMouseLeave={() => setHover(false)} + - - group - {props.group.name} - edit - -
+ group + {props.group.name} + edit + ); }; From 7b7160dc089ff1e539e0e5c64ed1251cff45114a Mon Sep 17 00:00:00 2001 From: Yuki Takei Date: Wed, 24 Jul 2024 09:53:34 +0000 Subject: [PATCH 32/32] add comment --- .../client/components/Admin/UserGroup/UserGroupTable.module.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.module.scss b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.module.scss index 031cfa31aab..23e70fc1ca7 100644 --- a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.module.scss +++ b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.module.scss @@ -2,6 +2,7 @@ text-decoration: underline; } +// switch visibility of the edit icon .user-group-edit-link { :global { .grw-edit-icon {