form: added support for json fields

inveniosoftware · Jun 3, 2024 · d9cae25 · d9cae25
1 parent b059cbf
commit d9cae25
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/invenio_administration/assets/semantic-ui/js/invenio_administration/src/formik/AdminForm.js b/invenio_administration/assets/semantic-ui/js/invenio_administration/src/formik/AdminForm.js
@@ -26,6 +26,12 @@ export class AdminForm extends Component {
             if (defaultValue) {
               return defaultValue;
             }
+            if (value.type === "bool") {
+              return false;
+            }
+            if (value.type === "object") {
+              return null;
+            }
             return "";
           }),
     };
@@ -37,17 +43,40 @@ export class AdminForm extends Component {
     const { apiEndpoint, pid, successCallback, create } = this.props;
     const { addNotification } = this.context;
     let response;
+    // eslint-disable-next-line no-debugger
+    debugger;
+
+    const transformedValues = mapValues(values, (value, key) => {
+      const fieldSchema = this.props.resourceSchema[key];
+      if (fieldSchema?.metadata?.type === "json") {
+        try {
+          if (value === "") {
+            return null;
+          } else if (typeof value === "object") {
+            return value;
+          } else {
+            return JSON.parse(value);
+          }
+        } catch (e) {
+          console.error(`Error parsing JSON for field ${key}:`, e);
+          actions.setFieldError(key, "Invalid JSON format");
+          throw e;
+        }
+      }
+      return value;
+    });
+
     try {
       if (create) {
         response = await InvenioAdministrationActionsApi.createResource(
           apiEndpoint,
-          values
+          transformedValues
         );
       } else {
         response = await InvenioAdministrationActionsApi.editResource(
           apiEndpoint,
           pid,
-          values
+          transformedValues
         );
       }
       actions.setSubmitting(false);

diff --git a/...io_administration/assets/semantic-ui/js/invenio_administration/src/formik/GenerateForm.js b/...io_administration/assets/semantic-ui/js/invenio_administration/src/formik/GenerateForm.js
@@ -110,6 +110,7 @@ const mapFormFields = (obj, parentField, isCreate, formFieldsConfig, dropDumpOnl
 
     if (fieldSchema.type === "bool") {
       const description = fieldProps.description;
+
       return (
         <>
           <BooleanField
@@ -134,7 +135,7 @@ const mapFormFields = (obj, parentField, isCreate, formFieldsConfig, dropDumpOnl
       );
     }
 
-    if (fieldSchema.type === "object") {
+    if (fieldSchema.type === "object" && fieldSchema.metadata?.type !== "json") {
       // nested fields
       return (
         <React.Fragment key={fieldProps.fieldPath}>
@@ -169,7 +170,10 @@ const mapFormFields = (obj, parentField, isCreate, formFieldsConfig, dropDumpOnl
     }
 
     const rows = formFieldsConfig[fieldName]?.rows || fieldSchema?.metadata?.rows;
-    if (fieldSchema.type === "string" && rows) {
+    if (
+      (fieldSchema.type === "string" && rows) ||
+      fieldSchema.metadata?.type === "json"
+    ) {
       return (
         <TextArea
           key={fieldProps.fieldPath}