{getEnumDynamicFieldType(field.type)?.label}
@@ -55,7 +55,7 @@ export default function ConfigDetails({ config }: ConfigDetailsProps) {
{field.validation || "—"}
- {!hasChildren &&
}
+ {!targetHasChildren &&
}
);
diff --git a/resources/ts/back/Components/PageConfigs/DynamicFields.tsx b/resources/ts/back/Components/PageConfigs/DynamicFields.tsx
index 67259233..ee438699 100644
--- a/resources/ts/back/Components/PageConfigs/DynamicFields.tsx
+++ b/resources/ts/back/Components/PageConfigs/DynamicFields.tsx
@@ -71,7 +71,8 @@ export default function DynamicFields({
let currentId = startId;
const withIds = fields.map((field) => {
- const id = currentId++;
+ currentId += 1;
+ const id = currentId;
// Add the key in sensitive array.
const currentParentKey = `${parentKey}.${field.key}`;
@@ -197,18 +198,6 @@ export default function DynamicFields({
);
};
- /**
- * Remove a specific field.
- * @param fieldId string
- * @returns void
- */
- const removeField = (fieldId: number): void => {
- const targetField = fields.filter((field) => field.id === fieldId)[0];
-
- removeSensitiveField(targetField.key);
- setFields((prev) => prev.filter((field) => field.id !== fieldId));
- };
-
/**
* Remove sensitive field list.
* @param keyToRemove string
@@ -221,6 +210,18 @@ export default function DynamicFields({
setLocalErrors({});
};
+ /**
+ * Remove a specific field.
+ * @param fieldId string
+ * @returns void
+ */
+ const removeField = (fieldId: number): void => {
+ const targetField = fields.filter((field) => field.id === fieldId)[0];
+
+ removeSensitiveField(targetField.key);
+ setFields((prev) => prev.filter((field) => field.id !== fieldId));
+ };
+
/**
* Save the new order.
* @param event DragEndEvent
@@ -249,11 +250,11 @@ export default function DynamicFields({
/**
* Remove all local ids.
- * @param fields ConfigInternalField[]
+ * @param currentFields ConfigInternalField[]
* @returns
*/
- const removeIds = (fields: ConfigInternalField[]): ConfigField[] => {
- return fields.map(({ id, children, ...rest }) => ({
+ const removeIds = (currentFields: ConfigInternalField[]): ConfigField[] => {
+ return currentFields.map(({ children, ...rest }) => ({
...rest,
...(children ? { children: removeIds(children) } : {}),
})) as ConfigField[];
@@ -267,11 +268,13 @@ export default function DynamicFields({
setData(name, payload);
prevValueRef.current = payloadStr;
}
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [fields]);
// Update fields when copying config from another locale.
useEffect(() => {
setFields(() => addIdsRecursively(value ?? []));
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [selectedConfig]);
return (
diff --git a/resources/ts/back/Components/PageConfigs/FieldGroup.tsx b/resources/ts/back/Components/PageConfigs/FieldGroup.tsx
index cab6a27d..82c40088 100644
--- a/resources/ts/back/Components/PageConfigs/FieldGroup.tsx
+++ b/resources/ts/back/Components/PageConfigs/FieldGroup.tsx
@@ -39,6 +39,7 @@ import useTrans from "@/hooks/use-translations";
import str from "@/hooks/use-string";
import { cn } from "@/lib/utils";
+/* eslint-disable no-unused-vars */
type FieldGroupProps = {
currentId: number;
currentIndex: number;
@@ -63,6 +64,7 @@ type FieldGroupProps = {
setParentAccordionState: (key: string) => void;
limitMaxChildren: number;
};
+/* eslint-enable no-unused-vars */
export default function FieldGroup({
currentId,
diff --git a/resources/ts/back/Components/PageConfigs/ImportConfigJson.tsx b/resources/ts/back/Components/PageConfigs/ImportConfigJson.tsx
index 82a4af09..4299c2b9 100644
--- a/resources/ts/back/Components/PageConfigs/ImportConfigJson.tsx
+++ b/resources/ts/back/Components/PageConfigs/ImportConfigJson.tsx
@@ -1,5 +1,5 @@
// * Packages
-import { useRef, useState } from "react";
+import { ChangeEvent, DragEvent, useRef, useState } from "react";
import {
JsonEditor,
IconReplacements,
@@ -41,6 +41,7 @@ type JsonObject = {
};
type ImportConfigJsonProps = {
+ // eslint-disable-next-line no-unused-vars
onConfirm: (data: JsonObject[], overwrite: boolean) => void;
};
@@ -188,13 +189,28 @@ export default function ImportConfigJson({ onConfirm }: ImportConfigJsonProps) {
}
};
+ /**
+ * Reset component.
+ *
+ * @return void
+ */
+ const resetComponent = (): void => {
+ setIsOpen(false);
+ setTimeout(() => {
+ setJsonText([]);
+ setGlobalErrors({});
+ setEditorErrors({});
+ setOverwrite(false);
+ }, 200);
+ };
+
/**
* Action when changing file.
*
* @param event
* @return void
*/
- const handleFileChange = (e: React.ChangeEvent