Add fields for MongoDB SSL cert file paths (#8260)

* Added fields for tls certificate files

* lint

* Only include cert fields if SELF_HOSTED

* lint

* Refactor getSchema function

* Add datasource field group with accordion

* Handle no display column on fieldGroup field

* Override text transform accordian header

* Renamed from TLS to SSL in UI config

* readable flag

* Add accordion component

* Refactor

packages/bbui/package.json

@@ -38,6 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
+    "@spectrum-css/accordion": "3.0.24",
     "@budibase/string-templates": "2.2.12-alpha.33",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",

packages/bbui/src/Accordion/Accordion.svelte

@@ -0,0 +1,58 @@
+<script>
+  import "@spectrum-css/accordion"
+
+  export let itemName
+  export let initialOpen
+  export let header
+
+  let isOpen
+
+  function getOpenClass(isOpen) {
+    if (isOpen === undefined) {
+      isOpen = initialOpen
+    }
+    return isOpen ? "is-open" : ""
+  }
+</script>
+
+<div class="spectrum-Accordion" role={itemName}>
+  <div class="spectrum-Accordion-item {getOpenClass(isOpen)}">
+    <h3 class="spectrum-Accordion-itemHeading">
+      <button
+        class="spectrum-Accordion-itemHeader"
+        type="button"
+        on:click={() => (isOpen = !isOpen)}
+      >
+        {header}
+      </button>
+      <svg
+        class="spectrum-Icon spectrum-UIIcon-ChevronRight100 spectrum-Accordion-itemIndicator"
+        focusable="false"
+        aria-hidden="true"
+      >
+        <use xlink:href="#spectrum-css-icon-Chevron100" />
+      </svg>
+    </h3>
+    <div class="spectrum-Accordion-itemContent" role={itemName}>
+      <slot />
+    </div>
+  </div>
+</div>
+
+<style>
+  .spectrum-Accordion {
+    margin-left: -20px;
+  }
+  .spectrum-Accordion-item {
+    border: none;
+  }
+  .spectrum-Accordion-itemContent {
+    width: 97%;
+    padding-left: 30px;
+  }
+  .spectrum-Accordion-itemHeader {
+    text-transform: none;
+    font-weight: bold;
+    font-size: 0.875rem;
+  }
+</style>

packages/bbui/src/index.js

@@ -75,6 +75,7 @@ export { default as ListItem } from "./List/ListItem.svelte"
 export { default as IconSideNav } from "./IconSideNav/IconSideNav.svelte"
 export { default as IconSideNavItem } from "./IconSideNav/IconSideNavItem.svelte"
 export { default as Slider } from "./Form/Slider.svelte"
+export { default as Accordion } from "./Accordion/Accordion.svelte"
 
 // Renderers
 export { default as BoldRenderer } from "./Table/BoldRenderer.svelte"

packages/bbui/yarn.lock

@@ -109,10 +109,15 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@spectrum-css/actionbutton@1.0.1":
+"@spectrum-css/accordion@3.0.24":
-  version "1.0.1"
+  version "3.0.24"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74"
-  integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw==
+  integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA==
+
+"@spectrum-css/actionbutton@^1.0.1":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.2.tgz#7753a94c64cebecfca6749ef20e37a5ea80c59be"
+  integrity sha512-laDWk7PCgy2I0AGsMjTmYKkiMVYVoF1B4tffJf4cIp66znTiqPHEbLDh5EDNU88JLTY2bWoCOY4cJxvXk5gERw==
 
 "@spectrum-css/actiongroup@1.0.1":
   version "1.0.1"

packages/builder/package.json

@@ -78,6 +78,7 @@
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
+    "@spectrum-css/accordion": "^3.0.24",
     "codemirror": "^5.59.0",
     "dayjs": "^1.11.2",
     "downloadjs": "1.4.7",

packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte

@@ -6,6 +6,7 @@
     Toggle,
     Button,
     TextArea,
+    Accordion,
   } from "@budibase/bbui"
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
   import { capitalise } from "helpers"
@@ -51,15 +52,24 @@
 
   let addButton
 
