From ae7d653607b9b83e71657cb0a5f938166d5b4945 Mon Sep 17 00:00:00 2001 From: Pavindu Lakshan Date: Wed, 18 Oct 2023 16:43:06 +0530 Subject: [PATCH 1/3] Fix incorrect i18n keys --- .../roles/components/edit-role/edit-role-groups.tsx | 4 ++-- .../edit-organization-role/edit-organization-groups.tsx | 6 +++--- .../roles/components/edit-role/edit-role-groups.tsx | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/console/src/extensions/components/roles/components/edit-role/edit-role-groups.tsx b/apps/console/src/extensions/components/roles/components/edit-role/edit-role-groups.tsx index 36a27a5adc0..d4e43f4e203 100644 --- a/apps/console/src/extensions/components/roles/components/edit-role/edit-role-groups.tsx +++ b/apps/console/src/extensions/components/roles/components/edit-role/edit-role-groups.tsx @@ -729,7 +729,7 @@ export const RoleGroupsList: FunctionComponent = ( = ( icon="plus" onClick={ handleOpenAddNewGroupModal } > - { t("console:manage.features.roles.edit.groups." + + { t("console:manage.features.roles.edit.groups.placeholders." + "emptyPlaceholder.action") } ) diff --git a/apps/console/src/features/organizations/components/edit-organization-role/edit-organization-groups.tsx b/apps/console/src/features/organizations/components/edit-organization-role/edit-organization-groups.tsx index 5660270207a..f7cb6e8a7d4 100644 --- a/apps/console/src/features/organizations/components/edit-organization-role/edit-organization-groups.tsx +++ b/apps/console/src/features/organizations/components/edit-organization-role/edit-organization-groups.tsx @@ -686,10 +686,10 @@ export const RoleGroupsList: FunctionComponent = ( = ( icon="plus" onClick={ handleOpenAddNewGroupModal } > - { t("console:manage.features.roles.edit.groups." + + { t("console:manage.features.roles.edit.groups.placeholders." + "emptyPlaceholder.action") } ) diff --git a/apps/console/src/features/roles/components/edit-role/edit-role-groups.tsx b/apps/console/src/features/roles/components/edit-role/edit-role-groups.tsx index c8be31aec48..368fcbe84e1 100644 --- a/apps/console/src/features/roles/components/edit-role/edit-role-groups.tsx +++ b/apps/console/src/features/roles/components/edit-role/edit-role-groups.tsx @@ -742,11 +742,11 @@ export const RoleGroupsList: FunctionComponent = ( = ( onClick={ handleOpenAddNewGroupModal } > { t("console:manage.features.roles.edit.groups." + - "emptyPlaceholder.action") } + "placeholders.emptyPlaceholder.action") } ) } From 5ba184cff36f2342ce8444ca0b12dc1d1b16aeb3 Mon Sep 17 00:00:00 2001 From: Pavindu Lakshan Date: Wed, 18 Oct 2023 16:46:31 +0530 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A6=8B=20Add=20changeset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/great-laws-doubt.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/great-laws-doubt.md diff --git a/.changeset/great-laws-doubt.md b/.changeset/great-laws-doubt.md new file mode 100644 index 00000000000..3d92b1140e6 --- /dev/null +++ b/.changeset/great-laws-doubt.md @@ -0,0 +1,5 @@ +--- +"@wso2is/console": patch +--- + +Fix incorrect i18n keys in assigned groups UI in roles section From 84f4f91277c509577f7513c45dae387a5d29ccba Mon Sep 17 00:00:00 2001 From: Pavindu Lakshan Date: Wed, 18 Oct 2023 16:56:28 +0530 Subject: [PATCH 3/3] Address eslint warnings --- .../roles/components/edit-role/edit-role-groups.tsx | 2 +- .../edit-organization-role/edit-organization-groups.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/console/src/extensions/components/roles/components/edit-role/edit-role-groups.tsx b/apps/console/src/extensions/components/roles/components/edit-role/edit-role-groups.tsx index d4e43f4e203..adbc2807558 100644 --- a/apps/console/src/extensions/components/roles/components/edit-role/edit-role-groups.tsx +++ b/apps/console/src/extensions/components/roles/components/edit-role/edit-role-groups.tsx @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021, WSO2 LLC. (https://www.wso2.com). All Rights Reserved. + * Copyright (c) 2021-2023, WSO2 LLC. (https://www.wso2.com). * * WSO2 LLC. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except diff --git a/apps/console/src/features/organizations/components/edit-organization-role/edit-organization-groups.tsx b/apps/console/src/features/organizations/components/edit-organization-role/edit-organization-groups.tsx index f7cb6e8a7d4..c7db4974a73 100644 --- a/apps/console/src/features/organizations/components/edit-organization-role/edit-organization-groups.tsx +++ b/apps/console/src/features/organizations/components/edit-organization-role/edit-organization-groups.tsx @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022, WSO2 LLC. (https://www.wso2.com). All Rights Reserved. + * Copyright (c) 2022-2023, WSO2 LLC. (https://www.wso2.com). * * WSO2 LLC. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -699,8 +699,8 @@ export const RoleGroupsList: FunctionComponent = ( icon="plus" onClick={ handleOpenAddNewGroupModal } > - { t("console:manage.features.roles.edit.groups.placeholders." + - "emptyPlaceholder.action") } + { t("console:manage.features.roles.edit.groups." + + "placeholders.emptyPlaceholder.action") } ) }