diff --git a/app/Enums/DynamicFieldTypes.php b/app/Enums/DynamicFieldTypes.php index be4bedbf..b70c546b 100644 --- a/app/Enums/DynamicFieldTypes.php +++ b/app/Enums/DynamicFieldTypes.php @@ -9,15 +9,17 @@ enum DynamicFieldTypes: int use BaseEnum; // Name must be one word in lowercase. - case string = 1; - case text = 2; - case number = 3; - case boolean = 4; - case url = 5; - case email = 6; - case image = 7; - case list = 8; - // case color = 9; + case string = 1; + case textarea = 2; + case wysiwyg = 3; + case number = 4; + case boolean = 5; + case url = 6; + case email = 7; + case image = 8; + case list = 9; + // case color = 10; + // case date = 11; /** * Labels definition. @@ -25,28 +27,30 @@ enum DynamicFieldTypes: int * @phpstan-ignore-next-line */ private const LABELS = [ - self::string->name => 'enums.dynamic-field-types.string', - self::text->name => 'enums.dynamic-field-types.text', - self::number->name => 'enums.dynamic-field-types.number', - self::boolean->name => 'enums.dynamic-field-types.boolean', - self::url->name => 'enums.dynamic-field-types.url', - self::email->name => 'enums.dynamic-field-types.email', - self::image->name => 'enums.dynamic-field-types.image', - self::list->name => 'enums.dynamic-field-types.list', + self::string->name => 'enums.dynamic-field-types.string', + self::textarea->name => 'enums.dynamic-field-types.textarea', + self::wysiwyg->name => 'enums.dynamic-field-types.wysiwyg', + self::number->name => 'enums.dynamic-field-types.number', + self::boolean->name => 'enums.dynamic-field-types.boolean', + self::url->name => 'enums.dynamic-field-types.url', + self::email->name => 'enums.dynamic-field-types.email', + self::image->name => 'enums.dynamic-field-types.image', + self::list->name => 'enums.dynamic-field-types.list', ]; /** * Validations definition. */ private const VALIDATIONS = [ - self::string->name => 'required|string|between:3,255', - self::text->name => 'required|string|string|min:15', - self::number->name => 'required|numeric|min:0', - self::boolean->name => 'required|boolean', - self::url->name => 'required|url:https', - self::email->name => 'required|email:rfc,strict,dns,spoof,filter', - self::image->name => 'required|file|mimes:jpg,jpeg,png,pdf|max:5120|dimensions:width=100,height=100', - self::list->name => 'required|array|min:1|max:10', + self::string->name => 'required|string|between:3,255', + self::textarea->name => 'required|string|string|min:15', + self::wysiwyg->name => 'required|string|string|min:15', + self::number->name => 'required|numeric|min:0', + self::boolean->name => 'required|boolean', + self::url->name => 'required|url:https', + self::email->name => 'required|email:rfc,strict,dns,spoof,filter', + self::image->name => 'required|file|mimes:jpg,jpeg,png,pdf|max:5120|dimensions:width=100,height=100', + self::list->name => 'required|array|min:1|max:10', ]; /** @@ -61,15 +65,18 @@ enum DynamicFieldTypes: int /** * Is array definition. + * + * @return array */ private const ISARRAY = [ - self::string->name => false, - self::text->name => false, - self::number->name => false, - self::boolean->name => false, - self::url->name => false, - self::email->name => false, - self::image->name => false, - self::list->name => true, + self::string->name => false, + self::textarea->name => false, + self::wysiwyg->name => false, + self::number->name => false, + self::boolean->name => false, + self::url->name => false, + self::email->name => false, + self::image->name => false, + self::list->name => true, ]; } diff --git a/app/Helpers/DynamicPageHelper.php b/app/Helpers/DynamicPageHelper.php index dba45a2a..7208ba4f 100644 --- a/app/Helpers/DynamicPageHelper.php +++ b/app/Helpers/DynamicPageHelper.php @@ -95,7 +95,7 @@ class DynamicPageHelper */ protected static function removeWysiwygImages(array $oldContent, array $newContent): void { - $prefix = DynamicFieldTypes::text->name . '_'; + $prefix = DynamicFieldTypes::wysiwyg->name . '_'; static::getDynamicFieldKeys($oldContent, $newContent, $prefix) ->each(function ($key) use ($oldContent) { diff --git a/app/Http/Requests/Back/UpdateDynamicFieldRequest.php b/app/Http/Requests/Back/UpdateDynamicFieldRequest.php index c55713f1..447fbeed 100644 --- a/app/Http/Requests/Back/UpdateDynamicFieldRequest.php +++ b/app/Http/Requests/Back/UpdateDynamicFieldRequest.php @@ -67,8 +67,8 @@ abstract class UpdateDynamicFieldRequest extends FormRequest $ruleKey => $this->compileValidate(DynamicFieldTypes::string->getValidation(), $input) ]); break; - case DynamicFieldTypes::text->value: - $mergeRules = $this->compileValidate(DynamicFieldTypes::text->getValidation(), $input); + case DynamicFieldTypes::wysiwyg->value: + $mergeRules = $this->compileValidate(DynamicFieldTypes::wysiwyg->getValidation(), $input); $mergeRules = collect($mergeRules) ->map(function ($rule) { // TODO: check pour utiliser la rule wysiwyg length. @@ -92,13 +92,9 @@ abstract class UpdateDynamicFieldRequest extends FormRequest ]); break; case DynamicFieldTypes::boolean->value: - $all = $this->all(); - $nested = ToolboxHelper::dotStringToNestedArray( - $ruleKey, - $this->input($ruleKey) ? true : false - ); - $all = ToolboxHelper::arrayMergeRecursiveDistinct($all, $nested); - $this->merge($all); + $all = $this->all(); + $modified = $this->castBooleanFields($all); + $this->merge($modified); $rules = array_merge($rules, [ $ruleKey => $this->compileValidate(DynamicFieldTypes::boolean->getValidation(), $input) ]); @@ -279,4 +275,28 @@ abstract class UpdateDynamicFieldRequest extends FormRequest } return $itemKey; } + + /** + * Recursively traverses an array and converts it to Boolean + * all values whose key begins with “boolean_”. + * + * @param array $data + * @return array + */ + private function castBooleanFields(array $data): array + { + foreach ($data as $key => $value) { + // If the value is an array, recursive method. + if (is_array($value)) { + $data[$key] = $this->castBooleanFields($value); + continue; + } + // Check if the key start with the pattern enum_. + if (str_starts_with($key, sprintf("%s_", DynamicFieldTypes::boolean->name))) { + // Manages values "true", "false", "1", "0", 1, 0, "on", "off". + $data[$key] = filter_var($value, FILTER_VALIDATE_BOOLEAN); + } + } + return $data; + } } diff --git a/database/factories/DynamicPageFactory.php b/database/factories/DynamicPageFactory.php index 7fd0e1db..47e421a4 100644 --- a/database/factories/DynamicPageFactory.php +++ b/database/factories/DynamicPageFactory.php @@ -46,7 +46,10 @@ class DynamicPageFactory extends Factory case DynamicFieldTypes::string->value: $configValue[$field['key']] = fake()->words(5, true); break; - case DynamicFieldTypes::text->value: + case DynamicFieldTypes::textarea->value: + $configValue[$field['key']] = fake()->words(10, true); + break; + case DynamicFieldTypes::wysiwyg->value: $configValue[$field['key']] = sprintf("

