Metadata forms: add backwards compatibility for Draft7 schemas

UtrechtUniversity · Nov 29, 2023 · e43cb65 · e43cb65
1 parent f9c25c5
commit e43cb65
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 17 deletions.
diff --git a/deposit/metadata-form/package-lock.json b/deposit/metadata-form/package-lock.json
diff --git a/deposit/metadata-form/src/index.js b/deposit/metadata-form/src/index.js
@@ -18,14 +18,16 @@ let schema       = {};
 let uiSchema     = {};
 let yodaFormData = {};
 
+let validator;
 let formProperties;
 
 let saving = false;
 let back   = false;
 
 let form = document.getElementById('form');
 
-const validator = customizeValidator({ AjvClass: Ajv2019, ajvOptionsOverrides: {verbose: true, addUsedSchema: false } });
+const validatorAjvDraft7 = customizeValidator({ ajvOptionsOverrides: {verbose: true, addUsedSchema: false } });
+const validatorAjv2019 = customizeValidator({ AjvClass: Ajv2019, ajvOptionsOverrides: {verbose: true, addUsedSchema: false } });
 
 const enumWidget = (props) => {
     let enumArray = props['schema']['enum'];
@@ -685,6 +687,13 @@ function loadForm() {
                 }
 
             } else {
+                // Select validator based on schema.
+                if (schema.$schema == "http://json-schema.org/draft-07/schema") {
+                    validator = validatorAjvDraft7
+                } else {
+                    validator = validatorAjv2019
+                }
+
                 // Metadata present or user has write access, load the form.
                 if (!formProperties.data.can_edit)
                     uiSchema['ui:readonly'] = true;

diff --git a/deposit/static/deposit/js/metadata-form.js b/deposit/static/deposit/js/metadata-form.js
diff --git a/research/metadata-form/package-lock.json b/research/metadata-form/package-lock.json
diff --git a/research/metadata-form/src/index.js b/research/metadata-form/src/index.js
@@ -18,13 +18,15 @@ let schema       = {};
 let uiSchema     = {};
 let yodaFormData = {};
 
+let validator;
 let formProperties;
 
 let saving = false;
 
 let form = document.getElementById('form');
 
-const validator = customizeValidator({ AjvClass: Ajv2019, ajvOptionsOverrides: {verbose: true, addUsedSchema: false } });
+const validatorAjvDraft7 = customizeValidator({ ajvOptionsOverrides: {verbose: true, addUsedSchema: false } });
+const validatorAjv2019 = customizeValidator({ AjvClass: Ajv2019, ajvOptionsOverrides: {verbose: true, addUsedSchema: false } });
 
 const enumWidget = (props) => {
     let enumArray = props['schema']['enum'];
@@ -699,6 +701,13 @@ function loadForm() {
                 }
 
             } else {
+                // Select validator based on schema.
+                if (schema.$schema == "http://json-schema.org/draft-07/schema") {
+                    validator = validatorAjvDraft7
+                } else {
+                    validator = validatorAjv2019
+                }
+
                 // Metadata present or user has write access, load the form.
                 if (!formProperties.data.can_edit)
                     uiSchema['ui:readonly'] = true;

diff --git a/research/static/research/js/metadata-form.js b/research/static/research/js/metadata-form.js
diff --git a/vault/metadata-form/package-lock.json b/vault/metadata-form/package-lock.json
diff --git a/vault/metadata-form/src/index.js b/vault/metadata-form/src/index.js
@@ -19,13 +19,16 @@ let uiSchema     = {};
 let yodaFormData = {};
 
 let actual_edit_mode = false; // if can edit, it is not directly shown.
+
+let validator;
 let formProperties;
 
 let saving = false;
 
 let form = document.getElementById('form');
 
-const validator = customizeValidator({ AjvClass: Ajv2019, ajvOptionsOverrides: {verbose: true, addUsedSchema: false } });
+const validatorAjvDraft7 = customizeValidator({ ajvOptionsOverrides: {verbose: true, addUsedSchema: false } });
+const validatorAjv2019 = customizeValidator({ AjvClass: Ajv2019, ajvOptionsOverrides: {verbose: true, addUsedSchema: false } });
 
 const enumWidget = (props) => {
     let enumArray = props['schema']['enum'];
@@ -643,6 +646,13 @@ function loadForm() {
             $('#no-metadata').removeClass('hide');
 
         } else {
+            // Select validator based on schema.
+            if (schema.$schema == "http://json-schema.org/draft-07/schema") {
+                validator = validatorAjvDraft7
+            } else {
+                validator = validatorAjv2019
+            }
+
             // Metadata present or user has write access, load the form and must be in actual_edit_mode as chosen by user
             if (formProperties.data.can_edit && actual_edit_mode) {
                 uiSchema = formProperties.data.uischema; // take over original ui-shema again- not the readonly one

diff --git a/vault/static/vault/js/metadata-form.js b/vault/static/vault/js/metadata-form.js