-  function getDisplayName(key) {
+  function getDisplayName(key, fieldKey) {
     let name
-    if (schema[key]?.display) {
+    if (fieldKey && schema[key]["fields"][fieldKey]?.display) {
+      name = schema[key]["fields"][fieldKey].display
+    } else if (fieldKey) {
+      name = fieldKey
+    } else if (schema[key]?.display) {
       name = schema[key].display
     } else {
       name = key
     }
     return capitalise(name)
   }
+  function getFieldGroupKeys(fieldGroup) {
+    return Object.entries(schema[fieldGroup].fields || {})
+      .filter(el => filter(el))
+      .map(([key]) => key)
+  }
 </script>
 
 <form>
@@ -100,6 +110,27 @@
             error={$validation.errors[configKey]}
           />
         </div>
+      {:else if schema[configKey].type === "fieldGroup"}
+        <Accordion
+          itemName={configKey}
+          initialOpen={getFieldGroupKeys(configKey).some(
+            fieldKey => !!config[fieldKey]
+          )}
+          header={getDisplayName(configKey)}
+        >
+          <Layout gap="S">
+            {#each getFieldGroupKeys(configKey) as fieldKey}
+              <div class="form-row">
+                <Label>{getDisplayName(configKey, fieldKey)}</Label>
+                <Input
+                  type={schema[configKey]["fields"][fieldKey]?.type}
+                  on:change
+                  bind:value={config[fieldKey]}
+                />
+              </div>
+            {/each}
+          </Layout>
+        </Accordion>
       {:else}
         <div class="form-row">
           <Label>{getDisplayName(configKey)}</Label>

packages/builder/yarn.lock

@@ -1356,6 +1356,11 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@spectrum-css/accordion@^3.0.24":
+  version "3.0.24"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74"
+  integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA==
+
 "@spectrum-css/page@^3.0.1":
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.8.tgz#001efa9e4c10095df9b2b37cf7d7d6eb60140190"

packages/server/src/integrations/mongodb.ts

@@ -12,11 +12,16 @@ import {
   FindOneAndUpdateOptions,
   UpdateOptions,
   OperationOptions,
+  MongoClientOptions,
 } from "mongodb"
+import environment from "../environment"
 
 interface MongoDBConfig {
   connectionString: string
   db: string
+  tlsCertificateFile: string
+  tlsCertificateKeyFile: string
+  tlsCAFile: string
 }
 
 interface MongoDBQuery {
@@ -26,7 +31,8 @@ interface MongoDBQuery {
   }
 }
 
-const SCHEMA: Integration = {
+const getSchema = () => {
+  let schema = {
     docs: "https://github.com/mongodb/node-mongodb-native",
     friendlyName: "MongoDB",
     type: "Non-relational",
@@ -37,10 +43,12 @@ const SCHEMA: Integration = {
         type: DatasourceFieldType.STRING,
         required: true,
         default: "mongodb://localhost:27017",
+        display: "Connection string",
       },
       db: {
         type: DatasourceFieldType.STRING,
         required: true,
+        display: "DB",
       },
     },
     query: {
@@ -71,7 +79,7 @@ const SCHEMA: Integration = {
     "boundaries": [],
     "default": "",
     "output": {}
-}`,
+  }`,
           },
           {
             key: "$bucketAuto",
@@ -80,7 +88,7 @@ const SCHEMA: Integration = {
     "buckets": 1,
     "output": {},
     "granularity": "R5"
-}`,
+  }`,
           },
           {
             key: "$changeStream",
@@ -92,7 +100,7 @@ const SCHEMA: Integration = {
     "showExpandedEvents": true,
     "startAfter": {},
     "startAtOperationTime": ""
-}`,
+  }`,
           },
           {
             key: "$collStats",
@@ -101,7 +109,7 @@ const SCHEMA: Integration = {
     "storageStats": { "scale": 1 } },
     "count": {},
     "queryExecStats": {}
-}`,
+  }`,
           },
           {
             key: "$count",
@@ -117,7 +125,7 @@ const SCHEMA: Integration = {
       "unit": 1,
       "bounds": "full"
     }
-}`,
+  }`,
           },
           {
             key: "$documents",
@@ -134,7 +142,7 @@ const SCHEMA: Integration = {
     "partitionByFields": [],
     "sortBy": {},
     "output": {}
-}`,
+  }`,
           },
           {
             key: "$geoNear",
@@ -148,7 +156,7 @@ const SCHEMA: Integration = {
     "key": "location",
     "distanceField": "dist.calculated",
     "query": { "category": "Parks" }
-}`,
+  }`,
           },
           {
             key: "$graphLookup",
@@ -161,13 +169,13 @@ const SCHEMA: Integration = {
     "maxDepth": 1,
     "depthField": "",
     "restrictSearchWithMatch": {}
-}`,
+  }`,
           },
           {
             key: "$group",
             template: `{
     "_id": ""
-}`,
+  }`,
           },
           {
             key: "$indexStats",
@@ -192,7 +200,7 @@ const SCHEMA: Integration = {
     "localField": "",
     "foreignField": "",
     "as": ""
-}`,
+  }`,
           },
           {
             key: "$match",
@@ -205,14 +213,14 @@ const SCHEMA: Integration = {
     "on": "_id",
     "whenMatched": "replace",
     "whenNotMatched": "insert"
-}`,
+  }`,
           },
           {
             key: "$out",
             template: `{
     "db": "",
     "coll": ""
-}`,
+  }`,
           },
           {
             key: "$planCacheStats",
@@ -248,7 +256,7 @@ const SCHEMA: Integration = {
     "partitionBy": "",
     "sortBy": {},
     "output": {}
-}`,
+  }`,
           },
           {
             key: "$skip",
@@ -267,7 +275,7 @@ const SCHEMA: Integration = {
             template: `{
     "coll": "",
     "pipeline": []
-}`,
+  }`,
           },
           {
             key: "$unset",
@@ -279,7 +287,7 @@ const SCHEMA: Integration = {
     "path": "",
     "includeArrayIndex": "",
     "preserveNullAndEmptyArrays": true
-}`,
+  }`,
           },
         ],
       },
@@ -303,15 +311,51 @@ const SCHEMA: Integration = {
         },
       },
     },
+  }
+  if (environment.SELF_HOSTED) {
+    schema.datasource = {
+      ...schema.datasource,
+      //@ts-ignore
+      tls: {
+        type: DatasourceFieldType.FIELD_GROUP,
+        display: "Configure SSL",
+        fields: {
+          tlsCertificateFile: {
+            type: DatasourceFieldType.STRING,
+            required: false,
+            display: "Certificate file path",
+          },
+          tlsCertificateKeyFile: {
+            type: DatasourceFieldType.STRING,
+            required: false,
+            display: "Certificate Key file path",
+          },
+          tlsCAFile: {
+            type: DatasourceFieldType.STRING,
+            required: false,
+            display: "CA file path",
+          },
+        },
+      },
+    }
+  }
+  return schema
 }
 
+const SCHEMA: Integration = getSchema()
+
 class MongoIntegration implements IntegrationBase {
   private config: MongoDBConfig
   private client: any
 
   constructor(config: MongoDBConfig) {
     this.config = config
-    this.client = new MongoClient(config.connectionString)
+    const options: MongoClientOptions = {
+      tlsCertificateFile: config.tlsCertificateFile || undefined,
+      tlsCertificateKeyFile: config.tlsCertificateKeyFile || undefined,
+      tlsCAFile: config.tlsCAFile || undefined,
+    }
+    this.client = new MongoClient(config.connectionString, options)
   }
 
   async connect() {

packages/types/src/sdk/datasources.ts

@@ -33,6 +33,7 @@ export enum DatasourceFieldType {
   OBJECT = "object",
   JSON = "json",
   FILE = "file",
+  FIELD_GROUP = "fieldGroup",
 }
 
 export enum SourceName {
@@ -95,6 +96,16 @@ export interface ExtraQueryConfig {
   }
 }
 
+export interface DatasourceConfig {
+  [key: string]: {
+    type: string
+    display?: string
+    required?: boolean
+    default?: any
+    deprecated?: boolean
+  }
+}
+
 export interface Integration {
   docs: string
   plus?: boolean
@@ -104,7 +115,7 @@ export interface Integration {
   friendlyName: string
   type?: string
   iconUrl?: string
-  datasource: {}
+  datasource: DatasourceConfig
   query: {
     [key: string]: QueryDefinition
   }