From 6e6bc536a1b7025e727ffe7dedb8137a4c631db4 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 28 May 2021 11:55:28 +0100
Subject: [PATCH 1/3] fix mssql encryption option

---
 .../TableIntegrationMenu/IntegrationConfigForm.svelte     | 7 ++++++-
 packages/server/src/integrations/Integration.js           | 1 +
 packages/server/src/integrations/microsoftSqlServer.js    | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
index 575399ed7a..4541052acf 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Label, Input, Layout } from "@budibase/bbui"
+  import { Label, Input, Layout, Toggle } from "@budibase/bbui"
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
   import { capitalise } from "helpers"
 
@@ -16,6 +16,11 @@
           defaults={schema[configKey].default}
           bind:object={integration[configKey]}
         />
+      {:else if schema[configKey].type === "boolean"}
+        <div class="form-row">
+          <Label>{capitalise(configKey)}</Label>
+          <Toggle text="" bind:value={integration[configKey]} />
+        </div>
       {:else}
         <div class="form-row">
           <Label>{capitalise(configKey)}</Label>
diff --git a/packages/server/src/integrations/Integration.js b/packages/server/src/integrations/Integration.js
index 07d6d159b0..345787a474 100644
--- a/packages/server/src/integrations/Integration.js
+++ b/packages/server/src/integrations/Integration.js
@@ -6,6 +6,7 @@ exports.QUERY_TYPES = {
 
 exports.FIELD_TYPES = {
   STRING: "string",
+  BOOLEAN: "boolean",
   NUMBER: "number",
   PASSWORD: "password",
   LIST: "list",
diff --git a/packages/server/src/integrations/microsoftSqlServer.js b/packages/server/src/integrations/microsoftSqlServer.js
index 6f99d1014a..05b92f1815 100644
--- a/packages/server/src/integrations/microsoftSqlServer.js
+++ b/packages/server/src/integrations/microsoftSqlServer.js
@@ -31,6 +31,10 @@ const SCHEMA = {
       type: FIELD_TYPES.STRING,
       default: "root",
     },
+    encrypt: {
+      type: FIELD_TYPES.BOOLEAN,
+      default: true,
+    },
   },
   query: {
     create: {
@@ -51,6 +55,10 @@ const SCHEMA = {
 class SqlServerIntegration {
   constructor(config) {
     this.config = config
+    this.config.options = {
+      encrypt: this.config.encrypt,
+    }
+    delete this.config.encrypt
     if (!pool) {
       pool = new sqlServer.ConnectionPool(this.config)
     }

From b412f10e6b9c5b146858c228331eb5d2b1ee8cd9 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 28 May 2021 12:44:29 +0100
Subject: [PATCH 2/3] go straight to app if you only have one published app

---
 .../src/pages/builder/apps/index.svelte        | 13 ++++++++++---
 .../src/pages/builder/portal/index.svelte      | 18 ++++++++++++++++--
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte
index 6f8827677b..c4224b9f15 100644
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/packages/builder/src/pages/builder/apps/index.svelte
@@ -13,7 +13,7 @@
   } from "@budibase/bbui"
   import { onMount } from "svelte"
   import { apps, organisation, auth } from "stores/portal"
-  import { goto } from "@roxi/routify"
+  import { goto, redirect } from "@roxi/routify"
   import { AppStatus } from "constants"
   import { gradient } from "actions"
   import UpdateUserInfoModal from "components/settings/UpdateUserInfoModal.svelte"
@@ -28,10 +28,17 @@
   onMount(async () => {
     await organisation.init()
     await apps.load()
-    loaded = true
+    // Skip the portal if you only have one app
+    if (!$auth.isBuilder && $apps.filter(publishedAppsOnly).length === 1) {
+      window.location = `/${publishedApps[0].prodId}`
+    } else {
+      loaded = true
+    }
   })
 
-  $: publishedApps = $apps.filter(app => app.status === AppStatus.DEPLOYED)
+  const publishedAppsOnly = app => app.status === AppStatus.DEPLOYED
+
+  $: publishedApps = $apps.filter(publishedAppsOnly)
 </script>
 
 {#if $auth.user && loaded}
diff --git a/packages/builder/src/pages/builder/portal/index.svelte b/packages/builder/src/pages/builder/portal/index.svelte
index 5426d52fae..bac4a762ea 100644
--- a/packages/builder/src/pages/builder/portal/index.svelte
+++ b/packages/builder/src/pages/builder/portal/index.svelte
@@ -1,4 +1,18 @@
 <script>
-  import { redirect } from "@roxi/routify"
-  $redirect("./apps")
+  import { onMount } from "svelte"
+  import { redirect, goto } from "@roxi/routify"
+  import { apps, organisation, auth } from "stores/portal"
+  import { AppStatus } from "constants"
+
+  onMount(async () => {
+    await apps.load()
+    // Skip the portal if you only have one app
+    if (!$auth.isBuilder && $apps.filter(app => app.status === AppStatus.DEPLOYED).length === 1) {
+      // window.location = `/${publishedApps[0].prodId}`
+      $redirect(`/${publishedApps[0].prodId}`)
+    } else {
+      $goto("./apps")
+    }
+  })
+
 </script>

From 587e6d36a11e2ee258e6ab199c1ca5cdb7d775ba Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 28 May 2021 14:06:18 +0100
Subject: [PATCH 3/3] tidy up

---
 .../src/pages/builder/portal/index.svelte      | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/index.svelte b/packages/builder/src/pages/builder/portal/index.svelte
index bac4a762ea..5426d52fae 100644
--- a/packages/builder/src/pages/builder/portal/index.svelte
+++ b/packages/builder/src/pages/builder/portal/index.svelte
@@ -1,18 +1,4 @@
 <script>
-  import { onMount } from "svelte"
-  import { redirect, goto } from "@roxi/routify"
-  import { apps, organisation, auth } from "stores/portal"
-  import { AppStatus } from "constants"
-
-  onMount(async () => {
-    await apps.load()
-    // Skip the portal if you only have one app
-    if (!$auth.isBuilder && $apps.filter(app => app.status === AppStatus.DEPLOYED).length === 1) {
-      // window.location = `/${publishedApps[0].prodId}`
-      $redirect(`/${publishedApps[0].prodId}`)
-    } else {
-      $goto("./apps")
-    }
-  })
-
+  import { redirect } from "@roxi/routify"
+  $redirect("./apps")
 </script>