Implemented ability to address specific 'defaultProtocols'

within the ProtocolParametersSelect.svelte component from the config\miappe\wizard.steps.config.js
IPK-BIT · Dec 12, 2024 · c450e2a · c450e2a
1 parent 07f65a5
commit c450e2a
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 3 deletions.
diff --git a/config/miappe/wizard.config.js b/config/miappe/wizard.config.js
@@ -85,6 +85,7 @@ window.config = {
 
         "defaultProtocols": [
             {
+                "id": "growth",
                 "name": "Growth",
                 "parameters": [
                     { "label":"Growth facility", "explanation":"Type of growth facility in which the study was carried out" },
@@ -136,7 +137,12 @@ window.config = {
                 ]
             },
             {
-                "name": "Phenotyping"
+                "id": "phenotyping",
+                "name": "Phenotyping",
+                "parameters": [
+                    { "label": "Phenotyping method", "explanation": "The method that was used for phenotyping e.g. human bonitur" },
+                    { "label": "Phenotyping facility", "explanation": "Facility used for automatic plant phenotyping e.g. LemnaTec" },
+                ]
             }
         ]
     }

diff --git a/config/miappe/wizard.steps.config.js b/config/miappe/wizard.steps.config.js
@@ -199,13 +199,32 @@ window.steps = [
     {
         title: 'Please select all Parameters, which are constant for all Samples of your Experiment.',
         component: 'ProtocolParametersSelect',
+        protocolId: 'growth',
         jsonPath: 'studies[0].protocols[0].parameters'
     },
     {
         title: 'Select Factors that are different between the Samples.',
         component: 'FactorsSelect',
         jsonPath: 'studies[0].factors'
     },
+    {
+        hooks: [
+            {
+                type: 'addProtocol',
+                parameters: {
+                    protocolName: 'Phenotyping',
+                    protocolVersion: 'MIAPPE v1.1',
+                    protocolParameters: ['Phenotyping method']
+                }
+            }
+        ],
+        title: 'Please select all Parameters corresponding to your phenotyping.',
+        component: 'ProtocolParametersSelect',
+        componentConfig: {
+            protocolId: 'phenotyping'
+        },
+        jsonPath: 'studies[0].protocols[1].parameters'
+    },
     {
         title: 'Upload template',
         component: 'Uploader',

diff --git a/src/components/isa/study/ProtocolParametersSelect.svelte b/src/components/isa/study/ProtocolParametersSelect.svelte
@@ -1,6 +1,7 @@
 <script>
 export let value;
 export let jsonPath;
+export let componentConfig = {};
 
 import { onMount } from 'svelte';
 
@@ -12,13 +13,27 @@ import Schemas from '@/lib/schemas';
 import { config } from '@/stores/config';
 import { isaObj } from '@/stores/isa';
 
+import { keyBy } from '@/lib/utils';
+
 let parameters = [];
-let parametersAvailable = config.checklist.defaultProtocols[0].parameters;
 let parameterValues = {};
 let parametersPredefined = [];
 
 let selectedParameterNames = [];
 
+console.log(componentConfig);
+
+let parametersAvailable;
+if (componentConfig.protocolId) {
+    //label = componentConfig.label;
+    let allDefaultProtocols = keyBy(config.checklist.defaultProtocols, 'id');
+    console.log(allDefaultProtocols);
+    parametersAvailable = allDefaultProtocols[componentConfig.protocolId].parameters
+} else {
+    parametersAvailable = config.checklist.defaultProtocols[0].parameters
+}
+
+
 function addParameter(parameterName) {
     if (!selectedParameterNames.includes(parameterName)) {
         selectedParameterNames = [...selectedParameterNames, parameterName];
@@ -37,6 +52,9 @@ function removeParameter(parameterName) {
 
     set($isaObj, jsonPath, parameters);
     $isaObj = $isaObj;
+
+    parameters = get($isaObj, jsonPath);
+    selectedParameterNames = parameters.map(o => o.parameterName.annotationValue);
 }
 
 function _getParameter(parameterName) {
@@ -121,7 +139,7 @@ onMount(() => {
     {/if}
 
 
-    {#if parametersAvailable.length > 0}
+    {#if parametersAvailable.filter(parameter => !selectedParameterNames.includes(parameter.label) ).length > 0}
     <div style="height: 400px; padding-right: 10px; overflow-y: scroll;">
         <table id="parameters-predefined">
             <tr>

diff --git a/src/lib/utils.js b/src/lib/utils.js
@@ -0,0 +1,8 @@
+export const keyBy = (array, key) => {
+    return array.reduce((result, item) => {
+        if (item[key] !== undefined) {
+            result[item[key]] = item;
+        }
+        return result;
+    }, {});
+};