refactoring as part of #2

IPK-BIT · Mar 4, 2024 · 28294fd · 28294fd
1 parent 53b7bcf
commit 28294fd
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 31 deletions.
diff --git a/config/breedfides/wizard.steps.config.js b/config/breedfides/wizard.steps.config.js
@@ -39,20 +39,13 @@ window.steps = [
         ]
     },
     {
-        title: 'Please provide all Authors of your Dataset and define their Contribution.',
-        fields: [
-            {
-                label: 'Authors',
-                type: 'people',
-                isaMapping: {
-                    jsonPath: 'people'
-                },
-                explanation: 'DM-16',
-                componentConfig: {
-                    showComments: false
-                }
-            }
-        ],
+        title: 'Please provide the Authors of your Dataset and define their Contribution.',
+        component: 'People',
+        jsonPath: 'people',
+        componentConfig: {
+            showComments: false,
+            label: 'Authors'
+        }
     },
     {
         hooks: [

diff --git a/config/miappe/wizard.steps.config.js b/config/miappe/wizard.steps.config.js
@@ -62,19 +62,12 @@ window.steps = [
     },
     {
         title: 'Please provide the Authors of your Dataset and define their Contribution.',
-        fields: [
-            {
-                label: 'Authors',
-                type: 'people',
-                isaMapping: {
-                    jsonPath: 'people'
-                },
-                explanation: 'DM-16',
-                componentConfig: {
-                    showComments: false
-                }
-            }
-        ]
+        component: 'People',
+        jsonPath: 'people',
+        componentConfig: {
+            showComments: false,
+            label: 'Authors'
+        }
     },
     {
         hooks: [

diff --git a/src/components/isa/generic/People.svelte b/src/components/isa/generic/People.svelte
@@ -13,6 +13,10 @@ const addPerson = async () => {
     people = [...people, emptyPerson];
 }
 
+if (componentConfig.label) {
+    label = componentConfig.label;
+}
+
 let __person__ = 'person';
 if (label === 'Authors') {
     __person__ = 'Author';
@@ -32,7 +36,7 @@ function onRemovePerson(event) {
         <h3>{label}</h3>
 
         {#each people as person, index}
-        <Person on:change on:removePerson={onRemovePerson} bind:person wording={__person__} countPeople={people.length} {componentConfig} {index} />
+        <Person on:change on:removePerson={onRemovePerson} bind:person countPeople={people.length} {componentConfig} {index} />
         {/each}
 
         <button class="btn" on:click|preventDefault={() => addPerson()}>Add {__person__}</button>

diff --git a/src/components/isa/generic/Person.svelte b/src/components/isa/generic/Person.svelte
@@ -1,7 +1,6 @@
 <script>
 export let person;
 export let index;
-export let wording = 'person';
 export let countPeople = 1;
 export let componentConfig = {};
 

diff --git a/src/components/questionnaire/GenericQuestionnaire.svelte b/src/components/questionnaire/GenericQuestionnaire.svelte
@@ -43,7 +43,6 @@ const fieldTypes = {
     'text': String,
     'textarea': Textarea,
     'date': Date,
-    'people': People,
     'ror': ResearchOrganizationRegistryPicker,
     'license': LicensePicker,
 }
@@ -54,7 +53,8 @@ const components = {
     'Materials': Materials,
     'ProtocolParametersSelect': ProtocolParametersSelect,
     'FactorsSelect': FactorsSelect,
-    'Uploader': Uploader
+    'Uploader': Uploader,
+    'People': People
 }
 
 let steps = config.steps;
@@ -200,6 +200,7 @@ onMount(() => {
                 <ComponentWrapperJsonPath
                     component={components[steps[currentStep].component]}
                     jsonPath={steps[currentStep].jsonPath}
+                    componentConfig={steps[currentStep].componentConfig}
                 />
                 {/if}
             

diff --git a/src/components/questionnaire/wrappers/ComponentWrapperJsonPath.svelte b/src/components/questionnaire/wrappers/ComponentWrapperJsonPath.svelte
@@ -1,6 +1,7 @@
 <script>
 export let component;
 export let jsonPath = undefined;
+export let componentConfig = {};
 
 import { isaObj } from '@/stores/isa';
 
@@ -16,6 +17,7 @@ if (jsonPath) {
     this={component} 
     bind:value={$value}
     jsonPath={jsonPath}
+    {componentConfig}
 />
 
 <style>