Merge pull request #147 from samply/develop

Release 0.4.3
samply · Oct 30, 2024 · 2b251f0 · 2b251f0
2 parents dbad8c1 + 33c9c95
commit 2b251f0
Show file tree

Hide file tree

Showing 16 changed files with 561 additions and 447 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@samply/lens",
   "description": "A web component library for clinical data search and visualisation",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "type": "module",
   "module": "dist/lens.js",
   "main": "dist/lens.umd.js",

diff --git a/packages/demo/public/options-ccp-demo.json b/packages/demo/public/options-ccp-demo.json
@@ -22,6 +22,7 @@
         "wuerzburg": "Würzburg",
         "mannheim": "Mannheim",
         "dktk-test": "DKTK-Test",
+        "dktk-datashield-test": "DKTK Datashield Test",
         "hamburg": "Hamburg"
     },
     "catalogueKeyToResponseKeyMap": [
@@ -70,6 +71,8 @@
                 "ulm": "Ulm",
                 "wuerzburg": "Würzburg",
                 "mannheim": "Mannheim",
+                "dktk-test": "DKTK-Test",
+                "dktk-datashield-test": "DKTK Datashield Test",
                 "hamburg": "Hamburg"
             }
         },
@@ -260,6 +263,8 @@
                 "backendMeasures": "DKTK_STRAT_DEF_IN_INITIAL_POPULATION",
                 "url": "https://backend.demo.lens.samply.de/prod/",
                 "sites": [
+                    "dktk-test",
+                    "dktk-datashield-test",
                     "berlin",
                     "berlin-test",
                     "dresden",
@@ -277,5 +282,72 @@
                 ]
             }
         ]
+    },
+    "negotiateOptions": {
+        "negotiateApp": "project-manager",
+        "newProjectUrl": "https://e260-ccp-req/project-manager/create-query-and-design-project",
+        "editProjectUrl": "https://e260-ccp-req/project-manager/edit-project",
+        "siteMapping": [
+            {
+                "site": "dktk-test",
+                "collection": "lens-dktk-test"
+            },
+            {
+                "site": "dktk-datashield-test",
+                "collection": "lens-dktk-datashield-test"
+            },
+            {
+                "site": "Berlin",
+                "collection": "lens-berlin"
+            },
+            {
+                "site": "Dresden",
+                "collection": "lens-dresden"
+            },
+            {
+                "site": "Essen",
+                "collection": "lens-essen"
+            },
+            {
+                "site": "Frankfurt",
+                "collection": "lens-frankfurt"
+            },
+            {
+                "site": "Freiburg",
+                "collection": "lens-freiburg"
+            },
+            {
+                "site": "Hannover",
+                "collection": "lens-hannover"
+            },
+            {
+                "site": "Mainz",
+                "collection": "lens-mainz"
+            },
+            {
+                "site": "München LMU",
+                "collection": "lens-muenchen-lmu"
+            },
+            {
+                "site": "München TUM",
+                "collection": "lens-muenchen-tum"
+            },
+            {
+                "site": "Ulm",
+                "collection": "lens-ulm"
+            },
+            {
+                "site": "Würzburg",
+                "collection": "lens-wuerzburg"
+            },
+            {
+                "site": "Mannheim",
+                "collection": "lens-mannheim"
+            },
+            {
+                "site": "Hamburg",
+                "collection": "lens-hamburg"
+            }
+        ]
     }
 }
diff --git a/packages/demo/src/AppCCP.svelte b/packages/demo/src/AppCCP.svelte
@@ -160,8 +160,6 @@
                 <lens-search-modified-display
                     >Diagramme repräsentieren nicht mehr die aktuelle Suche!</lens-search-modified-display
                 >
-                <!-- TODO: comment in when backend is ready -->
-                <!-- <lens-negotiate-button /> -->
             </div>
             <div class="chart-wrapper">
                 <lens-chart

diff --git a/packages/lib/src/components/buttons/InfoButtonComponent.wc.svelte b/packages/lib/src/components/buttons/InfoButtonComponent.wc.svelte
@@ -8,7 +8,7 @@
     import {
         getHumanReadableQuery,
         buildHumanReadableRecursively,
-    } from "../../stores/negotiate";
+    } from "../../stores/datarequests";
     import { returnNestedValues } from "../../helpers/ast-transformer";
     import type { AstElement } from "../../types/ast";
     import type { QueryItem } from "../../types/queryData";
