diff --git a/lang/en/back.php b/lang/en/back.php index ec5cbc87..015829cf 100644 --- a/lang/en/back.php +++ b/lang/en/back.php @@ -231,6 +231,7 @@ return [ "select-file" => "Drag and drop a file or click to select one", "allowed_format" => "Allowed format: :format", "rules_weight" => "Max size: :size", + "overwrite" => "Overwrite existing data ?", "validation" => [ "mimes" => "The file must be of type: :values.", "max_size" => "The file must not exceed :value", diff --git a/lang/fr/back.php b/lang/fr/back.php index b4d0080e..8e17159d 100644 --- a/lang/fr/back.php +++ b/lang/fr/back.php @@ -232,6 +232,7 @@ return [ "select-file" => "Glisser-déposer un fichier ou cliquez pour en sélectionner un", "allowed_format" => "Format autorisé: :format", "rules_weight" => "Taille max: :size", + "overwrite" => "Surcharger les données existantes ?", "validation" => [ "mimes" => "Le fichier doit être de type : :values.", "max_size" => "Le fichier ne doit pas dépasser : :value", diff --git a/resources/ts/back/Components/PageConfigs/ImportConfigJson.tsx b/resources/ts/back/Components/PageConfigs/ImportConfigJson.tsx index abc4df2b..354395d5 100644 --- a/resources/ts/back/Components/PageConfigs/ImportConfigJson.tsx +++ b/resources/ts/back/Components/PageConfigs/ImportConfigJson.tsx @@ -14,28 +14,51 @@ import { } from "@/components/ui/dialog"; import { Button } from "@/components/ui/button"; // * Other +import SimpleSwitch from "@/back/Components/Inputs/SimpleSwitch"; +import InputError from "@/back/Components/InputError"; import BtnOptionnalLinkWithTooltip from "@/back/Components/BtnOptionnalLinkWithTooltip"; import { cn } from "@/lib/utils"; import str from "@/hooks/use-string"; import useTrans from "@/hooks/use-translations"; -import InputError from "../InputError"; -type JsonValue = string | number | boolean | null | JsonValue[] | { [key: string]: JsonValue }; +type JsonPrimitive = string | number | boolean | null; + +type JsonObject = { + [key: string]: JsonPrimitive | JsonObject | JsonObject[]; +}; type ImportConfigJsonProps = { - onConfirm: (data: JsonValue) => void; + onConfirm: (data: JsonObject[], overwrite: boolean) => void; }; +// Zod schemas. +const jsonObjectSchema: z.ZodType = z.lazy(() => + z.record( + z.string(), + z.union([ + z.string(), + z.number(), + z.boolean(), + z.null(), + jsonObjectSchema, + z.array(jsonObjectSchema), + ]) + ) +); +const jsonArraySchema = z.array(jsonObjectSchema); + export default function ImportConfigJson({ onConfirm, }: ImportConfigJsonProps) { // Json content. - const [jsonText, setJsonText] = useState({}); + const [jsonText, setJsonText] = useState([]); // Modale state. - const [isOpen, setIsOpen] = useState(false); + const [isOpen, setIsOpen] = useState(false); // Event state. - const [isDragging, setIsDragging] = useState(false); + const [isDragging, setIsDragging] = useState(false); + // Overwrite state. + const [overwrite, setOverwrite] = useState(false); // Local errors. const [globalErrors, setGlobalErrors] = useState>({}); @@ -47,18 +70,6 @@ export default function ImportConfigJson({ // Maximum file size accepted (2MB). const maxSize = 2 * 1024 * 1024; - // JSON valide: string | number | boolean | null | array | object - const jsonValueSchema: z.ZodType = z.lazy(() => - z.union([ - z.string(), - z.number(), - z.boolean(), - z.null(), - z.array(jsonValueSchema), - z.record(z.string(), jsonValueSchema), - ]) - ); - /** * Get translation of specific key. * @@ -135,7 +146,7 @@ export default function ImportConfigJson({ const parsed = JSON.parse(text); // Validate json with zod. - jsonValueSchema.parse(parsed); + jsonArraySchema.parse(parsed); setJsonText(parsed); setGlobalErrors({}); @@ -178,8 +189,8 @@ export default function ImportConfigJson({ const handleConfirm = (): void => { try { // Validate json with zod. - jsonValueSchema.parse(jsonText); - onConfirm(jsonText); + jsonArraySchema.parse(jsonText); + onConfirm(jsonText, overwrite); resetComponent(); } catch { setEditorErrors(prev => ({ ...prev, 'editor-error': useTrans('back.json_editor.validation.invalid_content_json') })); @@ -194,9 +205,10 @@ export default function ImportConfigJson({ const resetComponent = (): void => { setIsOpen(false); setTimeout(() => { - setJsonText(null); + setJsonText([]); setGlobalErrors({}); setEditorErrors({}); + setOverwrite(false); }, 200); } @@ -261,7 +273,7 @@ export default function ImportConfigJson({ {/* JSON editor */} setJsonText(val as JsonValue)} + setData={(val) => setJsonText(val as JsonObject[])} icons={icons} translations={translations} showIconTooltips={true} @@ -271,22 +283,30 @@ export default function ImportConfigJson({ /> - - - + setOverwrite(value)} /> +
+ + +
diff --git a/resources/ts/back/Pages/PageConfigs/Form.tsx b/resources/ts/back/Pages/PageConfigs/Form.tsx index 47195d6f..9709c996 100644 --- a/resources/ts/back/Pages/PageConfigs/Form.tsx +++ b/resources/ts/back/Pages/PageConfigs/Form.tsx @@ -221,8 +221,9 @@ export default function Form({ {auth.user.role === enumUserRole.conceptor.value && route().current('back.page-configs.create') && (
{ - setData('config', value as ConfigField[]) + onConfirm={(value, overwrite) => { + const newConfig = (!overwrite) ? [...data.config, ...value] : value; + setData('config', newConfig as ConfigField[]) setResetState(prev => prev + 1) }} />