From ef9ff0d28cc23c06b062a9fb768badef76bab0e6 Mon Sep 17 00:00:00 2001
From: Mats Johansen <mats.johansen@dkfz-heidelberg.de>
Date: Wed, 2 Oct 2024 09:21:07 +0200
Subject: [PATCH 1/2] fix(ast): system is passed to query and ast

---
 packages/demo/src/AppCCP.svelte                    | 14 ++++++++++++++
 .../catalogue/AutoCompleteComponent.svelte         |  1 +
 .../catalogue/SingleSelectItemComponent.svelte     | 10 ++++++----
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/demo/src/AppCCP.svelte b/packages/demo/src/AppCCP.svelte
index f87f35a..e1c16e6 100644
--- a/packages/demo/src/AppCCP.svelte
+++ b/packages/demo/src/AppCCP.svelte
@@ -107,8 +107,22 @@
     );
 
     let dataPasser: LensDataPasser;
+
+    const getQuery = (): void => {
+        console.log("QueryStore:", dataPasser.getQueryAPI());
+    };
+
+    const getAST = (): void => {
+        console.log("AST:", dataPasser.getAstAPI());
+    };
 </script>
 
+<button
+    on:click={() => {
+        getQuery();
+        getAST();
+    }}>query</button
+>
 <header>
     <div class="header-wrapper">
         <div class="logo">
diff --git a/packages/lib/src/components/catalogue/AutoCompleteComponent.svelte b/packages/lib/src/components/catalogue/AutoCompleteComponent.svelte
index d78a974..92dd29f 100644
--- a/packages/lib/src/components/catalogue/AutoCompleteComponent.svelte
+++ b/packages/lib/src/components/catalogue/AutoCompleteComponent.svelte
@@ -139,6 +139,7 @@
             name: element.name,
             key: element.key,
             type: "type" in element && element.type,
+            system: "system" in element ? element.system : "",
             values: [
                 {
                     value: inputItem.key,
diff --git a/packages/lib/src/components/catalogue/SingleSelectItemComponent.svelte b/packages/lib/src/components/catalogue/SingleSelectItemComponent.svelte
index 31727ba..c520ba6 100644
--- a/packages/lib/src/components/catalogue/SingleSelectItemComponent.svelte
+++ b/packages/lib/src/components/catalogue/SingleSelectItemComponent.svelte
@@ -15,10 +15,14 @@
         key: element.key,
         name: element.name,
         type: "type" in element && element.type,
+        system: "system" in element ? element.system : "",
         values: [
             {
                 name: criterion.name,
-                value: 'aggregatedValue' in criterion ? criterion.aggregatedValue : criterion.key,
+                value:
+                    "aggregatedValue" in criterion
+                        ? criterion.aggregatedValue
+                        : criterion.key,
                 queryBindId: queryBindId,
             },
         ],
@@ -30,6 +34,4 @@
         {criterion.name}
     </span>
 </div>
-<QueryAddButtonComponent
-    queryItem={queryItem}
-/>
+<QueryAddButtonComponent {queryItem} />

From aa05e66eeab98a2c715d534b9a3751ffafff5317 Mon Sep 17 00:00:00 2001
From: Mats Johansen <mats.johansen@dkfz-heidelberg.de>
Date: Wed, 2 Oct 2024 09:38:20 +0200
Subject: [PATCH 2/2] chore(testing): remove test functions

---
 packages/demo/src/AppCCP.svelte | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/packages/demo/src/AppCCP.svelte b/packages/demo/src/AppCCP.svelte
index e1c16e6..f87f35a 100644
--- a/packages/demo/src/AppCCP.svelte
+++ b/packages/demo/src/AppCCP.svelte
@@ -107,22 +107,8 @@
     );
 
     let dataPasser: LensDataPasser;
-
-    const getQuery = (): void => {
-        console.log("QueryStore:", dataPasser.getQueryAPI());
-    };
-
-    const getAST = (): void => {
-        console.log("AST:", dataPasser.getAstAPI());
-    };
 </script>
 
-<button
-    on:click={() => {
-        getQuery();
-        getAST();
-    }}>query</button
->
 <header>
     <div class="header-wrapper">
         <div class="logo">