@@ -33,6 +33,10 @@
     };
 
     const displayQueryInfo = (e: MouseEvent, queryItem?: QueryItem): void => {
+        if (typeof message == "string") {
+            message = message.split(",");
+        }
+
         const target: HTMLElement = e.target as HTMLElement;
         if (showQuery) {
             if (onlyChildInfo && queryItem !== undefined) {

diff --git a/packages/lib/src/components/buttons/NegotiateButtonComponent.wc.svelte b/packages/lib/src/components/buttons/NegotiateButtonComponent.wc.svelte
@@ -5,18 +5,18 @@
 />
 
 <script lang="ts">
-    import { negotiate, negotiateStore } from "../../stores/negotiate";
+    import { datarequestsStore } from "../../stores/datarequests";
+    import { negotiate } from "../../services/bbmriNegotiate.ts";
 
     export let title: string = "Negotiate with biobanks";
-    let disabled: boolean = false;
 </script>
 
 <button
     part={`lens-negotiate-button lens-negotiate-button-${
-        disabled ? "disabled" : "active"
+        $datarequestsStore.length === 0 ? "disabled" : "active"
     }`}
-    on:click={() => negotiate($negotiateStore)}
-    {disabled}
+    on:click={() => negotiate($datarequestsStore)}
+    disabled={$datarequestsStore.length === 0}
 >
     <div part="lens-negotiate-button-title">
         {title}

diff --git a/packages/lib/src/components/buttons/SearchButtonComponenet.wc.svelte b/packages/lib/src/components/buttons/SearchButtonComponenet.wc.svelte
@@ -49,6 +49,13 @@
 
         const ast = buildAstFromQuery($queryStore);
 
+        if (ast.children.includes(null)) {
+            alert(
+                "No query entered in one of the queries. You can enter a query or remove the query fields.",
+            );
+            return;
+        }
+
         options?.spots?.forEach((spot: SpotOption) => {
             const name = spot.name;
             const measureItem: MeasureOption | undefined = $measureStore.find(

diff --git a/packages/lib/src/components/results/ChartComponent.wc.svelte b/packages/lib/src/components/results/ChartComponent.wc.svelte
@@ -192,6 +192,11 @@
     ): ChartDataSets => {
         let dataSet: number[];
 
+        // This is bad. For some reason the passed value is a string not a array of strings. With this conversion it does work!
+        if (typeof backgroundColor == "string") {
+            backgroundColor = backgroundColor.split(",");
+        }
+
         if (perSite) {
             dataSet = chartLabels.map((label: string) => {
                 const site: Site | undefined = responseStore.get(label);
@@ -431,6 +436,10 @@
         chart.data.datasets = chartData.data;
         chartLabels = chartData.labels;
 
+        if (typeof groupRange == "string") {
+            groupRange = Number(groupRange);
+        }
+
         /**
          * lets the user define a range for the labels when only single values are used eg. '60' -> '60 - 69'
          */

diff --git a/packages/lib/src/components/results/ResultTableComponent.wc.svelte b/packages/lib/src/components/results/ResultTableComponent.wc.svelte
@@ -6,7 +6,7 @@
 
 <script lang="ts">
     import { uiSiteMappingsStore } from "../../stores/mappings";
-    import { negotiateStore } from "../../stores/negotiate";
+    import { datarequestsStore } from "../../stores/datarequests.ts";
     import {
         getSitePopulationForCode,
         getSitePopulationForStratumCode,
@@ -134,21 +134,21 @@
     );
 
     /**
-     * watches the negotiateStore for changes to check or uncheck the checkbox
+     * watches the datarequestsStore for changes to check or uncheck the checkbox
      */
     let allChecked: boolean = false;
     $: allChecked =
-        $negotiateStore.length === tableRowData.length &&
+        $datarequestsStore.length === tableRowData.length &&
         tableRowData.length !== 0;
 
     /**
      * checks or unchecks all biobanks
      */
     const checkAllBiobanks = (): void => {
         if (allChecked) {
-            $negotiateStore = [];
+            $datarequestsStore = [];
         } else {
-            $negotiateStore = tableRowData.map(
+            $datarequestsStore = tableRowData.map(
                 (tableRow: (string | number)[]) => tableRow[0] as string,
             );
         }

diff --git a/packages/lib/src/components/results/TableItemComponent.svelte b/packages/lib/src/components/results/TableItemComponent.svelte
@@ -1,22 +1,22 @@
 <script lang="ts">
-    import { negotiateStore } from "../../stores/negotiate";
+    import { datarequestsStore } from "../../stores/datarequests";
 
     export let tableRow: (string | number)[];
 
     let checked: boolean = false;
-    $: checked = $negotiateStore.includes(tableRow[0] as string);
+    $: checked = $datarequestsStore.includes(tableRow[0] as string);
 
     /**
      * adds and removes tableRows from the negotiateStore whenever the checkbox is checked or unchecked
      */
     const updateStoreOnCheck = (): void => {
         if (!checked) {
-            negotiateStore.update((store: string[]) => {
+            datarequestsStore.update((store: string[]) => {
                 return [...store, tableRow[0] as string];
             });
         }
         if (checked) {
-            negotiateStore.update((store: string[]) => {
+            datarequestsStore.update((store: string[]) => {
                 return store.filter((site: string) => site !== tableRow[0]);
             });
         }