From 348c94e48761f6e23c93c89b5b6d6d30013a49c3 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 16 Oct 2020 15:26:08 +0100
Subject: [PATCH 1/3] allow calculation views to be used in context components
 again

---
 packages/standard-components/src/fetchData.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/standard-components/src/fetchData.js b/packages/standard-components/src/fetchData.js
index 68aca7eac6..42f07d3910 100644
--- a/packages/standard-components/src/fetchData.js
+++ b/packages/standard-components/src/fetchData.js
@@ -46,13 +46,18 @@ export default async function fetchData(datasource, store) {
   }
 
   async function fetchViewData() {
-    const { field, groupBy } = datasource
+    const { field, groupBy, calculation } = datasource
     const params = new URLSearchParams()
 
-    if (field) {
+    if (calculation) {
       params.set("field", field)
-      params.set("stats", true)
+      params.set("calculation", calculation)
     }
+
+    if (groupBy) {
+      params.set("group", groupBy)
+    }
+
     if (groupBy) params.set("group", groupBy)
 
     let QUERY_VIEW_URL = field

From afa5418d5a97f825378df68d8af197be715ad6dc Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 16 Oct 2020 22:02:17 +0100
Subject: [PATCH 2/3] adding health check endpoint for AWS ALB

---
 packages/server/src/api/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/server/src/api/index.js b/packages/server/src/api/index.js
index 5d5f64459e..0a4de71135 100644
--- a/packages/server/src/api/index.js
+++ b/packages/server/src/api/index.js
@@ -51,6 +51,7 @@ router
       process.env.NODE_ENV !== "cypress"
     await next()
   })
+  .use("/health", ctx => (ctx.status = 200))
   .use(authenticated)
 
 // error handling middleware

From 4d3fb4f84738fed2494d97257e1a92addb64df04 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 16 Oct 2020 22:11:13 +0100
Subject: [PATCH 3/3] hiding templates for now

---
 packages/builder/src/pages/index.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte
index 09fa40d1c7..43f3fd02d7 100644
--- a/packages/builder/src/pages/index.svelte
+++ b/packages/builder/src/pages/index.svelte
@@ -66,7 +66,7 @@
     </div>
   </div>
 
-  <TemplateList onSelect={selectTemplate} />
+  <!-- <TemplateList onSelect={selectTemplate} /> -->
 
   <AppList />
 </div>