Skip to content

Commit 3f172ec

Browse files
SteveGT96SteveGT96
andauthored
fix(OH2-441): Show group code in users table and update labels (#707)
Co-authored-by: SteveGT96 <steve.tsala@intesys.it>
1 parent 4733480 commit 3f172ec

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/components/accessories/admin/users/usersTable/UsersTable.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export const UsersTable = ({ headerActions, onEdit, onDelete }: IOwnProps) => {
7979
const header = ["userName", "userGroupName", "desc", "deleted"];
8080
const label = {
8181
userName: t("user.username"),
82-
userGroupName: t("user.groups"),
82+
userGroupName: t("user.group"),
8383
desc: t("user.description"),
8484
deleted: t("common.deleted"),
8585
};
@@ -88,14 +88,14 @@ export const UsersTable = ({ headerActions, onEdit, onDelete }: IOwnProps) => {
8888
(state) =>
8989
state.usergroups.groupList.data?.map((item) => ({
9090
value: item.code ?? "",
91-
label: item.desc ?? item.code ?? "",
91+
label: item.code ?? "",
9292
})) ?? []
9393
);
9494

9595
const filters: TFilterField[] = [
9696
{
9797
key: "userGroupName",
98-
label: t("user.groups"),
98+
label: t("user.group"),
9999
type: "select",
100100
options: userGroupOptions,
101101
},
@@ -115,8 +115,7 @@ export const UsersTable = ({ headerActions, onEdit, onDelete }: IOwnProps) => {
115115
return data.map((item) => {
116116
return {
117117
userName: item.userName ?? "",
118-
userGroupName:
119-
item.userGroupName?.desc ?? item.userGroupName?.code ?? "",
118+
userGroupName: item.userGroupName?.code ?? "",
120119
desc: item.desc ?? "",
121120
passwd: item.passwd ?? "",
122121
deleted: item.deleted ? <CheckOutlined fontSize="small" /> : "",

0 commit comments

Comments
 (0)