diff --git a/hosting/envoy.dev.yaml.hbs b/hosting/envoy.dev.yaml.hbs index 080311ee49..76417b3e0d 100644 --- a/hosting/envoy.dev.yaml.hbs +++ b/hosting/envoy.dev.yaml.hbs @@ -38,6 +38,11 @@ static_resources: route: cluster: server-dev + - match: { prefix: "/app/" } + route: + cluster: server-dev + prefix_rewrite: "/" + # the below three cases are needed to make sure # all traffic prefixed for the builder is passed through # correctly. diff --git a/packages/bbui/src/Table/StringRenderer.svelte b/packages/bbui/src/Table/StringRenderer.svelte index 2756839616..6fd731f5ec 100644 --- a/packages/bbui/src/Table/StringRenderer.svelte +++ b/packages/bbui/src/Table/StringRenderer.svelte @@ -2,7 +2,7 @@ export let value -
{value}
+
{typeof value === "object" ? JSON.stringify(value) : value}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js index 6d469e0904..e251595934 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js @@ -9,8 +9,10 @@ import SqlServer from "./SQLServer.svelte" import MySQL from "./MySQL.svelte" import ArangoDB from "./ArangoDB.svelte" import Rest from "./Rest.svelte" +import Budibase from "./Budibase.svelte" export default { + BUDIBASE: Budibase, POSTGRES: Postgres, DYNAMODB: DynamoDB, MONGODB: MongoDB, diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte index a03f07e746..180d03f7ff 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte @@ -23,16 +23,17 @@ } async function saveDatasource() { - const { type, ...config } = integration + const { type, plus, ...config } = integration // Create datasource const response = await datasources.save({ name, source: type, config, + plus, }) notifications.success(`Datasource ${name} created successfully.`) - analytics.captureEvent("Datasource Created", { name }) + analytics.captureEvent("Datasource Created", { name, type }) // Navigate to new datasource $goto(`./datasource/${response._id}`) diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte index fa8733a8b3..4291738d3d 100644 --- a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte +++ b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte @@ -6,6 +6,8 @@ import EditViewPopover from "./popovers/EditViewPopover.svelte" import NavItem from "components/common/NavItem.svelte" + export let sourceId + $: selectedView = $views.selected && $views.selected.name function selectTable(table) { @@ -31,12 +33,13 @@ {#if $database?._id}
- {#each $tables.list as table, idx} + {#each $tables.list.filter(table => table.sourceId === sourceId) as table, idx} 0} icon={table._id === TableNames.USERS ? "UserGroup" : "Table"} text={table.name} - selected={selectedView === `all_${table._id}`} + selected={$tables.selected?._id === table._id} on:click={() => selectTable(table)} > {#if table._id !== TableNames.USERS} @@ -45,7 +48,7 @@ {#each Object.keys(table.views || {}) as viewName, idx (idx)} diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte index 17d5aa2046..2513c6c7e5 100644 --- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte +++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte @@ -1,15 +1,15 @@ + + + + + + diff --git a/packages/builder/src/components/deploy/DeployModal.svelte b/packages/builder/src/components/deploy/DeployModal.svelte index bade2605d9..6e1b5f76e9 100644 --- a/packages/builder/src/components/deploy/DeployModal.svelte +++ b/packages/builder/src/components/deploy/DeployModal.svelte @@ -1,10 +1,10 @@ + +
+ This action doesn't require any additional settings. +
+ + diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js index a3e43cb045..b8114461f9 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js @@ -4,6 +4,7 @@ import DeleteRow from "./DeleteRow.svelte" import ExecuteQuery from "./ExecuteQuery.svelte" import TriggerAutomation from "./TriggerAutomation.svelte" import ValidateForm from "./ValidateForm.svelte" +import LogOut from "./LogOut.svelte" // Defines which actions are available to configure in the front end. // Unfortunately the "name" property is used as the identifier so please don't @@ -37,4 +38,8 @@ export default [ name: "Validate Form", component: ValidateForm, }, + { + name: "Log Out", + component: LogOut, + }, ] diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.js index 8a0e8fd60e..aefc1fab0e 100644 --- a/packages/builder/src/constants/index.js +++ b/packages/builder/src/constants/index.js @@ -31,3 +31,5 @@ export const LAYOUT_NAMES = { PUBLIC: "layout_private_master", }, } + +export const BUDIBASE_INTERNAL_DB = "bb_internal" diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte index 6910d3e925..6ce765d424 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte @@ -1,49 +1,27 @@
- - -
- - - - -
- - + +
@@ -54,7 +32,7 @@
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte index 4d6acc22ae..4fa864ce7a 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte @@ -1,13 +1 @@ - - diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte index 98379607c9..f805a5724f 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte @@ -1,7 +1,7 @@ -{#if datasource} +{#if datasource && integration}
@@ -66,6 +86,34 @@ on:change={setUnsaved} />
+ {#if datasource.plus} + +
+ Tables + +
+ + This datasource can determine tables automatically. Budibase can fetch + your tables directly from the database and you can use them without + having to write any queries at all. + +
+ {#if datasource.entities} + {#each Object.keys(datasource.entities) as entity} +
onClickTable(datasource.entities[entity])} + > +

{entity}

+

Primary Key: {datasource.entities[entity].primary}

+

→

+
+ {/each} + {/if} +
+ {/if}
Queries diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte new file mode 100644 index 0000000000..d6a76b2cf3 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte @@ -0,0 +1,81 @@ + + + + + + +
+ +
+ + Budibase Internal +
+ Budibase internal tables are part of your app, the data will be stored in + your apps context. + + Tables +
+ {#each $tables.list.filter(table => table.type !== "external") as table} +
+ {table.name} + {#if table.primaryDisplay} + display column: {table.primaryDisplay} + {/if} +
+ {/each} +
+
+ +
+ +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/_layout.svelte new file mode 100644 index 0000000000..14f6303e5f --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/_layout.svelte @@ -0,0 +1,13 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/index.svelte new file mode 100644 index 0000000000..a68c0dc651 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/index.svelte @@ -0,0 +1,16 @@ + + +{#if $database?._id && $tables?.selected?.name} + +{:else}Create your first table to start building{/if} + + diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte new file mode 100644 index 0000000000..eddb5ab598 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte @@ -0,0 +1,10 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/relationship/[selectedRow]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/relationship/[selectedRow]/index.svelte new file mode 100644 index 0000000000..8e195ddb12 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/relationship/[selectedRow]/index.svelte @@ -0,0 +1,6 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/relationship/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/relationship/index.svelte new file mode 100644 index 0000000000..7d081b6976 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/[selectedTable]/relationship/index.svelte @@ -0,0 +1,6 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/_layout.svelte new file mode 100644 index 0000000000..f957355c5c --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/_layout.svelte @@ -0,0 +1,19 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/index.svelte new file mode 100644 index 0000000000..6d61614145 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/table/index.svelte @@ -0,0 +1,21 @@ + + +{#if $tables.list.length === 0} + Create your first table to start building +{:else}Select a table to edit{/if} + + diff --git a/packages/builder/src/pages/builder/portal/settings/update.svelte b/packages/builder/src/pages/builder/portal/settings/update.svelte index 24e18c68f8..db69915358 100644 --- a/packages/builder/src/pages/builder/portal/settings/update.svelte +++ b/packages/builder/src/pages/builder/portal/settings/update.svelte @@ -1,4 +1,5 @@ {#if $auth.isAdmin} @@ -43,6 +57,11 @@
+
+ {#if version} + Current Version: {version} + {/if} +
diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/backend/datasources.js index ff634c0185..bb4a94b63b 100644 --- a/packages/builder/src/stores/backend/datasources.js +++ b/packages/builder/src/stores/backend/datasources.js @@ -1,5 +1,5 @@ import { writable } from "svelte/store" -import { queries } from "./" +import { queries, tables, views } from "./" import api from "../../builderStore/api" export const INITIAL_DATASOURCE_VALUES = { @@ -21,17 +21,53 @@ export function createDatasourcesStore() { fetch: async () => { const response = await api.get(`/api/datasources`) const json = await response.json() - update(state => ({ ...state, list: json })) + update(state => ({ ...state, list: json, selected: null })) return json }, select: async datasourceId => { update(state => ({ ...state, selected: datasourceId })) - queries.update(state => ({ ...state, selected: null })) + queries.unselect() + tables.unselect() + views.unselect() + }, + unselect: () => { + update(state => ({ ...state, selected: null })) + }, + updateSchema: async datasource => { + let url = `/api/datasources/${datasource._id}/schema` + + const response = await api.post(url) + const json = await response.json() + + if (response.status !== 200) { + throw new Error(json.message) + } + + update(state => { + const currentIdx = state.list.findIndex(ds => ds._id === json._id) + + const sources = state.list + + if (currentIdx >= 0) { + sources.splice(currentIdx, 1, json) + } else { + sources.push(json) + } + + return { list: sources, selected: json._id } + }) + return json }, save: async datasource => { - const response = await api.post("/api/datasources", datasource) + let url = "/api/datasources" + + const response = await api.post(url, datasource) const json = await response.json() + if (response.status !== 200) { + throw new Error(json.message) + } + update(state => { const currentIdx = state.list.findIndex(ds => ds._id === json._id) diff --git a/packages/builder/src/stores/backend/queries.js b/packages/builder/src/stores/backend/queries.js index 47ce365c61..2eeae29b9d 100644 --- a/packages/builder/src/stores/backend/queries.js +++ b/packages/builder/src/stores/backend/queries.js @@ -1,5 +1,5 @@ import { writable, get } from "svelte/store" -import { datasources, integrations } from "./" +import { datasources, integrations, tables } from "./" import api from "builderStore/api" export function createQueriesStore() { @@ -55,11 +55,14 @@ export function createQueriesStore() { }, select: query => { update(state => ({ ...state, selected: query._id })) - datasources.update(state => ({ + tables.update(state => ({ ...state, - selected: query.datasourceId, + selected: null, })) }, + unselect: () => { + update(state => ({ ...state, selected: null })) + }, delete: async query => { const response = await api.delete( `/api/queries/${query._id}/${query._rev}` diff --git a/packages/builder/src/stores/backend/rows.js b/packages/builder/src/stores/backend/rows.js index e3872d5873..2c858c9883 100644 --- a/packages/builder/src/stores/backend/rows.js +++ b/packages/builder/src/stores/backend/rows.js @@ -1,13 +1,13 @@ import { writable, get } from "svelte/store" -import { views } from "./" +import { tables } from "./" export function createRowsStore() { const { subscribe } = writable([]) return { subscribe, - save: () => views.select(get(views).selected), - delete: () => views.select(get(views).selected), + save: () => tables.select(get(tables).selected), + delete: () => tables.select(get(tables).selected), } } diff --git a/packages/builder/src/stores/backend/tables.js b/packages/builder/src/stores/backend/tables.js index 34bd5a9a24..e0b614a63e 100644 --- a/packages/builder/src/stores/backend/tables.js +++ b/packages/builder/src/stores/backend/tables.js @@ -1,5 +1,5 @@ import { writable, get } from "svelte/store" -import { views } from "./" +import { views, queries, datasources } from "./" import { cloneDeep } from "lodash/fp" import api from "builderStore/api" @@ -25,7 +25,9 @@ export function createTablesStore() { selected: table, draft: cloneDeep(table), })) - views.select({ name: `all_${table._id}` }) + views.unselect() + queries.unselect() + datasources.unselect() } } @@ -66,8 +68,15 @@ export function createTablesStore() { return { subscribe, + update, fetch, select, + unselect: () => { + update(state => ({ + ...state, + selected: null, + })) + }, save, init: async () => { const response = await api.get("/api/tables") diff --git a/packages/builder/src/stores/backend/tests/datasources.spec.js b/packages/builder/src/stores/backend/tests/datasources.spec.js index f4e10b6aa3..fb175f03b9 100644 --- a/packages/builder/src/stores/backend/tests/datasources.spec.js +++ b/packages/builder/src/stores/backend/tests/datasources.spec.js @@ -24,10 +24,10 @@ describe("Datasources Store", () => { }) it("fetches all the datasources and updates the store", async () => { - api.get.mockReturnValue({ json: () => [SOME_DATASOURCE]}) + api.get.mockReturnValue({ json: () => [SOME_DATASOURCE] }) await store.fetch() - expect(get(store)).toEqual({ list: [SOME_DATASOURCE], selected: null}) + expect(get(store)).toEqual({ list: [SOME_DATASOURCE], selected: null }) }) it("selects a datasource", async () => { @@ -44,7 +44,7 @@ describe("Datasources Store", () => { }) it("saves the datasource, updates the store and returns status message", async () => { - api.post.mockReturnValue({ json: () => SAVE_DATASOURCE}) + api.post.mockReturnValue({ status: 200, json: () => SAVE_DATASOURCE}) await store.save({ name: 'CoolDB', diff --git a/packages/builder/src/stores/backend/tests/queries.spec.js b/packages/builder/src/stores/backend/tests/queries.spec.js index d1efd678f9..1d1a1d0154 100644 --- a/packages/builder/src/stores/backend/tests/queries.spec.js +++ b/packages/builder/src/stores/backend/tests/queries.spec.js @@ -30,13 +30,6 @@ describe("Queries Store", () => { expect(get(store)).toEqual({ list: [SOME_QUERY], selected: null}) }) - it("selects a query and updates selected datasource", async () => { - await store.select(SOME_QUERY) - - expect(get(store).selected).toEqual(SOME_QUERY._id) - expect(get(datasources).selected).toEqual(SOME_QUERY.datasourceId) - }) - it("saves the query, updates the store and returns status message", async () => { api.post.mockReturnValue({ json: () => SAVE_QUERY_RESPONSE}) diff --git a/packages/builder/src/stores/backend/tests/tables.spec.js b/packages/builder/src/stores/backend/tests/tables.spec.js index ef65632ec8..faed217d43 100644 --- a/packages/builder/src/stores/backend/tests/tables.spec.js +++ b/packages/builder/src/stores/backend/tests/tables.spec.js @@ -41,14 +41,6 @@ describe("Tables Store", () => { expect(get(store).draft).toEqual({}) }) - it("selecting a table updates the view store", async () => { - const tableToSelect = SOME_TABLES[0] - await store.select(tableToSelect) - - expect(get(store).selected).toEqual(tableToSelect) - expect(get(views).selected).toEqual({ name: `all_${tableToSelect._id}` }) - }) - it("saving a table also selects it", async () => { api.post.mockReturnValue({ json: () => SAVE_TABLES_RESPONSE}) diff --git a/packages/builder/src/stores/backend/views.js b/packages/builder/src/stores/backend/views.js index d6497bf871..0b15d18fa5 100644 --- a/packages/builder/src/stores/backend/views.js +++ b/packages/builder/src/stores/backend/views.js @@ -1,5 +1,5 @@ import { writable, get } from "svelte/store" -import { tables } from "./" +import { tables, datasources, queries } from "./" import api from "builderStore/api" export function createViewsStore() { @@ -10,11 +10,20 @@ export function createViewsStore() { return { subscribe, + update, select: async view => { update(state => ({ ...state, selected: view, })) + queries.unselect() + datasources.unselect() + }, + unselect: () => { + update(state => ({ + ...state, + selected: null, + })) }, delete: async view => { await api.delete(`/api/views/${view}`) diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index 5257ba0c37..ea08cf1eb1 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@adobe/spectrum-css-workflow-icons@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4" + integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w== + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" @@ -870,11 +875,127 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/bbui@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.53.tgz#b6841a31ff2c28feb929c57f7f10a1dae1b3aea3" + integrity sha512-jO11Ky1KhPGRv922jMRO49FeTY1TeF3u2JaBJYBkVY95il3uPOI20M1AdA6w2emppDlyP6FSEHk+prdra4Lndw== + dependencies: + "@adobe/spectrum-css-workflow-icons" "^1.2.1" + "@spectrum-css/actionbutton" "^1.0.1" + "@spectrum-css/actiongroup" "^1.0.1" + "@spectrum-css/avatar" "^3.0.2" + "@spectrum-css/button" "^3.0.1" + "@spectrum-css/buttongroup" "^3.0.2" + "@spectrum-css/checkbox" "^3.0.2" + "@spectrum-css/dialog" "^3.0.1" + "@spectrum-css/divider" "^1.0.1" + "@spectrum-css/dropzone" "^3.0.2" + "@spectrum-css/fieldgroup" "^3.0.2" + "@spectrum-css/fieldlabel" "^3.0.1" + "@spectrum-css/icon" "^3.0.1" + "@spectrum-css/illustratedmessage" "^3.0.2" + "@spectrum-css/inputgroup" "^3.0.2" + "@spectrum-css/label" "^2.0.10" + "@spectrum-css/link" "^3.1.1" + "@spectrum-css/menu" "^3.0.1" + "@spectrum-css/modal" "^3.0.1" + "@spectrum-css/pagination" "^3.0.3" + "@spectrum-css/picker" "^1.0.1" + "@spectrum-css/popover" "^3.0.1" + "@spectrum-css/progressbar" "^1.0.2" + "@spectrum-css/progresscircle" "^1.0.2" + "@spectrum-css/radio" "^3.0.2" + "@spectrum-css/search" "^3.0.2" + "@spectrum-css/sidenav" "^3.0.2" + "@spectrum-css/statuslight" "^3.0.2" + "@spectrum-css/switch" "^1.0.2" + "@spectrum-css/table" "^3.0.1" + "@spectrum-css/tabs" "^3.0.1" + "@spectrum-css/tags" "^3.0.2" + "@spectrum-css/textfield" "^3.0.1" + "@spectrum-css/toast" "^3.0.1" + "@spectrum-css/tooltip" "^3.0.3" + "@spectrum-css/treeview" "^3.0.2" + "@spectrum-css/typography" "^3.0.1" + "@spectrum-css/underlay" "^2.0.9" + "@spectrum-css/vars" "^3.0.1" + dayjs "^1.10.4" + svelte-flatpickr "^3.1.0" + svelte-portal "^1.0.0" + +"@budibase/client@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.9.53.tgz#9e430057bdfc2968862ca25eb37dad30c3d2c86c" + integrity sha512-KK7e5rnmE61ms3q8F3NShB/nE03DfdHHqdj15tO9dMe/lr6fypK6aKkt4hfMPyDPVjn53n1Bg9tuzLvvGJABIg== + dependencies: + "@budibase/bbui" "^0.9.53" + "@budibase/standard-components" "^0.9.53" + "@budibase/string-templates" "^0.9.53" + regexparam "^1.3.0" + shortid "^2.2.15" + svelte-spa-router "^3.0.5" + "@budibase/colorpicker@1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@budibase/colorpicker/-/colorpicker-1.1.2.tgz#f7436924ee746d7be9b2009c2fa193e710c30f89" integrity sha512-2PlZBVkATDqDC4b4Ri8Xi8X3OxhuHOGfmZwtXbZL38lNIeofaQT3Qyc1ECzEY5N+HrdGrWhY9EnliF6QM+LIuA== +"@budibase/handlebars-helpers@^0.11.4": + version "0.11.4" + resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.4.tgz#8acfa2ee84134f7be4b2906e710fce6d25c5d000" + integrity sha512-AJNJYlJnxZmn9QJ8tBl8nrm4YxbwHP4AR0pbiVGK+EoOylkNBlUnZ/QDL1VyqM5fTkAE/Z2IZVLKrrG3kxuWLA== + dependencies: + arr-flatten "^1.1.0" + array-sort "^0.1.4" + define-property "^1.0.0" + extend-shallow "^3.0.2" + "falsey" "^0.3.2" + for-in "^1.0.2" + for-own "^1.0.0" + get-object "^0.2.0" + get-value "^2.0.6" + handlebars "^4.0.11" + handlebars-utils "^1.0.6" + has-value "^1.0.0" + helper-date "^1.0.1" + helper-markdown "^1.0.0" + helper-md "^0.2.2" + html-tag "^2.0.0" + is-even "^1.0.0" + is-glob "^4.0.0" + is-number "^4.0.0" + kind-of "^6.0.0" + logging-helpers "^1.0.0" + micromatch "^3.1.4" + relative "^3.0.2" + striptags "^3.1.0" + to-gfm-code-block "^0.1.1" + year "^0.2.1" + +"@budibase/standard-components@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.53.tgz#5e8d84bf4c3b1ceadfc40b5b5b6c0513b6283fc5" + integrity sha512-8QJmjwF51vh+rCiLbk+JLqCNZZBq9M8/LuyQOGvjnhB8l6DNrfjnCypP/xYoBf0uUvlki8TeNuZKQmDpBBnR7A== + dependencies: + "@budibase/bbui" "^0.9.53" + "@spectrum-css/page" "^3.0.1" + "@spectrum-css/vars" "^3.0.1" + apexcharts "^3.22.1" + dayjs "^1.10.5" + svelte-apexcharts "^1.0.2" + svelte-flatpickr "^3.1.0" + +"@budibase/string-templates@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.53.tgz#9228965afcef4cc19f7d016b291d5f298bb3b725" + integrity sha512-TL3Zx6VN+YpbIT5vtuTXEv2SOAwmx+YN42pbWxH3ExHj54bvhmRxSS+xJySs75kWdvQU4OMnYywQcMeMsqkOqg== + dependencies: + "@budibase/handlebars-helpers" "^0.11.4" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1289,6 +1410,98 @@ dependencies: "@sinonjs/commons" "^1.7.0" +"@spectrum-css/actionbutton@^1.0.1": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.3.tgz#8f7342a69b303c5acdcfa0a59f5e9267b9f3cb30" + integrity sha512-P9qoCPSiZ1SB6ZYqK5hub0vGty00YYqonQE0KTjtb1i+T1nYR/87vWqVPERx9j63uhgZncjwFYaThTvRqye7eQ== + +"@spectrum-css/actiongroup@^1.0.1": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.3.tgz#4713ce65e6f5c72c404a7b638fbc3b4fd7e3874f" + integrity sha512-NlB9Q4ZlWixXxymoPIYG6g2hkwAGKFodHWPFfxHD8ddkjXWRB9G2akUP7cfsJ4DcYn4VisUORCOYQwqDiSmboQ== + +"@spectrum-css/avatar@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95" + integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ== + +"@spectrum-css/button@^3.0.1": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84" + integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg== + +"@spectrum-css/buttongroup@^3.0.2": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.3.tgz#719d868845ac9d2c4f939c1b9f6044507902d5aa" + integrity sha512-eXl8U4QWMWXqyTu654FdQdEGnmczgOYlpIFSHyCMVjhtPqZp2xwnLFiGh6LKw+bLio6eeOZ0L+vpk1GcoYqgkw== + +"@spectrum-css/checkbox@^3.0.2": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.0.3.tgz#8577067fc8b97e4609f92bd242364937a533a7bb" + integrity sha512-QVG9uMHq+lh70Dh6mDNnY+vEvNz2p7VC6xgLfDYfijp2qeiqYPq72fQK6p/SiyqPk96ZACzNRwgeROU6Xf6Wgg== + +"@spectrum-css/dialog@^3.0.1": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.3.tgz#7715a4ea435e753afb623d99ca5917ed1bcd6f34" + integrity sha512-AhmKgfRIVyTe3ABiJ8lLUQL34VB/H6fN16na2LlbDRJvyRMzkdN1Xf2i6U3f4OMd3qQ8Gm5xat4BvMxIQPBAUQ== + +"@spectrum-css/divider@^1.0.1": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385" + integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA== + dependencies: + "@spectrum-css/vars" "^3.0.2" + +"@spectrum-css/dropzone@^3.0.2": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.3.tgz#aee71697a2c195947599d7541b858c3c198741dc" + integrity sha512-ujrswdtB6bHigklyHsm6zomFd6rUnKJ3xVVRjroVF4+ouK4DxK5tX0iVd0EW6AOfOjx4Cc28uyFot3fpxp+MQw== + +"@spectrum-css/fieldgroup@^3.0.2": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.0.3.tgz#85d85da048d08200f25ceab378026dd2b11e0bb2" + integrity sha512-wXUXTXN1CPnR7M4Ltd+3uh7BfcNGUV1+Xe0/h0tCpq/j+S2Sd4xo7/pUMdU19sIDrAAtpEFp1tt+nouHcU5HGQ== + +"@spectrum-css/fieldlabel@^3.0.1": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.3.tgz#f73c04d20734d4718ffb620dc46458904685b449" + integrity sha512-nEvIkEXCD5n4fW67Unq6Iu7VXoauEd/JGpfTY02VsC5p4FJLnwKfPDbJUuUsqClAxqw7nAsmXVKtn4zQFf5yPQ== + +"@spectrum-css/icon@^3.0.1": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.3.tgz#5c612822380927087aebd526855d82ed2c3e2cba" + integrity sha512-hyloKOejPCXhP3MBNsm3SjR9j8xT1R1S19p32KW/0Qhj+VMUtfyEPmevyFptpn7wcovQccdl/vZVIVDuML/imw== + +"@spectrum-css/illustratedmessage@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.2.tgz#6a480be98b027e050b086e7899e40d87adb0a8c0" + integrity sha512-dqnE8X27bGcO0HN8+dYx8O4o0dNNIAqeivOzDHhe2El+V4dTzMrNIerF6G0NLm3GjVf6XliwmitsZK+K6FmbtA== + +"@spectrum-css/inputgroup@^3.0.2": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.3.tgz#00c9a370ddc2c55cf0f37dd6069faa9501fd7eb5" + integrity sha512-FqRJTiLL7jiGfzDVXWUGVLqHryJjCcqQIrqAi+Tq0oenapzsBe2qc/zIrKgh2wtMI+NTIBLXTECvij3L1HlqAg== + +"@spectrum-css/label@^2.0.10": + version "2.0.10" + resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001" + integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ== + +"@spectrum-css/link@^3.1.1": + version "3.1.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.3.tgz#b0e560a7e0acdb4a2b329b6669696aa3438f5993" + integrity sha512-8Pmy5d73MwKcATTPaj+fSrZYnIw7GmfX40AvpC1xx5LauOxsbUb4AVNp1kn2H8rrOBmxF7czyhoBBhEiv66QUg== + +"@spectrum-css/menu@^3.0.1": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.3.tgz#46a9b221bb5f470a2f8a934bdfd512d84d2fdc4d" + integrity sha512-qKA9J/MrikNKIpCEHsAazG2vY3im5tjGCmo6p9Pdnu8/aQMsiuZDHZayukeCttJUZkrb9guDVL9OIHlK5RZvcQ== + +"@spectrum-css/modal@^3.0.1": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.2.tgz#58b6621cab65f90788d310374f40df1f7090473f" + integrity sha512-YnIivJhoaao7Otu+HV7sgebPyFbO6sd/oMvTN/Rb2wwgnaMnIIuIRdGandSrcgotN2uNgs+P0knG6mv/xA1/dg== + "@spectrum-css/page@^3.0.1": version "3.0.1" resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.1.tgz#5e1c3dd5b1a1ee591f9d636b75f03665f542d846" @@ -1296,11 +1509,111 @@ dependencies: "@spectrum-css/vars" "^3.0.1" +"@spectrum-css/pagination@^3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.3.tgz#b204c3ada384c4af751a354bc428346d82eeea65" + integrity sha512-OJ/v9GeNXJOZ9Yr9LDBYPrR2NCiLOWP9wANT/a5sqFuugRnQbn/HYMnRp9TBxwpDY6ihaPo0T/wi7kLiAJFdDw== + +"@spectrum-css/picker@^1.0.1": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.3.tgz#21379bcf8ae94277deeb6ad65dcd9e2bbfacb487" + integrity sha512-oHLGxBx5BwVCSGo7/T1C9PTHX1+/5AmVjyLiTJ4UoIdSJmOERw9YcRZbcGZgBJNWbxcjr4TyGtwj1EcSjEy97w== + +"@spectrum-css/popover@^3.0.1": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.3.tgz#6fb69873474fb968afb738eacb9e121f93e83a09" + integrity sha512-KvmXv4TV19FBx39KfmgVlDYtvtBqv/8RRK7RRLDDHGViTxZtShjVsVpwIgfkfgn4iJztCnXpWzFqRXWUu2XCpQ== + +"@spectrum-css/progressbar@^1.0.2": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.3.tgz#f70bcc38a2a21cff2f422ec825724ebbb9455e67" + integrity sha512-vJHplefUuy8+NjCw1X7fLbqHVGNVBpvGFXNAeaIj4SFf4ygxiUq/5c9iRhhsCQixEsJlfD/b7BnGXU7BUDkr6Q== + +"@spectrum-css/progresscircle@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.2.tgz#258ea9170fb70f795edda03e38a61d93bef4487c" + integrity sha512-JLULpyzjIY95lzlWR1yE1gv4l1K6p+scQ+edmuZZUHBzwM3pUtkvHJmUlA9TYdResUYW6Uka60VRdY6lZ8gnFQ== + +"@spectrum-css/radio@^3.0.2": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.3.tgz#25c3bc5e9c30a8a8ae728717b7c7fb736cdae640" + integrity sha512-LaLGfz/eGNR2iyqouXYILIA+pKRqF769iPdwM0REm5RpWvMQDD7rPZ/kWlg18owjaFsyllEp25gEjmhRJIIVOw== + +"@spectrum-css/search@^3.0.2": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.0.3.tgz#3415dc106aca0d5dd996e87084a1b47c2b95a882" + integrity sha512-kdLpKTt0obljuhS1q1tukujRlvSs8sBwij76D4Qp8KpMzwePfZyvv1kYzuWPNZfTeISxWsmyZ6Wxd1uvzjn+UA== + +"@spectrum-css/sidenav@^3.0.2": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.3.tgz#132141fbd2500a927c312fa4e1d712c438b3d597" + integrity sha512-cQ+CgwjxGftrcc79i1XnGd66QTl7H7zopSU0UTV4Qq7hvqfrjjWxfZ6b+3tezrrhNlDope1ff9o8sm67PsPXtg== + +"@spectrum-css/statuslight@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5" + integrity sha512-xodB8g8vGJH20XmUj9ZsPlM1jHrGeRbvmVXkz0q7YvQrYAhim8pP3W+XKKZAletPFAuu8cmUOc6SWn6i4X4z6w== + +"@spectrum-css/switch@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.2.tgz#f0b4c69271964573e02b08e90998096e49e1de44" + integrity sha512-zqmHpgWPNg1gEwdUNFYV3CBX5JaeALfIqcJIxE0FLZqr9d1C4+oLE0ItIFzt1bwr4bFAOmkEpvtiY+amluzGxQ== + +"@spectrum-css/table@^3.0.1": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.3.tgz#7f7f19905ef3275cbf907ce3a5818e63c30b2caf" + integrity sha512-nxwzVjLPsXoY/v4sdxOVYLcC+cEbGgJyLcLclT5LT9MGSbngFeUMJzzVR4EvehzuN4dH7hrATG7Mbuq29Mf0Hg== + +"@spectrum-css/tabs@^3.0.1": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.0.3.tgz#51dd6f168c897b0fdc3a7e9f901df7bd2288b4fc" + integrity sha512-iLP1I72bJWz9APdQB1jiw+pOv5a7N+hYOCJvRoc56Us/hJKVzowkyGRe3uH+8v36nCG9bHxiAQNLoU8eXisVrg== + +"@spectrum-css/tags@^3.0.2": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.3.tgz#fc76d2735cdc442de91b7eb3bee49a928c0767ac" + integrity sha512-SL8vPxVDfWcY5VdIuyl0TImEXcOU1I7yCyXkk7MudMwfnYs81FaIyY32hFV9OHj0Tz/36UzRzc7AVMSuRQ53pw== + +"@spectrum-css/textfield@^3.0.1": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.0.2.tgz#907f62d2dc82852dd6236a820be99e252b531631" + integrity sha512-nkFgAb0cP4jUodkUBErMNfyF78jJLtgL1Mrr9/rvGpGobo10IAbb8zZY4CkZ64o8XmMy/85+wZTKcx+KHatqpg== + +"@spectrum-css/toast@^3.0.1": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.3.tgz#97c1527384707600832ecda35643ed304615250f" + integrity sha512-CjLeaMs+cjUXojCCRtbj0YkD2BoZW16kjj2o5omkEpUTjA34IJ8xJ1a+CCtDILWekhXvN0MBN4sbumcnwcnx8w== + +"@spectrum-css/tooltip@^3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281" + integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A== + +"@spectrum-css/treeview@^3.0.2": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.3.tgz#aeda5175158b9f8d7529cb2b394428eb2a428046" + integrity sha512-D5gGzZC/KtRArdx86Mesc9+99W9nTbUOeyYGqoJoAfJSOttoT6Tk5CrDvlCmAqjKf5rajemAkGri1ChqvUIwkw== + +"@spectrum-css/typography@^3.0.1": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38" + integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA== + +"@spectrum-css/underlay@^2.0.9": + version "2.0.10" + resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.10.tgz#8b75b646605a311850f6620caa18d4996cd64ed7" + integrity sha512-PmsmkzeGD/rY4pp3ILXHt9w8BW7uaEqXe08hQRS7rGki7wqCpG4mE0/8N3yEcA3QxWQclmG9gdkg5uz6wMmYzA== + "@spectrum-css/vars@^3.0.1": version "3.0.1" resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.1.tgz#561fd69098f896a647242dd8d6108af603bfa31e" integrity sha512-l4oRcCOqInChYXZN6OQhpe3isk6l4OE6Ys8cgdlsiKp53suNoQxyyd9p/eGRbCjZgH3xQ8nK0t4DHa7QYC0S6w== +"@spectrum-css/vars@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999" + integrity sha512-vzS9KqYXot4J3AEER/u618MXWAS+IoMvYMNrOoscKiLLKYQWenaueakUWulFonToPd/9vIpqtdbwxznqrK5qDw== + "@sveltejs/vite-plugin-svelte@^1.0.0-next.5": version "1.0.0-next.5" resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.0-next.5.tgz#8cf608f7a3c33dfa5b648397aae1ba90e6a4883f" @@ -1544,6 +1857,130 @@ ajv@^6.12.3: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ansi-bgblack@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-bgblack/-/ansi-bgblack-0.1.1.tgz#a68ba5007887701b6aafbe3fa0dadfdfa8ee3ca2" + integrity sha1-poulAHiHcBtqr74/oNrf36juPKI= + dependencies: + ansi-wrap "0.1.0" + +ansi-bgblue@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-bgblue/-/ansi-bgblue-0.1.1.tgz#67bdc04edc9b9b5278969da196dea3d75c8c3613" + integrity sha1-Z73ATtybm1J4lp2hlt6j11yMNhM= + dependencies: + ansi-wrap "0.1.0" + +ansi-bgcyan@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-bgcyan/-/ansi-bgcyan-0.1.1.tgz#58489425600bde9f5507068dd969ebfdb50fe768" + integrity sha1-WEiUJWAL3p9VBwaN2Wnr/bUP52g= + dependencies: + ansi-wrap "0.1.0" + +ansi-bggreen@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-bggreen/-/ansi-bggreen-0.1.1.tgz#4e3191248529943f4321e96bf131d1c13816af49" + integrity sha1-TjGRJIUplD9DIelr8THRwTgWr0k= + dependencies: + ansi-wrap "0.1.0" + +ansi-bgmagenta@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-bgmagenta/-/ansi-bgmagenta-0.1.1.tgz#9b28432c076eaa999418672a3efbe19391c2c7a1" + integrity sha1-myhDLAduqpmUGGcqPvvhk5HCx6E= + dependencies: + ansi-wrap "0.1.0" + +ansi-bgred@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-bgred/-/ansi-bgred-0.1.1.tgz#a76f92838382ba43290a6c1778424f984d6f1041" + integrity sha1-p2+Sg4OCukMpCmwXeEJPmE1vEEE= + dependencies: + ansi-wrap "0.1.0" + +ansi-bgwhite@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-bgwhite/-/ansi-bgwhite-0.1.1.tgz#6504651377a58a6ececd0331994e480258e11ba8" + integrity sha1-ZQRlE3elim7OzQMxmU5IAljhG6g= + dependencies: + ansi-wrap "0.1.0" + +ansi-bgyellow@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-bgyellow/-/ansi-bgyellow-0.1.1.tgz#c3fe2eb08cd476648029e6874d15a0b38f61d44f" + integrity sha1-w/4usIzUdmSAKeaHTRWgs49h1E8= + dependencies: + ansi-wrap "0.1.0" + +ansi-black@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-black/-/ansi-black-0.1.1.tgz#f6185e889360b2545a1ec50c0bf063fc43032453" + integrity sha1-9hheiJNgslRaHsUMC/Bj/EMDJFM= + dependencies: + ansi-wrap "0.1.0" + +ansi-blue@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-blue/-/ansi-blue-0.1.1.tgz#15b804990e92fc9ca8c5476ce8f699777c21edbf" + integrity sha1-FbgEmQ6S/JyoxUds6PaZd3wh7b8= + dependencies: + ansi-wrap "0.1.0" + +ansi-bold@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-bold/-/ansi-bold-0.1.1.tgz#3e63950af5acc2ae2e670e6f67deb115d1a5f505" + integrity sha1-PmOVCvWswq4uZw5vZ96xFdGl9QU= + dependencies: + ansi-wrap "0.1.0" + +ansi-colors@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-0.2.0.tgz#72c31de2a0d9a2ccd0cac30cc9823eeb2f6434b5" + integrity sha1-csMd4qDZoszQysMMyYI+6y9kNLU= + dependencies: + ansi-bgblack "^0.1.1" + ansi-bgblue "^0.1.1" + ansi-bgcyan "^0.1.1" + ansi-bggreen "^0.1.1" + ansi-bgmagenta "^0.1.1" + ansi-bgred "^0.1.1" + ansi-bgwhite "^0.1.1" + ansi-bgyellow "^0.1.1" + ansi-black "^0.1.1" + ansi-blue "^0.1.1" + ansi-bold "^0.1.1" + ansi-cyan "^0.1.1" + ansi-dim "^0.1.1" + ansi-gray "^0.1.1" + ansi-green "^0.1.1" + ansi-grey "^0.1.1" + ansi-hidden "^0.1.1" + ansi-inverse "^0.1.1" + ansi-italic "^0.1.1" + ansi-magenta "^0.1.1" + ansi-red "^0.1.1" + ansi-reset "^0.1.1" + ansi-strikethrough "^0.1.1" + ansi-underline "^0.1.1" + ansi-white "^0.1.1" + ansi-yellow "^0.1.1" + lazy-cache "^2.0.1" + +ansi-cyan@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873" + integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM= + dependencies: + ansi-wrap "0.1.0" + +ansi-dim@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-dim/-/ansi-dim-0.1.1.tgz#40de4c603aa8086d8e7a86b8ff998d5c36eefd6c" + integrity sha1-QN5MYDqoCG2Oeoa4/5mNXDbu/Ww= + dependencies: + ansi-wrap "0.1.0" + ansi-escapes@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" @@ -1556,6 +1993,62 @@ ansi-escapes@^4.2.1: dependencies: type-fest "^0.21.3" +ansi-gray@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" + integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE= + dependencies: + ansi-wrap "0.1.0" + +ansi-green@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-green/-/ansi-green-0.1.1.tgz#8a5d9a979e458d57c40e33580b37390b8e10d0f7" + integrity sha1-il2al55FjVfEDjNYCzc5C44Q0Pc= + dependencies: + ansi-wrap "0.1.0" + +ansi-grey@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-grey/-/ansi-grey-0.1.1.tgz#59d98b6ac2ba19f8a51798e9853fba78339a33c1" + integrity sha1-WdmLasK6GfilF5jphT+6eDOaM8E= + dependencies: + ansi-wrap "0.1.0" + +ansi-hidden@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-hidden/-/ansi-hidden-0.1.1.tgz#ed6a4c498d2bb7cbb289dbf2a8d1dcc8567fae0f" + integrity sha1-7WpMSY0rt8uyidvyqNHcyFZ/rg8= + dependencies: + ansi-wrap "0.1.0" + +ansi-inverse@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-inverse/-/ansi-inverse-0.1.1.tgz#b6af45826fe826bfb528a6c79885794355ccd269" + integrity sha1-tq9Fgm/oJr+1KKbHmIV5Q1XM0mk= + dependencies: + ansi-wrap "0.1.0" + +ansi-italic@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-italic/-/ansi-italic-0.1.1.tgz#104743463f625c142a036739cf85eda688986f23" + integrity sha1-EEdDRj9iXBQqA2c5z4XtpoiYbyM= + dependencies: + ansi-wrap "0.1.0" + +ansi-magenta@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-magenta/-/ansi-magenta-0.1.1.tgz#063b5ba16fb3f23e1cfda2b07c0a89de11e430ae" + integrity sha1-BjtboW+z8j4c/aKwfAqJ3hHkMK4= + dependencies: + ansi-wrap "0.1.0" + +ansi-red@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c" + integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw= + dependencies: + ansi-wrap "0.1.0" + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -1571,6 +2064,20 @@ ansi-regex@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== +ansi-reset@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-reset/-/ansi-reset-0.1.1.tgz#e7e71292c3c7ddcd4d62ef4a6c7c05980911c3b7" + integrity sha1-5+cSksPH3c1NYu9KbHwFmAkRw7c= + dependencies: + ansi-wrap "0.1.0" + +ansi-strikethrough@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-strikethrough/-/ansi-strikethrough-0.1.1.tgz#d84877140b2cff07d1c93ebce69904f68885e568" + integrity sha1-2Eh3FAss/wfRyT685pkE9oiF5Wg= + dependencies: + ansi-wrap "0.1.0" + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -1590,6 +2097,32 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" +ansi-underline@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-underline/-/ansi-underline-0.1.1.tgz#dfc920f4c97b5977ea162df8ffb988308aaa71a4" + integrity sha1-38kg9Ml7WXfqFi34/7mIMIqqcaQ= + dependencies: + ansi-wrap "0.1.0" + +ansi-white@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-white/-/ansi-white-0.1.1.tgz#9c77b7c193c5ee992e6011d36ec4c921b4578944" + integrity sha1-nHe3wZPF7pkuYBHTbsTJIbRXiUQ= + dependencies: + ansi-wrap "0.1.0" + +ansi-wrap@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" + integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768= + +ansi-yellow@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-yellow/-/ansi-yellow-0.1.1.tgz#cb9356f2f46c732f0e3199e6102955a77da83c1d" + integrity sha1-y5NW8vRscy8OMZnmEClVp32oPB0= + dependencies: + ansi-wrap "0.1.0" + any-observable@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" @@ -1611,12 +2144,24 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" +apexcharts@^3.19.2, apexcharts@^3.22.1: + version "3.27.1" + resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.27.1.tgz#b0e6dd3b3ace028f29b32fcd88e19a2420a18089" + integrity sha512-2pfw3pxeWhI0ap5lfxyfGNGoGScfEwfc8XnTpbnzgRdr1AOH5JJN9hh3MvfwrC9TQQfJYC2TZc8P/q9qXUj1bQ== + dependencies: + svg.draggable.js "^2.2.2" + svg.easing.js "^2.0.0" + svg.filter.js "^2.0.2" + svg.pathmorphing.js "^0.1.3" + svg.resize.js "^1.4.3" + svg.select.js "^3.0.1" + arch@^2.1.2: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== -argparse@^1.0.7: +argparse@^1.0.10, argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -1646,6 +2191,15 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= +array-sort@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-0.1.4.tgz#662855eaeb671b4188df4451b2f24a0753992b23" + integrity sha512-BNcM+RXxndPxiZ2rd76k6nyQLRZr2/B/sdi8pQ+Joafr5AH279L40dfokSUTp8O+AaqYjXWhblBWa2st2nc4fQ== + dependencies: + default-compare "^1.0.0" + get-value "^2.0.6" + kind-of "^5.0.2" + array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -1693,6 +2247,13 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== +autolinker@~0.28.0: + version "0.28.1" + resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" + integrity sha1-BlK0kYgYefB3XazgzcoyM5QqTkc= + dependencies: + gulp-header "^1.7.1" + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -2184,6 +2745,13 @@ concat-stream@^1.6.2: readable-stream "^2.2.2" typedarray "^0.0.6" +concat-with-sourcemaps@*: + version "1.1.0" + resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" + integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== + dependencies: + source-map "^0.6.1" + configent@^2.1.4: version "2.2.0" resolved "https://registry.yarnpkg.com/configent/-/configent-2.2.0.tgz#2de230fc43f22c47cfd99016aa6962d6f9546994" @@ -2356,6 +2924,18 @@ date-fns@^1.27.2: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== +date.js@^0.3.1: + version "0.3.3" + resolved "https://registry.yarnpkg.com/date.js/-/date.js-0.3.3.tgz#ef1e92332f507a638795dbb985e951882e50bbda" + integrity sha512-HgigOS3h3k6HnW011nAb43c5xx5rBXk8P2v/WIT9Zv4koIaVXiH2BURguI78VVp+5Qc076T7OR378JViCnZtBw== + dependencies: + debug "~3.1.0" + +dayjs@^1.10.4, dayjs@^1.10.5: + version "1.10.5" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.5.tgz#5600df4548fc2453b3f163ebb2abbe965ccfb986" + integrity sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g== + debug@4.3.1, debug@^4.1.0, debug@^4.1.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" @@ -2384,6 +2964,13 @@ debug@^4.3.2: dependencies: ms "2.1.2" +debug@~3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -2409,6 +2996,13 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== +default-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" + integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== + dependencies: + kind-of "^5.0.2" + define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -2522,6 +3116,11 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" +ent@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" + integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= + error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -2529,6 +3128,11 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +error-symbol@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/error-symbol/-/error-symbol-0.1.0.tgz#0a4dae37d600d15a29ba453d8ef920f1844333f6" + integrity sha1-Ck2uN9YA0VopukU9jvkg8YRDM/Y= + esbuild@^0.9.3: version "0.9.7" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.9.7.tgz#ea0d639cbe4b88ec25fbed4d6ff00c8d788ef70b" @@ -2759,6 +3363,13 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= +"falsey@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/falsey/-/falsey-0.3.2.tgz#b21c90c5c34660fc192bf909575db95b6880d597" + integrity sha512-lxEuefF5MBIVDmE6XeqCdM4BWk1+vYmGZtkbKZ/VFcg6uBBw6fXNEbWmxCjDdQlFc9hy450nkiWwM3VAW6G1qg== + dependencies: + kind-of "^5.0.2" + fast-deep-equal@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -2847,6 +3458,11 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +flatpickr@^4.5.2: + version "4.6.9" + resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.9.tgz#9a13383e8a6814bda5d232eae3fcdccb97dc1499" + integrity sha512-F0azNNi8foVWKSF+8X+ZJzz8r9sE1G4hl06RyceIaLvyltKvDl6vqk9Lm/6AUUCi5HWaIjiUbk7UpeE/fOXOpw== + fn-name@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-3.0.0.tgz#0596707f635929634d791f452309ab41558e3c5c" @@ -2857,11 +3473,18 @@ follow-redirects@^1.10.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267" integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA== -for-in@^1.0.2: +for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= +for-own@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" + integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= + dependencies: + for-in "^1.0.1" + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -2888,6 +3511,11 @@ from@~0: resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= +fs-exists-sync@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" + integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0= + fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -2941,6 +3569,14 @@ get-intrinsic@^1.0.2: has "^1.0.3" has-symbols "^1.0.1" +get-object@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" + integrity sha1-2S/31RkMZFMM2gVD2sY6PUf+jAw= + dependencies: + is-number "^2.0.2" + isobject "^0.2.0" + get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -3034,6 +3670,35 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= +gulp-header@^1.7.1: + version "1.8.12" + resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" + integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== + dependencies: + concat-with-sourcemaps "*" + lodash.template "^4.4.0" + through2 "^2.0.0" + +handlebars-utils@^1.0.2, handlebars-utils@^1.0.4, handlebars-utils@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" + integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== + dependencies: + kind-of "^6.0.0" + typeof-article "^0.1.1" + +handlebars@^4.0.11, handlebars@^4.7.6: + version "4.7.7" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" + integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== + dependencies: + minimist "^1.2.5" + neo-async "^2.6.0" + source-map "^0.6.1" + wordwrap "^1.0.0" + optionalDependencies: + uglify-js "^3.1.4" + har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -3117,6 +3782,39 @@ hash-sum@^2.0.0: resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a" integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg== +helper-date@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/helper-date/-/helper-date-1.0.1.tgz#12fedea3ad8e44a7ca4c4efb0ff4104a5120cffb" + integrity sha512-wU3VOwwTJvGr/w5rZr3cprPHO+hIhlblTJHD6aFBrKLuNbf4lAmkawd2iK3c6NbJEvY7HAmDpqjOFSI5/+Ey2w== + dependencies: + date.js "^0.3.1" + handlebars-utils "^1.0.4" + moment "^2.18.1" + +helper-markdown@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/helper-markdown/-/helper-markdown-1.0.0.tgz#ee7e9fc554675007d37eb90f7853b13ce74f3e10" + integrity sha512-AnDqMS4ejkQK0MXze7pA9TM3pu01ZY+XXsES6gEE0RmCGk5/NIfvTn0NmItfyDOjRAzyo9z6X7YHbHX4PzIvOA== + dependencies: + handlebars-utils "^1.0.2" + highlight.js "^9.12.0" + remarkable "^1.7.1" + +helper-md@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" + integrity sha1-wfWdflW7riM2L9ig6XFgeuxp1B8= + dependencies: + ent "^2.2.0" + extend-shallow "^2.0.1" + fs-exists-sync "^0.1.0" + remarkable "^1.6.2" + +highlight.js@^9.12.0: + version "9.18.5" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825" + integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA== + hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -3134,6 +3832,14 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== +html-tag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" + integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== + dependencies: + is-self-closing "^1.0.1" + kind-of "^6.0.0" + http-signature@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" @@ -3206,6 +3912,11 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" +info-symbol@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/info-symbol/-/info-symbol-0.1.0.tgz#27841d72867ddb4242cd612d79c10633881c6a78" + integrity sha1-J4QdcoZ920JCzWEtecEGM4gcang= + inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" @@ -3291,6 +4002,13 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== +is-even@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" + integrity sha1-drUFX7rY0pSoa2qUkBXhyXtxfAY= + dependencies: + is-odd "^0.1.2" + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -3330,7 +4048,7 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== -is-glob@^4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== @@ -3345,6 +4063,13 @@ is-installed-globally@^0.3.2: global-dirs "^2.0.1" is-path-inside "^3.0.1" +is-number@^2.0.2: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= + dependencies: + kind-of "^3.0.2" + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -3352,6 +4077,11 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" +is-number@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" + integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== + is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -3364,6 +4094,13 @@ is-observable@^1.1.0: dependencies: symbol-observable "^1.1.0" +is-odd@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" + integrity sha1-vFc7XONx7yqtbm9JeZtyvvE5eKc= + dependencies: + is-number "^3.0.0" + is-path-inside@^3.0.1: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -3391,6 +4128,13 @@ is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== +is-self-closing@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" + integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== + dependencies: + self-closing-tags "^1.0.1" + is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -3433,6 +4177,11 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= +isobject@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" + integrity sha1-o0MhkvObkQtfAsyYlIeDbscKqF4= + isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -3988,7 +4737,7 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= @@ -4002,7 +4751,7 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0: +kind-of@^5.0.0, kind-of@^5.0.2: version "5.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== @@ -4022,6 +4771,13 @@ lazy-ass@1.6.0, lazy-ass@^1.6.0: resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM= +lazy-cache@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264" + integrity sha1-uRkKT5EzVGlIQIWfio9whNiCImQ= + dependencies: + set-getter "^0.1.0" + leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -4096,6 +4852,11 @@ lodash-es@^4.17.11: resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== +lodash._reinterpolate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= + lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -4106,11 +4867,34 @@ lodash.once@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= -lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0: +lodash.template@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" + integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== + dependencies: + lodash._reinterpolate "^3.0.0" + lodash.templatesettings "^4.0.0" + +lodash.templatesettings@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" + integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== + dependencies: + lodash._reinterpolate "^3.0.0" + +lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== +log-ok@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/log-ok/-/log-ok-0.1.1.tgz#bea3dd36acd0b8a7240d78736b5b97c65444a334" + integrity sha1-vqPdNqzQuKckDXhza1uXxlREozQ= + dependencies: + ansi-green "^0.1.1" + success-symbol "^0.1.0" + log-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" @@ -4142,6 +4926,27 @@ log-update@^2.3.0: cli-cursor "^2.0.0" wrap-ansi "^3.0.1" +log-utils@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/log-utils/-/log-utils-0.2.1.tgz#a4c217a0dd9a50515d9b920206091ab3d4e031cf" + integrity sha1-pMIXoN2aUFFdm5ICBgkas9TgMc8= + dependencies: + ansi-colors "^0.2.0" + error-symbol "^0.1.0" + info-symbol "^0.1.0" + log-ok "^0.1.1" + success-symbol "^0.1.0" + time-stamp "^1.0.1" + warning-symbol "^0.1.0" + +logging-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/logging-helpers/-/logging-helpers-1.0.0.tgz#b5a37b32ad53eb0137c58c7898a47b175ddb7c36" + integrity sha512-qyIh2goLt1sOgQQrrIWuwkRjUx4NUcEqEGAcYqD8VOnOC6ItwkrVE8/tA4smGpjzyp4Svhc6RodDp9IO5ghpyA== + dependencies: + isobject "^3.0.0" + log-utils "^0.2.1" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -4288,7 +5093,7 @@ mkdirp@^0.5.4: dependencies: minimist "^1.2.5" -moment@^2.27.0: +moment@^2.18.1, moment@^2.27.0: version "2.29.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== @@ -4345,6 +5150,11 @@ ncp@^2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= +neo-async@^2.6.0: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -4792,7 +5602,7 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readable-stream@^2.2.2: +readable-stream@^2.2.2, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -4845,6 +5655,16 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" +regexparam@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.0.tgz#059476767d5f5f87f735fc7922d133fd1a118c8c" + integrity sha512-gJKwd2MVPWHAIFLsaYDZfyKzHNS4o7E/v8YmNf44vmeV2e4YfVoDToTOKTvE7ab68cRJ++kLuEXJBaEeJVt5ow== + +regexparam@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" + integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== + regexpu-core@^4.7.1: version "4.7.1" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" @@ -4869,6 +5689,21 @@ regjsparser@^0.6.4: dependencies: jsesc "~0.5.0" +relative@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" + integrity sha1-Dc2OxUpdNaPBXhBFA9ZTdbWlNn8= + dependencies: + isobject "^2.0.0" + +remarkable@^1.6.2, remarkable@^1.7.1: + version "1.7.4" + resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" + integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== + dependencies: + argparse "^1.0.10" + autolinker "~0.28.0" + remixicon@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/remixicon/-/remixicon-2.5.0.tgz#b5e245894a1550aa23793f95daceadbf96ad1a41" @@ -5104,6 +5939,11 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" +self-closing-tags@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" + integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== + "semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -5131,6 +5971,13 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= +set-getter@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.1.tgz#a3110e1b461d31a9cfc8c5c9ee2e9737ad447102" + integrity sha512-9sVWOy+gthr+0G9DzqqLaYNA7+5OKkSmcqjL9cBpDEaZrr3ShQlyX2cZ/O/ozE41oxn/Tt0LGEM/w4Rub3A3gw== + dependencies: + to-object-path "^0.3.0" + set-value@^2.0.0, set-value@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" @@ -5177,6 +6024,13 @@ shortid@2.2.15: dependencies: nanoid "^2.1.0" +shortid@^2.2.15: + version "2.2.16" + resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" + integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== + dependencies: + nanoid "^2.1.0" + signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" @@ -5468,6 +6322,16 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" +striptags@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" + integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== + +success-symbol@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/success-symbol/-/success-symbol-0.1.0.tgz#24022e486f3bf1cdca094283b769c472d3b72897" + integrity sha1-JAIuSG878c3KCUKDt2nEctO3KJc= + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -5495,11 +6359,25 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" +svelte-apexcharts@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/svelte-apexcharts/-/svelte-apexcharts-1.0.2.tgz#4e000f8b8f7c901c05658c845457dfc8314d54c1" + integrity sha512-6qlx4rE+XsonZ0FZudfwqOQ34Pq+3wpxgAD75zgEmGoYhYBJcwmikTuTf3o8ZBsZue9U/pAwhNy3ed1Bkq1gmA== + dependencies: + apexcharts "^3.19.2" + svelte-dnd-action@^0.9.8: version "0.9.8" resolved "https://registry.yarnpkg.com/svelte-dnd-action/-/svelte-dnd-action-0.9.8.tgz#d8e6813aba64148b38ac65ec5df7b153568b5cfa" integrity sha512-EWzxSpgNRkD6t8oHWcY4hqMoDJ16nkeFTza3V5K1r8GDqCJwK32zhpNv9ETDwfQiy2V2bJJMrH7io9xdlkYadg== +svelte-flatpickr@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.1.1.tgz#c79da72a4acab252ed39bac8168f30f79db3ff80" + integrity sha512-z/sV/AMTqyybeWPCjoWYUOyuMmu9qX2c2f2cRqYos9K9sM5L3CqagtvfVy7GZQrnEYe+K7l/gGDCAyxJNp2+gA== + dependencies: + flatpickr "^4.5.2" + svelte-hmr@^0.13.3: version "0.13.3" resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.13.3.tgz#fba5739b477ea44caf70e542a24a4352bee2b897" @@ -5522,11 +6400,78 @@ svelte-portal@0.1.0: resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-0.1.0.tgz#cc2821cc84b05ed5814e0218dcdfcbebc53c1742" integrity sha512-kef+ksXVKun224mRxat+DdO4C+cGHla+fEcZfnBAvoZocwiaceOfhf5azHYOPXSSB1igWVFTEOF3CDENPnuWxg== +svelte-portal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" + integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== + +svelte-spa-router@^3.0.5: + version "3.2.0" + resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.2.0.tgz#fae3311d292451236cb57131262406cf312b15ee" + integrity sha512-igemo5Vs82TGBBw+DjWt6qKameXYzNs6aDXcTxou5XbEvOjiRcAM6MLkdVRCatn6u8r42dE99bt/br7T4qe/AQ== + dependencies: + regexparam "2.0.0" + svelte@^3.38.2: version "3.38.2" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.38.2.tgz#55e5c681f793ae349b5cc2fe58e5782af4275ef5" integrity sha512-q5Dq0/QHh4BLJyEVWGe7Cej5NWs040LWjMbicBGZ+3qpFWJ1YObRmUDZKbbovddLC9WW7THTj3kYbTOFmU9fbg== +svg.draggable.js@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba" + integrity sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw== + dependencies: + svg.js "^2.0.1" + +svg.easing.js@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/svg.easing.js/-/svg.easing.js-2.0.0.tgz#8aa9946b0a8e27857a5c40a10eba4091e5691f12" + integrity sha1-iqmUawqOJ4V6XEChDrpAkeVpHxI= + dependencies: + svg.js ">=2.3.x" + +svg.filter.js@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/svg.filter.js/-/svg.filter.js-2.0.2.tgz#91008e151389dd9230779fcbe6e2c9a362d1c203" + integrity sha1-kQCOFROJ3ZIwd5/L5uLJo2LRwgM= + dependencies: + svg.js "^2.2.5" + +svg.js@>=2.3.x, svg.js@^2.0.1, svg.js@^2.2.5, svg.js@^2.4.0, svg.js@^2.6.5: + version "2.7.1" + resolved "https://registry.yarnpkg.com/svg.js/-/svg.js-2.7.1.tgz#eb977ed4737001eab859949b4a398ee1bb79948d" + integrity sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA== + +svg.pathmorphing.js@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz#c25718a1cc7c36e852ecabc380e758ac09bb2b65" + integrity sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww== + dependencies: + svg.js "^2.4.0" + +svg.resize.js@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/svg.resize.js/-/svg.resize.js-1.4.3.tgz#885abd248e0cd205b36b973c4b578b9a36f23332" + integrity sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw== + dependencies: + svg.js "^2.6.5" + svg.select.js "^2.1.2" + +svg.select.js@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-2.1.2.tgz#e41ce13b1acff43a7441f9f8be87a2319c87be73" + integrity sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ== + dependencies: + svg.js "^2.2.5" + +svg.select.js@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-3.0.1.tgz#a4198e359f3825739226415f82176a90ea5cc917" + integrity sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw== + dependencies: + svg.js "^2.6.5" + symbol-observable@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -5569,11 +6514,24 @@ throttleit@^1.0.0: resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= +through2@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" + through@2, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= +time-stamp@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" + integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM= + tmp@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" @@ -5591,6 +6549,11 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= +to-gfm-code-block@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" + integrity sha1-JdBFpfrlUxielje1kJANpzLYqoI= + to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" @@ -5708,6 +6671,18 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= +typeof-article@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" + integrity sha1-nwfnM8P7tkb/qeYcCN66zUYOBq8= + dependencies: + kind-of "^3.1.0" + +uglify-js@^3.1.4: + version "3.13.9" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.9.tgz#4d8d21dcd497f29cfd8e9378b9df123ad025999b" + integrity sha512-wZbyTQ1w6Y7fHdt8sJnHfSIuWeDgk6B5rCb4E/AM6QNNPbOMIZph21PW5dRB3h7Df0GszN+t7RuUH6sWK5bF0g== + unicode-canonical-property-names-ecmascript@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" @@ -5886,6 +6861,11 @@ walker@^1.0.7, walker@~1.0.5: dependencies: makeerror "1.0.x" +warning-symbol@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/warning-symbol/-/warning-symbol-0.1.0.tgz#bb31dd11b7a0f9d67ab2ed95f457b65825bbad21" + integrity sha1-uzHdEbeg+dZ6su2V9Fe2WCW7rSE= + webidl-conversions@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" @@ -5941,6 +6921,11 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +wordwrap@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= + wrap-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba" @@ -5988,6 +6973,11 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== +xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + y18n@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" @@ -6036,6 +7026,11 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" +year@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" + integrity sha1-QIOuUgoxiyPshgN/MADLiSvfm7A= + yup@0.29.2: version "0.29.2" resolved "https://registry.yarnpkg.com/yup/-/yup-0.29.2.tgz#5302abd9024cca335b987793f8df868e410b7b67" diff --git a/packages/client/src/api/rows.js b/packages/client/src/api/rows.js index 87cc9a9d37..14d696351d 100644 --- a/packages/client/src/api/rows.js +++ b/packages/client/src/api/rows.js @@ -44,7 +44,7 @@ export const updateRow = async row => { return } const res = await API.patch({ - url: `/api/${row.tableId}/rows/${row._id}`, + url: `/api/${row.tableId}/rows`, body: row, }) res.error @@ -65,7 +65,11 @@ export const deleteRow = async ({ tableId, rowId, revId }) => { return } const res = await API.del({ - url: `/api/${tableId}/rows/${rowId}/${revId}`, + url: `/api/${tableId}/rows`, + body: { + _id: rowId, + _rev: revId, + }, }) res.error ? notificationStore.danger("An error has occurred") @@ -84,11 +88,10 @@ export const deleteRows = async ({ tableId, rows }) => { if (!tableId || !rows) { return } - const res = await API.post({ + const res = await API.del({ url: `/api/${tableId}/rows`, body: { rows, - type: "delete", }, }) res.error diff --git a/packages/client/src/api/tables.js b/packages/client/src/api/tables.js index 6d9457cacb..09f77de6ee 100644 --- a/packages/client/src/api/tables.js +++ b/packages/client/src/api/tables.js @@ -45,7 +45,7 @@ export const searchTable = async ({ } } const res = await API.post({ - url: `/api/search/${tableId}/rows`, + url: `/api/${tableId}/search`, body: { query, bookmark, diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock index e501f44c7b..f687900aed 100644 --- a/packages/client/yarn.lock +++ b/packages/client/yarn.lock @@ -28,10 +28,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@budibase/bbui@^0.9.47": - version "0.9.47" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.47.tgz#d8664a05203432d522cd91a0bad1cdd8518baf93" - integrity sha512-LXvJCgUSoc4EJKafBaKfUzU4GUOQGmts/8F4V6LTFtTyMZavgq2/KFAgPbR3QeYvidLsshtwop/pQfoszXTQnQ== +"@budibase/bbui@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.53.tgz#b6841a31ff2c28feb929c57f7f10a1dae1b3aea3" + integrity sha512-jO11Ky1KhPGRv922jMRO49FeTY1TeF3u2JaBJYBkVY95il3uPOI20M1AdA6w2emppDlyP6FSEHk+prdra4Lndw== dependencies: "@adobe/spectrum-css-workflow-icons" "^1.2.1" "@spectrum-css/actionbutton" "^1.0.1" @@ -108,12 +108,12 @@ to-gfm-code-block "^0.1.1" year "^0.2.1" -"@budibase/standard-components@^0.9.47": - version "0.9.47" - resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.47.tgz#8e4f27c43b5a6f65d3d296c61f842195e297f061" - integrity sha512-0+Ndg67Jgk7cqOYluGKpixNFvEqvy2oguKLEr1l83Sf0oWTQ3RCmUGs2mU66ljwnE+o4/JN/EdkA2uSqKInQtg== +"@budibase/standard-components@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.53.tgz#5e8d84bf4c3b1ceadfc40b5b5b6c0513b6283fc5" + integrity sha512-8QJmjwF51vh+rCiLbk+JLqCNZZBq9M8/LuyQOGvjnhB8l6DNrfjnCypP/xYoBf0uUvlki8TeNuZKQmDpBBnR7A== dependencies: - "@budibase/bbui" "^0.9.47" + "@budibase/bbui" "^0.9.53" "@spectrum-css/page" "^3.0.1" "@spectrum-css/vars" "^3.0.1" apexcharts "^3.22.1" @@ -121,10 +121,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@^0.9.47": - version "0.9.47" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.47.tgz#484ce5ce29a6ddaef3480368b1a24ce8c3852324" - integrity sha512-I16Ps4AW7VW8MrSdsoZdwLutiX7GhRkiH6m1AdFcmzh2mZI6YyFM000PuKGEt+sREXK2NI6cBzmi9ZpKIAPJJw== +"@budibase/string-templates@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.53.tgz#9228965afcef4cc19f7d016b291d5f298bb3b725" + integrity sha512-TL3Zx6VN+YpbIT5vtuTXEv2SOAwmx+YN42pbWxH3ExHj54bvhmRxSS+xJySs75kWdvQU4OMnYywQcMeMsqkOqg== dependencies: "@budibase/handlebars-helpers" "^0.11.4" dayjs "^1.10.4" @@ -4030,9 +4030,9 @@ serialize-javascript@^4.0.0: randombytes "^2.1.0" set-getter@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376" - integrity sha1-12nBgsnVpR9AkUXy+6guXoboA3Y= + version "0.1.1" + resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.1.tgz#a3110e1b461d31a9cfc8c5c9ee2e9737ad447102" + integrity sha512-9sVWOy+gthr+0G9DzqqLaYNA7+5OKkSmcqjL9cBpDEaZrr3ShQlyX2cZ/O/ozE41oxn/Tt0LGEM/w4Rub3A3gw== dependencies: to-object-path "^0.3.0" @@ -4233,9 +4233,9 @@ string_decoder@~1.1.1: safe-buffer "~5.1.0" striptags@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.1.1.tgz#c8c3e7fdd6fb4bb3a32a3b752e5b5e3e38093ebd" - integrity sha1-yMPn/db7S7OjKjt1LltePjgJPr0= + version "3.2.0" + resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" + integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== style-inject@^0.3.0: version "0.3.0" diff --git a/packages/server/__mocks__/mysql.js b/packages/server/__mocks__/mysql.js index 2b4df3e44b..d382755c50 100644 --- a/packages/server/__mocks__/mysql.js +++ b/packages/server/__mocks__/mysql.js @@ -2,7 +2,9 @@ const mysql = {} const client = { connect: jest.fn(), - query: jest.fn(), + query: jest.fn((query, bindings, fn) => { + fn(null, []) + }), } mysql.createConnection = jest.fn(() => client) diff --git a/packages/server/package.json b/packages/server/package.json index 402109c2d8..0acd4035bc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -78,6 +78,7 @@ "jimp": "0.16.1", "joi": "17.2.1", "jsonschema": "1.4.0", + "knex": "^0.95.6", "koa": "2.7.0", "koa-body": "4.2.0", "koa-compress": "4.0.1", diff --git a/packages/server/scripts/integrations/mysql/docker-compose.yaml b/packages/server/scripts/integrations/mysql/docker-compose.yaml new file mode 100644 index 0000000000..1c520c12a1 --- /dev/null +++ b/packages/server/scripts/integrations/mysql/docker-compose.yaml @@ -0,0 +1,21 @@ +# Use root/example as user/password credentials +version: '3.1' + +services: + + db: + image: mysql + restart: always + command: --init-file /data/application/init.sql --default-authentication-plugin=mysql_native_password + volumes: + - ./init.sql:/data/application/init.sql + environment: + MYSQL_ROOT_PASSWORD: root + ports: + - 3306:3306 + + adminer: + image: adminer + restart: always + ports: + - 8080:8080 diff --git a/packages/server/scripts/integrations/mysql/init.sql b/packages/server/scripts/integrations/mysql/init.sql new file mode 100644 index 0000000000..3ffe84cd7d --- /dev/null +++ b/packages/server/scripts/integrations/mysql/init.sql @@ -0,0 +1,9 @@ +CREATE DATABASE IF NOT EXISTS main; +USE main; +CREATE TABLE Persons ( + PersonID int NOT NULL PRIMARY KEY, + LastName varchar(255), + FirstName varchar(255), + Address varchar(255), + City varchar(255) +); diff --git a/packages/server/scripts/integrations/postgres/docker-compose.yml b/packages/server/scripts/integrations/postgres/docker-compose.yml new file mode 100644 index 0000000000..e2bba9f38e --- /dev/null +++ b/packages/server/scripts/integrations/postgres/docker-compose.yml @@ -0,0 +1,28 @@ +version: "3.8" +services: + db: + container_name: postgres + image: postgres + restart: always + environment: + POSTGRES_USER: root + POSTGRES_PASSWORD: root + POSTGRES_DB: main + ports: + - "5432:5432" + volumes: + #- pg_data:/var/lib/postgresql/data/ + - ./init.sql:/docker-entrypoint-initdb.d/init.sql + + pgadmin: + container_name: pgadmin + image: dpage/pgadmin4 + restart: always + environment: + PGADMIN_DEFAULT_EMAIL: root@root.com + PGADMIN_DEFAULT_PASSWORD: root + ports: + - "5050:80" + +#volumes: +# pg_data: diff --git a/packages/server/scripts/integrations/postgres/init.sql b/packages/server/scripts/integrations/postgres/init.sql new file mode 100644 index 0000000000..baa7022f87 --- /dev/null +++ b/packages/server/scripts/integrations/postgres/init.sql @@ -0,0 +1,9 @@ +SELECT 'CREATE DATABASE main' +WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'main')\gexec +CREATE TABLE Persons ( + PersonID int NOT NULL PRIMARY KEY, + LastName varchar(255), + FirstName varchar(255), + Address varchar(255), + City varchar(255) +); diff --git a/packages/server/src/api/controllers/automation.js b/packages/server/src/api/controllers/automation.js index c9c8759fd6..e1e721b347 100644 --- a/packages/server/src/api/controllers/automation.js +++ b/packages/server/src/api/controllers/automation.js @@ -59,7 +59,7 @@ async function checkForCronTriggers({ appId, oldAuto, newAuto }) { const cronTriggerActivated = isLive(newAuto) && !isLive(oldAuto) - if (cronTriggerRemoved || cronTriggerDeactivated) { + if (cronTriggerRemoved || (cronTriggerDeactivated && oldTrigger.cronJobId)) { await triggers.automationQueue.removeRepeatableByKey(oldTrigger.cronJobId) } // need to create cron job diff --git a/packages/server/src/api/controllers/datasource.js b/packages/server/src/api/controllers/datasource.js index 1d9469f2e7..b6d25b7b83 100644 --- a/packages/server/src/api/controllers/datasource.js +++ b/packages/server/src/api/controllers/datasource.js @@ -3,26 +3,67 @@ const { generateDatasourceID, getDatasourceParams, getQueryParams, + DocumentTypes, + BudibaseInternalDB, + getTableParams, } = require("../../db/utils") const { integrations } = require("../../integrations") +const { makeExternalQuery } = require("./row/utils") exports.fetch = async function (ctx) { const database = new CouchDB(ctx.appId) - ctx.body = ( + + // Get internal tables + const db = new CouchDB(ctx.appId) + const internalTables = await db.allDocs( + getTableParams(null, { + include_docs: true, + }) + ) + const internal = internalTables.rows.map(row => row.doc) + + const bbInternalDb = { + ...BudibaseInternalDB, + entities: internal, + } + + // Get external datasources + const datasources = ( await database.allDocs( getDatasourceParams(null, { include_docs: true, }) ) ).rows.map(row => row.doc) + + ctx.body = [bbInternalDb, ...datasources] +} + +exports.buildSchemaFromDb = async function (ctx) { + const db = new CouchDB(ctx.appId) + const datasourceId = ctx.params.datasourceId + const datasource = await db.get(datasourceId) + + const Connector = integrations[datasource.source] + + // Connect to the DB and build the schema + const connector = new Connector(datasource.config) + await connector.buildSchema(datasource._id) + datasource.entities = connector.tables + + const response = await db.post(datasource) + datasource._rev = response.rev + + ctx.body = datasource } exports.save = async function (ctx) { const db = new CouchDB(ctx.appId) + const plus = ctx.request.body.plus const datasource = { - _id: generateDatasourceID(), - type: "datasource", + _id: generateDatasourceID({ plus }), + type: plus ? DocumentTypes.DATASOURCE_PLUS : DocumentTypes.DATASOURCE, ...ctx.request.body, } @@ -30,9 +71,11 @@ exports.save = async function (ctx) { datasource._rev = response.rev // Drain connection pools when configuration is changed - const source = integrations[datasource.source] - if (source && source.pool) { - await source.pool.end() + if (datasource.source) { + const source = integrations[datasource.source] + if (source && source.pool) { + await source.pool.end() + } } ctx.status = 200 @@ -58,3 +101,13 @@ exports.find = async function (ctx) { const database = new CouchDB(ctx.appId) ctx.body = await database.get(ctx.params.datasourceId) } + +// dynamic query functionality +exports.query = async function (ctx) { + const queryJson = ctx.request.body + try { + ctx.body = await makeExternalQuery(ctx.appId, queryJson) + } catch (err) { + ctx.throw(400, err) + } +} diff --git a/packages/server/src/api/controllers/dev.js b/packages/server/src/api/controllers/dev.js index 068e1e59c0..ae7ab631d0 100644 --- a/packages/server/src/api/controllers/dev.js +++ b/packages/server/src/api/controllers/dev.js @@ -93,3 +93,7 @@ exports.revert = async ctx => { ctx.throw(400, `Unable to revert. ${err}`) } } + +exports.getBudibaseVersion = async ctx => { + ctx.body = require("../../../package.json").version +} diff --git a/packages/server/src/api/controllers/query.js b/packages/server/src/api/controllers/query.js index 737c8c9b01..d584b73e20 100644 --- a/packages/server/src/api/controllers/query.js +++ b/packages/server/src/api/controllers/query.js @@ -160,6 +160,8 @@ exports.execute = async function (ctx) { ) const integration = new Integration(datasource.config) + console.log(query) + // ctx.body = {} // call the relevant CRUD method on the integration class ctx.body = formatResponse(await integration[query.queryVerb](enrichedQuery)) // cleanup diff --git a/packages/server/src/api/controllers/row/external.js b/packages/server/src/api/controllers/row/external.js new file mode 100644 index 0000000000..896f5a78e2 --- /dev/null +++ b/packages/server/src/api/controllers/row/external.js @@ -0,0 +1,276 @@ +const { makeExternalQuery } = require("./utils") +const { DataSourceOperation, SortDirection } = require("../../../constants") +const { getExternalTable } = require("../table/utils") +const { + breakExternalTableId, + generateRowIdField, + breakRowIdField, +} = require("../../../integrations/utils") +const { cloneDeep } = require("lodash/fp") + +function inputProcessing(row, table) { + if (!row) { + return row + } + let newRow = {} + for (let key of Object.keys(table.schema)) { + // currently excludes empty strings + if (row[key]) { + newRow[key] = row[key] + } + } + return newRow +} + +function generateIdForRow(row, table) { + if (!row) { + return + } + const primary = table.primary + // build id array + let idParts = [] + for (let field of primary) { + idParts.push(row[field]) + } + return generateRowIdField(idParts) +} + +function outputProcessing(rows, table) { + // if no rows this is what is returned? Might be PG only + if (rows[0].read === true) { + return [] + } + for (let row of rows) { + row._id = generateIdForRow(row, table) + row.tableId = table._id + row._rev = "rev" + } + return rows +} + +function buildFilters(id, filters, table) { + const primary = table.primary + // if passed in array need to copy for shifting etc + let idCopy = cloneDeep(id) + if (filters) { + // need to map over the filters and make sure the _id field isn't present + for (let filter of Object.values(filters)) { + if (filter._id) { + const parts = breakRowIdField(filter._id) + for (let field of primary) { + filter[field] = parts.shift() + } + } + // make sure this field doesn't exist on any filter + delete filter._id + } + } + // there is no id, just use the user provided filters + if (!idCopy || !table) { + return filters + } + // if used as URL parameter it will have been joined + if (typeof idCopy === "string") { + idCopy = breakRowIdField(idCopy) + } + const equal = {} + for (let field of primary) { + // work through the ID and get the parts + equal[field] = idCopy.shift() + } + return { + equal, + } +} + +async function handleRequest( + appId, + operation, + tableId, + { id, row, filters, sort, paginate } = {} +) { + let { datasourceId, tableName } = breakExternalTableId(tableId) + const table = await getExternalTable(appId, datasourceId, tableName) + if (!table) { + throw `Unable to process query, table "${tableName}" not defined.` + } + // clean up row on ingress using schema + filters = buildFilters(id, filters, table) + row = inputProcessing(row, table) + if ( + operation === DataSourceOperation.DELETE && + (filters == null || Object.keys(filters).length === 0) + ) { + throw "Deletion must be filtered" + } + let json = { + endpoint: { + datasourceId, + entityId: tableName, + operation, + }, + resource: { + // not specifying any fields means "*" + fields: [], + }, + filters, + sort, + paginate, + body: row, + // pass an id filter into extra, purely for mysql/returning + extra: { + idFilter: buildFilters(id || generateIdForRow(row, table), {}, table), + }, + } + // can't really use response right now + const response = await makeExternalQuery(appId, json) + // we searched for rows in someway + if (operation === DataSourceOperation.READ && Array.isArray(response)) { + return outputProcessing(response, table) + } else { + row = outputProcessing(response, table)[0] + return { row, table } + } +} + +exports.patch = async ctx => { + const appId = ctx.appId + const inputs = ctx.request.body + const tableId = ctx.params.tableId + const id = breakRowIdField(inputs._id) + // don't save the ID to db + delete inputs._id + return handleRequest(appId, DataSourceOperation.UPDATE, tableId, { + id, + row: inputs, + }) +} + +exports.save = async ctx => { + const appId = ctx.appId + const inputs = ctx.request.body + const tableId = ctx.params.tableId + return handleRequest(appId, DataSourceOperation.CREATE, tableId, { + row: inputs, + }) +} + +exports.fetchView = async ctx => { + // there are no views in external data sources, shouldn't ever be called + // for now just fetch + ctx.params.tableId = ctx.params.viewName.split("all_")[1] + return exports.fetch(ctx) +} + +exports.fetch = async ctx => { + const appId = ctx.appId + const tableId = ctx.params.tableId + return handleRequest(appId, DataSourceOperation.READ, tableId) +} + +exports.find = async ctx => { + const appId = ctx.appId + const id = ctx.params.rowId + const tableId = ctx.params.tableId + return handleRequest(appId, DataSourceOperation.READ, tableId, { + id, + }) +} + +exports.destroy = async ctx => { + const appId = ctx.appId + const tableId = ctx.params.tableId + const id = ctx.request.body._id + const { row } = await handleRequest( + appId, + DataSourceOperation.DELETE, + tableId, + { + id, + } + ) + return { response: { ok: true }, row } +} + +exports.bulkDestroy = async ctx => { + const appId = ctx.appId + const { rows } = ctx.request.body + const tableId = ctx.params.tableId + let promises = [] + for (let row of rows) { + promises.push( + handleRequest(appId, DataSourceOperation.DELETE, tableId, { + id: breakRowIdField(row._id), + }) + ) + } + const responses = await Promise.all(promises) + return { response: { ok: true }, rows: responses.map(resp => resp.row) } +} + +exports.search = async ctx => { + const appId = ctx.appId + const tableId = ctx.params.tableId + const { paginate, query, ...params } = ctx.request.body + let { bookmark, limit } = params + if (!bookmark && paginate) { + bookmark = 1 + } + let paginateObj = {} + + if (paginate) { + paginateObj = { + // add one so we can track if there is another page + limit: limit, + page: bookmark, + } + } else if (params && limit) { + paginateObj = { + limit: limit, + } + } + let sort + if (params.sort) { + const direction = + params.sortOrder === "descending" + ? SortDirection.DESCENDING + : SortDirection.ASCENDING + sort = { + [params.sort]: direction, + } + } + const rows = await handleRequest(appId, DataSourceOperation.READ, tableId, { + filters: query, + sort, + paginate: paginateObj, + }) + let hasNextPage = false + if (paginate && rows.length === limit) { + const nextRows = await handleRequest( + appId, + DataSourceOperation.READ, + tableId, + { + filters: query, + sort, + paginate: { + limit: 1, + page: bookmark * limit + 1, + }, + } + ) + hasNextPage = nextRows.length > 0 + } + // need wrapper object for bookmarks etc when paginating + return { rows, hasNextPage, bookmark: bookmark + 1 } +} + +exports.validate = async () => { + // can't validate external right now - maybe in future + return { valid: true } +} + +exports.fetchEnrichedRow = async () => { + // TODO: How does this work + throw "Not Implemented" +} diff --git a/packages/server/src/api/controllers/row/index.js b/packages/server/src/api/controllers/row/index.js new file mode 100644 index 0000000000..a50afa77ea --- /dev/null +++ b/packages/server/src/api/controllers/row/index.js @@ -0,0 +1,138 @@ +const internal = require("./internal") +const external = require("./external") +const { isExternalTable } = require("../../../integrations/utils") + +function pickApi(tableId) { + if (isExternalTable(tableId)) { + return external + } + return internal +} + +function getTableId(ctx) { + if (ctx.request.body && ctx.request.body.tableId) { + return ctx.request.body.tableId + } + if (ctx.params && ctx.params.tableId) { + return ctx.params.tableId + } + if (ctx.params && ctx.params.viewName) { + return ctx.params.viewName + } +} + +exports.patch = async ctx => { + const appId = ctx.appId + const tableId = getTableId(ctx) + const body = ctx.request.body + // if it doesn't have an _id then its save + if (body && !body._id) { + return exports.save(ctx) + } + try { + const { row, table } = await pickApi(tableId).patch(ctx) + ctx.status = 200 + ctx.eventEmitter && + ctx.eventEmitter.emitRow(`row:update`, appId, row, table) + ctx.message = `${table.name} updated successfully.` + ctx.body = row + } catch (err) { + ctx.throw(400, err) + } +} + +exports.save = async function (ctx) { + const appId = ctx.appId + const tableId = getTableId(ctx) + const body = ctx.request.body + // if it has an ID already then its a patch + if (body && body._id) { + return exports.patch(ctx) + } + try { + const { row, table } = await pickApi(tableId).save(ctx) + ctx.status = 200 + ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:save`, appId, row, table) + ctx.message = `${table.name} saved successfully` + ctx.body = row + } catch (err) { + ctx.throw(400, err) + } +} + +exports.fetchView = async function (ctx) { + const tableId = getTableId(ctx) + try { + ctx.body = await pickApi(tableId).fetchView(ctx) + } catch (err) { + ctx.throw(400, err) + } +} + +exports.fetch = async function (ctx) { + const tableId = getTableId(ctx) + try { + ctx.body = await pickApi(tableId).fetch(ctx) + } catch (err) { + ctx.throw(400, err) + } +} + +exports.find = async function (ctx) { + const tableId = getTableId(ctx) + try { + ctx.body = await pickApi(tableId).find(ctx) + } catch (err) { + ctx.throw(400, err) + } +} + +exports.destroy = async function (ctx) { + const appId = ctx.appId + const inputs = ctx.request.body + const tableId = getTableId(ctx) + let response, row + if (inputs.rows) { + let { rows } = await pickApi(tableId).bulkDestroy(ctx) + response = rows + for (let row of rows) { + ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row) + } + } else { + let resp = await pickApi(tableId).destroy(ctx) + response = resp.response + row = resp.row + ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row) + } + ctx.status = 200 + // for automations include the row that was deleted + ctx.row = row || {} + ctx.body = response +} + +exports.search = async ctx => { + const tableId = getTableId(ctx) + try { + ctx.body = await pickApi(tableId).search(ctx) + } catch (err) { + ctx.throw(400, err) + } +} + +exports.validate = async function (ctx) { + const tableId = getTableId(ctx) + try { + ctx.body = await pickApi(tableId).validate(ctx) + } catch (err) { + ctx.throw(400, err) + } +} + +exports.fetchEnrichedRow = async function (ctx) { + const tableId = getTableId(ctx) + try { + ctx.body = await pickApi(tableId).fetchEnrichedRow(ctx) + } catch (err) { + ctx.throw(400, err) + } +} diff --git a/packages/server/src/api/controllers/row.js b/packages/server/src/api/controllers/row/internal.js similarity index 60% rename from packages/server/src/api/controllers/row.js rename to packages/server/src/api/controllers/row/internal.js index 1bdafb7354..f0009a4413 100644 --- a/packages/server/src/api/controllers/row.js +++ b/packages/server/src/api/controllers/row/internal.js @@ -1,23 +1,20 @@ -const CouchDB = require("../../db") -const validateJs = require("validate.js") -const linkRows = require("../../db/linkedRows") +const CouchDB = require("../../../db") +const linkRows = require("../../../db/linkedRows") const { getRowParams, generateRowID, DocumentTypes, - SEPARATOR, InternalTables, -} = require("../../db/utils") -const userController = require("./user") +} = require("../../../db/utils") +const userController = require("../user") const { inputProcessing, outputProcessing, -} = require("../../utilities/rowProcessor") -const { FieldTypes } = require("../../constants") +} = require("../../../utilities/rowProcessor") +const { FieldTypes } = require("../../../constants") const { isEqual } = require("lodash") -const { cloneDeep } = require("lodash/fp") - -const TABLE_VIEW_BEGINS_WITH = `all${SEPARATOR}${DocumentTypes.TABLE}${SEPARATOR}` +const { validate, findRow } = require("./utils") +const { fullSearch, paginatedSearch } = require("./internalSearch") const CALCULATION_TYPES = { SUM: "sum", @@ -25,35 +22,7 @@ const CALCULATION_TYPES = { STATS: "stats", } -validateJs.extend(validateJs.validators.datetime, { - parse: function (value) { - return new Date(value).getTime() - }, - // Input is a unix timestamp - format: function (value) { - return new Date(value).toISOString() - }, -}) - -async function findRow(ctx, db, tableId, rowId) { - let row - // TODO remove special user case in future - if (tableId === InternalTables.USER_METADATA) { - ctx.params = { - id: rowId, - } - await userController.findMetadata(ctx) - row = ctx.body - } else { - row = await db.get(rowId) - } - if (row.tableId !== tableId) { - throw "Supplied tableId does not match the rows tableId" - } - return row -} - -exports.patch = async function (ctx) { +exports.patch = async ctx => { const appId = ctx.appId const db = new CouchDB(appId) const inputs = ctx.request.body @@ -61,7 +30,7 @@ exports.patch = async function (ctx) { const isUserTable = tableId === InternalTables.USER_METADATA let dbRow try { - dbRow = await db.get(ctx.params.rowId) + dbRow = await db.get(inputs._id) } catch (err) { if (isUserTable) { // don't include the rev, it'll be the global rev @@ -70,7 +39,7 @@ exports.patch = async function (ctx) { _id: inputs._id, } } else { - ctx.throw(400, "Row does not exist") + throw "Row does not exist" } } let dbTable = await db.get(tableId) @@ -88,12 +57,7 @@ exports.patch = async function (ctx) { }) if (!validateResult.valid) { - ctx.status = 400 - ctx.body = { - status: 400, - errors: validateResult.errors, - } - return + throw validateResult.errors } // returned row is cleaned and prepared for writing to DB @@ -109,7 +73,7 @@ exports.patch = async function (ctx) { // the row has been updated, need to put it into the ctx ctx.request.body = row await userController.updateMetadata(ctx) - return + return { row: ctx.body, table } } const response = await db.put(row) @@ -119,10 +83,7 @@ exports.patch = async function (ctx) { } row._rev = response.rev row.type = "row" - ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:update`, appId, row, table) - ctx.body = row - ctx.status = 200 - ctx.message = `${table.name} updated successfully.` + return { row, table } } exports.save = async function (ctx) { @@ -131,20 +92,6 @@ exports.save = async function (ctx) { let inputs = ctx.request.body inputs.tableId = ctx.params.tableId - // TODO: find usage of this and break out into own endpoint - if (inputs.type === "delete") { - await bulkDelete(ctx) - ctx.body = inputs.rows - return - } - - // if the row obj had an _id then it will have been retrieved - if (inputs._id && inputs._rev) { - ctx.params.rowId = inputs._id - await exports.patch(ctx) - return - } - if (!inputs._rev && !inputs._id) { inputs._id = generateRowID(inputs.tableId) } @@ -158,12 +105,7 @@ exports.save = async function (ctx) { }) if (!validateResult.valid) { - ctx.status = 400 - ctx.body = { - status: 400, - errors: validateResult.errors, - } - return + throw validateResult.errors } // make sure link rows are up to date @@ -182,21 +124,17 @@ exports.save = async function (ctx) { await db.put(table) } row._rev = response.rev - ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:save`, appId, row, table) - ctx.body = row - ctx.status = 200 - ctx.message = `${table.name} saved successfully` + return { row, table } } -exports.fetchView = async function (ctx) { +exports.fetchView = async ctx => { const appId = ctx.appId const viewName = ctx.params.viewName // if this is a table view being looked for just transfer to that - if (viewName.startsWith(TABLE_VIEW_BEGINS_WITH)) { - ctx.params.tableId = viewName.substring(4) - await exports.fetchTableRows(ctx) - return + if (viewName.includes(DocumentTypes.TABLE)) { + ctx.params.tableId = viewName + return exports.fetch(ctx) } const db = new CouchDB(appId) @@ -204,13 +142,14 @@ exports.fetchView = async function (ctx) { const designDoc = await db.get("_design/database") const viewInfo = designDoc.views[viewName] if (!viewInfo) { - ctx.throw(400, "View does not exist.") + throw "View does not exist." } const response = await db.query(`database/${viewName}`, { include_docs: !calculation, group: !!group, }) + let rows if (!calculation) { response.rows = response.rows.map(row => row.doc) let table @@ -222,7 +161,7 @@ exports.fetchView = async function (ctx) { schema: {}, } } - ctx.body = await outputProcessing(appId, table, response.rows) + rows = await outputProcessing(appId, table, response.rows) } if (calculation === CALCULATION_TYPES.STATS) { @@ -232,26 +171,26 @@ exports.fetchView = async function (ctx) { ...row.value, avg: row.value.sum / row.value.count, })) - ctx.body = response.rows + rows = response.rows } if ( calculation === CALCULATION_TYPES.COUNT || calculation === CALCULATION_TYPES.SUM ) { - ctx.body = response.rows.map(row => ({ + rows = response.rows.map(row => ({ group: row.key, field, value: row.value, })) } + return rows } -exports.fetchTableRows = async function (ctx) { +exports.fetch = async ctx => { const appId = ctx.appId const db = new CouchDB(appId) - // TODO remove special user case in future let rows, table = await db.get(ctx.params.tableId) if (ctx.params.tableId === InternalTables.USER_METADATA) { @@ -265,27 +204,26 @@ exports.fetchTableRows = async function (ctx) { ) rows = response.rows.map(row => row.doc) } - ctx.body = await outputProcessing(appId, table, rows) + return outputProcessing(appId, table, rows) } -exports.find = async function (ctx) { +exports.find = async ctx => { const appId = ctx.appId const db = new CouchDB(appId) - try { - const table = await db.get(ctx.params.tableId) - const row = await findRow(ctx, db, ctx.params.tableId, ctx.params.rowId) - ctx.body = await outputProcessing(appId, table, row) - } catch (err) { - ctx.throw(400, err) - } + const table = await db.get(ctx.params.tableId) + let row = await findRow(ctx, db, ctx.params.tableId, ctx.params.rowId) + row = await outputProcessing(appId, table, row) + return row } exports.destroy = async function (ctx) { const appId = ctx.appId const db = new CouchDB(appId) - const row = await db.get(ctx.params.rowId) + const { _id, _rev } = ctx.request.body + const row = await db.get(_id) + if (row.tableId !== ctx.params.tableId) { - ctx.throw(400, "Supplied tableId doesn't match the row's tableId") + throw "Supplied tableId doesn't match the row's tableId" } await linkRows.updateLinks({ appId, @@ -293,54 +231,80 @@ exports.destroy = async function (ctx) { row, tableId: row.tableId, }) - // TODO remove special user case in future if (ctx.params.tableId === InternalTables.USER_METADATA) { ctx.params = { - id: ctx.params.rowId, + id: _id, } await userController.destroyMetadata(ctx) + return { response: ctx.body, row } } else { - ctx.body = await db.remove(ctx.params.rowId, ctx.params.revId) + const response = await db.remove(_id, _rev) + return { response, row } } - - // for automations include the row that was deleted - ctx.row = row - ctx.status = 200 - ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row) } -exports.validate = async function (ctx) { - const errors = await validate({ +exports.bulkDestroy = async ctx => { + const appId = ctx.appId + const { rows } = ctx.request.body + const db = new CouchDB(appId) + + let updates = rows.map(row => + linkRows.updateLinks({ + appId, + eventType: linkRows.EventType.ROW_DELETE, + row, + tableId: row.tableId, + }) + ) + // TODO remove special user case in future + if (ctx.params.tableId === InternalTables.USER_METADATA) { + updates = updates.concat( + rows.map(row => { + ctx.params = { + id: row._id, + } + return userController.destroyMetadata(ctx) + }) + ) + } else { + await db.bulkDocs(rows.map(row => ({ ...row, _deleted: true }))) + } + await Promise.all(updates) + return { response: { ok: true }, rows } +} + +exports.search = async ctx => { + const appId = ctx.appId + const { tableId } = ctx.params + const db = new CouchDB(appId) + const { paginate, query, ...params } = ctx.request.body + params.tableId = tableId + + let response + if (paginate) { + response = await paginatedSearch(appId, query, params) + } else { + response = await fullSearch(appId, query, params) + } + + // Enrich search results with relationships + if (response.rows && response.rows.length) { + const table = await db.get(tableId) + response.rows = await outputProcessing(appId, table, response.rows) + } + + return response +} + +exports.validate = async ctx => { + return validate({ appId: ctx.appId, tableId: ctx.params.tableId, row: ctx.request.body, }) - ctx.status = 200 - ctx.body = errors } -async function validate({ appId, tableId, row, table }) { - if (!table) { - const db = new CouchDB(appId) - table = await db.get(tableId) - } - const errors = {} - for (let fieldName of Object.keys(table.schema)) { - const constraints = cloneDeep(table.schema[fieldName].constraints) - // special case for options, need to always allow unselected (null) - if ( - table.schema[fieldName].type === FieldTypes.OPTIONS && - constraints.inclusion - ) { - constraints.inclusion.push(null) - } - const res = validateJs.single(row[fieldName], constraints) - if (res) errors[fieldName] = res - } - return { valid: Object.keys(errors).length === 0, errors } -} - -exports.fetchEnrichedRow = async function (ctx) { +exports.fetchEnrichedRow = async ctx => { const appId = ctx.appId const db = new CouchDB(appId) const tableId = ctx.params.tableId @@ -381,39 +345,5 @@ exports.fetchEnrichedRow = async function (ctx) { ) } } - ctx.body = row - ctx.status = 200 -} - -async function bulkDelete(ctx) { - const appId = ctx.appId - const { rows } = ctx.request.body - const db = new CouchDB(appId) - - let updates = rows.map(row => - linkRows.updateLinks({ - appId, - eventType: linkRows.EventType.ROW_DELETE, - row, - tableId: row.tableId, - }) - ) - // TODO remove special user case in future - if (ctx.params.tableId === InternalTables.USER_METADATA) { - updates = updates.concat( - rows.map(row => { - ctx.params = { - id: row._id, - } - return userController.destroyMetadata(ctx) - }) - ) - } else { - await db.bulkDocs(rows.map(row => ({ ...row, _deleted: true }))) - } - await Promise.all(updates) - - rows.forEach(row => { - ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row) - }) + return row } diff --git a/packages/server/src/api/controllers/search/utils.js b/packages/server/src/api/controllers/row/internalSearch.js similarity index 100% rename from packages/server/src/api/controllers/search/utils.js rename to packages/server/src/api/controllers/row/internalSearch.js diff --git a/packages/server/src/api/controllers/row/utils.js b/packages/server/src/api/controllers/row/utils.js new file mode 100644 index 0000000000..16c48181d1 --- /dev/null +++ b/packages/server/src/api/controllers/row/utils.js @@ -0,0 +1,70 @@ +const validateJs = require("validate.js") +const { cloneDeep } = require("lodash/fp") +const CouchDB = require("../../../db") +const { InternalTables } = require("../../../db/utils") +const userController = require("../user") +const { FieldTypes } = require("../../../constants") +const { integrations } = require("../../../integrations") + +validateJs.extend(validateJs.validators.datetime, { + parse: function (value) { + return new Date(value).getTime() + }, + // Input is a unix timestamp + format: function (value) { + return new Date(value).toISOString() + }, +}) + +exports.makeExternalQuery = async (appId, json) => { + const datasourceId = json.endpoint.datasourceId + const db = new CouchDB(appId) + const datasource = await db.get(datasourceId) + const Integration = integrations[datasource.source] + // query is the opinionated function + if (Integration.prototype.query) { + const integration = new Integration(datasource.config) + return integration.query(json) + } else { + throw "Datasource does not support query." + } +} + +exports.findRow = async (ctx, db, tableId, rowId) => { + let row + // TODO remove special user case in future + if (tableId === InternalTables.USER_METADATA) { + ctx.params = { + id: rowId, + } + await userController.findMetadata(ctx) + row = ctx.body + } else { + row = await db.get(rowId) + } + if (row.tableId !== tableId) { + throw "Supplied tableId does not match the rows tableId" + } + return row +} + +exports.validate = async ({ appId, tableId, row, table }) => { + if (!table) { + const db = new CouchDB(appId) + table = await db.get(tableId) + } + const errors = {} + for (let fieldName of Object.keys(table.schema)) { + const constraints = cloneDeep(table.schema[fieldName].constraints) + // special case for options, need to always allow unselected (null) + if ( + table.schema[fieldName].type === FieldTypes.OPTIONS && + constraints.inclusion + ) { + constraints.inclusion.push(null) + } + const res = validateJs.single(row[fieldName], constraints) + if (res) errors[fieldName] = res + } + return { valid: Object.keys(errors).length === 0, errors } +} diff --git a/packages/server/src/api/controllers/search/index.js b/packages/server/src/api/controllers/search/index.js deleted file mode 100644 index ede0556e18..0000000000 --- a/packages/server/src/api/controllers/search/index.js +++ /dev/null @@ -1,26 +0,0 @@ -const { fullSearch, paginatedSearch } = require("./utils") -const CouchDB = require("../../../db") -const { outputProcessing } = require("../../../utilities/rowProcessor") - -exports.rowSearch = async ctx => { - const appId = ctx.appId - const { tableId } = ctx.params - const db = new CouchDB(appId) - const { paginate, query, ...params } = ctx.request.body - params.tableId = tableId - - let response - if (paginate) { - response = await paginatedSearch(appId, query, params) - } else { - response = await fullSearch(appId, query, params) - } - - // Enrich search results with relationships - if (response.rows && response.rows.length) { - const table = await db.get(tableId) - response.rows = await outputProcessing(appId, table, response.rows) - } - - ctx.body = response -} diff --git a/packages/server/src/api/controllers/table/index.js b/packages/server/src/api/controllers/table/index.js index 335f87f1e5..60b5167f66 100644 --- a/packages/server/src/api/controllers/table/index.js +++ b/packages/server/src/api/controllers/table/index.js @@ -5,23 +5,57 @@ const { getRowParams, getTableParams, generateTableID, + getDatasourceParams, + BudibaseInternalDB, } = require("../../../db/utils") const { FieldTypes } = require("../../../constants") -const { TableSaveFunctions } = require("./utils") +const { TableSaveFunctions, getExternalTable } = require("./utils") +const { + isExternalTable, + breakExternalTableId, +} = require("../../../integrations/utils") exports.fetch = async function (ctx) { const db = new CouchDB(ctx.appId) - const body = await db.allDocs( + + const internalTables = await db.allDocs( getTableParams(null, { include_docs: true, }) ) - ctx.body = body.rows.map(row => row.doc) + + const internal = internalTables.rows.map(row => ({ + ...row.doc, + type: "internal", + sourceId: BudibaseInternalDB._id, + })) + + const externalTables = await db.allDocs( + getDatasourceParams("plus", { + include_docs: true, + }) + ) + + const external = externalTables.rows.flatMap(row => { + return Object.values(row.doc.entities || {}).map(entity => ({ + ...entity, + type: "external", + sourceId: row.doc._id, + })) + }) + + ctx.body = [...internal, ...external] } exports.find = async function (ctx) { const db = new CouchDB(ctx.appId) - ctx.body = await db.get(ctx.params.id) + const tableId = ctx.params.id + if (isExternalTable(tableId)) { + let { datasourceId, tableName } = breakExternalTableId(tableId) + ctx.body = await getExternalTable(ctx.appId, datasourceId, tableName) + } else { + ctx.body = await db.get(ctx.params.id) + } } exports.save = async function (ctx) { diff --git a/packages/server/src/api/controllers/table/utils.js b/packages/server/src/api/controllers/table/utils.js index 990840af06..cdfd390027 100644 --- a/packages/server/src/api/controllers/table/utils.js +++ b/packages/server/src/api/controllers/table/utils.js @@ -204,4 +204,15 @@ class TableSaveFunctions { } } +exports.getExternalTable = async (appId, datasourceId, tableName) => { + const db = new CouchDB(appId) + const datasource = await db.get(datasourceId) + if (!datasource || !datasource.entities) { + throw "Datasource is not configured fully." + } + return Object.values(datasource.entities).find( + entity => entity.name === tableName + ) +} + exports.TableSaveFunctions = TableSaveFunctions diff --git a/packages/server/src/api/routes/datasource.js b/packages/server/src/api/routes/datasource.js index 3c022e8e26..e645cccd2b 100644 --- a/packages/server/src/api/routes/datasource.js +++ b/packages/server/src/api/routes/datasource.js @@ -1,14 +1,64 @@ const Router = require("@koa/router") const datasourceController = require("../controllers/datasource") const authorized = require("../../middleware/authorized") +const joiValidator = require("../../middleware/joi-validator") const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/auth/permissions") +const Joi = require("joi") +const { DataSourceOperation } = require("../../constants") const router = Router() +function generateDatasourceSchema() { + // prettier-ignore + return joiValidator.body(Joi.object({ + _id: Joi.string(), + _rev: Joi.string(), + // source: Joi.string().valid("POSTGRES_PLUS"), + type: Joi.string().allow("datasource_plus"), + relationships: Joi.array().items(Joi.object({ + from: Joi.string().required(), + to: Joi.string().required(), + cardinality: Joi.valid("1:N", "1:1", "N:N").required() + })), + // entities: Joi.array().items(Joi.object({ + // type: Joi.string().valid(...Object.values(FieldTypes)).required(), + // name: Joi.string().required(), + // })), + }).unknown(true)) +} + +function generateQueryDatasourceSchema() { + // prettier-ignore + return joiValidator.body(Joi.object({ + endpoint: Joi.object({ + datasourceId: Joi.string().required(), + operation: Joi.string().required().valid(...Object.values(DataSourceOperation)), + entityId: Joi.string().required(), + }).required(), + resource: Joi.object({ + fields: Joi.array().items(Joi.string()).optional(), + }).optional(), + body: Joi.object().optional(), + sort: Joi.object().optional(), + filters: Joi.object({ + string: Joi.object().optional(), + range: Joi.object().optional(), + equal: Joi.object().optional(), + notEqual: Joi.object().optional(), + empty: Joi.object().optional(), + notEmpty: Joi.object().optional(), + }).optional(), + paginate: Joi.object({ + page: Joi.string().alphanum().optional(), + limit: Joi.number().optional(), + }).optional(), + })) +} + router .get("/api/datasources", authorized(BUILDER), datasourceController.fetch) .get( @@ -16,7 +66,23 @@ router authorized(PermissionTypes.TABLE, PermissionLevels.READ), datasourceController.find ) - .post("/api/datasources", authorized(BUILDER), datasourceController.save) + .post( + "/api/datasources/query", + authorized(PermissionTypes.TABLE, PermissionLevels.READ), + generateQueryDatasourceSchema(), + datasourceController.query + ) + .post( + "/api/datasources/:datasourceId/schema", + authorized(BUILDER), + datasourceController.buildSchemaFromDb + ) + .post( + "/api/datasources", + authorized(BUILDER), + generateDatasourceSchema(), + datasourceController.save + ) .delete( "/api/datasources/:datasourceId/:revId", authorized(BUILDER), diff --git a/packages/server/src/api/routes/dev.js b/packages/server/src/api/routes/dev.js index bbc8147369..cd4c6e8fde 100644 --- a/packages/server/src/api/routes/dev.js +++ b/packages/server/src/api/routes/dev.js @@ -14,6 +14,7 @@ if (env.isDev() || env.isTest()) { } router + .get("/api/dev/version", authorized(BUILDER), controller.getBudibaseVersion) .delete("/api/dev/:appId/lock", authorized(BUILDER), controller.clearLock) .post("/api/dev/:appId/revert", authorized(BUILDER), controller.revert) diff --git a/packages/server/src/api/routes/index.js b/packages/server/src/api/routes/index.js index 5ea3ddacef..0b09a78bb8 100644 --- a/packages/server/src/api/routes/index.js +++ b/packages/server/src/api/routes/index.js @@ -23,7 +23,6 @@ const queryRoutes = require("./query") const hostingRoutes = require("./hosting") const backupRoutes = require("./backup") const devRoutes = require("./dev") -const searchRoutes = require("./search") exports.mainRoutes = [ authRoutes, @@ -52,7 +51,6 @@ exports.mainRoutes = [ // this could be breaking as koa may recognise other routes as this tableRoutes, rowRoutes, - searchRoutes, ] exports.staticRoutes = staticRoutes diff --git a/packages/server/src/api/routes/row.js b/packages/server/src/api/routes/row.js index ca1e170754..c48f492909 100644 --- a/packages/server/src/api/routes/row.js +++ b/packages/server/src/api/routes/row.js @@ -24,7 +24,7 @@ router "/api/:tableId/rows", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.READ), - rowController.fetchTableRows + rowController.fetch ) .get( "/api/:tableId/rows/:rowId", @@ -32,6 +32,12 @@ router authorized(PermissionTypes.TABLE, PermissionLevels.READ), rowController.find ) + .post( + "/api/:tableId/search", + paramResource("tableId"), + authorized(PermissionTypes.TABLE, PermissionLevels.READ), + rowController.search + ) .post( "/api/:tableId/rows", paramResource("tableId"), @@ -40,8 +46,8 @@ router rowController.save ) .patch( - "/api/:tableId/rows/:rowId", - paramSubResource("tableId", "rowId"), + "/api/:tableId/rows", + paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.WRITE), rowController.patch ) @@ -52,8 +58,8 @@ router rowController.validate ) .delete( - "/api/:tableId/rows/:rowId/:revId", - paramSubResource("tableId", "rowId"), + "/api/:tableId/rows", + paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.WRITE), usage, rowController.destroy diff --git a/packages/server/src/api/routes/search.js b/packages/server/src/api/routes/search.js deleted file mode 100644 index bd513fd348..0000000000 --- a/packages/server/src/api/routes/search.js +++ /dev/null @@ -1,19 +0,0 @@ -const Router = require("@koa/router") -const controller = require("../controllers/search") -const { - PermissionTypes, - PermissionLevels, -} = require("@budibase/auth/permissions") -const authorized = require("../../middleware/authorized") -const { paramResource } = require("../../middleware/resourceId") - -const router = Router() - -router.post( - "/api/search/:tableId/rows", - paramResource("tableId"), - authorized(PermissionTypes.TABLE, PermissionLevels.READ), - controller.rowSearch -) - -module.exports = router diff --git a/packages/server/src/api/routes/table.js b/packages/server/src/api/routes/table.js index 381e0ecc2a..806caff6aa 100644 --- a/packages/server/src/api/routes/table.js +++ b/packages/server/src/api/routes/table.js @@ -17,7 +17,7 @@ function generateSaveValidator() { return joiValidator.body(Joi.object({ _id: Joi.string(), _rev: Joi.string(), - type: Joi.string().valid("table"), + type: Joi.string().valid("table", "internal", "external"), primaryDisplay: Joi.string(), schema: Joi.object().required(), name: Joi.string().required(), diff --git a/packages/server/src/api/routes/tests/__snapshots__/datasource.spec.js.snap b/packages/server/src/api/routes/tests/__snapshots__/datasource.spec.js.snap new file mode 100644 index 0000000000..287605cdd6 --- /dev/null +++ b/packages/server/src/api/routes/tests/__snapshots__/datasource.spec.js.snap @@ -0,0 +1,89 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`/datasources fetch returns all the datasources from the server 1`] = ` +Array [ + Object { + "config": Object {}, + "entities": Array [ + Object { + "_id": "ta_users", + "_rev": "1-039883a06c1f9cb3945731d79838181e", + "name": "Users", + "primaryDisplay": "email", + "schema": Object { + "email": Object { + "constraints": Object { + "email": true, + "length": Object { + "maximum": "", + }, + "presence": true, + "type": "string", + }, + "fieldName": "email", + "name": "email", + "type": "string", + }, + "firstName": Object { + "constraints": Object { + "presence": false, + "type": "string", + }, + "fieldName": "firstName", + "name": "firstName", + "type": "string", + }, + "lastName": Object { + "constraints": Object { + "presence": false, + "type": "string", + }, + "fieldName": "lastName", + "name": "lastName", + "type": "string", + }, + "roleId": Object { + "constraints": Object { + "inclusion": Array [ + "ADMIN", + "POWER", + "BASIC", + "PUBLIC", + ], + "presence": false, + "type": "string", + }, + "fieldName": "roleId", + "name": "roleId", + "type": "options", + }, + "status": Object { + "constraints": Object { + "inclusion": Array [ + "active", + "inactive", + ], + "presence": false, + "type": "string", + }, + "fieldName": "status", + "name": "status", + "type": "options", + }, + }, + "type": "table", + "views": Object {}, + }, + ], + "name": "Budibase DB", + "source": "BUDIBASE", + "type": "budibase", + }, + Object { + "config": Object {}, + "name": "Test", + "source": "POSTGRES", + "type": "datasource", + }, +] +`; diff --git a/packages/server/src/api/routes/tests/datasource.spec.js b/packages/server/src/api/routes/tests/datasource.spec.js index c1448894b1..0f6b4128f9 100644 --- a/packages/server/src/api/routes/tests/datasource.spec.js +++ b/packages/server/src/api/routes/tests/datasource.spec.js @@ -2,6 +2,9 @@ let setup = require("./utilities") let { basicDatasource } = setup.structures let { checkBuilderEndpoint } = require("./utilities/TestFunctions") +jest.mock("pg") +const pg = require("pg") + describe("/datasources", () => { let request = setup.getRequest() let config = setup.getConfig() @@ -37,13 +40,14 @@ describe("/datasources", () => { .expect(200) const datasources = res.body - expect(datasources).toEqual([ - { - "_id": datasources[0]._id, - "_rev": datasources[0]._rev, - ...basicDatasource() - } - ]) + + // remove non-deterministic fields + for (let source of datasources) { + delete source._id + delete source._rev + } + + expect(datasources).toMatchSnapshot() }) it("should apply authorization to endpoint", async () => { @@ -66,6 +70,34 @@ describe("/datasources", () => { }) }) + describe("query", () => { + it("should be able to query a pg datasource", async () => { + const res = await request + .post(`/api/datasources/query`) + .send({ + endpoint: { + datasourceId: datasource._id, + operation: "READ", + // table name below + entityId: "users", + }, + resource: { + fields: ["name", "age"], + }, + filters: { + string: { + name: "John", + }, + }, + }) + .set(config.defaultHeaders()) + .expect(200) + // this is mock data, can't test it + expect(res.body).toBeDefined() + expect(pg.queryMock).toHaveBeenCalledWith(`select "name", "age" from "users" where "name" like $1 limit $2`, ["John%", 5000]) + }) + }) + describe("destroy", () => { it("deletes queries for the datasource after deletion and returns a success message", async () => { await config.createQuery() @@ -81,7 +113,7 @@ describe("/datasources", () => { .expect('Content-Type', /json/) .expect(200) - expect(res.body).toEqual([]) + expect(res.body.length).toEqual(1) }) it("should apply authorization to endpoint", async () => { diff --git a/packages/server/src/api/routes/tests/row.spec.js b/packages/server/src/api/routes/tests/row.spec.js index 60796e56f1..9515384608 100644 --- a/packages/server/src/api/routes/tests/row.spec.js +++ b/packages/server/src/api/routes/tests/row.spec.js @@ -201,7 +201,7 @@ describe("/rows", () => { const existing = await config.createRow() const res = await request - .patch(`/api/${table._id}/rows/${existing._id}`) + .patch(`/api/${table._id}/rows`) .send({ _id: existing._id, _rev: existing._rev, @@ -225,7 +225,7 @@ describe("/rows", () => { it("should throw an error when given improper types", async () => { const existing = await config.createRow() await request - .patch(`/api/${table._id}/rows/${existing._id}`) + .patch(`/api/${table._id}/rows`) .send({ _id: existing._id, _rev: existing._rev, @@ -241,19 +241,16 @@ describe("/rows", () => { it("should be able to delete a row", async () => { const createdRow = await config.createRow(row) const res = await request - .delete(`/api/${table._id}/rows/${createdRow._id}/${createdRow._rev}`) + .delete(`/api/${table._id}/rows`) + .send({ + rows: [ + createdRow + ] + }) .set(config.defaultHeaders()) .expect('Content-Type', /json/) .expect(200) - expect(res.body.ok).toEqual(true) - }) - - it("shouldn't allow deleting a row in a table which is different to the one the row was created on", async () => { - const createdRow = await config.createRow(row) - await request - .delete(`/api/wrong_table/rows/${createdRow._id}/${createdRow._rev}`) - .set(config.defaultHeaders()) - .expect(400) + expect(res.body[0]._id).toEqual(createdRow._id) }) }) @@ -289,9 +286,8 @@ describe("/rows", () => { const row1 = await config.createRow() const row2 = await config.createRow() const res = await request - .post(`/api/${table._id}/rows`) + .delete(`/api/${table._id}/rows`) .send({ - type: "delete", rows: [ row1, row2, @@ -309,7 +305,7 @@ describe("/rows", () => { it("should be able to fetch tables contents via 'view'", async () => { const row = await config.createRow() const res = await request - .get(`/api/views/all_${table._id}`) + .get(`/api/views/${table._id}`) .set(config.defaultHeaders()) .expect('Content-Type', /json/) .expect(200) diff --git a/packages/server/src/api/routes/tests/table.spec.js b/packages/server/src/api/routes/tests/table.spec.js index df28eed0c2..794e35e040 100644 --- a/packages/server/src/api/routes/tests/table.spec.js +++ b/packages/server/src/api/routes/tests/table.spec.js @@ -108,7 +108,7 @@ describe("/tables", () => { .expect(200) const fetchedTable = res.body[0] expect(fetchedTable.name).toEqual(testTable.name) - expect(fetchedTable.type).toEqual("table") + expect(fetchedTable.type).toEqual("internal") }) it("should apply authorization to endpoint", async () => { diff --git a/packages/server/src/api/routes/tests/utilities/TestFunctions.js b/packages/server/src/api/routes/tests/utilities/TestFunctions.js index dfd77eec7a..3ba5b4d694 100644 --- a/packages/server/src/api/routes/tests/utilities/TestFunctions.js +++ b/packages/server/src/api/routes/tests/utilities/TestFunctions.js @@ -7,11 +7,12 @@ const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles") function Request(appId, params) { this.appId = appId this.params = params + this.request = {} } exports.getAllTableRows = async config => { const req = new Request(config.appId, { tableId: config.table._id }) - await rowController.fetchTableRows(req) + await rowController.fetch(req) return req.body } diff --git a/packages/server/src/app.js b/packages/server/src/app.js index d7fc248bba..6b610ec880 100644 --- a/packages/server/src/app.js +++ b/packages/server/src/app.js @@ -25,6 +25,7 @@ app.use( jsonLimit: "10mb", textLimit: "10mb", enableTypes: ["json", "form", "text"], + parsedMethods: ["POST", "PUT", "PATCH", "DELETE"], }) ) diff --git a/packages/server/src/automations/automationUtils.js b/packages/server/src/automations/automationUtils.js index b86107f7e9..5cb84c63b1 100644 --- a/packages/server/src/automations/automationUtils.js +++ b/packages/server/src/automations/automationUtils.js @@ -1,4 +1,9 @@ const CouchDB = require("../db") +const { + isExternalTable, + breakExternalTableId, +} = require("../integrations/utils") +const { getExternalTable } = require("../api/controllers/table/utils") /** * When values are input to the system generally they will be of type string as this is required for template strings. @@ -60,7 +65,13 @@ module.exports.cleanInputValues = (inputs, schema) => { */ module.exports.cleanUpRow = async (appId, tableId, row) => { const db = new CouchDB(appId) - const table = await db.get(tableId) + let table + if (isExternalTable(tableId)) { + const { datasourceId, tableName } = breakExternalTableId(tableId) + table = await getExternalTable(appId, datasourceId, tableName) + } else { + table = await db.get(tableId) + } return module.exports.cleanInputValues(row, { properties: table.schema }) } diff --git a/packages/server/src/automations/steps/deleteRow.js b/packages/server/src/automations/steps/deleteRow.js index b6af7ecaab..94243fa03a 100644 --- a/packages/server/src/automations/steps/deleteRow.js +++ b/packages/server/src/automations/steps/deleteRow.js @@ -62,8 +62,12 @@ module.exports.run = async function ({ inputs, appId, apiKey, emitter }) { let ctx = { params: { tableId: inputs.tableId, - rowId: inputs.id, - revId: inputs.revision, + }, + request: { + body: { + _id: inputs.id, + _rev: inputs.revision, + }, }, appId, eventEmitter: emitter, diff --git a/packages/server/src/automations/triggers.js b/packages/server/src/automations/triggers.js index 332710a3e4..2a2d68ecb1 100644 --- a/packages/server/src/automations/triggers.js +++ b/packages/server/src/automations/triggers.js @@ -8,6 +8,11 @@ const { getAutomationParams } = require("../db/utils") const { coerce } = require("../utilities/rowProcessor") const { utils } = require("@budibase/auth/redis") const { JobQueues } = require("../constants") +const { + isExternalTable, + breakExternalTableId, +} = require("../integrations/utils") +const { getExternalTable } = require("../api/controllers/table/utils") const { opts } = utils.getRedisOptions() let automationQueue = new Queue(JobQueues.AUTOMATIONS, { redis: opts }) @@ -288,9 +293,15 @@ emitter.on("row:delete", async function (event) { async function fillRowOutput(automation, params) { let triggerSchema = automation.definition.trigger let tableId = triggerSchema.inputs.tableId - const db = new CouchDB(params.appId) try { - let table = await db.get(tableId) + let table + if (!isExternalTable(tableId)) { + const db = new CouchDB(params.appId) + table = await db.get(tableId) + } else { + const { datasourceId, tableName } = breakExternalTableId(tableId) + table = await getExternalTable(params.appId, datasourceId, tableName) + } let row = {} for (let schemaKey of Object.keys(table.schema)) { const paramValue = params[schemaKey] diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js index e15a5de82d..b01aa0d994 100644 --- a/packages/server/src/constants/index.js +++ b/packages/server/src/constants/index.js @@ -31,6 +31,18 @@ exports.AuthTypes = { EXTERNAL: "external", } +exports.DataSourceOperation = { + CREATE: "CREATE", + READ: "READ", + UPDATE: "UPDATE", + DELETE: "DELETE", +} + +exports.SortDirection = { + ASCENDING: "ASCENDING", + DESCENDING: "DESCENDING", +} + exports.USERS_TABLE_SCHEMA = { _id: "ta_users", type: "table", diff --git a/packages/server/src/db/utils.js b/packages/server/src/db/utils.js index be57f8b70f..74ddf87176 100644 --- a/packages/server/src/db/utils.js +++ b/packages/server/src/db/utils.js @@ -32,6 +32,7 @@ const DocumentTypes = { LAYOUT: "layout", SCREEN: "screen", DATASOURCE: "datasource", + DATASOURCE_PLUS: "datasource_plus", QUERY: "query", } @@ -56,6 +57,14 @@ exports.StaticDatabases = { ...StaticDatabases, } +const BudibaseInternalDB = { + _id: "bb_internal", + type: "budibase", + name: "Budibase DB", + source: "BUDIBASE", + config: {}, +} + exports.APP_PREFIX = APP_PREFIX exports.APP_DEV_PREFIX = APP_DEV_PREFIX exports.USER_METDATA_PREFIX = `${DocumentTypes.ROW}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}` @@ -67,6 +76,7 @@ exports.SEPARATOR = SEPARATOR exports.UNICODE_MAX = UNICODE_MAX exports.SearchIndexes = SearchIndexes exports.AppStatus = AppStatus +exports.BudibaseInternalDB = BudibaseInternalDB exports.generateRoleID = generateRoleID exports.getRoleParams = getRoleParams @@ -283,8 +293,10 @@ exports.getWebhookParams = (webhookId = null, otherProps = {}) => { * Generates a new datasource ID. * @returns {string} The new datasource ID which the webhook doc can be stored under. */ -exports.generateDatasourceID = () => { - return `${DocumentTypes.DATASOURCE}${SEPARATOR}${newid()}` +exports.generateDatasourceID = ({ plus = false } = {}) => { + return `${ + plus ? DocumentTypes.DATASOURCE_PLUS : DocumentTypes.DATASOURCE + }${SEPARATOR}${newid()}` } /** diff --git a/packages/server/src/integrations/base/constants.js b/packages/server/src/integrations/base/constants.js new file mode 100644 index 0000000000..01cde75fd6 --- /dev/null +++ b/packages/server/src/integrations/base/constants.js @@ -0,0 +1,11 @@ +exports.Operation = { + CREATE: "CREATE", + READ: "READ", + UPDATE: "UPDATE", + DELETE: "DELETE", +} + +exports.SortDirection = { + ASCENDING: "ASCENDING", + DESCENDING: "DESCENDING", +} diff --git a/packages/server/src/integrations/base/sql.js b/packages/server/src/integrations/base/sql.js new file mode 100644 index 0000000000..c7cc95fc3e --- /dev/null +++ b/packages/server/src/integrations/base/sql.js @@ -0,0 +1,175 @@ +const { DataSourceOperation, SortDirection } = require("../../constants") + +const BASE_LIMIT = 5000 + +function addFilters(query, filters) { + function iterate(structure, fn) { + for (let [key, value] of Object.entries(structure)) { + fn(key, value) + } + } + if (!filters) { + return query + } + // if all or specified in filters, then everything is an or + const allOr = !!filters.allOr + if (filters.string) { + iterate(filters.string, (key, value) => { + const fnc = allOr ? "orWhere" : "where" + query = query[fnc](key, "like", `${value}%`) + }) + } + if (filters.range) { + iterate(filters.range, (key, value) => { + if (!value.high || !value.low) { + return + } + const fnc = allOr ? "orWhereBetween" : "whereBetween" + query = query[fnc](key, [value.low, value.high]) + }) + } + if (filters.equal) { + iterate(filters.equal, (key, value) => { + const fnc = allOr ? "orWhere" : "where" + query = query[fnc]({ [key]: value }) + }) + } + if (filters.notEqual) { + iterate(filters.notEqual, (key, value) => { + const fnc = allOr ? "orWhereNot" : "whereNot" + query = query[fnc]({ [key]: value }) + }) + } + if (filters.empty) { + iterate(filters.empty, key => { + const fnc = allOr ? "orWhereNull" : "whereNull" + query = query[fnc](key) + }) + } + if (filters.notEmpty) { + iterate(filters.notEmpty, key => { + const fnc = allOr ? "orWhereNotNull" : "whereNotNull" + query = query[fnc](key) + }) + } + return query +} + +function buildCreate(knex, json, opts) { + const { endpoint, body } = json + let query = knex(endpoint.entityId) + // mysql can't use returning + if (opts.disableReturning) { + return query.insert(body) + } else { + return query.insert(body).returning("*") + } +} + +function buildRead(knex, json, limit) { + let { endpoint, resource, filters, sort, paginate } = json + let query = knex(endpoint.entityId) + // select all if not specified + if (!resource) { + resource = { fields: [] } + } + // handle select + if (resource.fields && resource.fields.length > 0) { + query = query.select(resource.fields) + } else { + query = query.select("*") + } + // handle where + query = addFilters(query, filters) + // handle sorting + if (sort) { + for (let [key, value] of Object.entries(sort)) { + const direction = value === SortDirection.ASCENDING ? "asc" : "desc" + query = query.orderBy(key, direction) + } + } + // handle pagination + if (paginate && paginate.page && paginate.limit) { + const page = paginate.page <= 1 ? 0 : paginate.page - 1 + const offset = page * paginate.limit + query = query.offset(offset).limit(paginate.limit) + } else if (paginate && paginate.limit) { + query = query.limit(paginate.limit) + } else { + query.limit(limit) + } + return query +} + +function buildUpdate(knex, json, opts) { + const { endpoint, body, filters } = json + let query = knex(endpoint.entityId) + query = addFilters(query, filters) + // mysql can't use returning + if (opts.disableReturning) { + return query.update(body) + } else { + return query.update(body).returning("*") + } +} + +function buildDelete(knex, json, opts) { + const { endpoint, filters } = json + let query = knex(endpoint.entityId) + query = addFilters(query, filters) + // mysql can't use returning + if (opts.disableReturning) { + return query.delete() + } else { + return query.delete().returning("*") + } +} + +class SqlQueryBuilder { + // pass through client to get flavour of SQL + constructor(client, limit = BASE_LIMIT) { + this._client = client + this._limit = limit + } + + /** + * @param json the input JSON structure from which an SQL query will be built. + * @return {string} the operation that was found in the JSON. + */ + _operation(json) { + if (!json || !json.endpoint) { + return "" + } + return json.endpoint.operation + } + + /** + * @param json The JSON query DSL which is to be converted to SQL. + * @param opts extra options which are to be passed into the query builder, e.g. disableReturning + * which for the sake of mySQL stops adding the returning statement to inserts, updates and deletes. + * @return {{ sql: string, bindings: object }} the query ready to be passed to the driver. + */ + _query(json, opts = {}) { + const knex = require("knex")({ client: this._client }) + let query + switch (this._operation(json)) { + case DataSourceOperation.CREATE: + query = buildCreate(knex, json, opts) + break + case DataSourceOperation.READ: + query = buildRead(knex, json, this._limit, opts) + break + case DataSourceOperation.UPDATE: + query = buildUpdate(knex, json, opts) + break + case DataSourceOperation.DELETE: + query = buildDelete(knex, json, opts) + break + default: + throw `Operation type is not supported by SQL query builder` + } + return query.toSQL().toNative() + } +} + +module.exports = SqlQueryBuilder diff --git a/packages/server/src/integrations/microsoftSqlServer.js b/packages/server/src/integrations/microsoftSqlServer.js index 3dc5676e94..cc4041142e 100644 --- a/packages/server/src/integrations/microsoftSqlServer.js +++ b/packages/server/src/integrations/microsoftSqlServer.js @@ -1,5 +1,6 @@ const sqlServer = require("mssql") const { FIELD_TYPES } = require("./Integration") +const Sql = require("./base/sql") const SCHEMA = { docs: "https://github.com/tediousjs/node-mssql", @@ -50,10 +51,21 @@ const SCHEMA = { }, } -class SqlServerIntegration { +async function internalQuery(client, query) { + const sql = typeof query === "string" ? query : query.sql + const bindings = typeof query === "string" ? {} : query.bindings + try { + return await client.query(sql, bindings) + } catch (err) { + throw new Error(err) + } +} + +class SqlServerIntegration extends Sql { static pool constructor(config) { + super("mssql") this.config = config this.config.options = { encrypt: this.config.encrypt, @@ -65,52 +77,43 @@ class SqlServerIntegration { } async connect() { - const client = await this.pool.connect() - this.client = client.request() + try { + const client = await this.pool.connect() + this.client = client.request() + } catch (err) { + throw new Error(err) + } } async read(query) { - try { - await this.connect() - const response = await this.client.query(query.sql) - return response.recordset - } catch (err) { - console.error("Error querying MS SQL Server", err) - throw err - } + await this.connect() + const response = await internalQuery(this.client, query) + return response.recordset } async create(query) { - try { - await this.connect() - const response = await this.client.query(query.sql) - return response.recordset || [{ created: true }] - } catch (err) { - console.error("Error querying MS SQL Server", err) - throw err - } + await this.connect() + const response = await internalQuery(this.client, query) + return response.recordset || [{ created: true }] } async update(query) { - try { - await this.connect() - const response = await this.client.query(query.sql) - return response.recordset - } catch (err) { - console.error("Error querying MS SQL Server", err) - throw err - } + await this.connect() + const response = await internalQuery(this.client, query) + return response.recordset || [{ updated: true }] } async delete(query) { - try { - await this.connect() - const response = await this.client.query(query.sql) - return response.recordset - } catch (err) { - console.error("Error querying MS SQL Server", err) - throw err - } + await this.connect() + const response = await internalQuery(this.client, query) + return response.recordset || [{ deleted: true }] + } + + async query(json) { + const operation = this._operation(json).toLowerCase() + const input = this._query(json) + const response = await internalQuery(this.client, input) + return response.recordset ? response.recordset : [{ [operation]: true }] } } diff --git a/packages/server/src/integrations/mysql.js b/packages/server/src/integrations/mysql.js index c505c4fc14..9e60958d76 100644 --- a/packages/server/src/integrations/mysql.js +++ b/packages/server/src/integrations/mysql.js @@ -1,8 +1,36 @@ const mysql = require("mysql") const { FIELD_TYPES, QUERY_TYPES } = require("./Integration") +const Sql = require("./base/sql") +const { buildExternalTableId, convertType } = require("./utils") +const { FieldTypes } = require("../constants") +const { Operation } = require("./base/constants") + +const TYPE_MAP = { + text: FieldTypes.LONGFORM, + blob: FieldTypes.LONGFORM, + enum: FieldTypes.STRING, + varchar: FieldTypes.STRING, + int: FieldTypes.NUMBER, + numeric: FieldTypes.NUMBER, + bigint: FieldTypes.NUMBER, + mediumint: FieldTypes.NUMBER, + decimal: FieldTypes.NUMBER, + dec: FieldTypes.NUMBER, + double: FieldTypes.NUMBER, + real: FieldTypes.NUMBER, + fixed: FieldTypes.NUMBER, + smallint: FieldTypes.NUMBER, + timestamp: FieldTypes.DATETIME, + date: FieldTypes.DATETIME, + datetime: FieldTypes.DATETIME, + time: FieldTypes.DATETIME, + tinyint: FieldTypes.BOOLEAN, + json: FIELD_TYPES.JSON, +} const SCHEMA = { docs: "https://github.com/mysqljs/mysql", + plus: true, friendlyName: "MySQL", description: "MySQL Database Service is a fully managed database service to deploy cloud-native applications. ", @@ -52,45 +80,143 @@ const SCHEMA = { }, } -class MySQLIntegration { +function internalQuery(client, query, connect = true) { + const sql = typeof query === "string" ? query : query.sql + const bindings = typeof query === "string" ? {} : query.bindings + // Node MySQL is callback based, so we must wrap our call in a promise + return new Promise((resolve, reject) => { + if (connect) { + client.connect() + } + return client.query(sql, bindings, (error, results) => { + if (error) { + reject(error) + } else { + resolve(results) + } + if (connect) { + client.end() + } + }) + }) +} + +class MySQLIntegration extends Sql { constructor(config) { + super("mysql") this.config = config - if (Object.keys(config.ssl).length === 0) { + if (config.ssl && Object.keys(config.ssl).length === 0) { delete config.ssl } this.client = mysql.createConnection(config) } - query(query) { - // Node MySQL is callback based, so we must wrap our call in a promise - return new Promise((resolve, reject) => { - this.client.connect() - return this.client.query(query.sql, (error, results) => { - if (error) return reject(error) - resolve(results) - this.client.end() - }) - }) + async buildSchema(datasourceId) { + const tables = {} + const database = this.config.database + this.client.connect() + + // get the tables first + const tablesResp = await internalQuery(this.client, "SHOW TABLES;", false) + const tableNames = tablesResp.map(obj => obj[`Tables_in_${database}`]) + for (let tableName of tableNames) { + const primaryKeys = [] + const schema = {} + const descResp = await internalQuery( + this.client, + `DESCRIBE ${tableName};`, + false + ) + for (let column of descResp) { + const columnName = column.Field + if (column.Key === "PRI") { + primaryKeys.push(columnName) + } + const constraints = {} + if (column.Null !== "YES") { + constraints.required = true + } + schema[columnName] = { + name: columnName, + type: convertType(column.Type, TYPE_MAP), + constraints, + } + } + // for now just default to first column + if (primaryKeys.length === 0) { + primaryKeys.push(descResp[0].Field) + } + if (!tables[tableName]) { + tables[tableName] = { + _id: buildExternalTableId(datasourceId, tableName), + primary: primaryKeys, + name: tableName, + schema, + } + } + } + + this.client.end() + this.tables = tables } async create(query) { - const results = await this.query(query) + const results = await internalQuery(this.client, query) return results.length ? results : [{ created: true }] } read(query) { - return this.query(query) + return internalQuery(this.client, query) } async update(query) { - const results = await this.query(query) + const results = await internalQuery(this.client, query) return results.length ? results : [{ updated: true }] } async delete(query) { - const results = await this.query(query) + const results = await internalQuery(this.client, query) return results.length ? results : [{ deleted: true }] } + + async getReturningRow(json) { + if (!json.extra.idFilter) { + return {} + } + const input = this._query({ + endpoint: { + ...json.endpoint, + operation: Operation.READ, + }, + fields: [], + filters: json.extra.idFilter, + paginate: { + limit: 1, + }, + }) + return internalQuery(this.client, input, false) + } + + async query(json) { + const operation = this._operation(json) + this.client.connect() + const input = this._query(json, { disableReturning: true }) + let row + // need to manage returning, a feature mySQL can't do + if (operation === Operation.DELETE) { + row = this.getReturningRow(json) + } + const results = await internalQuery(this.client, input, false) + // same as delete, manage returning + if (operation === Operation.CREATE || operation === Operation.UPDATE) { + row = this.getReturningRow(json) + } + this.client.end() + if (operation !== Operation.READ) { + return row + } + return results.length ? results : [{ [operation.toLowerCase()]: true }] + } } module.exports = { diff --git a/packages/server/src/integrations/postgres.js b/packages/server/src/integrations/postgres.js index ebc39a31a4..94cdad30ed 100644 --- a/packages/server/src/integrations/postgres.js +++ b/packages/server/src/integrations/postgres.js @@ -1,8 +1,12 @@ const { Pool } = require("pg") const { FIELD_TYPES } = require("./Integration") +const Sql = require("./base/sql") +const { FieldTypes } = require("../constants") +const { buildExternalTableId, convertType } = require("./utils") const SCHEMA = { docs: "https://node-postgres.com", + plus: true, friendlyName: "PostgreSQL", description: "PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance.", @@ -54,10 +58,47 @@ const SCHEMA = { }, } -class PostgresIntegration { +const TYPE_MAP = { + text: FieldTypes.LONGFORM, + varchar: FieldTypes.STRING, + integer: FieldTypes.NUMBER, + bigint: FieldTypes.NUMBER, + decimal: FieldTypes.NUMBER, + smallint: FieldTypes.NUMBER, + timestamp: FieldTypes.DATETIME, + time: FieldTypes.DATETIME, + boolean: FieldTypes.BOOLEAN, + json: FIELD_TYPES.JSON, +} + +async function internalQuery(client, query) { + const sql = typeof query === "string" ? query : query.sql + const bindings = typeof query === "string" ? {} : query.bindings + try { + return await client.query(sql, bindings) + } catch (err) { + throw new Error(err) + } +} + +class PostgresIntegration extends Sql { static pool + COLUMNS_SQL = + "select * from information_schema.columns where table_schema = 'public'" + + PRIMARY_KEYS_SQL = ` + select tc.table_schema, tc.table_name, kc.column_name as primary_key + from information_schema.table_constraints tc + join + information_schema.key_column_usage kc on kc.table_name = tc.table_name + and kc.table_schema = tc.table_schema + and kc.constraint_name = tc.constraint_name + where tc.constraint_type = 'PRIMARY KEY'; + ` + constructor(config) { + super("pg") this.config = config if (this.config.ssl) { this.config.ssl = { @@ -72,33 +113,73 @@ class PostgresIntegration { this.client = this.pool } - async query(sql) { + /** + * Fetches the tables from the postgres table and assigns them to the datasource. + * @param {*} datasourceId - datasourceId to fetch + */ + async buildSchema(datasourceId) { + let keys = [] try { - return await this.client.query(sql) + const primaryKeysResponse = await this.client.query(this.PRIMARY_KEYS_SQL) + for (let table of primaryKeysResponse.rows) { + keys.push(table.column_name || table.primary_key) + } } catch (err) { - throw new Error(err) + // TODO: this try catch method isn't right + keys = ["id"] } + + const columnsResponse = await this.client.query(this.COLUMNS_SQL) + const tables = {} + + for (let column of columnsResponse.rows) { + const tableName = column.table_name + const columnName = column.column_name + + // table key doesn't exist yet + if (!tables[tableName]) { + tables[tableName] = { + _id: buildExternalTableId(datasourceId, tableName), + primary: keys, + name: tableName, + schema: {}, + } + } + + tables[tableName].schema[columnName] = { + name: columnName, + type: convertType(column.data_type, TYPE_MAP), + } + } + this.tables = tables } - async create({ sql }) { - const response = await this.query(sql) + async create(sql) { + const response = await internalQuery(this.client, sql) return response.rows.length ? response.rows : [{ created: true }] } - async read({ sql }) { - const response = await this.query(sql) + async read(sql) { + const response = await internalQuery(this.client, sql) return response.rows } - async update({ sql }) { - const response = await this.query(sql) + async update(sql) { + const response = await internalQuery(this.client, sql) return response.rows.length ? response.rows : [{ updated: true }] } - async delete({ sql }) { - const response = await this.query(sql) + async delete(sql) { + const response = await internalQuery(this.client, sql) return response.rows.length ? response.rows : [{ deleted: true }] } + + async query(json) { + const operation = this._operation(json).toLowerCase() + const input = this._query(json) + const response = await internalQuery(this.client, input) + return response.rows.length ? response.rows : [{ [operation]: true }] + } } module.exports = { diff --git a/packages/server/src/integrations/tests/microsoftSqlServer.spec.js b/packages/server/src/integrations/tests/microsoftSqlServer.spec.js index 5d7d59a647..af65fcbec4 100644 --- a/packages/server/src/integrations/tests/microsoftSqlServer.spec.js +++ b/packages/server/src/integrations/tests/microsoftSqlServer.spec.js @@ -20,7 +20,7 @@ describe("MS SQL Server Integration", () => { const response = await config.integration.create({ sql }) - expect(config.integration.client.query).toHaveBeenCalledWith(sql) + expect(config.integration.client.query).toHaveBeenCalledWith(sql, undefined) }) it("calls the read method with the correct params", async () => { @@ -28,7 +28,7 @@ describe("MS SQL Server Integration", () => { const response = await config.integration.read({ sql }) - expect(config.integration.client.query).toHaveBeenCalledWith(sql) + expect(config.integration.client.query).toHaveBeenCalledWith(sql, undefined) }) describe("no rows returned", () => { diff --git a/packages/server/src/integrations/tests/mysql.spec.js b/packages/server/src/integrations/tests/mysql.spec.js index eca3e523b0..6d6d00dd67 100644 --- a/packages/server/src/integrations/tests/mysql.spec.js +++ b/packages/server/src/integrations/tests/mysql.spec.js @@ -1,12 +1,9 @@ -const pg = require("mysql") const MySQLIntegration = require("../mysql") jest.mock("mysql") class TestConfiguration { constructor(config = { ssl: {} }) { - this.integration = new MySQLIntegration.integration(config) - this.query = jest.fn(() => [{ id: 1 }]) - this.integration.query = this.query + this.integration = new MySQLIntegration.integration(config) } } @@ -19,43 +16,37 @@ describe("MySQL Integration", () => { it("calls the create method with the correct params", async () => { const sql = "insert into users (name, age) values ('Joe', 123);" - const response = await config.integration.create({ + await config.integration.create({ sql }) - expect(config.query).toHaveBeenCalledWith({ sql }) + expect(config.integration.client.query).toHaveBeenCalledWith(sql, undefined, expect.any(Function)) }) it("calls the read method with the correct params", async () => { const sql = "select * from users;" - const response = await config.integration.read({ - sql - }) - expect(config.query).toHaveBeenCalledWith({ + await config.integration.read({ sql }) + expect(config.integration.client.query).toHaveBeenCalledWith(sql, undefined, expect.any(Function)) }) it("calls the update method with the correct params", async () => { const sql = "update table users set name = 'test';" - const response = await config.integration.update({ + await config.integration.update({ sql }) - expect(config.query).toHaveBeenCalledWith({ sql }) + expect(config.integration.client.query).toHaveBeenCalledWith(sql, undefined, expect.any(Function)) }) it("calls the delete method with the correct params", async () => { const sql = "delete from users where name = 'todelete';" - const response = await config.integration.delete({ + await config.integration.delete({ sql }) - expect(config.query).toHaveBeenCalledWith({ sql }) + expect(config.integration.client.query).toHaveBeenCalledWith(sql, undefined, expect.any(Function)) }) describe("no rows returned", () => { - beforeEach(() => { - config.query.mockImplementation(() => []) - }) - it("returns the correct response when the create response has no rows", async () => { const sql = "insert into users (name, age) values ('Joe', 123);" const response = await config.integration.create({ diff --git a/packages/server/src/integrations/tests/postgres.spec.js b/packages/server/src/integrations/tests/postgres.spec.js index dc34fcf6bb..d0d579f32d 100644 --- a/packages/server/src/integrations/tests/postgres.spec.js +++ b/packages/server/src/integrations/tests/postgres.spec.js @@ -20,7 +20,7 @@ describe("Postgres Integration", () => { const response = await config.integration.create({ sql }) - expect(pg.queryMock).toHaveBeenCalledWith(sql) + expect(pg.queryMock).toHaveBeenCalledWith(sql, undefined) }) it("calls the read method with the correct params", async () => { @@ -28,7 +28,7 @@ describe("Postgres Integration", () => { const response = await config.integration.read({ sql }) - expect(pg.queryMock).toHaveBeenCalledWith(sql) + expect(pg.queryMock).toHaveBeenCalledWith(sql, undefined) }) it("calls the update method with the correct params", async () => { @@ -36,7 +36,7 @@ describe("Postgres Integration", () => { const response = await config.integration.update({ sql }) - expect(pg.queryMock).toHaveBeenCalledWith(sql) + expect(pg.queryMock).toHaveBeenCalledWith(sql, undefined) }) it("calls the delete method with the correct params", async () => { @@ -44,7 +44,7 @@ describe("Postgres Integration", () => { await config.integration.delete({ sql }) - expect(pg.queryMock).toHaveBeenCalledWith(sql) + expect(pg.queryMock).toHaveBeenCalledWith(sql, undefined) }) describe("no rows returned", () => { diff --git a/packages/server/src/integrations/tests/sql.spec.js b/packages/server/src/integrations/tests/sql.spec.js new file mode 100644 index 0000000000..2b6badd92d --- /dev/null +++ b/packages/server/src/integrations/tests/sql.spec.js @@ -0,0 +1,173 @@ +const Sql = require("../base/sql") + +const TABLE_NAME = "test" + +function endpoint(table, operation) { + return { + datasourceId: "Postgres", + operation: operation, + entityId: table || TABLE_NAME, + } +} + +function generateReadJson({ table, fields, filters, sort, paginate} = {}) { + return { + endpoint: endpoint(table || TABLE_NAME, "READ"), + resource: { + fields: fields || [], + }, + filters: filters || {}, + sort: sort || {}, + paginate: paginate || {}, + } +} + +function generateCreateJson(table = TABLE_NAME, body = {}) { + return { + endpoint: endpoint(table, "CREATE"), + body, + } +} + +function generateUpdateJson(table = TABLE_NAME, body = {}, filters = {}) { + return { + endpoint: endpoint(table, "UPDATE"), + filters, + body, + } +} + +function generateDeleteJson(table = TABLE_NAME, filters = {}) { + return { + endpoint: endpoint(table, "DELETE"), + filters, + } +} + +describe("SQL query builder", () => { + const limit = 500 + const client = "pg" + let sql + + beforeEach(() => { + sql = new Sql(client, limit) + }) + + it("should test a basic read", () => { + const query = sql._query(generateReadJson()) + expect(query).toEqual({ + bindings: [limit], + sql: `select * from "${TABLE_NAME}" limit $1` + }) + }) + + it("should test a read with specific columns", () => { + const query = sql._query(generateReadJson({ + fields: ["name", "age"] + })) + expect(query).toEqual({ + bindings: [limit], + sql: `select "name", "age" from "${TABLE_NAME}" limit $1` + }) + }) + + it("should test a where string starts with read", () => { + const query = sql._query(generateReadJson({ + filters: { + string: { + name: "John", + } + } + })) + expect(query).toEqual({ + bindings: ["John%", limit], + sql: `select * from "${TABLE_NAME}" where "name" like $1 limit $2` + }) + }) + + it("should test a where range read", () => { + const query = sql._query(generateReadJson({ + filters: { + range: { + age: { + low: 2, + high: 10, + } + } + } + })) + expect(query).toEqual({ + bindings: [2, 10, limit], + sql: `select * from "${TABLE_NAME}" where "age" between $1 and $2 limit $3` + }) + }) + + it("should test for multiple IDs with OR", () => { + const query = sql._query(generateReadJson({ + filters: { + equal: { + age: 10, + name: "John", + }, + allOr: true, + } + })) + expect(query).toEqual({ + bindings: [10, "John", limit], + sql: `select * from "${TABLE_NAME}" where ("age" = $1) or ("name" = $2) limit $3` + }) + }) + + it("should test an create statement", () => { + const query = sql._query(generateCreateJson(TABLE_NAME, { + name: "Michael", + age: 45, + })) + expect(query).toEqual({ + bindings: [45, "Michael"], + sql: `insert into "${TABLE_NAME}" ("age", "name") values ($1, $2) returning *` + }) + }) + + it("should test an update statement", () => { + const query = sql._query(generateUpdateJson(TABLE_NAME, { + name: "John" + }, { + equal: { + id: 1001, + } + })) + expect(query).toEqual({ + bindings: ["John", 1001], + sql: `update "${TABLE_NAME}" set "name" = $1 where "id" = $2 returning *` + }) + }) + + it("should test a delete statement", () => { + const query = sql._query(generateDeleteJson(TABLE_NAME, { + equal: { + id: 1001, + } + })) + expect(query).toEqual({ + bindings: [1001], + sql: `delete from "${TABLE_NAME}" where "id" = $1 returning *` + }) + }) + + it("should work with MS-SQL", () => { + const query = new Sql("mssql", 10)._query(generateReadJson()) + expect(query).toEqual({ + bindings: [10], + sql: `select top (@p0) * from [${TABLE_NAME}]` + }) + }) + + it("should work with mySQL", () => { + const query = new Sql("mysql", 10)._query(generateReadJson()) + expect(query).toEqual({ + bindings: [10], + sql: `select * from \`${TABLE_NAME}\` limit ?` + }) + }) +}) diff --git a/packages/server/src/integrations/utils.js b/packages/server/src/integrations/utils.js new file mode 100644 index 0000000000..d3deb50963 --- /dev/null +++ b/packages/server/src/integrations/utils.js @@ -0,0 +1,45 @@ +const { DocumentTypes, SEPARATOR } = require("../db/utils") +const { FieldTypes } = require("../constants") + +const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}` + +exports.isExternalTable = tableId => { + return tableId.includes(DocumentTypes.DATASOURCE) +} + +exports.buildExternalTableId = (datasourceId, tableName) => { + return `${datasourceId}${DOUBLE_SEPARATOR}${tableName}` +} + +exports.breakExternalTableId = tableId => { + const parts = tableId.split(DOUBLE_SEPARATOR) + let tableName = parts.pop() + // if they need joined + let datasourceId = parts.join(DOUBLE_SEPARATOR) + return { datasourceId, tableName } +} + +exports.generateRowIdField = (keyProps = []) => { + if (!Array.isArray(keyProps)) { + keyProps = [keyProps] + } + // this conserves order and types + return encodeURIComponent(JSON.stringify(keyProps)) +} + +// should always return an array +exports.breakRowIdField = _id => { + if (!_id) { + return null + } + return JSON.parse(decodeURIComponent(_id)) +} + +exports.convertType = (type, map) => { + for (let [external, internal] of Object.entries(map)) { + if (type.toLowerCase().includes(external)) { + return internal + } + } + return FieldTypes.STRING +} diff --git a/packages/server/src/tests/utilities/TestConfiguration.js b/packages/server/src/tests/utilities/TestConfiguration.js index 7e56b66dc9..0f458a31bd 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.js +++ b/packages/server/src/tests/utilities/TestConfiguration.js @@ -215,7 +215,7 @@ class TestConfiguration { if (!tableId && this.table) { tableId = this.table._id } - return this._req(null, { tableId }, controllers.row.fetchTableRows) + return this._req(null, { tableId }, controllers.row.fetch) } async createRole(config = null) { diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 678159e94c..d64a2e9aff 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -930,10 +930,10 @@ "@babel/helper-validator-identifier" "^7.14.0" to-fast-properties "^2.0.0" -"@budibase/auth@^0.9.47": - version "0.9.47" - resolved "https://registry.yarnpkg.com/@budibase/auth/-/auth-0.9.47.tgz#d0518f6bb7b29780799eee4574a0354ce9c07065" - integrity sha512-H2fbhVIZ4zwvN4XD3JcqhhwmxuAuL23Cssld7S8qNXYHNj84NdjPYVuGHQPzZudT9htiOKtOgpLkRzSWXUyxjw== +"@budibase/auth@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/auth/-/auth-0.9.53.tgz#7b84aef4a7683c1da7d872c7e0f29d5897b2331c" + integrity sha512-0WO7LVrNfjkvIguVeHWnSeQOvY90EPyKLx9rXpS0etYD52WjdL8dwpydtTmh/pGHhoqiikuLTAgre2F6CZCOTg== dependencies: aws-sdk "^2.901.0" bcryptjs "^2.4.3" @@ -951,10 +951,10 @@ uuid "^8.3.2" zlib "^1.0.5" -"@budibase/bbui@^0.9.47": - version "0.9.47" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.47.tgz#d8664a05203432d522cd91a0bad1cdd8518baf93" - integrity sha512-LXvJCgUSoc4EJKafBaKfUzU4GUOQGmts/8F4V6LTFtTyMZavgq2/KFAgPbR3QeYvidLsshtwop/pQfoszXTQnQ== +"@budibase/bbui@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.53.tgz#b6841a31ff2c28feb929c57f7f10a1dae1b3aea3" + integrity sha512-jO11Ky1KhPGRv922jMRO49FeTY1TeF3u2JaBJYBkVY95il3uPOI20M1AdA6w2emppDlyP6FSEHk+prdra4Lndw== dependencies: "@adobe/spectrum-css-workflow-icons" "^1.2.1" "@spectrum-css/actionbutton" "^1.0.1" @@ -999,14 +999,14 @@ svelte-flatpickr "^3.1.0" svelte-portal "^1.0.0" -"@budibase/client@^0.9.47": - version "0.9.47" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.9.47.tgz#d0871246f69ebe2d9b8a3ab7663d1e687a81a323" - integrity sha512-RhN8lDavcPnSdlHpFIfjKeuiWi7Y+0YhIQMcXav5p7SgOAsJde+Bq1ubZLgKCEl7OMTMrdHO/b7mHj9naXuyTA== +"@budibase/client@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.9.53.tgz#9e430057bdfc2968862ca25eb37dad30c3d2c86c" + integrity sha512-KK7e5rnmE61ms3q8F3NShB/nE03DfdHHqdj15tO9dMe/lr6fypK6aKkt4hfMPyDPVjn53n1Bg9tuzLvvGJABIg== dependencies: - "@budibase/bbui" "^0.9.47" - "@budibase/standard-components" "^0.9.47" - "@budibase/string-templates" "^0.9.47" + "@budibase/bbui" "^0.9.53" + "@budibase/standard-components" "^0.9.53" + "@budibase/string-templates" "^0.9.53" regexparam "^1.3.0" shortid "^2.2.15" svelte-spa-router "^3.0.5" @@ -1043,12 +1043,12 @@ to-gfm-code-block "^0.1.1" year "^0.2.1" -"@budibase/standard-components@^0.9.47": - version "0.9.47" - resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.47.tgz#8e4f27c43b5a6f65d3d296c61f842195e297f061" - integrity sha512-0+Ndg67Jgk7cqOYluGKpixNFvEqvy2oguKLEr1l83Sf0oWTQ3RCmUGs2mU66ljwnE+o4/JN/EdkA2uSqKInQtg== +"@budibase/standard-components@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.53.tgz#5e8d84bf4c3b1ceadfc40b5b5b6c0513b6283fc5" + integrity sha512-8QJmjwF51vh+rCiLbk+JLqCNZZBq9M8/LuyQOGvjnhB8l6DNrfjnCypP/xYoBf0uUvlki8TeNuZKQmDpBBnR7A== dependencies: - "@budibase/bbui" "^0.9.47" + "@budibase/bbui" "^0.9.53" "@spectrum-css/page" "^3.0.1" "@spectrum-css/vars" "^3.0.1" apexcharts "^3.22.1" @@ -1056,10 +1056,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@^0.9.47": - version "0.9.47" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.47.tgz#484ce5ce29a6ddaef3480368b1a24ce8c3852324" - integrity sha512-I16Ps4AW7VW8MrSdsoZdwLutiX7GhRkiH6m1AdFcmzh2mZI6YyFM000PuKGEt+sREXK2NI6cBzmi9ZpKIAPJJw== +"@budibase/string-templates@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-0.9.53.tgz#9228965afcef4cc19f7d016b291d5f298bb3b725" + integrity sha512-TL3Zx6VN+YpbIT5vtuTXEv2SOAwmx+YN42pbWxH3ExHj54bvhmRxSS+xJySs75kWdvQU4OMnYywQcMeMsqkOqg== dependencies: "@budibase/handlebars-helpers" "^0.11.4" dayjs "^1.10.4" @@ -2738,7 +2738,7 @@ autolinker@~0.28.0: dependencies: gulp-header "^1.7.1" -aws-sdk@^2.767.0, aws-sdk@^2.901.0: +aws-sdk@^2.767.0: version "2.924.0" resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.924.0.tgz#daefcd11729638d9c9279633a0cc5ba1c98fee64" integrity sha512-EwJmZDNhEY1/hrihile8+EdrYrT5VKcLuL5F+OA9L+AYWxNou0i4fP36N5KFtMikkAGB31qhAuRDPcr132RnUw== @@ -2753,6 +2753,21 @@ aws-sdk@^2.767.0, aws-sdk@^2.901.0: uuid "3.3.2" xml2js "0.4.19" +aws-sdk@^2.901.0: + version "2.931.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.931.0.tgz#7fdc886fa7697095203fe7de16bc948a8b1c8daa" + integrity sha512-Db97/aJq8zYl8mHzY6dNO6m9S89TqN4HEUUc2aCYQCTyMb/eNrjf+uZTnutnQbJkClqHzxFcWc3aqe5VlTac/A== + dependencies: + buffer "4.9.2" + events "1.1.1" + ieee754 "1.1.13" + jmespath "0.15.0" + querystring "0.2.0" + sax "1.2.1" + url "0.10.3" + uuid "3.3.2" + xml2js "0.4.19" + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -3456,6 +3471,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +colorette@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" + integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== + colorette@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" @@ -3473,6 +3493,11 @@ commander@^2.5.0, commander@^2.8.1: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +commander@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + commoner@^0.10.1: version "0.10.8" resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5" @@ -3694,7 +3719,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3: dependencies: ms "2.0.0" -debug@4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: +debug@4, debug@4.3.1, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== @@ -4249,6 +4274,11 @@ eslint@^6.8.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" +esm@^3.2.25: + version "3.2.25" + resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" + integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== + esmangle-evaluator@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/esmangle-evaluator/-/esmangle-evaluator-1.0.1.tgz#620d866ef4861b3311f75766d52a8572bb3c6336" @@ -4934,6 +4964,11 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= +getopts@2.2.5: + version "2.2.5" + resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz#67a0fe471cacb9c687d817cab6450b96dde8313b" + integrity sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA== + getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -5490,6 +5525,11 @@ inquirer@^7.0.0: strip-ansi "^6.0.0" through "^2.3.6" +interpret@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" + integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== + into-stream@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6" @@ -5510,7 +5550,7 @@ invert-kv@^2.0.0: resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== -ioredis@^4.27.0, ioredis@^4.27.1: +ioredis@^4.27.0: version "4.27.5" resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.27.5.tgz#b62192bb6198f8a5a02947902117150aef39b7f1" integrity sha512-JJ3HzOzU6kgUk3gKhpx8kxEYn9ruI5TkpOtGvbw/hLyWxfC19T9uCZTgmw4Mci4al4aOCCMfAjYzJ7aqQkLbJg== @@ -5526,6 +5566,22 @@ ioredis@^4.27.0, ioredis@^4.27.1: redis-parser "^3.0.0" standard-as-callback "^2.1.0" +ioredis@^4.27.1: + version "4.27.6" + resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.27.6.tgz#a53d427d3fe75fbd10ed7ad150ce00559df8dcf8" + integrity sha512-6W3ZHMbpCa8ByMyC1LJGOi7P2WiOKP9B3resoZOVLDhi+6dDBOW+KNsRq3yI36Hmnb2sifCxHX+YSarTeXh48A== + dependencies: + cluster-key-slot "^1.1.0" + debug "^4.3.1" + denque "^1.1.0" + lodash.defaults "^4.2.0" + lodash.flatten "^4.4.0" + p-map "^2.1.0" + redis-commands "1.7.0" + redis-errors "^1.2.0" + redis-parser "^3.0.0" + standard-as-callback "^2.1.0" + ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" @@ -6660,6 +6716,25 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== +knex@^0.95.6: + version "0.95.6" + resolved "https://registry.yarnpkg.com/knex/-/knex-0.95.6.tgz#5fc60ffc2935567bf122925526b1b06b8dbca785" + integrity sha512-noRcmkJl1MdicUbezrcr8OtVLcqQ/cfLIwgAx5EaxNxQOIJff88rBeyLywUScGhQNd/b78DIKKXZzLMrm6h/cw== + dependencies: + colorette "1.2.1" + commander "^7.1.0" + debug "4.3.1" + escalade "^3.1.1" + esm "^3.2.25" + getopts "2.2.5" + interpret "^2.2.0" + lodash "^4.17.21" + pg-connection-string "2.4.0" + rechoir "^0.7.0" + resolve-from "^5.0.0" + tarn "^3.0.1" + tildify "2.0.0" + koa-body@4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/koa-body/-/koa-body-4.2.0.tgz#37229208b820761aca5822d14c5fc55cee31b26f" @@ -8127,6 +8202,11 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +pg-connection-string@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz#c979922eb47832999a204da5dbe1ebf2341b6a10" + integrity sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ== + pg-connection-string@^2.4.0: version "2.5.0" resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34" @@ -8850,6 +8930,13 @@ recast@^0.11.17: private "~0.1.5" source-map "~0.5.0" +rechoir@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca" + integrity sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q== + dependencies: + resolve "^1.9.0" + redis-commands@1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.7.0.tgz#15a6fea2d58281e27b1cd1acfb4b293e278c3a89" @@ -8906,7 +8993,12 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexparam@1.3.0, regexparam@^1.3.0: +regexparam@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.0.tgz#059476767d5f5f87f735fc7922d133fd1a118c8c" + integrity sha512-gJKwd2MVPWHAIFLsaYDZfyKzHNS4o7E/v8YmNf44vmeV2e4YfVoDToTOKTvE7ab68cRJ++kLuEXJBaEeJVt5ow== + +regexparam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== @@ -9089,7 +9181,7 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@^1.10.0, resolve@^1.14.2: +resolve@^1.10.0, resolve@^1.14.2, resolve@^1.9.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -9293,9 +9385,9 @@ set-blocking@^2.0.0: integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= set-getter@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376" - integrity sha1-12nBgsnVpR9AkUXy+6guXoboA3Y= + version "0.1.1" + resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.1.tgz#a3110e1b461d31a9cfc8c5c9ee2e9737ad447102" + integrity sha512-9sVWOy+gthr+0G9DzqqLaYNA7+5OKkSmcqjL9cBpDEaZrr3ShQlyX2cZ/O/ozE41oxn/Tt0LGEM/w4Rub3A3gw== dependencies: to-object-path "^0.3.0" @@ -9779,9 +9871,9 @@ strip-outer@^1.0.0: escape-string-regexp "^1.0.2" striptags@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.1.1.tgz#c8c3e7fdd6fb4bb3a32a3b752e5b5e3e38093ebd" - integrity sha1-yMPn/db7S7OjKjt1LltePjgJPr0= + version "3.2.0" + resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" + integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== sublevel-pouchdb@7.2.2: version "7.2.2" @@ -9870,11 +9962,11 @@ svelte-portal@^1.0.0: integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== svelte-spa-router@^3.0.5: - version "3.1.0" - resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.1.0.tgz#a929f0def7e12c41f32bc356f91685aeadcd75bf" - integrity sha512-jlM/xwjn57mylr+pzHYCOOy+IPQauT46gOucNGTBu6jHcFXu3F+oaojN4PXC1LYizRGxFB6QA0qnYbZnRfX7Sg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.2.0.tgz#fae3311d292451236cb57131262406cf312b15ee" + integrity sha512-igemo5Vs82TGBBw+DjWt6qKameXYzNs6aDXcTxou5XbEvOjiRcAM6MLkdVRCatn6u8r42dE99bt/br7T4qe/AQ== dependencies: - regexparam "1.3.0" + regexparam "2.0.0" svelte@^3.38.2: version "3.38.2" @@ -9990,6 +10082,11 @@ tarn@^1.1.5: resolved "https://registry.yarnpkg.com/tarn/-/tarn-1.1.5.tgz#7be88622e951738b9fa3fb77477309242cdddc2d" integrity sha512-PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g== +tarn@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.1.tgz#ebac2c6dbc6977d34d4526e0a7814200386a8aec" + integrity sha512-6usSlV9KyHsspvwu2duKH+FMUhqJnAh6J5J/4MITl8s94iSUQTLkJggdiewKv4RyARQccnigV48Z+khiuVZDJw== + tedious@^6.6.2: version "6.7.0" resolved "https://registry.yarnpkg.com/tedious/-/tedious-6.7.0.tgz#ad02365f16f9e0416b216e13d3f83c53addd42ca" @@ -10091,6 +10188,11 @@ through@^2.3.6, through@^2.3.8, through@~2.3.4: resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= +tildify@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/tildify/-/tildify-2.0.0.tgz#f205f3674d677ce698b7067a99e949ce03b4754a" + integrity sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw== + time-stamp@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json index a2b2a2b99a..1f10f3ed96 100644 --- a/packages/standard-components/manifest.json +++ b/packages/standard-components/manifest.json @@ -209,6 +209,25 @@ "label": "Text", "key": "text" }, + { + "type": "select", + "label": "Button Type", + "key": "type", + "options": ["primary", "secondary", "cta", "warning"], + "defaultValue": "primary" + }, + { + "type": "select", + "label": "Size", + "key": "size", + "options": ["S", "M", "L", "XL"], + "defaultValue": "M" + }, + { + "type": "boolean", + "label": "Disabled", + "key": "disabled" + }, { "type": "event", "label": "On Click", diff --git a/packages/standard-components/src/Button.svelte b/packages/standard-components/src/Button.svelte index e9a6d6e95e..3739f5e3af 100644 --- a/packages/standard-components/src/Button.svelte +++ b/packages/standard-components/src/Button.svelte @@ -7,31 +7,15 @@ export let disabled = false export let text = "" export let onClick + export let size = "M" + export let type = "primary" - - diff --git a/packages/standard-components/yarn.lock b/packages/standard-components/yarn.lock index 624cefdb17..2b461980cf 100644 --- a/packages/standard-components/yarn.lock +++ b/packages/standard-components/yarn.lock @@ -7,10 +7,10 @@ resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4" integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w== -"@budibase/bbui@^0.9.47": - version "0.9.47" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.47.tgz#d8664a05203432d522cd91a0bad1cdd8518baf93" - integrity sha512-LXvJCgUSoc4EJKafBaKfUzU4GUOQGmts/8F4V6LTFtTyMZavgq2/KFAgPbR3QeYvidLsshtwop/pQfoszXTQnQ== +"@budibase/bbui@^0.9.53": + version "0.9.53" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.53.tgz#b6841a31ff2c28feb929c57f7f10a1dae1b3aea3" + integrity sha512-jO11Ky1KhPGRv922jMRO49FeTY1TeF3u2JaBJYBkVY95il3uPOI20M1AdA6w2emppDlyP6FSEHk+prdra4Lndw== dependencies: "@adobe/spectrum-css-workflow-icons" "^1.2.1" "@spectrum-css/actionbutton" "^1.0.1"