Merge branch 'main' of github.com:i-VRESSE/workflow-builder

i-VRESSE · Aug 27, 2024 · f59b3d1 · f59b3d1
2 parents 9ef716f + 2c3b0d3
commit f59b3d1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/packages/core/src/validate.test.ts b/packages/core/src/validate.test.ts
@@ -432,8 +432,7 @@ describe('validateWorkflow()', () => {
                   type: 'number'
                 }
               }
-            },
-            additionalProperties: true
+            }
           },
           uiSchema: {
 
@@ -484,8 +483,7 @@ describe('validateWorkflow()', () => {
                   type: 'number'
                 }
               }
-            },
-            additionalProperties: true
+            }
           },
           uiSchema: {
 

diff --git a/packages/haddock3_catalog/generate_haddock3_catalog.py b/packages/haddock3_catalog/generate_haddock3_catalog.py
@@ -366,14 +366,17 @@ def config2schema(config):
         "type": "object",
         "properties": properties,
         "required": required,
-        # Ajv only allows props from then|else block if additionalProperties is true
-        # otherwise ajv will give "must NOT have additional properties" error
-        "additionalProperties": bool(ifthenelses)
     }
     if ifthenelses:
         if len(ifthenelses) > 1:
             raise ValueError(f"Only one ifthenelse is supported, but got {len(ifthenelses)}")
         schema.update(list(ifthenelses.values())[0])
+    else:
+        # Ajv only allows props from then|else block if additionalProperties is true inplicitly or explicitly
+        # if additionalProperties=false then ajv will give "must NOT have additional properties" error
+        # if additionalProperties=true is explict then rjsf will render plus button for adding custom key/value pairs, which is unwanted
+        # so we make it implicit by not setting additionalProperties
+        schema['additionalProperties'] = False
     return {
         "schema": schema,
         "uiSchema": uiSchema,

diff --git a/packages/haddock3_catalog/public/catalog/haddock3.easy.yaml b/packages/haddock3_catalog/public/catalog/haddock3.easy.yaml
@@ -165,7 +165,6 @@ global:
         type: boolean
     required:
     - run_dir
-    additionalProperties: true
     if:
       properties:
         mode:

diff --git a/packages/haddock3_catalog/public/catalog/haddock3.expert.yaml b/packages/haddock3_catalog/public/catalog/haddock3.expert.yaml
@@ -175,7 +175,6 @@ global:
         type: boolean
     required:
     - run_dir
-    additionalProperties: true
     if:
       properties:
         mode:

diff --git a/packages/haddock3_catalog/public/catalog/haddock3.guru.yaml b/packages/haddock3_catalog/public/catalog/haddock3.guru.yaml
@@ -185,7 +185,6 @@ global:
         type: boolean
     required:
     - run_dir
-    additionalProperties: true
     if:
       properties:
         mode: