libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Remove first char upper case for realm (#3412)

Browse source
This commit is contained in:
Erik Jan de Wit 2022-10-03 12:46:56 +02:00 committed by GitHub
parent 249c6bbf02
commit 225ab19ef1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/admin-ui/src/components/realm-selector/RealmSelector.tsx
View file

@ -20,7 +20,6 @@ import { useRealms } from "../../context/RealmsContext";
import { useWhoAmI } from "../../context/whoami/WhoAmI"; import { useWhoAmI } from "../../context/whoami/WhoAmI";
import { toDashboard } from "../../dashboard/routes/Dashboard"; import { toDashboard } from "../../dashboard/routes/Dashboard";
import { toAddRealm } from "../../realm/routes/AddRealm"; import { toAddRealm } from "../../realm/routes/AddRealm";
import { toUpperCase } from "../../util";
import { RecentUsed } from "./recent-used"; import { RecentUsed } from "./recent-used";
import "./realm-selector.css"; import "./realm-selector.css";
@ -59,7 +58,7 @@ export const RealmSelector = () => {
const RealmText = ({ value }: { value: string }) => ( const RealmText = ({ value }: { value: string }) => (
<Split className="keycloak__realm_selector__list-item-split"> <Split className="keycloak__realm_selector__list-item-split">
<SplitItem isFilled>{toUpperCase(value)}</SplitItem> <SplitItem isFilled>{value}</SplitItem>
<SplitItem>{value === realm && <CheckIcon />}</SplitItem> <SplitItem>{value === realm && <CheckIcon />}</SplitItem>
</Split> </Split>
); );
@ -112,9 +111,9 @@ export const RealmSelector = () => {
{realms.length > 5 && ( {realms.length > 5 && (
<ContextSelector <ContextSelector
data-testid="realmSelector" data-testid="realmSelector"
toggleText={toUpperCase(realm)} toggleText={realm}
isOpen={open} isOpen={open}
screenReaderLabel={toUpperCase(realm)} screenReaderLabel={realm}
onToggle={() => setOpen(!open)} onToggle={() => setOpen(!open)}
onSelect={(_, r) => { onSelect={(_, r) => {
let element: ReactElement; let element: ReactElement;
@ -159,7 +158,7 @@ export const RealmSelector = () => {
onToggle={() => setOpen(!open)} onToggle={() => setOpen(!open)}
className="keycloak__realm_selector_dropdown__toggle" className="keycloak__realm_selector_dropdown__toggle"
> >
{toUpperCase(realm)} {realm}
</DropdownToggle> </DropdownToggle>
} }
dropdownItems={[...dropdownItems, addRealmComponent]} dropdownItems={[...dropdownItems, addRealmComponent]}

4
apps/admin-ui/src/dashboard/Dashboard.tsx
View file

@ -128,9 +128,7 @@ const Dashboard = () => {
<> <>
<PageSection variant="light"> <PageSection variant="light">
<TextContent className="pf-u-mr-sm"> <TextContent className="pf-u-mr-sm">
<Text component="h1"> <Text component="h1">{t("realmName", { name: realm })}</Text>
{t("realmName", { name: toUpperCase(realm) })}
</Text>
<Text> <Text>
<Trans t={t} i18nKey="adminUiVersion"> <Trans t={t} i18nKey="adminUiVersion">
<strong>Admin UI version</strong> <strong>Admin UI version</strong>

8
apps/admin-ui/src/realm-settings/RealmSettingsTabs.tsx
View file

@ -26,11 +26,7 @@ import { useRealms } from "../context/RealmsContext";
import { ViewHeader } from "../components/view-header/ViewHeader"; import { ViewHeader } from "../components/view-header/ViewHeader";
import { useAdminClient } from "../context/auth/AdminClient"; import { useAdminClient } from "../context/auth/AdminClient";
import { useAlerts } from "../components/alert/Alerts"; import { useAlerts } from "../components/alert/Alerts";
import { import { convertFormValuesToObject, convertToFormValues } from "../util";
convertFormValuesToObject,
convertToFormValues,
toUpperCase,
} from "../util";
import { RealmSettingsEmailTab } from "./EmailTab"; import { RealmSettingsEmailTab } from "./EmailTab";
import { EventsTab } from "./event-config/EventsTab"; import { EventsTab } from "./event-config/EventsTab";
@ -120,7 +116,7 @@ const RealmSettingsHeader = ({
onClose={() => setPartialExportOpen(false)} onClose={() => setPartialExportOpen(false)}
/> />
<ViewHeader <ViewHeader
titleKey={toUpperCase(realmName)} titleKey={realmName}
subKey="realm-settings:realmSettingsExplain" subKey="realm-settings:realmSettingsExplain"
helpUrl={helpUrls.realmSettingsUrl} helpUrl={helpUrls.realmSettingsUrl}
divider={false} divider={false}