%s

", fake()->text(160)); break; case DynamicFieldTypes::number->value: @@ -58,6 +61,21 @@ class DynamicPageFactory extends Factory case DynamicFieldTypes::url->value: $configValue[$field['key']] = fake()->url(); break; + case DynamicFieldTypes::email->value: + $configValue[$field['key']] = fake()->email(); + break; + case DynamicFieldTypes::image->value: + // Fake image in seeder. + $configValue[$field['key']] = null; + break; + case DynamicFieldTypes::list->value: + $configValue[$field['key']] = [ + [ + $field['children'][0]['key'] => fake()->unique()->word(), + 'order' => 1, + ], + ]; + break; default: $configValue = []; break; diff --git a/database/factories/PageConfigFactory.php b/database/factories/PageConfigFactory.php index 998eac2a..85397b4f 100644 --- a/database/factories/PageConfigFactory.php +++ b/database/factories/PageConfigFactory.php @@ -17,19 +17,33 @@ class PageConfigFactory extends Factory public function definition(): array { $enum = \collect(DynamicFieldTypes::toArray())->random(); - $slug = Str::slug($enum->label); - return [ + $data = [ 'label' => fake()->unique()->word(), 'view' => fake()->boolean(50) ? PageConfig::$defaultView : null, 'config' => [ [ 'type' => $enum->value, - 'key' => sprintf("%s_%s", $enum->name, $slug), + 'key' => sprintf("%s_%s", $enum->name, Str::slug($enum->label)), 'label' => $enum->label, 'validation' => $enum->validation, 'order' => 1, - ] + ], ], ]; + if ($enum->value === DynamicFieldTypes::list->value) { + // Set only one string input for the example. + $defaultEnum = DynamicFieldTypes::string; + $data['config'][0]['children'] = [ + [ + 'type' => $defaultEnum->value(), + 'key' => sprintf("%s_%s", $defaultEnum->name(), Str::slug($defaultEnum->label())), + 'label' => $defaultEnum->label(), + 'validation' => $defaultEnum->getValidation(), + 'order' => 1, + ], + ]; + } + + return $data; } } diff --git a/database/factories/assets/dynamic-pages/100x100.jpg b/database/factories/assets/dynamic-pages/100x100.jpg new file mode 100644 index 00000000..0d38b1dc Binary files /dev/null and b/database/factories/assets/dynamic-pages/100x100.jpg differ diff --git a/database/seeders/DynamicPageSeeder.php b/database/seeders/DynamicPageSeeder.php index 58100b65..b1c49e25 100644 --- a/database/seeders/DynamicPageSeeder.php +++ b/database/seeders/DynamicPageSeeder.php @@ -2,8 +2,11 @@ namespace Database\Seeders; +use App\Enums\DynamicFieldTypes; use App\Models\DynamicPage; use Illuminate\Database\Seeder; +use Illuminate\Support\Str; +use Uwil\LaravelCommon\Helpers\FileHelper; class DynamicPageSeeder extends Seeder { @@ -14,6 +17,23 @@ class DynamicPageSeeder extends Seeder */ public function run(): void { - DynamicPage::factory(10)->create(); + DynamicPage::factory(10)->make() + ->each(function ($model) { + $content = $model->content; + // Config factories add just one depth of children. + foreach ($model->content as $key => $value) { + $prefix = sprintf("%s_", DynamicFieldTypes::image->name); + if (Str::startsWith($key, $prefix)) { + $content[$key] = FileHelper::storeFile( + $model, + new \SplFileInfo(\resource_path( + '../database/factories/assets/dynamic-pages/100x100.jpg' + )) + ); + } + } + $model->content = $content; + $model->saveOrFail(); + }); } } diff --git a/lang/en/enums.php b/lang/en/enums.php index 003afc1d..d0f0d6e0 100644 --- a/lang/en/enums.php +++ b/lang/en/enums.php @@ -12,14 +12,15 @@ return [ 'unpublished' => 'Unpublished', ], 'dynamic-field-types' => [ - 'string' => 'String', - 'text' => 'Text', - 'number' => 'Number', - 'boolean' => 'Boolean', - 'url' => 'Link', - 'email' => 'E-mail', - 'image' => 'Image', - 'list' => 'Item list' + 'string' => 'String', + 'textarea' => 'Textarea', + 'wysiwyg' => 'Wysiwyg', + 'number' => 'Number', + 'boolean' => 'Boolean', + 'url' => 'Link', + 'email' => 'E-mail', + 'image' => 'Image', + 'list' => 'Item list' ], 'contactFormType' => [ 'collaborator' => [ diff --git a/lang/fr/enums.php b/lang/fr/enums.php index b2b2c374..715423bf 100644 --- a/lang/fr/enums.php +++ b/lang/fr/enums.php @@ -12,14 +12,15 @@ return [ 'unpublished' => 'Dépublié', ], 'dynamic-field-types' => [ - 'string' => 'Chaîne de caractères', - 'text' => 'Textuel', - 'number' => 'Numérique', - 'boolean' => 'Booléen', - 'url' => 'Lien', - 'email' => 'E-mail', - 'image' => 'Image', - 'list' => 'Liste de champs' + 'string' => 'Chaîne de caractères', + 'textarea' => 'Textarea', + 'wysiwyg' => 'Wysiwyg', + 'number' => 'Numérique', + 'boolean' => 'Booléen', + 'url' => 'Lien', + 'email' => 'E-mail', + 'image' => 'Image', + 'list' => 'Liste de champs' ], 'contactFormType' => [ 'collaborator' => [ diff --git a/resources/ts/back/Components/DynamicPages/DynamicInputs.tsx b/resources/ts/back/Components/DynamicPages/DynamicInputs.tsx index 2b74c28f..2caf3451 100644 --- a/resources/ts/back/Components/DynamicPages/DynamicInputs.tsx +++ b/resources/ts/back/Components/DynamicPages/DynamicInputs.tsx @@ -7,6 +7,7 @@ import SimpleSwitch from "@/back/Components/Inputs/SimpleSwitch"; import SimpleWysiwyg from "@/back/Components/Inputs/SimpleWysiwyg"; import ImageCropperWrapper from "@/back/Components/Inputs/ImageCropper/ImageCropperWrapper"; import DynamicList from "@/back/Components/DynamicPages/DynamicList"; +import SimpleTextarea from "@/back/Components/Inputs/SimpleTextarea"; import { ConfigField, DynamicFieldTypes, DynamicInternalField } from "@/back/types/global"; import str from "@/hooks/use-string"; import useTrans from "@/hooks/use-translations"; @@ -20,8 +21,10 @@ type DynamicInputsProps = { name: string; config: ConfigField[]; content: DynamicInternalField | null; + isChildren?: boolean; setData: (name: string, value: string | boolean | File | object | null) => void; reset: (name?: string) => void; + parentErrors?: Record | null, }; // Allows to get specific input from enum value. @@ -29,8 +32,10 @@ export default function DynamicInputs({ name, config, content = null, + isChildren = false, setData, reset, + parentErrors, }: DynamicInputsProps) { // Enums. const enumDynamicFieldTypes = usePage().props.enumDynamicFieldTypes as DynamicFieldTypes; @@ -75,10 +80,23 @@ export default function DynamicInputs({ required={extractRequiredValidation(field.validation)} value={String(fieldValue)} setData={setData} + parentErrors={parentErrors} + /> + ); + // Textarea input. + case enumDynamicFieldTypes.textarea.value: + return ( + ); // Wysiwyg input. - case enumDynamicFieldTypes.text.value: + case enumDynamicFieldTypes.wysiwyg.value: return (
); @@ -181,6 +200,7 @@ export default function DynamicInputs({ enumLabel={enumDynamicFieldTypes.list.label} setData={setData} reset={reset} + isChildren={isChildren} /> ); default: diff --git a/resources/ts/back/Components/DynamicPages/DynamicList.tsx b/resources/ts/back/Components/DynamicPages/DynamicList.tsx index f6d795de..2089969f 100644 --- a/resources/ts/back/Components/DynamicPages/DynamicList.tsx +++ b/resources/ts/back/Components/DynamicPages/DynamicList.tsx @@ -3,6 +3,8 @@ import { CSS } from "@dnd-kit/utilities"; import { GripVerticalIcon, TrashIcon } from "lucide-react"; import { closestCenter, DndContext, DragEndEvent, PointerSensor, useSensor, useSensors } from "@dnd-kit/core"; import { arrayMove, SortableContext, useSortable, verticalListSortingStrategy } from "@dnd-kit/sortable"; +import { useState } from "react"; +import { usePage } from "@inertiajs/react"; // * Components shadcn import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion"; import { Card, CardContent } from "@/components/ui/card"; @@ -14,6 +16,7 @@ import DynamicInputs from "@/back/Components/DynamicPages/DynamicInputs"; import useTrans from "@/hooks/use-translations"; import { extractMinMaxFromValidation, extractRequiredValidation } from "@/hooks/use-laravel-validation"; import { ConfigField, DynamicInternalField } from "@/back/types/global"; +import { cn } from "@/lib/utils"; type DynamicListProps = { name: string, @@ -22,6 +25,7 @@ type DynamicListProps = { enumLabel: string, field: ConfigField, content: DynamicInternalField | null; + isChildren: boolean; setData: (name: string, value: string | boolean | File | object | null) => void; reset: (name?: string) => void; } @@ -34,6 +38,7 @@ export default function DynamicList({ enumLabel, field, content, + isChildren, setData, reset, }: DynamicListProps) { @@ -48,6 +53,10 @@ export default function DynamicList({ ); } + // Errors. + const { errors } = usePage().props; + const [localErrors, setLocalErrors] = useState>(errors) + // Drag & drop module for user interactions (mouse, touch, keyboard or other). const sensors = useSensors(useSensor(PointerSensor)); @@ -63,6 +72,9 @@ export default function DynamicList({ const isRequired = extractRequiredValidation(field.validation); const configLimitMax = extractMinMaxFromValidation(field.validation).max ?? 1; + // Accordion open index. + const [openIndex, setOpenIndex] = useState(""); + /** * Get all elements without each unique identification values. * @param fields DynamicInternalField[] @@ -104,6 +116,8 @@ export default function DynamicList({ list.splice(index, 1); // Save the new list updated. setData(`${parentName}.${fieldKey}`, list); + // Reset all errors because of alter elements list. + setLocalErrors({}); } /** @@ -158,6 +172,8 @@ export default function DynamicList({ type="single" collapsible className="w-full" + value={openIndex} + onValueChange={setOpenIndex} > {/* The main provider for dnd-kit. @@ -189,6 +205,9 @@ export default function DynamicList({ setData={setData} reset={reset} removeField={handleRemoveField} + parentAccordionState={openIndex} + setParentAccordionState={setOpenIndex} + localErrors={localErrors} /> ))} @@ -199,6 +218,7 @@ export default function DynamicList({ array={sortedListItems} limitMax={configLimitMax} onClick={handleAddNewField} + variant={isChildren ? "secondary" : "default"} /> ) @@ -214,6 +234,9 @@ type SortableItemProps = { setData: (name: string, value: string | boolean | File | object | null) => void; reset: (name?: string) => void; removeField: (parentName: string, fieldKey: string, index: number) => void; + parentAccordionState: string; + setParentAccordionState: (key: string) => void; + localErrors: Record; } // Recursive component. @@ -227,6 +250,9 @@ function SortableItem({ setData, reset, removeField, + parentAccordionState, + setParentAccordionState, + localErrors, }: SortableItemProps) { // Provides the necessary props and helpers to make this item draggable and reorderable. // Includes event listeners, accessibility attributes, DOM ref, drag transform/transition values, @@ -251,7 +277,9 @@ function SortableItem({ return (
- + key.startsWith(`${name}.${itemIndex}`)), + })}>
@@ -264,6 +292,7 @@ function SortableItem({ type="button" variant="outline" size="icon" + disable={parentAccordionState !== ""} {...listeners} {...attributes} /> @@ -275,7 +304,12 @@ function SortableItem({ type="button" variant="destructive" size="icon" - onClick={() => removeField(parentName, field.key, itemIndex)} + onClick={() => { + if (parentAccordionState === `item-${itemIndex}`) { + setParentAccordionState("") + } + removeField(parentName, field.key, itemIndex) + }} />
{/* Define the trigger button to open or close the current accordion. */} @@ -293,6 +327,8 @@ function SortableItem({ content={item} setData={setData} reset={reset} + parentErrors={localErrors} + isChildren={true} /> diff --git a/resources/ts/back/Components/Inputs/SimpleDatePicker.tsx b/resources/ts/back/Components/Inputs/SimpleDatePicker.tsx index fdf9b5a7..5f3fb9e9 100644 --- a/resources/ts/back/Components/Inputs/SimpleDatePicker.tsx +++ b/resources/ts/back/Components/Inputs/SimpleDatePicker.tsx @@ -4,7 +4,6 @@ import InputError from "@/back/Components/InputError"; import { usePage } from "@inertiajs/react"; import { Calendar } from "@/components/ui/calendar"; import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"; -import { useState } from "react"; import { Button } from "@/components/ui/button"; import { CalendarIcon, RefreshCcw } from "lucide-react"; import { cn } from "@/lib/utils"; @@ -16,27 +15,35 @@ import { Separator } from "@/components/ui/separator"; import str from "@/hooks/use-string"; import useTrans from "@/hooks/use-translations"; +type SimpleDatePickerProps = { + name: string; + placeholder?: string; + date?: Date | null; + required?: boolean; + disabled?: boolean; + className?: string; + label: string; + hasTime?: boolean; + parentErrors?: Record | null, + // eslint-disable-next-line no-unused-vars + setData: (name: string, value: Date | null) => void; +} + export default function SimpleDatePicker({ name, placeholder = "Sélectionner une date", date, required = false, disabled = false, - setData, className, label, - hasTime = false -}: { - name: string; - placeholder?: string; - date?: Date | null; - required?: boolean; - disabled?: boolean; - setData: Function; - className?: string; - label: string; - hasTime?: boolean; -}) { + hasTime = false, + parentErrors = null, + setData, +}: SimpleDatePickerProps) { + const { errors } = usePage().props; + const localErrors = parentErrors ?? errors; + let calendarLocale = fr; switch (usePage().props.locale) { case "en": @@ -48,7 +55,6 @@ export default function SimpleDatePicker({ } const parsedDate = date ? new Date(date) : undefined; - const errors = usePage().props.errors; const hours = Array.from({ length: 24 }, (_, i) => i); const minutes = Array.from({ length: 12 }, (_, i) => i * 5); const handleDateSelect = (selectedDate: Date | undefined) => { @@ -171,7 +177,7 @@ export default function SimpleDatePicker({
- +
); } diff --git a/resources/ts/back/Components/Inputs/SimpleNumber.tsx b/resources/ts/back/Components/Inputs/SimpleNumber.tsx index d848c20f..668591af 100644 --- a/resources/ts/back/Components/Inputs/SimpleNumber.tsx +++ b/resources/ts/back/Components/Inputs/SimpleNumber.tsx @@ -20,6 +20,8 @@ type SimpleNumberProps = { placeholder?: string; required?: boolean; disabled?: boolean; + parentErrors?: Record | null, + // eslint-disable-next-line no-unused-vars setData: (name: string, value: string) => void; }; @@ -34,14 +36,17 @@ export default function SimpleNumber({ placeholder = "back.enter_number_here", required = true, disabled = false, + parentErrors = null, setData, }: SimpleNumberProps) { + const { errors } = usePage().props; + const localErrors = parentErrors ?? errors; + const localLimits = { min: limits?.min ? limits.min : 1, max: limits?.max ? limits.max : 1000 } const safeValue = value >= localLimits.min && value <= localLimits.max ? value : localLimits.min; - const { errors } = usePage().props; const [inputValue, setInputValue] = useState(safeValue); @@ -70,11 +75,11 @@ export default function SimpleNumber({ required={required} disabled={disabled} className={cn("w-full", { - "border-destructive/50": errors[name], + "border-destructive/50": localErrors[name], })} /> - + ); } diff --git a/resources/ts/back/Components/Inputs/SimpleSwitch.tsx b/resources/ts/back/Components/Inputs/SimpleSwitch.tsx index 919cdae2..9ea537cc 100644 --- a/resources/ts/back/Components/Inputs/SimpleSwitch.tsx +++ b/resources/ts/back/Components/Inputs/SimpleSwitch.tsx @@ -11,6 +11,7 @@ type SimpleSwitchProps = { checked?: boolean; required?: boolean; disabled?: boolean; + parentErrors?: Record | null, // eslint-disable-next-line no-unused-vars setData: (name: string, value: boolean) => void; }; @@ -20,9 +21,12 @@ export default function SimpleSwitch({ checked, required = false, disabled = false, + parentErrors = null, setData, }: SimpleSwitchProps) { const { errors } = usePage().props; + const localErrors = parentErrors ?? errors; + return (
- +
); } diff --git a/resources/ts/back/Components/Inputs/SimpleText.tsx b/resources/ts/back/Components/Inputs/SimpleTextarea.tsx similarity index 84% rename from resources/ts/back/Components/Inputs/SimpleText.tsx rename to resources/ts/back/Components/Inputs/SimpleTextarea.tsx index 65673c58..9caf8d81 100644 --- a/resources/ts/back/Components/Inputs/SimpleText.tsx +++ b/resources/ts/back/Components/Inputs/SimpleTextarea.tsx @@ -9,21 +9,22 @@ import WordCounter from "@/back/Components/WordCounter"; import useTrans from "@/hooks/use-translations"; import { cn } from "@/lib/utils"; -type SimpleTextProps = { +type SimpleTextareaProps = { className?: string; name: string; label: string; value?: string; id?: string; - placeholder: string; + placeholder?: string; wordCounter?: boolean; required?: boolean; disabled?: boolean; + parentErrors?: Record | null, // eslint-disable-next-line no-unused-vars setData: (name: string, value: string) => void; }; -export default function SimpleText({ +export default function SimpleTextarea({ className, name, label, @@ -33,9 +34,12 @@ export default function SimpleText({ wordCounter = true, required = true, disabled = false, + parentErrors = null, setData, -}: SimpleTextProps) { +}: SimpleTextareaProps) { const { errors } = usePage().props; + const localErrors = parentErrors ?? errors; + return (
- + ); } diff --git a/resources/ts/back/Components/Inputs/SimpleWysiwyg.tsx b/resources/ts/back/Components/Inputs/SimpleWysiwyg.tsx index 7887d650..271c161a 100644 --- a/resources/ts/back/Components/Inputs/SimpleWysiwyg.tsx +++ b/resources/ts/back/Components/Inputs/SimpleWysiwyg.tsx @@ -43,6 +43,7 @@ type SimpleWysiwygProps = { wordCounter?: boolean; required?: boolean; disabled?: boolean; + parentErrors?: Record | null, // eslint-disable-next-line no-unused-vars setData: (name: string, value: string) => void; }; @@ -58,9 +59,12 @@ export default function SimpleWysiwyg({ wordCounter = true, required = true, disabled = false, + parentErrors = null, setData, }: SimpleWysiwygProps) { const { errors } = usePage().props; + const localErrors = parentErrors ?? errors; + const extensions = [ BaseKit.configure({ placeholder: { @@ -136,10 +140,10 @@ export default function SimpleWysiwyg({ }, [value]); return ( -
+
{wordCounter && ]*>/g, "")} />} -
+
- +
); } diff --git a/resources/ts/back/Components/PageConfigs/DynamicFields.tsx b/resources/ts/back/Components/PageConfigs/DynamicFields.tsx index 5baceb1e..0c8d7970 100644 --- a/resources/ts/back/Components/PageConfigs/DynamicFields.tsx +++ b/resources/ts/back/Components/PageConfigs/DynamicFields.tsx @@ -196,6 +196,7 @@ export default function DynamicFields({ */ const removeSensitiveField = (keyToRemove: string): void => { setOriginalConfigKeys(prev => prev.filter((key) => key !== keyToRemove)); + // Reset all errors because of alter elements list. setLocalErrors({}); }; diff --git a/resources/views/front/pages/dynamic-pages/switch-input.blade.php b/resources/views/front/pages/dynamic-pages/switch-input.blade.php index 1ba75a60..35a5f156 100644 --- a/resources/views/front/pages/dynamic-pages/switch-input.blade.php +++ b/resources/views/front/pages/dynamic-pages/switch-input.blade.php @@ -9,7 +9,11 @@

{{ $filteredArray->first()['key'] }} ({{ $filteredArray->first()['label'] }}): {{ $value }}

@break - @case(\App\Enums\DynamicFieldTypes::text->value()) + @case(\App\Enums\DynamicFieldTypes::textarea->value()) +

{{ $filteredArray->first()['key'] }} ({{ $filteredArray->first()['label'] }}): {{ $value }}

+ @break + + @case(\App\Enums\DynamicFieldTypes::wysiwyg->value())

{{ $filteredArray->first()['key'] }} ({{ $filteredArray->first()['label'] }}):

{!! $value !!} @break diff --git a/resources/views/front/pages/simple-page.blade.php b/resources/views/front/pages/simple-page.blade.php index 3873eed8..0f9854d4 100644 --- a/resources/views/front/pages/simple-page.blade.php +++ b/resources/views/front/pages/simple-page.blade.php @@ -6,7 +6,7 @@
- {!! $dynamicPageModel->content['text_content'] !!} + {!! $dynamicPageModel->content['wysiwyg_content'] !!}