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

Enabled and Disable features incorrect (#3054)

Browse source
This commit is contained in:
Martin Bartoš 2022-08-08 06:59:00 -04:00 committed by GitHub
parent 4106b9de3f
commit f8a933fcd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
public/resources/en/dashboard.json
View file

@ -9,8 +9,9 @@
"enabledFeatures": "Enabled features",
"experimental": "Experimental",
"preview": "Preview",
"infoEnabledFeatures": "Something about what enabled features are.",
"infoDisabledFeatures": "Something about what disabled features are.",
"supported": "Supported",
"infoEnabledFeatures": "Shows enabled preview and experimental features.",
"infoDisabledFeatures": "Shows all disabled features.",
"disabledFeatures": "Disabled features",
"adminUiVersion": "<0 className=\"pf-u-mr-md\">Admin UI version</0>{{version}}",
"providerInfo": "Provider info",

65
src/dashboard/Dashboard.tsx
View file

@ -1,7 +1,7 @@
import { useMemo } from "react";
import { useHistory } from "react-router-dom";
import { Trans, useTranslation } from "react-i18next";
import { xor } from "lodash-es";
import { union, filter } from "lodash-es";
import {
Brand,
Card,
@ -73,18 +73,17 @@ const Dashboard = () => {
const history = useHistory();
const localeSort = useLocaleSort();
const enabledFeatures = useMemo(
() =>
localeSort(
xor(
serverInfo.profileInfo?.disabledFeatures,
serverInfo.profileInfo?.experimentalFeatures,
serverInfo.profileInfo?.previewFeatures
),
(item) => item
),
[serverInfo.profileInfo]
);
const isDeprecatedFeature = (feature: string) =>
disabledFeatures.includes(feature);
const isExperimentalFeature = (feature: string) =>
serverInfo.profileInfo?.experimentalFeatures?.includes(feature);
const isPreviewFeature = (feature: string) =>
serverInfo.profileInfo?.previewFeatures?.includes(feature);
const isSupportedFeature = (feature: string) =>
!isExperimentalFeature(feature) && !isPreviewFeature(feature);
const disabledFeatures = useMemo(
() =>
@ -95,11 +94,22 @@ const Dashboard = () => {
[serverInfo.profileInfo]
);
const isExperimentalFeature = (feature: string) =>
serverInfo.profileInfo?.experimentalFeatures?.includes(feature);
const isPreviewFeature = (feature: string) =>
serverInfo.profileInfo?.previewFeatures?.includes(feature);
const enabledFeatures = useMemo(
() =>
localeSort(
filter(
union(
serverInfo.profileInfo?.experimentalFeatures,
serverInfo.profileInfo?.previewFeatures
),
(feature) => {
return !isDeprecatedFeature(feature);
}
),
(item) => item
),
[serverInfo.profileInfo]
);
if (Object.keys(serverInfo).length === 0) {
return <KeycloakSpinner />;
@ -186,7 +196,7 @@ const Dashboard = () => {
<DescriptionListDescription>
<List variant={ListVariant.inline}>
{enabledFeatures.map((feature) => (
<ListItem key={feature}>
<ListItem key={feature} className="pf-u-mb-sm">
{feature}{" "}
{isExperimentalFeature(feature) ? (
<Label color="orange">
@ -212,7 +222,22 @@ const Dashboard = () => {
<DescriptionListDescription>
<List variant={ListVariant.inline}>
{disabledFeatures.map((feature) => (
<ListItem key={feature}>{feature}</ListItem>
<ListItem key={feature} className="pf-u-mb-sm">
{feature}{" "}
{isExperimentalFeature(feature) ? (
<Label color="orange">
{t("experimental")}
</Label>
) : null}
{isPreviewFeature(feature) ? (
<Label color="blue">{t("preview")}</Label>
) : null}
{isSupportedFeature(feature) ? (
<Label color="green">
{t("supported")}
</Label>
) : null}
</ListItem>
))}
</List>
</DescriptionListDescription>