change order of priorities for schema def keys

nf-core · Oct 23, 2024 · e10e0cd · e10e0cd
1 parent 85757cf
commit e10e0cd
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 11 deletions.
diff --git a/.cache.tar.xz b/.cache.tar.xz
diff --git a/package-lock.json b/package-lock.json
diff --git a/sites/main-site/package.json b/sites/main-site/package.json
@@ -112,6 +112,6 @@
         "prettier": "^3.3.3",
         "prettier-plugin-astro": "^0.14.1",
         "prettier-plugin-svelte": "^3.2.6",
-        "sass": "^1.77.8"
+        "sass": "1.77.6"
     }
 }
diff --git a/sites/main-site/src/components/schema/SchemaListing.svelte b/sites/main-site/src/components/schema/SchemaListing.svelte
@@ -5,7 +5,7 @@
 
     export let schema;
 
-    const schemaDefs = schema.definitions || schema.properties || schema.$defs;
+    const schemaDefs = schema.definitions || schema.$defs || schema.properties;
     onMount(() => {
         const observer = new IntersectionObserver(
             (entries) => {

diff --git a/sites/pipelines/src/pages/[pipeline]/[version]/parameters.astro b/sites/pipelines/src/pages/[pipeline]/[version]/parameters.astro
@@ -62,14 +62,12 @@ if (existsSync(cache_key)) {
     let schema_buffer = await promises.readFile(cache_key, 'utf-8');
     schema = JSON.parse(schema_buffer);
 }
-console.log('pipeline: ', pipeline);
 let schemaDefs =
     schema.definitions && Object.keys(schema.definitions).length > 0
         ? schema.definitions
-        : schema.properties
-          ? schema.properties
-          : schema.$defs;
-console.log('schemaDefs: ', schemaDefs);
+        : schema.$defs && Object.keys(schema.$defs).length > 0
+          ? schema.$defs
+          : schema.properties;
 if (schemaDefs && Object.keys(schemaDefs).length > 0) {
     headings = Object.entries(schemaDefs).map(([key, value]) => {
         return {