mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-13 00:45:44 +01:00
Introduce ui-forms framework
Adding a new ui framework to make creating forms as easy and consistent as possible. It wraps a lot of boilerplate code and enforces good practices for make the forms in the "SCM-Manager way". Co-authored-by: Florian Scholdei <florian.scholdei@cloudogu.com> Co-authored-by: Konstantin Schaper <konstantin.schaper@cloudogu.com> Reviewed-by: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
This commit is contained in:
committed by
SCM-Manager
parent
f2f2f29791
commit
72dfe80843
36
scm-ui/ui-forms/src/input/ControlledInputField.stories.mdx
Normal file
36
scm-ui/ui-forms/src/input/ControlledInputField.stories.mdx
Normal file
@@ -0,0 +1,36 @@
|
||||
import { Meta, Story } from "@storybook/addon-docs";
|
||||
import Form from "../Form";
|
||||
import ControlledInputField from "./ControlledInputField";
|
||||
|
||||
<Meta
|
||||
title="ControlledInputField"
|
||||
decorators={[
|
||||
(Story) => (
|
||||
<Form onSubmit={console.log} defaultValues={{name: "Initial value"}} translationPath={["sample", "form"]}>
|
||||
<Story />
|
||||
</Form>
|
||||
),
|
||||
]}
|
||||
/>
|
||||
|
||||
<Story name="Default">
|
||||
<ControlledInputField name="name" />
|
||||
</Story>
|
||||
|
||||
<Story name="WithHardcodedText">
|
||||
<ControlledInputField name="name" label="Name" helpText="A help text" />
|
||||
</Story>
|
||||
|
||||
<Story name="WithStyling">
|
||||
<ControlledInputField name="name" className="has-background-blue-light" />
|
||||
</Story>
|
||||
|
||||
<Story name="WithCheck">
|
||||
<ControlledInputField name="name" rules={{
|
||||
required: true
|
||||
}} />
|
||||
</Story>
|
||||
|
||||
<Story name="WithInitialFocus">
|
||||
<ControlledInputField name="name" autoFocus={true} />
|
||||
</Story>
|
||||
77
scm-ui/ui-forms/src/input/ControlledInputField.tsx
Normal file
77
scm-ui/ui-forms/src/input/ControlledInputField.tsx
Normal file
@@ -0,0 +1,77 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
import React, { ComponentProps } from "react";
|
||||
import { Controller, ControllerRenderProps, Path } from "react-hook-form";
|
||||
import classNames from "classnames";
|
||||
import { useScmFormContext } from "../ScmFormContext";
|
||||
import InputField from "./InputField";
|
||||
|
||||
type Props<T extends Record<string, unknown>> = Omit<
|
||||
ComponentProps<typeof InputField>,
|
||||
"error" | "label" | "defaultChecked" | "required" | keyof ControllerRenderProps
|
||||
> & {
|
||||
rules?: ComponentProps<typeof Controller>["rules"];
|
||||
name: Path<T>;
|
||||
label?: string;
|
||||
};
|
||||
|
||||
function ControlledInputField<T extends Record<string, unknown>>({
|
||||
name,
|
||||
label,
|
||||
helpText,
|
||||
rules,
|
||||
className,
|
||||
testId,
|
||||
defaultValue,
|
||||
readOnly,
|
||||
...props
|
||||
}: Props<T>) {
|
||||
const { control, t, readOnly: formReadonly } = useScmFormContext();
|
||||
const labelTranslation = label || t(`${name}.label`) || "";
|
||||
const helpTextTranslation = helpText || t(`${name}.helpText`);
|
||||
return (
|
||||
<Controller
|
||||
control={control}
|
||||
name={name}
|
||||
rules={rules}
|
||||
defaultValue={defaultValue as never}
|
||||
render={({ field, fieldState }) => (
|
||||
<InputField
|
||||
className={classNames("column", className)}
|
||||
readOnly={readOnly ?? formReadonly}
|
||||
required={rules?.required as boolean}
|
||||
{...props}
|
||||
{...field}
|
||||
label={labelTranslation}
|
||||
helpText={helpTextTranslation}
|
||||
error={fieldState.error ? fieldState.error.message || t(`${name}.error.${fieldState.error.type}`) : undefined}
|
||||
testId={testId ?? `input-${name}`}
|
||||
/>
|
||||
)}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
export default ControlledInputField;
|
||||
@@ -0,0 +1,39 @@
|
||||
import { Meta, Story } from "@storybook/addon-docs";
|
||||
import Form from "../Form";
|
||||
import ControlledSecretConfirmationField from "./ControlledSecretConfirmationField";
|
||||
|
||||
<Meta
|
||||
title="ControlledSecretConfirmationField"
|
||||
decorators={[
|
||||
(Story) => (
|
||||
<Form onSubmit={console.log} defaultValues={{ password: "", passwordConfirmation: "" }} translationPath={["sample", "form"]}>
|
||||
<Story />
|
||||
</Form>
|
||||
),
|
||||
]}
|
||||
/>
|
||||
|
||||
<Story name="Default">
|
||||
<ControlledSecretConfirmationField name="password" />
|
||||
</Story>
|
||||
|
||||
<Story name="WithHardcodedText">
|
||||
<ControlledSecretConfirmationField name="password" label="Password" confirmationLabel="Password Confirmation" helpText="A help text" confirmationHelpText="Another help text" />
|
||||
</Story>
|
||||
|
||||
<Story name="WithStyling">
|
||||
<ControlledSecretConfirmationField name="password" className="has-background-blue-light" />
|
||||
</Story>
|
||||
|
||||
<Story name="WithCheck">
|
||||
<ControlledSecretConfirmationField
|
||||
name="password"
|
||||
rules={{
|
||||
required: true,
|
||||
}}
|
||||
/>
|
||||
</Story>
|
||||
|
||||
<Story name="WithInitialFocus">
|
||||
<ControlledSecretConfirmationField name="password" autoFocus={true} />
|
||||
</Story>
|
||||
121
scm-ui/ui-forms/src/input/ControlledSecretConfirmationField.tsx
Normal file
121
scm-ui/ui-forms/src/input/ControlledSecretConfirmationField.tsx
Normal file
@@ -0,0 +1,121 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
import React, { ComponentProps } from "react";
|
||||
import { Controller, ControllerRenderProps, Path } from "react-hook-form";
|
||||
import classNames from "classnames";
|
||||
import { useScmFormContext } from "../ScmFormContext";
|
||||
import InputField from "./InputField";
|
||||
|
||||
type Props<T extends Record<string, unknown>> = Omit<
|
||||
ComponentProps<typeof InputField>,
|
||||
"error" | "label" | "defaultChecked" | "required" | keyof ControllerRenderProps
|
||||
> & {
|
||||
rules?: ComponentProps<typeof Controller>["rules"];
|
||||
name: Path<T>;
|
||||
label?: string;
|
||||
confirmationLabel?: string;
|
||||
confirmationHelpText?: string;
|
||||
confirmationErrorMessage?: string;
|
||||
confirmationTestId?: string;
|
||||
};
|
||||
|
||||
export default function ControlledSecretConfirmationField<T extends Record<string, unknown>>({
|
||||
name,
|
||||
label,
|
||||
confirmationLabel,
|
||||
helpText,
|
||||
confirmationHelpText,
|
||||
rules,
|
||||
confirmationErrorMessage,
|
||||
className,
|
||||
testId,
|
||||
confirmationTestId,
|
||||
defaultValue,
|
||||
readOnly,
|
||||
...props
|
||||
}: Props<T>) {
|
||||
const { control, watch, t, readOnly: formReadonly } = useScmFormContext();
|
||||
const labelTranslation = label || t(`${name}.label`) || "";
|
||||
const helpTextTranslation = helpText || t(`${name}.helpText`);
|
||||
const confirmationLabelTranslation = confirmationLabel || t(`${name}.confirmation.label`) || "";
|
||||
const confirmationHelpTextTranslation = confirmationHelpText || t(`${name}.confirmation.helpText`);
|
||||
const confirmationErrorMessageTranslation = confirmationErrorMessage || t(`${name}.confirmation.errorMessage`);
|
||||
const secretValue = watch(name);
|
||||
|
||||
return (
|
||||
<>
|
||||
<Controller
|
||||
control={control}
|
||||
name={name}
|
||||
defaultValue={defaultValue as never}
|
||||
rules={{
|
||||
...rules,
|
||||
deps: [`${name}Confirmation`],
|
||||
}}
|
||||
render={({ field, fieldState }) => (
|
||||
<InputField
|
||||
className={classNames("column", className)}
|
||||
readOnly={readOnly ?? formReadonly}
|
||||
{...props}
|
||||
{...field}
|
||||
required={rules?.required as boolean}
|
||||
type="password"
|
||||
label={labelTranslation}
|
||||
helpText={helpTextTranslation}
|
||||
error={
|
||||
fieldState.error ? fieldState.error.message || t(`${name}.error.${fieldState.error.type}`) : undefined
|
||||
}
|
||||
testId={testId ?? `input-${name}`}
|
||||
/>
|
||||
)}
|
||||
/>
|
||||
<Controller
|
||||
control={control}
|
||||
name={`${name}Confirmation`}
|
||||
defaultValue={defaultValue as never}
|
||||
render={({ field, fieldState }) => (
|
||||
<InputField
|
||||
className={classNames("column", className)}
|
||||
type="password"
|
||||
readOnly={readOnly ?? formReadonly}
|
||||
disabled={props.disabled}
|
||||
{...field}
|
||||
label={confirmationLabelTranslation}
|
||||
helpText={confirmationHelpTextTranslation}
|
||||
error={
|
||||
fieldState.error
|
||||
? fieldState.error.message || t(`${name}.confirmation.error.${fieldState.error.type}`)
|
||||
: undefined
|
||||
}
|
||||
testId={confirmationTestId ?? `input-${name}-confirmation`}
|
||||
/>
|
||||
)}
|
||||
rules={{
|
||||
validate: (value) => secretValue === value || confirmationErrorMessageTranslation,
|
||||
}}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}
|
||||
22
scm-ui/ui-forms/src/input/Input.stories.mdx
Normal file
22
scm-ui/ui-forms/src/input/Input.stories.mdx
Normal file
@@ -0,0 +1,22 @@
|
||||
import { Meta, Story } from "@storybook/addon-docs";
|
||||
import Input from "./Input"
|
||||
|
||||
<Meta title="Input" />
|
||||
|
||||
This will be our latest input component
|
||||
|
||||
<Story name="Default">
|
||||
<Input />
|
||||
</Story>
|
||||
|
||||
<Story name="With Variant">
|
||||
<Input variant="danger" />
|
||||
</Story>
|
||||
|
||||
<Story name="With Custom Class">
|
||||
<Input className="is-warning" />
|
||||
</Story>
|
||||
|
||||
<Story name="With Ref">
|
||||
<Input ref={r => {r.focus()}} />
|
||||
</Story>
|
||||
46
scm-ui/ui-forms/src/input/Input.tsx
Normal file
46
scm-ui/ui-forms/src/input/Input.tsx
Normal file
@@ -0,0 +1,46 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
import React, { InputHTMLAttributes } from "react";
|
||||
import classNames from "classnames";
|
||||
import { createVariantClass, Variant } from "../variants";
|
||||
import { createAttributesForTesting } from "@scm-manager/ui-components";
|
||||
|
||||
type Props = {
|
||||
variant?: Variant;
|
||||
testId?: string;
|
||||
} & InputHTMLAttributes<HTMLInputElement>;
|
||||
|
||||
const Input = React.forwardRef<HTMLInputElement, Props>(({ variant, className, testId, ...props }, ref) => {
|
||||
return (
|
||||
<input
|
||||
ref={ref}
|
||||
className={classNames("input", createVariantClass(variant), className)}
|
||||
{...props}
|
||||
{...createAttributesForTesting(testId)}
|
||||
/>
|
||||
);
|
||||
});
|
||||
|
||||
export default Input;
|
||||
22
scm-ui/ui-forms/src/input/InputField.stories.mdx
Normal file
22
scm-ui/ui-forms/src/input/InputField.stories.mdx
Normal file
@@ -0,0 +1,22 @@
|
||||
import { Meta, Story } from "@storybook/addon-docs";
|
||||
import InputField from "./InputField";
|
||||
|
||||
<Meta title="InputField" />
|
||||
|
||||
This will be our first form field molecule
|
||||
|
||||
<Story name="Default">
|
||||
<InputField label="MyInput" />
|
||||
</Story>
|
||||
|
||||
<Story name="WithHelp">
|
||||
<InputField label="MyInput" helpText="You can do all sorts of things with this input" />
|
||||
</Story>
|
||||
|
||||
<Story name="WithError">
|
||||
<InputField label="MyInput" error="This field is super required" />
|
||||
</Story>
|
||||
|
||||
<Story name="WithWidth">
|
||||
<InputField label="MyInput" className="column is-half" />
|
||||
</Story>
|
||||
60
scm-ui/ui-forms/src/input/InputField.tsx
Normal file
60
scm-ui/ui-forms/src/input/InputField.tsx
Normal file
@@ -0,0 +1,60 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
import React from "react";
|
||||
import Field from "../base/Field";
|
||||
import Control from "../base/Control";
|
||||
import Label from "../base/label/Label";
|
||||
import FieldMessage from "../base/field-message/FieldMessage";
|
||||
import Input from "./Input";
|
||||
import Help from "../base/help/Help";
|
||||
|
||||
type InputFieldProps = {
|
||||
label: string;
|
||||
helpText?: string;
|
||||
error?: string;
|
||||
type?: "text" | "password" | "email" | "tel";
|
||||
} & Omit<React.ComponentProps<typeof Input>, "type">;
|
||||
|
||||
/**
|
||||
* @see https://bulma.io/documentation/form/input/
|
||||
*/
|
||||
const InputField = React.forwardRef<HTMLInputElement, InputFieldProps>(
|
||||
({ label, helpText, error, className, ...props }, ref) => {
|
||||
const variant = error ? "danger" : undefined;
|
||||
return (
|
||||
<Field className={className}>
|
||||
<Label>
|
||||
{label}
|
||||
{helpText ? <Help className="ml-1" text={helpText} /> : null}
|
||||
</Label>
|
||||
<Control>
|
||||
<Input variant={variant} ref={ref} {...props}></Input>
|
||||
</Control>
|
||||
{error ? <FieldMessage variant={variant}>{error}</FieldMessage> : null}
|
||||
</Field>
|
||||
);
|
||||
}
|
||||
);
|
||||
export default InputField;
|
||||
Reference in New Issue
Block a user