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

Skip to content

Use TextControl in StringComponent #31442

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 2 commits into from
Jul 29, 2024
Merged

Use TextControl in StringComponent #31442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92904d1
Use TextControl in StringComponent
edewit Jul 19, 2024
82fa8ef
enable test-id override
edewit Jul 23, 2024
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
2 changes: 1 addition & 1 deletion ...ages/admin-ui/manage/client_scopes/client_scope_details/tabs/mappers/MapperDetailsPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export enum ClaimJsonType {

export default class MapperDetailsPage extends CommonPage {
#userAttributeInput = '[data-testid="config.user🍺attribute"]';
#tokenClaimNameInput = '[id="claim.name"]';
#tokenClaimNameInput = '[data-testid="claim.name"]';
#claimJsonType = '[id="jsonType.label"]';

fillUserAttribute(userAttribute: string) {
Expand Down
2 changes: 1 addition & 1 deletion js/apps/admin-ui/cypress/support/pages/admin-ui/manage/realm_settings/RealmSettingsPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ export default class RealmSettingsPage extends CommonPage {
#availablePeriodExecutorFld = "available-period";
#editExecutorBtn =
'[aria-label="Executors"] > li > div:first-child [data-testid="editExecutor"]';
#executorAvailablePeriodInput = "#available-period";
#executorAvailablePeriodInput = "[data-testid='available-period']";

#listingPage = new ListingPage();
#addCondition = "addCondition";
Expand Down
29 changes: 8 additions & 21 deletions js/apps/admin-ui/src/components/dynamic/StringComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,23 @@
import { FormGroup, TextInput } from "@patternfly/react-core";
import { useFormContext } from "react-hook-form";
import { TextControl } from "@keycloak/keycloak-ui-shared";
import { useTranslation } from "react-i18next";
import { HelpItem } from "@keycloak/keycloak-ui-shared";

import { convertToName } from "./DynamicComponents";
import type { ComponentProps } from "./components";

export const StringComponent = ({
name,
label,
helpText,
defaultValue,
isDisabled = false,
required,
...props
}: ComponentProps) => {
const { t } = useTranslation();
const { register } = useFormContext();

return (
<FormGroup
<TextControl
name={convertToName(name!)}
label={t(label!)}
labelIcon={<HelpItem helpText={t(helpText!)} fieldLabelId={`${label}`} />}
fieldId={name!}
isRequired={required}
>
<TextInput
id={name!}
data-testid={name}
isDisabled={isDisabled}
defaultValue={defaultValue?.toString()}
{...register(convertToName(name!))}
/>
</FormGroup>
helperText={t(helpText!)}
data-testid={name}
{...props}
/>
);
};
9 changes: 5 additions & 4 deletions js/libs/ui-shared/src/controls/TextControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export type TextControlProps<
labelIcon?: string | ReactNode;
isDisabled?: boolean;
helperText?: string;
"data-testid"?: string;
};

export const TextControl = <
Expand All @@ -34,7 +35,7 @@ export const TextControl = <
>(
props: TextControlProps<T, P>,
) => {
const { labelIcon, ...rest } = props;
const { labelIcon, helperText, ...rest } = props;
const required = !!props.rules?.required;
const defaultValue = props.defaultValue ?? ("" as PathValue<T, P>);

Expand All @@ -54,18 +55,18 @@ export const TextControl = <
<TextInput
isRequired={required}
id={props.name}
data-testid={props.name}
data-testid={props["data-testid"] || props.name}
validated={
fieldState.error ? ValidatedOptions.error : ValidatedOptions.default
}
isDisabled={props.isDisabled}
{...rest}
{...field}
/>
{props.helperText && (
{helperText && (
<FormHelperText>
<HelperText>
<HelperTextItem>{props.helperText}</HelperTextItem>
<HelperTextItem>{helperText}</HelperTextItem>
</HelperText>
</FormHelperText>
)}
Expand Down