Skip to content

refactor forms #1964

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

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

refactor forms #1964

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
310d9c2
Removed stale code
gpaoloni Dec 27, 2023
fb6513a
refactor: introduced useInputContext custom hook
gpaoloni Dec 27, 2023
ab94f40
refactor: factored NumericInput into it's own component
gpaoloni Dec 27, 2023
e9be715
refactor: factored EmailInput into it's own component
gpaoloni Dec 27, 2023
515e9e0
refactor: moved tests alongisde the corresponding code
gpaoloni Dec 28, 2023
ebfc745
refactor: factored RadioInput into it's own component
gpaoloni Dec 28, 2023
8622951
refactor: reworked CSAM related code that was using old code
gpaoloni Dec 28, 2023
277f27f
chore: fixed tests
gpaoloni Dec 28, 2023
0c38db4
refactor: factored SelectInput into it's own component
gpaoloni Dec 28, 2023
c94ca8d
Merge remote-tracking branch 'origin/master' into gian_refactor-forms
gpaoloni Jan 8, 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
130 changes: 0 additions & 130 deletions plugin-hrm-form/src/components/common/forms/formGenerators.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,136 +182,6 @@ export const getInputType = (parents: string[], updateCallback: () => void, cust
const labelTextComponent = <Template code={`${def.label}`} className=".fullstory-unmask" />;

switch (def.type) {
case FormInputType.Input:
return (
<ConnectForm key={path}>
{({ errors, register }) => {
const error = get(errors, path);
return (
<FormLabel htmlFor={path}>
<Row>
<Box marginBottom="8px">
{labelTextComponent}
{rules.required && <RequiredAsterisk />}
</Box>
</Row>
<FormInput
id={path}
data-testid={path}
name={path}
error={Boolean(error)}
aria-invalid={Boolean(error)}
aria-describedby={`${path}-error`}
onBlur={updateCallback}
ref={ref => {
if (htmlElRef) {
htmlElRef.current = ref;
}

register(rules)(ref);
}}
defaultValue={initialValue}
disabled={!isEnabled}
/>
{error && (
<FormError>
<Template id={`${path}-error`} code={error.message} />
</FormError>
)}
</FormLabel>
);
}}
</ConnectForm>
);
case FormInputType.NumericInput:
return (
<ConnectForm key={path}>
{({ errors, register }) => {
const error = get(errors, path);
return (
<FormLabel htmlFor={path}>
<Row>
<Box marginBottom="8px">
{labelTextComponent}
{rules.required && <RequiredAsterisk />}
</Box>
</Row>
<FormInput
id={path}
data-testid={path}
name={path}
error={Boolean(error)}
aria-invalid={Boolean(error)}
aria-describedby={`${path}-error`}
onBlur={updateCallback}
ref={ref => {
if (htmlElRef) {
htmlElRef.current = ref;
}

register({
...rules,
pattern: { value: /^[0-9]+$/g, message: 'This field only accepts numeric input.' },
})(ref);
}}
defaultValue={initialValue}
disabled={!isEnabled}
/>
{error && (
<FormError>
<Template id={`${path}-error`} code={error.message} />
</FormError>
)}
</FormLabel>
);
}}
</ConnectForm>
);
case FormInputType.Email:
return (
<ConnectForm key={path}>
{({ errors, register }) => {
const error = get(errors, path);
return (
<FormLabel htmlFor={path}>
<Row>
<Box marginBottom="8px">
{labelTextComponent}
{rules.required && <RequiredAsterisk />}
</Box>
</Row>
<FormInput
id={path}
data-testid={path}
name={path}
error={Boolean(error)}
aria-invalid={Boolean(error)}
aria-describedby={`${path}-error`}
onBlur={updateCallback}
ref={ref => {
if (htmlElRef) {
htmlElRef.current = ref;
}

register({
...rules,
pattern: { value: /\S+@\S+\.\S+/, message: 'Entered value does not match email format' },
})(ref);
}}
defaultValue={initialValue}
disabled={!isEnabled}
type="email"
/>
{error && (
<FormError>
<Template id={`${path}-error`} code={error.message} />
</FormError>
)}
</FormLabel>
);
}}
</ConnectForm>
);
case FormInputType.RadioInput:
return (
<ConnectForm key={path}>
Expand Down
Loading