diff --git a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties index e3f53c4c999b..fb0abb7b9d77 100644 --- a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties +++ b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties @@ -3043,8 +3043,10 @@ chooseBindingType=Choose binding type selectFlowType=Select flow type selectClientAssertionSigningAlg=Select client assertion signing algorithm resourceDetailsTypeHelp=The type of this resource. It can be used to group different resource instances with the same type. -searchForClientPolicy=Search for client policy selectVendor=Select vendor spinnerLoading=Loading enableClientSignatureRequiredModal=Enable client signature required -selectBindType=Select bind type \ No newline at end of file +selectBindType=Select bind type +searchClientAuthorizationResource=Search resource +searchClientAuthorizationPolicy=Search policy +searchClientAuthorizationPermission=Search permission \ No newline at end of file diff --git a/js/apps/admin-ui/src/clients/authorization/Permissions.tsx b/js/apps/admin-ui/src/clients/authorization/Permissions.tsx index e4688c674d16..8579335a0ae0 100644 --- a/js/apps/admin-ui/src/clients/authorization/Permissions.tsx +++ b/js/apps/admin-ui/src/clients/authorization/Permissions.tsx @@ -201,6 +201,7 @@ export const AuthorizationPermissions = ({ types={policyProviders} search={search} onSearch={setSearch} + type="permission" /> diff --git a/js/apps/admin-ui/src/clients/authorization/Policies.tsx b/js/apps/admin-ui/src/clients/authorization/Policies.tsx index 43fc49602104..54d7e44fd54a 100644 --- a/js/apps/admin-ui/src/clients/authorization/Policies.tsx +++ b/js/apps/admin-ui/src/clients/authorization/Policies.tsx @@ -202,6 +202,7 @@ export const AuthorizationPolicies = ({ types={policyProviders} search={search} onSearch={setSearch} + type="policy" /> diff --git a/js/apps/admin-ui/src/clients/authorization/Resources.tsx b/js/apps/admin-ui/src/clients/authorization/Resources.tsx index 7c2cb8b2b0bf..8c2d4ebe8181 100644 --- a/js/apps/admin-ui/src/clients/authorization/Resources.tsx +++ b/js/apps/admin-ui/src/clients/authorization/Resources.tsx @@ -165,7 +165,7 @@ export const AuthorizationResources = ({ diff --git a/js/apps/admin-ui/src/clients/authorization/SearchDropdown.tsx b/js/apps/admin-ui/src/clients/authorization/SearchDropdown.tsx index e0c1b6624a0d..c2d83ce97094 100644 --- a/js/apps/admin-ui/src/clients/authorization/SearchDropdown.tsx +++ b/js/apps/admin-ui/src/clients/authorization/SearchDropdown.tsx @@ -32,14 +32,14 @@ type SearchDropdownProps = { types?: PolicyProviderRepresentation[] | PolicyProviderRepresentation[]; search: SearchForm; onSearch: (form: SearchForm) => void; - isResource?: boolean; + type: "resource" | "policy" | "permission"; }; export const SearchDropdown = ({ types, search, onSearch, - isResource = false, + type, }: SearchDropdownProps) => { const { t } = useTranslation(); const { @@ -84,7 +84,9 @@ export const SearchDropdown = ({ onToggle={toggle} className="keycloak__client_authentication__searchdropdown" > - {t("searchForClientPolicy")} + {type === "resource" && t("searchClientAuthorizationResource")} + {type === "policy" && t("searchClientAuthorizationPolicy")} + {type === "permission" && t("searchClientAuthorizationPermission")} } isOpen={open} @@ -101,7 +103,7 @@ export const SearchDropdown = ({ {...register("name")} /> - {isResource && ( + {type === "resource" && ( <> )} - {!isResource && ( + {type !== "resource" && type !== "policy" && ( )} - - - - {!isResource && ( + {type !== "policy" && ( + + + + )} + {type !== "resource" && (