processed feedback

apps/metadata-utils/src/fieldHelpers.ts

@@ -57,7 +57,8 @@ export const isValueType = (column: IColumn) => {
     column.columnType === "DATETIME" ||
     column.columnType === "INT" ||
     column.columnType === "LONG" ||
-    column.columnType === "DECIMAL"
+    column.columnType === "DECIMAL" ||
+    column.columnType === "JSON"
   );
 };
 

apps/molgenis-components/src/components/forms/InputJson.vue

@@ -30,12 +30,18 @@
 import FormGroup from "./FormGroup.vue";
 import InputGroup from "./InputGroup.vue";
 import BaseInput from "./baseInputs/BaseInput.vue";
-import { parseJson, isJsonObjectOrArray } from "./formUtils/formUtils";
+import { isJsonObjectOrArray } from "./formUtils/formUtils";
 
 export default {
   name: "InputJson",
   components: { FormGroup, InputGroup },
   extends: BaseInput,
+  props: {
+    modelValue: {
+      type: [String, null],
+      default: null,
+    },
+  },
   computed: {
     stringError() {
       if (typeof this.modelValue === "string") {

apps/molgenis-components/src/components/forms/formUtils/formUtils.test.ts

@@ -9,6 +9,7 @@ import {
   splitColumnIdsByHeadings,
   isMissingValue,
   isRequired,
+  isJsonObjectOrArray,
 } from "./formUtils";
 import type { ITableMetaData, IColumn } from "metadata-utils";
 const { AUTO_ID, HEADING } = constants;
@@ -375,4 +376,17 @@ describe("isValidHyperLink", () => {
       constants.HYPERLINK_REGEX.test("https://example.com/(test)".toLowerCase())
     ).toBe(true);
   });
+
+  describe("isJsonObjectOrArray", () => {
+    test("only JSON object/array should return true (after parsing from JSON string)", () => {
+      expect(isJsonObjectOrArray(JSON.parse('{"key":"value"}'))).toBe(true);
+      expect(isJsonObjectOrArray(JSON.parse('["string1", "string2"]'))).toBe(true);
+      expect(isJsonObjectOrArray(JSON.parse('{"key1":{"key2":["value1", "value2"]}}'))).toBe(true);
+      expect(isJsonObjectOrArray(JSON.parse('"string"'))).toBe(false);
+      expect(isJsonObjectOrArray(JSON.parse('1'))).toBe(false);
+      expect(isJsonObjectOrArray(JSON.parse('true'))).toBe(false);
+      expect(isJsonObjectOrArray(JSON.parse('false'))).toBe(false);
+      expect(isJsonObjectOrArray(JSON.parse('null'))).toBe(false);
+    });
+  });
 });