SSL config for mysql, remove rickroll

This commit is contained in:
Martin McKeaveney 2021-02-24 16:31:47 +00:00
parent ef069f9a1c
commit a17a1fb07b
5 changed files with 16 additions and 57 deletions

View File

@ -10,10 +10,12 @@
<form> <form>
{#each Object.keys(schema) as configKey} {#each Object.keys(schema) as configKey}
{#if typeof schema[configKey].type === 'object'} {#if schema[configKey].type === 'object'}
<Label small>{configKey}</Label> <Label small>{configKey}</Label>
<Spacer small /> <Spacer small />
<KeyValueBuilder bind:object={integration[configKey]} on:change /> <KeyValueBuilder
defaults={schema[configKey].default}
bind:object={integration[configKey]} />
{:else} {:else}
<div class="form-row"> <div class="form-row">
<Label small>{configKey}</Label> <Label small>{configKey}</Label>

View File

@ -1,7 +1,8 @@
<script> <script>
import { Button, Input } from "@budibase/bbui" import { Button, Input } from "@budibase/bbui"
export let object = {} export let defaults
export let object = defaults || {}
export let readOnly export let readOnly
let fields = Object.entries(object).map(([name, value]) => ({ name, value })) let fields = Object.entries(object).map(([name, value]) => ({ name, value }))

View File

@ -185,8 +185,7 @@ const BASE_LAYOUTS = [
"margin-right": "auto", "margin-right": "auto",
"margin-left": "auto", "margin-left": "auto",
"min-height": "100%", "min-height": "100%",
"background-image": background: "#f5f5f5",
"linear-gradient(135deg, rgba(252,215,212,1) 20%, rgba(207,218,255,1) 100%);",
}, },
selected: {}, selected: {},
}, },
@ -240,8 +239,7 @@ const BASE_LAYOUTS = [
"margin-right": "auto", "margin-right": "auto",
"margin-left": "auto", "margin-left": "auto",
"min-height": "100%", "min-height": "100%",
"background-image": background: "#f5f5f5",
"linear-gradient(135deg, rgba(252,215,212,1) 20%, rgba(207,218,255,1) 100%);",
}, },
selected: {}, selected: {},
}, },

View File

@ -39,55 +39,6 @@ exports.createHomeScreen = () => ({
_instanceName: "Heading", _instanceName: "Heading",
_children: [], _children: [],
}, },
{
_id: "cbbf41b27c2b44d1abba38bb694880c6a",
_component: "@budibase/standard-components/container",
_styles: {
normal: {
display: "flex",
"flex-direction": "column",
"justify-content": "center",
"align-items": "stretch",
flex: "1 1 auto",
"border-width": "4px",
"border-style": "Dashed",
"margin-bottom": "32px",
},
hover: {},
active: {},
selected: {},
},
type: "div",
_instanceName: "Video Container",
_children: [
{
_id: "c07d752cb3e544b418088fa9be84ba2e4",
_component: "@budibase/standard-components/embed",
_styles: {
normal: {
width: "100%",
flex: "1 1 auto",
opacity: "0",
"transition-property": "Opacity",
"transition-duration": "1s",
"transition-timing-function:": "ease-in",
},
hover: {
"transition-property": "Opacity",
"transition-duration": "1s",
"transition-timing-function:": "ease-out",
opacity: "1",
},
active: {},
selected: {},
},
embed:
'<iframe width="560" height="315" src="https://www.youtube.com/embed/dQw4w9WgXcQ" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
_instanceName: "Rick Astley Video",
_children: [],
},
],
},
], ],
_instanceName: "Home", _instanceName: "Home",
}, },

View File

@ -14,7 +14,7 @@ const SCHEMA = {
}, },
port: { port: {
type: FIELD_TYPES.NUMBER, type: FIELD_TYPES.NUMBER,
default: 1433, default: 3306,
required: false, required: false,
}, },
user: { user: {
@ -31,6 +31,10 @@ const SCHEMA = {
type: FIELD_TYPES.STRING, type: FIELD_TYPES.STRING,
required: true, required: true,
}, },
ssl: {
type: FIELD_TYPES.OBJECT,
required: false,
},
}, },
query: { query: {
create: { create: {
@ -51,6 +55,9 @@ const SCHEMA = {
class MySQLIntegration { class MySQLIntegration {
constructor(config) { constructor(config) {
this.config = config this.config = config
if (Object.keys(config.ssl) === 0) {
delete config.ssl
}
this.client = mysql.createConnection(config) this.client = mysql.createConnection(config)
} }