fix: 🐛 add unsupported types vimeoid and vimeoid in dynamic inputs
This commit is contained in:
parent
a1a9d55568
commit
2df26fb856
2 changed files with 126 additions and 30 deletions
|
|
@ -59,7 +59,7 @@ abstract class UpdateDynamicFieldRequest extends FormRequest
|
|||
|
||||
/**
|
||||
* Get rules from a specific input type.
|
||||
*
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
private function recursiveRules(&$input, $prefix): array
|
||||
|
|
@ -150,6 +150,16 @@ abstract class UpdateDynamicFieldRequest extends FormRequest
|
|||
$ruleKey => $this->pictureRules(implode("|", $imgRules)),
|
||||
]);
|
||||
break;
|
||||
case DynamicFieldTypes::vimeoid->value:
|
||||
$rules = array_merge($rules, [
|
||||
$ruleKey => $this->compileValidate(DynamicFieldTypes::vimeoid->getValidation(), $input)
|
||||
]);
|
||||
break;
|
||||
case DynamicFieldTypes::youtubeid->value:
|
||||
$rules = array_merge($rules, [
|
||||
$ruleKey => $this->compileValidate(DynamicFieldTypes::youtubeid->getValidation(), $input)
|
||||
]);
|
||||
break;
|
||||
case DynamicFieldTypes::date->value:
|
||||
$rules = array_merge($rules, [
|
||||
$ruleKey => $this->compileValidate(DynamicFieldTypes::date->getValidation(), $input)
|
||||
|
|
@ -183,7 +193,7 @@ abstract class UpdateDynamicFieldRequest extends FormRequest
|
|||
|
||||
/**
|
||||
* Get attributes from a specific input type.
|
||||
*
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
private function recursiveAttributes(&$input, $prefix): array
|
||||
|
|
@ -313,7 +323,7 @@ abstract class UpdateDynamicFieldRequest extends FormRequest
|
|||
/**
|
||||
* Recursively traverses an array and converts it to Boolean
|
||||
* all values whose key begins with “boolean_”.
|
||||
*
|
||||
*
|
||||
* @param array $data
|
||||
* @return array
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -10,7 +10,13 @@ import DynamicList from "@/back/Components/DynamicPages/DynamicList";
|
|||
import SimpleTextarea from "@/back/Components/Inputs/SimpleTextarea";
|
||||
import SimpleDatePicker from "@/back/Components/Inputs/SimpleDatePicker";
|
||||
import SimpleColorPicker from "@/back/Components/Inputs/SimpleColorPicker";
|
||||
import { ConfigField, DynamicFieldTypes, DynamicInternalField } from "@/back/types/global";
|
||||
import SimpleYoutubeId from "@/back/Components/Inputs/SimpleYoutubeId";
|
||||
import SimpleVimeoId from "@/back/Components/Inputs/SimpleVimeoId";
|
||||
import {
|
||||
ConfigField,
|
||||
DynamicFieldTypes,
|
||||
DynamicInternalField,
|
||||
} from "@/back/types/global";
|
||||
import str from "@/hooks/use-string";
|
||||
import useTrans from "@/hooks/use-translations";
|
||||
import {
|
||||
|
|
@ -24,9 +30,12 @@ type DynamicInputsProps = {
|
|||
config: ConfigField[];
|
||||
content: DynamicInternalField | null;
|
||||
isChildren?: boolean;
|
||||
setData: (name: string, value: string | boolean | File | object | null) => void;
|
||||
setData: (
|
||||
name: string,
|
||||
value: string | boolean | File | object | null,
|
||||
) => void;
|
||||
reset: (name?: string) => void;
|
||||
parentErrors?: Record<string, string> | null,
|
||||
parentErrors?: Record<string, string> | null;
|
||||
};
|
||||
|
||||
// Allows to get specific input from enum value.
|
||||
|
|
@ -40,7 +49,8 @@ export default function DynamicInputs({
|
|||
parentErrors,
|
||||
}: DynamicInputsProps) {
|
||||
// Enums.
|
||||
const enumDynamicFieldTypes = usePage().props.enumDynamicFieldTypes as DynamicFieldTypes;
|
||||
const enumDynamicFieldTypes = usePage().props
|
||||
.enumDynamicFieldTypes as DynamicFieldTypes;
|
||||
|
||||
// Translations.
|
||||
const transAssociateTo = useTrans("back.form_associate_to");
|
||||
|
|
@ -53,7 +63,11 @@ export default function DynamicInputs({
|
|||
* @returns string
|
||||
*/
|
||||
const getTrans = (fieldLabel: string): string => {
|
||||
return str(`${transAssociateTo.split("|")[0].replace(":attribute", fieldLabel)}`).ucFirst().value();
|
||||
return str(
|
||||
`${transAssociateTo.split("|")[0].replace(":attribute", fieldLabel)}`,
|
||||
)
|
||||
.ucFirst()
|
||||
.value();
|
||||
};
|
||||
|
||||
return (
|
||||
|
|
@ -69,7 +83,8 @@ export default function DynamicInputs({
|
|||
const fieldName = `${name}.${field.key}`;
|
||||
|
||||
// Set the content value from the config key.
|
||||
const fieldValue = content?.[field.key as keyof typeof content] ?? "";
|
||||
const fieldValue =
|
||||
content?.[field.key as keyof typeof content] ?? "";
|
||||
|
||||
switch (field.type) {
|
||||
// String input.
|
||||
|
|
@ -79,7 +94,9 @@ export default function DynamicInputs({
|
|||
key={id}
|
||||
name={fieldName}
|
||||
label={getTrans(field.label)}
|
||||
required={extractRequiredValidation(field.validation)}
|
||||
required={extractRequiredValidation(
|
||||
field.validation,
|
||||
)}
|
||||
value={String(fieldValue)}
|
||||
setData={setData}
|
||||
parentErrors={parentErrors}
|
||||
|
|
@ -92,7 +109,9 @@ export default function DynamicInputs({
|
|||
key={id}
|
||||
name={fieldName}
|
||||
label={getTrans(field.label)}
|
||||
required={extractRequiredValidation(field.validation)}
|
||||
required={extractRequiredValidation(
|
||||
field.validation,
|
||||
)}
|
||||
value={String(fieldValue)}
|
||||
setData={setData}
|
||||
parentErrors={parentErrors}
|
||||
|
|
@ -105,7 +124,9 @@ export default function DynamicInputs({
|
|||
<SimpleWysiwyg
|
||||
name={fieldName}
|
||||
model="DynamicPage"
|
||||
required={extractRequiredValidation(field.validation)}
|
||||
required={extractRequiredValidation(
|
||||
field.validation,
|
||||
)}
|
||||
label={getTrans(field.label)}
|
||||
value={String(fieldValue)}
|
||||
setData={setData}
|
||||
|
|
@ -120,8 +141,12 @@ export default function DynamicInputs({
|
|||
key={id}
|
||||
name={fieldName}
|
||||
label={getTrans(field.label)}
|
||||
limits={extractMinMaxFromValidation(field.validation)}
|
||||
required={extractRequiredValidation(field.validation)}
|
||||
limits={extractMinMaxFromValidation(
|
||||
field.validation,
|
||||
)}
|
||||
required={extractRequiredValidation(
|
||||
field.validation,
|
||||
)}
|
||||
value={Number(fieldValue)}
|
||||
setData={setData}
|
||||
/>
|
||||
|
|
@ -147,7 +172,9 @@ export default function DynamicInputs({
|
|||
label={getTrans(field.label)}
|
||||
type="url"
|
||||
placeholder="ex: https://..."
|
||||
required={extractRequiredValidation(field.validation)}
|
||||
required={extractRequiredValidation(
|
||||
field.validation,
|
||||
)}
|
||||
value={String(fieldValue)}
|
||||
setData={setData}
|
||||
/>
|
||||
|
|
@ -163,12 +190,28 @@ export default function DynamicInputs({
|
|||
setData={setData}
|
||||
reset={reset}
|
||||
value={fieldValue as string | File | null}
|
||||
required={extractRequiredValidation(field.validation)}
|
||||
maxFileSize={extractLaravelValidationValue(field.validation, 'max')}
|
||||
allowedFormats={extractLaravelValidationValue(field.validation, 'mimes')}
|
||||
required={extractRequiredValidation(
|
||||
field.validation,
|
||||
)}
|
||||
maxFileSize={extractLaravelValidationValue(
|
||||
field.validation,
|
||||
"max",
|
||||
)}
|
||||
allowedFormats={extractLaravelValidationValue(
|
||||
field.validation,
|
||||
"mimes",
|
||||
)}
|
||||
validationRules={{
|
||||
width: extractLaravelValidationValue(field.validation, "dimensions", 'width'),
|
||||
height: extractLaravelValidationValue(field.validation, "dimensions", 'height')
|
||||
width: extractLaravelValidationValue(
|
||||
field.validation,
|
||||
"dimensions",
|
||||
"width",
|
||||
),
|
||||
height: extractLaravelValidationValue(
|
||||
field.validation,
|
||||
"dimensions",
|
||||
"height",
|
||||
),
|
||||
}}
|
||||
/>
|
||||
);
|
||||
|
|
@ -181,7 +224,9 @@ export default function DynamicInputs({
|
|||
label={getTrans(field.label)}
|
||||
type="email"
|
||||
placeholder="ex: john.doe@ldc.fr"
|
||||
required={extractRequiredValidation(field.validation)}
|
||||
required={extractRequiredValidation(
|
||||
field.validation,
|
||||
)}
|
||||
value={String(fieldValue)}
|
||||
setData={setData}
|
||||
/>
|
||||
|
|
@ -195,7 +240,9 @@ export default function DynamicInputs({
|
|||
parentName={name}
|
||||
content={content}
|
||||
field={field}
|
||||
value={Array.isArray(fieldValue) ? fieldValue : []}
|
||||
value={
|
||||
Array.isArray(fieldValue) ? fieldValue : []
|
||||
}
|
||||
enumLabel={enumDynamicFieldTypes.list.label}
|
||||
setData={setData}
|
||||
reset={reset}
|
||||
|
|
@ -211,20 +258,56 @@ export default function DynamicInputs({
|
|||
label={str(
|
||||
useTrans("back.form_associate_to", {
|
||||
params: {
|
||||
attribute: useTrans("validation.custom.file"),
|
||||
attribute: useTrans(
|
||||
"validation.custom.file",
|
||||
),
|
||||
},
|
||||
choice: 1,
|
||||
}),
|
||||
).ucFirst().value()}
|
||||
)
|
||||
.ucFirst()
|
||||
.value()}
|
||||
setData={setData}
|
||||
reset={reset}
|
||||
value={fieldValue as string | File | null}
|
||||
required={extractRequiredValidation(field.validation)}
|
||||
maxFileSize={extractLaravelValidationValue(field.validation, 'max')}
|
||||
allowedFormats={extractLaravelValidationValue(field.validation, 'mimes')}
|
||||
required={extractRequiredValidation(
|
||||
field.validation,
|
||||
)}
|
||||
maxFileSize={extractLaravelValidationValue(
|
||||
field.validation,
|
||||
"max",
|
||||
)}
|
||||
allowedFormats={extractLaravelValidationValue(
|
||||
field.validation,
|
||||
"mimes",
|
||||
)}
|
||||
inputType={enumDynamicFieldTypes.file.value}
|
||||
/>
|
||||
)
|
||||
);
|
||||
// VimeoId input
|
||||
case enumDynamicFieldTypes.vimeoid.value:
|
||||
return (
|
||||
<SimpleVimeoId
|
||||
name={fieldName}
|
||||
setData={setData}
|
||||
value={String(fieldValue)}
|
||||
required={extractRequiredValidation(
|
||||
field.validation,
|
||||
)}
|
||||
/>
|
||||
);
|
||||
// YoutubeId input
|
||||
case enumDynamicFieldTypes.youtubeid.value:
|
||||
return (
|
||||
<SimpleYoutubeId
|
||||
name={fieldName}
|
||||
setData={setData}
|
||||
value={String(fieldValue)}
|
||||
required={extractRequiredValidation(
|
||||
field.validation,
|
||||
)}
|
||||
/>
|
||||
);
|
||||
// Date picker.
|
||||
case enumDynamicFieldTypes.date.value:
|
||||
return (
|
||||
|
|
@ -244,7 +327,9 @@ export default function DynamicInputs({
|
|||
setData={setData}
|
||||
value={String(fieldValue)}
|
||||
label={getTrans(field.label)}
|
||||
required={extractRequiredValidation(field.validation)}
|
||||
required={extractRequiredValidation(
|
||||
field.validation,
|
||||
)}
|
||||
/>
|
||||
);
|
||||
default:
|
||||
|
|
@ -253,7 +338,8 @@ export default function DynamicInputs({
|
|||
key={id}
|
||||
className="text-muted-foreground text-sm"
|
||||
>
|
||||
{transUnsupportedType} {typeEnum?.label ?? field.type}
|
||||
{transUnsupportedType}{" "}
|
||||
{typeEnum?.label ?? field.type}
|
||||
</p>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue