Thanks to visit codestin.com
Credit goes to github.com

Skip to content

made realm the namespace so we can change the bundle #30239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agagancarczyk merged 1 commit into from
Jun 24, 2024
Merged

made realm the namespace so we can change the bundle #30239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions js/apps/admin-ui/src/context/realm-context/RealmContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { PropsWithChildren, useEffect, useMemo, useState } from "react";
import { useMatch } from "react-router-dom";
import RealmRepresentation from "@keycloak/keycloak-admin-client/lib/defs/realmRepresentation";
import {
createNamedContext,
useEnvironment,
useRequiredContext,
} from "@keycloak/keycloak-ui-shared";
import { PropsWithChildren, useEffect, useMemo, useState } from "react";
import { useMatch } from "react-router-dom";
import { useAdminClient } from "../../admin-client";
import { DashboardRouteWithRealm } from "../../dashboard/routes/Dashboard";
import RealmRepresentation from "@keycloak/keycloak-admin-client/lib/defs/realmRepresentation";
import { i18n } from "../../i18n/i18n";
import { useFetch } from "../../utils/useFetch";

type RealmContextType = {
Expand Down Expand Up @@ -41,7 +42,13 @@ export const RealmContextProvider = ({ children }: PropsWithChildren) => {
);

// Configure admin client to use selected realm when it changes.
useEffect(() => adminClient.setConfig({ realmName: realm }), [realm]);
useEffect(() => {
(async () => {
adminClient.setConfig({ realmName: realm });
await i18n.loadNamespaces(realm);
i18n.setDefaultNamespace(realm);
})();
}, [realm]);
useFetch(
() => adminClient.realms.findOne({ realm }),
setRealmRepresentation,
Expand Down
4 changes: 3 additions & 1 deletion js/apps/admin-ui/src/i18n/i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ export const i18n = createInstance({
interpolation: {
escapeValue: false,
},
defaultNS: [environment.realm],
ns: [environment.realm],
backend: {
loadPath: joinPath(
environment.adminBaseUrl,
`resources/${environment.realm}/admin/{{lng}}`,
`resources/{{ns}}/admin/{{lng}}`,
),
parse: (data: string) => {
const messages = JSON.parse(data);
Expand Down
2 changes: 1 addition & 1 deletion js/apps/admin-ui/src/realm-settings/localization/RealmOverrides.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ export const RealmOverrides = ({
try {
for (const key of selectedRowKeys) {
delete (
i18n.store.data[whoAmI.getLocale()]["translation"] as Record<
i18n.store.data[whoAmI.getLocale()][currentRealm] as Record<
string,
string
>
Expand Down