diff --git a/lerna.json b/lerna.json index 999f51bba0..24172a05b0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.32-alpha.1", + "version": "2.1.32-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 9dc917c0b5..6a54c16c89 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.32-alpha.1", + "version": "2.1.32-alpha.3", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "2.1.32-alpha.1", + "@budibase/types": "2.1.32-alpha.3", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/backend-core/src/constants.js b/packages/backend-core/src/constants.js new file mode 100644 index 0000000000..7fda17f6f2 --- /dev/null +++ b/packages/backend-core/src/constants.js @@ -0,0 +1,44 @@ +exports.UserStatus = { + ACTIVE: "active", + INACTIVE: "inactive", +} + +exports.Cookie = { + CurrentApp: "budibase:currentapp", + Auth: "budibase:auth", + Init: "budibase:init", + ACCOUNT_RETURN_URL: "budibase:account:returnurl", + DatasourceAuth: "budibase:datasourceauth", + OIDC_CONFIG: "budibase:oidc:config", +} + +exports.Header = { + API_KEY: "x-budibase-api-key", + LICENSE_KEY: "x-budibase-license-key", + API_VER: "x-budibase-api-version", + APP_ID: "x-budibase-app-id", + TYPE: "x-budibase-type", + PREVIEW_ROLE: "x-budibase-role", + TENANT_ID: "x-budibase-tenant-id", + TOKEN: "x-budibase-token", + CSRF_TOKEN: "x-csrf-token", +} + +exports.GlobalRoles = { + OWNER: "owner", + ADMIN: "admin", + BUILDER: "builder", + WORKSPACE_MANAGER: "workspace_manager", +} + +exports.Config = { + SETTINGS: "settings", + ACCOUNT: "account", + SMTP: "smtp", + GOOGLE: "google", + OIDC: "oidc", + OIDC_LOGOS: "logos_oidc", +} + +exports.MAX_VALID_DATE = new Date(2147483647000) +exports.DEFAULT_TENANT_ID = "default" diff --git a/packages/backend-core/src/db/constants.ts b/packages/backend-core/src/db/constants.ts index 446f1f7d01..92392457d6 100644 --- a/packages/backend-core/src/db/constants.ts +++ b/packages/backend-core/src/db/constants.ts @@ -92,3 +92,4 @@ export const StaticDatabases = { export const APP_PREFIX = DocumentType.APP + SEPARATOR export const APP_DEV = DocumentType.APP_DEV + SEPARATOR export const APP_DEV_PREFIX = APP_DEV +export const BUDIBASE_DATASOURCE_TYPE = "budibase" diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 692eaa9fe9..b619e85651 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.32-alpha.1", + "version": "2.1.32-alpha.3", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "2.1.32-alpha.1", + "@budibase/string-templates": "2.1.32-alpha.3", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index af8e7b8ab9..2e8367db1f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.32-alpha.1", + "version": "2.1.32-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.1.32-alpha.1", - "@budibase/client": "2.1.32-alpha.1", - "@budibase/frontend-core": "2.1.32-alpha.1", - "@budibase/string-templates": "2.1.32-alpha.1", + "@budibase/bbui": "2.1.32-alpha.3", + "@budibase/client": "2.1.32-alpha.3", + "@budibase/frontend-core": "2.1.32-alpha.3", + "@budibase/string-templates": "2.1.32-alpha.3", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index a3531513fb..c860c7cba3 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -2,7 +2,7 @@ import { onMount } from "svelte" import { get } from "svelte/store" import { goto, params } from "@roxi/routify" - import { BUDIBASE_INTERNAL_DB } from "constants" + import { BUDIBASE_INTERNAL_DB_ID } from "constants/backend" import { database, datasources, queries, tables, views } from "stores/backend" import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte" import EditQueryPopover from "./popovers/EditQueryPopover.svelte" @@ -129,7 +129,7 @@ size="18" /> - {#if datasource._id !== BUDIBASE_INTERNAL_DB} + {#if datasource._id !== BUDIBASE_INTERNAL_DB_ID} {/if} diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte index 49138a3b0e..1872a308e5 100644 --- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte +++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte @@ -10,10 +10,23 @@ Divider, Layout, } from "@budibase/bbui" + import { datasources } from "stores/backend" import TableDataImport from "../TableDataImport.svelte" + import { + BUDIBASE_INTERNAL_DB_ID, + BUDIBASE_DATASOURCE_TYPE, + } from "constants/backend" import { buildAutoColumn, getAutoColumnInformation } from "builderStore/utils" $: tableNames = $tables.list.map(table => table.name) + $: selectedSource = $datasources.list.find( + source => source._id === $datasources.selected + ) + + $: isSelectedInternal = selectedSource?.type === BUDIBASE_DATASOURCE_TYPE + $: targetDatasourceId = isSelectedInternal + ? selectedSource._id + : BUDIBASE_INTERNAL_DB_ID export let name let dataImport @@ -45,7 +58,7 @@ schema: addAutoColumns(name, dataImport.schema || {}), dataImport, type: "internal", - sourceId: "bb_internal", + sourceId: targetDatasourceId, } // Only set primary display if defined diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js index 441993fe1c..1d8df7a052 100644 --- a/packages/builder/src/components/design/settings/componentSettings.js +++ b/packages/builder/src/components/design/settings/componentSettings.js @@ -19,6 +19,7 @@ import FormFieldSelect from "./controls/FormFieldSelect.svelte" import ValidationEditor from "./controls/ValidationEditor/ValidationEditor.svelte" import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte" import ColumnEditor from "./controls/ColumnEditor/ColumnEditor.svelte" +import BasicColumnEditor from "./controls/ColumnEditor/BasicColumnEditor.svelte" import BarButtonList from "./controls/BarButtonList.svelte" const componentMap = { @@ -42,6 +43,7 @@ const componentMap = { filter: FilterEditor, url: URLSelect, columns: ColumnEditor, + "columns/basic": BasicColumnEditor, "field/sortable": SortableFieldSelect, "field/string": FormFieldSelect, "field/number": FormFieldSelect, diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte index 6b9efa76d3..c74613b649 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte @@ -3,7 +3,10 @@ import { datasources, integrations, queries } from "stores/backend" import BindingBuilder from "components/integration/QueryBindingBuilder.svelte" import IntegrationQueryEditor from "components/integration/index.svelte" - import { BUDIBASE_DATASOURCE_ID } from "constants/backend" + import { + BUDIBASE_INTERNAL_DB_ID, + BUDIBASE_DATASOURCE_TYPE, + } from "constants/backend" export let parameters export let bindings = [] @@ -14,7 +17,8 @@ ) // Executequery must exclude budibase datasource $: executeQueryDatasources = $datasources.list.filter( - x => x._id !== BUDIBASE_DATASOURCE_ID + x => + x._id !== BUDIBASE_INTERNAL_DB_ID && x.type !== BUDIBASE_DATASOURCE_TYPE ) function fetchQueryDefinition(query) { diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/BasicColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/BasicColumnEditor.svelte new file mode 100644 index 0000000000..053735cc6d --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/BasicColumnEditor.svelte @@ -0,0 +1,10 @@ + + + diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte index cf85b2506b..87fbba3b52 100644 --- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte @@ -17,6 +17,7 @@ export let columns = [] export let options = [] export let schema = {} + export let allowCellEditing = true const flipDurationMs = 150 let dragDisabled = true @@ -123,7 +124,9 @@ on:change={e => (column.displayName = e.detail)} /> - + {#if allowCellEditing} + + {/if} Configure columns - + - Configure the columns in your table. + Configure the columns in your {subject.toLowerCase()}. - + diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte index 23f9f3f80c..9ebc046cdc 100644 --- a/packages/builder/src/components/start/CreateAppModal.svelte +++ b/packages/builder/src/components/start/CreateAppModal.svelte @@ -1,6 +1,12 @@ @@ -27,7 +32,7 @@ Tables
- {#each $tables.list.filter(table => table.type !== "external") as table} + {#each internalTablesBySourceId as table}
+ import { datasources } from "stores/backend" + + datasources.select("datasource_internal_bb_default") + + + diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte new file mode 100644 index 0000000000..540ca20bc1 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte @@ -0,0 +1,87 @@ + + + + + + +
+ + +
+ + Sample Data +
+ A little something to get you up and running! + If you have no need for this datasource, feel free to delete it. + + + Tables +
+ + {#each internalTablesBySourceId as table} +
+ {table.name} + {#if table.primaryDisplay} + Display column: {table.primaryDisplay} + {/if} +
+ {/each} +
+
+ +
+ +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/data/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/index.svelte index 42ee02a308..b2aca1f7f3 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/index.svelte @@ -7,8 +7,8 @@ let modal $: setupComplete = - $datasources.list.find(x => (x._id = "bb_internal"))?.entities.length > 1 || - $datasources.list.length > 1 + $datasources.list.find(x => (x._id = "bb_internal"))?.entities?.length > + 1 || $datasources.list.length > 1 onMount(() => { if (!setupComplete && !$admin.isDev) { diff --git a/packages/cli/package.json b/packages/cli/package.json index f601980c56..45f269b1a3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.32-alpha.1", + "version": "2.1.32-alpha.3", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.1.32-alpha.1", - "@budibase/string-templates": "2.1.32-alpha.1", - "@budibase/types": "2.1.32-alpha.1", + "@budibase/backend-core": "2.1.32-alpha.3", + "@budibase/string-templates": "2.1.32-alpha.3", + "@budibase/types": "2.1.32-alpha.3", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 980bd4585e..8ded099d80 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -3932,10 +3932,10 @@ "required": true }, { - "type": "multifield", - "label": "Allowed filter fields", + "type": "columns/basic", + "label": "Allowed filter columns", "key": "allowedFields", - "placeholder": "All fields" + "dependsOn": "dataProvider" }, { "type": "select", diff --git a/packages/client/package.json b/packages/client/package.json index b1ef7e971c..14ecbbf5d8 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.32-alpha.1", + "version": "2.1.32-alpha.3", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.1.32-alpha.1", - "@budibase/frontend-core": "2.1.32-alpha.1", - "@budibase/string-templates": "2.1.32-alpha.1", + "@budibase/bbui": "2.1.32-alpha.3", + "@budibase/frontend-core": "2.1.32-alpha.3", + "@budibase/string-templates": "2.1.32-alpha.3", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte b/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte index 141ce2e955..df06979f48 100644 --- a/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte +++ b/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte @@ -61,7 +61,10 @@ clonedSchema = schema } else { allowedFields?.forEach(field => { - if (schema[field]) { + if (schema[field.name]) { + clonedSchema[field.name] = schema[field.name] + clonedSchema[field.name].displayName = field.displayName + } else if (schema[field]) { clonedSchema[field] = schema[field] } }) diff --git a/packages/client/src/components/app/dynamic-filter/FilterModal.svelte b/packages/client/src/components/app/dynamic-filter/FilterModal.svelte index b8815279dd..8d89d3a6ff 100644 --- a/packages/client/src/components/app/dynamic-filter/FilterModal.svelte +++ b/packages/client/src/components/app/dynamic-filter/FilterModal.svelte @@ -25,7 +25,10 @@ !BannedTypes.includes(field.type) || (field.type === "formula" && field.formulaType === "static") ) - .map(field => field.name) + .map(field => ({ + label: field.displayName || field.name, + value: field.name, + })) const addFilter = () => { filters = [ diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index a793607831..5fa508f8c1 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.32-alpha.1", + "version": "2.1.32-alpha.3", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.1.32-alpha.1", + "@budibase/bbui": "2.1.32-alpha.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 9174769d89..9c1efd78f3 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.32-alpha.1", + "version": "2.1.32-alpha.3", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index fb6c1af1f2..62b2395ad5 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.32-alpha.1", + "version": "2.1.32-alpha.3", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.1.32-alpha.1", - "@budibase/client": "2.1.32-alpha.1", - "@budibase/pro": "2.1.31", - "@budibase/string-templates": "2.1.32-alpha.1", - "@budibase/types": "2.1.32-alpha.1", + "@budibase/backend-core": "2.1.32-alpha.3", + "@budibase/client": "2.1.32-alpha.3", + "@budibase/pro": "2.1.32-alpha.3", + "@budibase/string-templates": "2.1.32-alpha.3", + "@budibase/types": "2.1.32-alpha.3", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index dcd092d06a..83d7bb0b8d 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -25,8 +25,14 @@ import { migrations, } from "@budibase/backend-core" import { USERS_TABLE_SCHEMA } from "../../constants" +import { buildDefaultDocs } from "../../db/defaultData/datasource_bb_default" + import { removeAppFromUserRoles } from "../../utilities/workerRequests" -import { clientLibraryPath, stringToReadStream } from "../../utilities" +import { + clientLibraryPath, + stringToReadStream, + isQsTrue, +} from "../../utilities" import { getLocksById } from "../../utilities/redis" import { updateClientLibrary, @@ -117,7 +123,7 @@ const checkAppName = ( } } -async function createInstance(template: any) { +async function createInstance(template: any, includeSampleData: boolean) { const tenantId = tenancy.isMultiTenant() ? tenancy.getTenantId() : null const baseAppId = generateAppID(tenantId) const appId = generateDevAppID(baseAppId) @@ -149,11 +155,23 @@ async function createInstance(template: any) { } else { // create the users table await db.put(USERS_TABLE_SCHEMA) + + if (includeSampleData) { + // create ootb stock db + await addDefaultTables(db) + } } return { _id: appId } } +const addDefaultTables = async (db: any) => { + const defaultDbDocs = buildDefaultDocs() + + // add in the default db data docs - tables, datasource, rows and links + await db.bulkDocs([...defaultDbDocs]) +} + export const fetch = async (ctx: any) => { const dev = ctx.query && ctx.query.status === AppStatus.DEV const all = ctx.query && ctx.query.status === AppStatus.ALL @@ -234,7 +252,8 @@ const performAppCreate = async (ctx: any) => { if (ctx.request.files && ctx.request.files.templateFile) { instanceConfig.file = ctx.request.files.templateFile } - const instance = await createInstance(instanceConfig) + const includeSampleData = isQsTrue(ctx.request.body.sampleData) + const instance = await createInstance(instanceConfig, includeSampleData) const appId = instance._id const db = context.getAppDB() diff --git a/packages/server/src/api/controllers/datasource.js b/packages/server/src/api/controllers/datasource.js index af52be8e26..80bd263d87 100644 --- a/packages/server/src/api/controllers/datasource.js +++ b/packages/server/src/api/controllers/datasource.js @@ -6,12 +6,14 @@ const { BudibaseInternalDB, getTableParams, } = require("../../db/utils") +const { destroy: tableDestroy } = require("./table/internal") const { BuildSchemaErrors, InvalidColumns } = require("../../constants") const { getIntegration } = require("../../integrations") const { getDatasourceAndQuery } = require("./row/utils") const { invalidateDynamicVariables } = require("../../threads/utils") const { getAppDB } = require("@budibase/backend-core/context") const { events } = require("@budibase/backend-core") +const { db: dbCore } = require("@budibase/backend-core") exports.fetch = async function (ctx) { // Get internal tables @@ -21,11 +23,16 @@ exports.fetch = async function (ctx) { include_docs: true, }) ) - const internal = internalTables.rows.map(row => row.doc) + + const internal = internalTables.rows.reduce((acc, row) => { + const sourceId = row.doc.sourceId || "bb_internal" + acc[sourceId] = acc[sourceId] || [] + acc[sourceId].push(row.doc) + return acc + }, {}) const bbInternalDb = { ...BudibaseInternalDB, - entities: internal, } // Get external datasources @@ -37,11 +44,17 @@ exports.fetch = async function (ctx) { ) ).rows.map(row => row.doc) - for (let datasource of datasources) { + const allDatasources = [bbInternalDb, ...datasources] + + for (let datasource of allDatasources) { if (datasource.config && datasource.config.auth) { // strip secrets from response so they don't show in the network request delete datasource.config.auth } + + if (datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE) { + datasource.entities = internal[datasource._id] + } } ctx.body = [bbInternalDb, ...datasources] @@ -196,20 +209,53 @@ exports.save = async function (ctx) { ctx.body = response } +const destroyInternalTablesBySourceId = async datasourceId => { + const db = getAppDB() + + // Get all internal tables + const internalTables = await db.allDocs( + getTableParams(null, { + include_docs: true, + }) + ) + + // Filter by datasource and return the docs. + const datasourceTableDocs = internalTables.rows.reduce((acc, table) => { + if (table.doc.sourceId == datasourceId) { + acc.push(table.doc) + } + return acc + }, []) + + // Destroy the tables. + for (const table of datasourceTableDocs) { + await tableDestroy({ + params: { + tableId: table._id, + }, + }) + } +} + exports.destroy = async function (ctx) { const db = getAppDB() const datasourceId = ctx.params.datasourceId const datasource = await db.get(datasourceId) // Delete all queries for the datasource - const queries = await db.allDocs(getQueryParams(datasourceId, null)) - await db.bulkDocs( - queries.rows.map(row => ({ - _id: row.id, - _rev: row.value.rev, - _deleted: true, - })) - ) + + if (datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE) { + await destroyInternalTablesBySourceId(datasourceId) + } else { + const queries = await db.allDocs(getQueryParams(datasourceId, null)) + await db.bulkDocs( + queries.rows.map(row => ({ + _id: row.id, + _rev: row.value.rev, + _deleted: true, + })) + ) + } // delete the datasource await db.remove(datasourceId, ctx.params.revId) diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts index 6d17d12f3d..f182e6777d 100644 --- a/packages/server/src/api/controllers/table/utils.ts +++ b/packages/server/src/api/controllers/table/utils.ts @@ -95,18 +95,7 @@ export function makeSureTableUpToDate(table: any, tableToSave: any) { return tableToSave } -export async function handleDataImport(user: any, table: any, dataImport: any) { - if (!dataImport || !dataImport.csvString) { - return table - } - - const db = getAppDB() - // Populate the table with rows imported from CSV in a bulk update - const data = await transform({ - ...dataImport, - existingTable: table, - }) - +export function importToRows(data: any, table: any, user: any = {}) { let finalData: any = [] for (let i = 0; i < data.length; i++) { let row = data[i] @@ -136,6 +125,22 @@ export async function handleDataImport(user: any, table: any, dataImport: any) { finalData.push(row) } + return finalData +} + +export async function handleDataImport(user: any, table: any, dataImport: any) { + if (!dataImport || !dataImport.csvString) { + return table + } + + const db = getAppDB() + // Populate the table with rows imported from CSV in a bulk update + const data = await transform({ + ...dataImport, + existingTable: table, + }) + + let finalData: any = importToRows(data, table, user) await quotas.addRows(finalData.length, () => db.bulkDocs(finalData), { tableId: table._id, diff --git a/packages/server/src/db/defaultData/datasource_bb_default.js b/packages/server/src/db/defaultData/datasource_bb_default.js new file mode 100644 index 0000000000..f12ee2c97d --- /dev/null +++ b/packages/server/src/db/defaultData/datasource_bb_default.js @@ -0,0 +1,646 @@ +const { + FieldTypes, + AutoFieldSubTypes, + RelationshipTypes, +} = require("../../constants/index") +const { importToRows } = require("../../api/controllers/table/utils") +const { cloneDeep } = require("lodash/fp") +const LinkDocument = require("../linkedRows/LinkDocument") +const { inventoryImport } = require("./inventoryImport") +const { employeeImport } = require("./employeeImport") +const { jobsImport } = require("./jobsImport") +const { expensesImport } = require("./expensesImport") +const { db: dbCore } = require("@budibase/backend-core") + +exports.DEFAULT_JOBS_TABLE_ID = "ta_bb_jobs" +exports.DEFAULT_INVENTORY_TABLE_ID = "ta_bb_inventory" +exports.DEFAULT_EXPENSES_TABLE_ID = "ta_bb_expenses" +exports.DEFAULT_EMPLOYEE_TABLE_ID = "ta_bb_employee" +exports.DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default" +exports.DEFAULT_BB_DATASOURCE = { + _id: this.DEFAULT_BB_DATASOURCE_ID, + type: dbCore.BUDIBASE_DATASOURCE_TYPE, + name: "Sample Data", + source: "BUDIBASE", + config: {}, +} + +const syncLastIds = (table, rowCount) => { + Object.keys(table.schema).forEach(key => { + const entry = table.schema[key] + if (entry.autocolumn && entry.subtype == "autoID") { + entry.lastID = rowCount + } + }) +} + +const tableImport = (table, data) => { + const cloneTable = cloneDeep(table) + const rowDocs = importToRows(data, cloneTable) + syncLastIds(cloneTable, rowDocs.length) + return { rows: rowDocs, table: cloneTable } +} + +// AUTO COLUMNS +const AUTO_COLUMNS = { + "Created At": { + name: "Created At", + type: FieldTypes.DATETIME, + subtype: AutoFieldSubTypes.CREATED_AT, + icon: "ri-magic-line", + autocolumn: true, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + datetime: { + latest: "", + earliest: "", + }, + }, + }, + "Updated At": { + name: "Updated At", + type: FieldTypes.DATETIME, + subtype: AutoFieldSubTypes.UPDATED_AT, + icon: "ri-magic-line", + autocolumn: true, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + datetime: { + latest: "", + earliest: "", + }, + }, + }, +} + +exports.DEFAULT_INVENTORY_TABLE_SCHEMA = { + _id: this.DEFAULT_INVENTORY_TABLE_ID, + type: "internal", + views: {}, + sourceId: exports.DEFAULT_BB_DATASOURCE_ID, + primaryDisplay: "Item Name", + name: "Inventory", + schema: { + "Item ID": { + name: "Item ID", + type: FieldTypes.NUMBER, + subtype: AutoFieldSubTypes.AUTO_ID, + icon: "ri-magic-line", + autocolumn: true, + constraints: { + type: FieldTypes.NUMBER, + presence: false, + numericality: { + greaterThanOrEqualTo: "", + lessThanOrEqualTo: "", + }, + }, + }, + "Item Name": { + type: FieldTypes.STRING, + constraints: { + type: FieldTypes.STRING, + length: { + maximum: null, + }, + presence: { + allowEmpty: false, + }, + }, + name: "Item Name", + }, + "Item Tags": { + type: FieldTypes.ARRAY, + constraints: { + type: FieldTypes.ARRAY, + presence: { + allowEmpty: false, + }, + inclusion: ["Electrical", "Material", "Vehicle", "Office", "Tools"], + }, + name: "Item Tags", + sortable: false, + }, + Notes: { + type: FieldTypes.LONGFORM, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + }, + name: "Notes", + useRichText: null, + }, + Status: { + type: FieldTypes.ARRAY, + constraints: { + type: FieldTypes.ARRAY, + presence: { + allowEmpty: false, + }, + inclusion: ["Available", "Repair", "Broken"], + }, + name: "Status", + sortable: false, + }, + SKU: { + type: FieldTypes.BARCODEQR, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + }, + name: "SKU", + }, + "Purchase Date": { + type: FieldTypes.DATETIME, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + datetime: { + latest: "", + earliest: "", + }, + }, + name: "Purchase Date", + ignoreTimezones: true, + }, + "Purchase Price": { + type: FieldTypes.NUMBER, + constraints: { + type: FieldTypes.NUMBER, + presence: false, + numericality: { + greaterThanOrEqualTo: null, + lessThanOrEqualTo: "", + }, + }, + name: "Purchase Price", + }, + ...AUTO_COLUMNS, + }, +} + +exports.DEFAULT_EMPLOYEE_TABLE_SCHEMA = { + _id: this.DEFAULT_EMPLOYEE_TABLE_ID, + type: "internal", + views: {}, + name: "Employees", + sourceId: exports.DEFAULT_BB_DATASOURCE_ID, + primaryDisplay: "First Name", + schema: { + "First Name": { + name: "First Name", + type: FieldTypes.STRING, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + }, + }, + "Last Name": { + name: "Last Name", + type: FieldTypes.STRING, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + }, + }, + Email: { + name: "Email", + type: FieldTypes.STRING, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + }, + }, + Address: { + name: "Address", + type: FieldTypes.STRING, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + }, + }, + City: { + name: "City", + type: FieldTypes.STRING, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + }, + }, + Postcode: { + name: "Postcode", + type: FieldTypes.STRING, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + }, + }, + Phone: { + name: "Phone", + type: FieldTypes.STRING, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + }, + }, + "EMPLOYEE ID": { + name: "EMPLOYEE ID", + type: FieldTypes.NUMBER, + subtype: AutoFieldSubTypes.AUTO_ID, + icon: "ri-magic-line", + autocolumn: true, + constraints: { + type: FieldTypes.NUMBER, + presence: false, + numericality: { + greaterThanOrEqualTo: "", + lessThanOrEqualTo: "", + }, + }, + }, + "Employee Level": { + type: FieldTypes.ARRAY, + constraints: { + type: FieldTypes.ARRAY, + presence: false, + inclusion: ["Manager", "Junior", "Senior", "Apprentice", "Contractor"], + }, + name: "Employee Level", + sortable: false, + }, + "Badge Photo": { + type: "attachment", + constraints: { + type: FieldTypes.ARRAY, + presence: false, + }, + name: "Badge Photo", + sortable: false, + }, + Jobs: { + type: FieldTypes.LINK, + constraints: { + type: FieldTypes.ARRAY, + presence: false, + }, + fieldName: "Assigned", + name: "Jobs", + relationshipType: RelationshipTypes.MANY_TO_MANY, + tableId: this.DEFAULT_JOBS_TABLE_ID, + }, + "Start Date": { + type: FieldTypes.DATETIME, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + datetime: { + latest: "", + earliest: "", + }, + }, + name: "Start Date", + ignoreTimezones: true, + }, + "End Date": { + type: FieldTypes.DATETIME, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + datetime: { + latest: "", + earliest: "", + }, + }, + name: "End Date", + ignoreTimezones: true, + }, + ...AUTO_COLUMNS, + }, +} + +exports.DEFAULT_JOBS_TABLE_SCHEMA = { + _id: this.DEFAULT_JOBS_TABLE_ID, + type: "internal", + name: "Jobs", + sourceId: exports.DEFAULT_BB_DATASOURCE_ID, + primaryDisplay: "Job ID", + schema: { + "Job ID": { + name: "Job ID", + type: FieldTypes.NUMBER, + subtype: AutoFieldSubTypes.AUTO_ID, + icon: "ri-magic-line", + autocolumn: true, + constraints: { + type: FieldTypes.NUMBER, + presence: false, + numericality: { + greaterThanOrEqualTo: "", + lessThanOrEqualTo: "", + }, + }, + }, + "Quote Date": { + type: FieldTypes.DATETIME, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: { + allowEmpty: false, + }, + datetime: { + latest: "", + earliest: "", + }, + }, + name: "Quote Date", + ignoreTimezones: true, + }, + "Quote Price": { + type: FieldTypes.NUMBER, + constraints: { + type: FieldTypes.NUMBER, + presence: { + allowEmpty: false, + }, + numericality: { + greaterThanOrEqualTo: "", + lessThanOrEqualTo: "", + }, + }, + name: "Quote Price", + }, + "Works Start": { + type: FieldTypes.DATETIME, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + datetime: { + latest: "", + earliest: "", + }, + }, + name: "Works Start", + ignoreTimezones: true, + }, + Address: { + type: FieldTypes.LONGFORM, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + }, + name: "Address", + useRichText: null, + }, + "Customer Name": { + type: FieldTypes.STRING, + constraints: { + type: FieldTypes.STRING, + length: { + maximum: null, + }, + presence: false, + }, + name: "Customer Name", + }, + Notes: { + type: FieldTypes.LONGFORM, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + }, + name: "Notes", + useRichText: null, + }, + "Customer Phone": { + type: FieldTypes.STRING, + constraints: { + type: FieldTypes.STRING, + length: { + maximum: null, + }, + presence: false, + }, + name: "Customer Phone", + }, + "Customer Email": { + type: FieldTypes.STRING, + constraints: { + type: FieldTypes.STRING, + length: { + maximum: null, + }, + presence: false, + }, + name: "Customer Email", + }, + Assigned: { + name: "Assigned", + type: FieldTypes.LINK, + tableId: this.DEFAULT_EMPLOYEE_TABLE_ID, + fieldName: "Jobs", + relationshipType: RelationshipTypes.MANY_TO_MANY, + // sortable: true, + }, + "Works End": { + type: "datetime", + constraints: { + type: "string", + length: {}, + presence: false, + datetime: { + latest: "", + earliest: "", + }, + }, + name: "Works End", + ignoreTimezones: true, + }, + "Updated Price": { + type: "number", + constraints: { + type: "number", + presence: false, + numericality: { + greaterThanOrEqualTo: "", + lessThanOrEqualTo: "", + }, + }, + name: "Updated Price", + }, + ...AUTO_COLUMNS, + }, +} + +exports.DEFAULT_EXPENSES_TABLE_SCHEMA = { + _id: this.DEFAULT_EXPENSES_TABLE_ID, + type: "internal", + views: {}, + name: "Expenses", + sourceId: exports.DEFAULT_BB_DATASOURCE_ID, + primaryDisplay: "Expense ID", + schema: { + "Expense ID": { + name: "Expense ID", + type: FieldTypes.NUMBER, + subtype: AutoFieldSubTypes.AUTO_ID, + icon: "ri-magic-line", + autocolumn: true, + constraints: { + type: FieldTypes.NUMBER, + presence: false, + numericality: { + greaterThanOrEqualTo: "", + lessThanOrEqualTo: "", + }, + }, + }, + "Expense Tags": { + type: FieldTypes.ARRAY, + constraints: { + type: FieldTypes.ARRAY, + presence: { + allowEmpty: false, + }, + inclusion: [ + "Fuel", + "Food", + "Materials", + "Repair", + "Equipment", + "Fees", + "Service", + "Office", + "Other", + ], + }, + name: "Expense Tags", + sortable: false, + }, + Cost: { + type: FieldTypes.NUMBER, + constraints: { + type: FieldTypes.NUMBER, + presence: { + allowEmpty: false, + }, + numericality: { + greaterThanOrEqualTo: "", + lessThanOrEqualTo: "", + }, + }, + name: "Cost", + }, + Notes: { + type: FieldTypes.LONGFORM, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + }, + name: "Notes", + useRichText: null, + }, + "Payment Due": { + type: FieldTypes.DATETIME, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + datetime: { + latest: "", + earliest: "", + }, + }, + name: "Payment Due", + ignoreTimezones: true, + }, + "Date Paid": { + type: FieldTypes.DATETIME, + constraints: { + type: FieldTypes.STRING, + length: {}, + presence: false, + datetime: { + latest: "", + earliest: "", + }, + }, + name: "Date Paid", + ignoreTimezones: true, + }, + Attachment: { + type: FieldTypes.ATTACHMENT, + constraints: { + type: FieldTypes.ARRAY, + presence: false, + }, + name: "Attachment", + sortable: false, + }, + ...AUTO_COLUMNS, + }, +} + +exports.buildDefaultDocs = () => { + const inventoryData = tableImport( + this.DEFAULT_INVENTORY_TABLE_SCHEMA, + inventoryImport + ) + + const employeeData = tableImport( + this.DEFAULT_EMPLOYEE_TABLE_SCHEMA, + employeeImport + ) + + const jobData = tableImport(this.DEFAULT_JOBS_TABLE_SCHEMA, jobsImport) + + const expensesData = tableImport( + this.DEFAULT_EXPENSES_TABLE_SCHEMA, + expensesImport + ) + + // Build one link doc for each employee/job + const jobEmployeeLinks = employeeData.rows.map((employee, index) => { + return new LinkDocument( + employeeData.table._id, + "Jobs", + employeeData.rows[index]._id, + jobData.table._id, + "Assigned", + jobData.rows[index]._id + ) + }) + + return [ + this.DEFAULT_BB_DATASOURCE, + inventoryData.table, + employeeData.table, + jobData.table, + expensesData.table, + ...inventoryData.rows, + ...employeeData.rows, + ...jobData.rows, + ...expensesData.rows, + ...jobEmployeeLinks, + ] +} diff --git a/packages/server/src/db/defaultData/employeeImport.js b/packages/server/src/db/defaultData/employeeImport.js new file mode 100644 index 0000000000..eae43e182a --- /dev/null +++ b/packages/server/src/db/defaultData/employeeImport.js @@ -0,0 +1,152 @@ +exports.employeeImport = [ + { + "First Name": "Julie", + "Last Name": "Jimenez", + Email: "julie.jimenez@example.com", + Address: "4250 New Street", + City: "Stevenage", + Postcode: "EE32 3SE", + Phone: "01754 13523", + "Created At": "2022-11-10T17:56:18.353Z", + "Updated At": "2022-11-10T18:32:15.298Z", + tableId: "ta_bb_employees", + type: "row", + "Employee Level": ["Senior"], + "Start Date": "2015-02-12T12:00:00.000", + }, + { + "First Name": "Mandy", + "Last Name": "Clark", + Email: "mandy.clark@example.com", + Address: "8632 North Street", + City: "Hereford", + Postcode: "GT81 7DG", + Phone: "016973 32814", + "Created At": "2022-11-10T17:56:18.353Z", + "Updated At": "2022-11-10T18:31:44.928Z", + tableId: "ta_bb_employees", + type: "row", + "Employee Level": ["Senior"], + "Start Date": "2017-09-10T12:00:00.000", + }, + { + "First Name": "Holly", + "Last Name": "Carroll", + Email: "holly.carroll@example.com", + Address: "5976 Springfield Road", + City: "Edinburgh", + Postcode: "Y4 2LH", + Phone: "016977 73053", + "Created At": "2022-11-10T17:56:18.356Z", + "Updated At": "2022-11-10T18:31:32.086Z", + tableId: "ta_bb_employees", + type: "row", + "Employee Level": ["Senior"], + "Start Date": "2022-02-12T12:00:00.000", + }, + { + "First Name": "Francis", + "Last Name": "Castro", + Email: "francis.castro@example.com", + Address: "3970 High Street", + City: "Wells", + Postcode: "X12 6QA", + Phone: "017684 23551", + "Created At": "2022-11-10T17:56:18.357Z", + "Updated At": "2022-11-10T18:31:16.976Z", + tableId: "ta_bb_employees", + type: "row", + "Employee Level": ["Apprentice"], + "Start Date": "2021-03-10T12:00:00.000", + }, + { + "First Name": "Richard", + "Last Name": "Kelley", + Email: "richard.kelley@example.com", + Address: "2346 York Road", + City: "Leicester", + Postcode: "H7S 1AH", + Phone: "013873 65167", + "Created At": "2022-11-10T17:56:18.353Z", + "Updated At": "2022-11-10T18:32:23.314Z", + tableId: "ta_bb_employees", + type: "row", + "Employee Level": ["Apprentice"], + "Start Date": "2020-07-09T12:00:00.000", + }, + { + "First Name": "Donald", + "Last Name": "Lynch", + Email: "donald.lynch@example.com", + Address: "9642 New Road", + City: "St Albans", + Postcode: "V9A 1NP", + Phone: "015242 46760", + "Created At": "2022-11-10T17:56:18.352Z", + "Updated At": "2022-11-10T18:30:38.439Z", + tableId: "ta_bb_employees", + type: "row", + "Employee Level": ["Junior"], + "Start Date": "2018-04-13T12:00:00.000", + }, + { + "First Name": "Maria", + "Last Name": "Torres", + Email: "maria.torres@example.com", + Address: "9998 New Road", + City: "Aberdeen", + Postcode: "LP7 8JQ", + Phone: "0101 472 3365", + "Created At": "2022-11-10T17:56:18.353Z", + "Updated At": "2022-11-10T18:31:37.748Z", + tableId: "ta_bb_employees", + type: "row", + "Employee Level": ["Manager"], + "Start Date": "2016-05-22T12:00:00.000", + }, + { + "First Name": "Suzy", + "Last Name": "Ruiz", + Email: "suzy.ruiz@example.com", + Address: "4641 Victoria Street", + City: "Armagh", + Postcode: "MO4X 8BP", + Phone: "015242 79977", + "Created At": "2022-11-10T17:56:18.354Z", + "Updated At": "2022-11-10T18:58:54.632Z", + tableId: "ta_bb_employees", + type: "row", + "Employee Level": ["Senior", "Manager"], + "Start Date": "2019-05-01T12:00:00.000", + }, + { + "First Name": "Patrick", + "Last Name": "Garcia", + Email: "patrick.garcia@example.com", + Address: "7818 The Crescent", + City: "Bath", + Postcode: "OH5 3HE", + Phone: "017683 02608", + "Created At": "2022-11-10T17:56:18.353Z", + "Updated At": "2022-11-10T18:31:06.820Z", + tableId: "ta_bb_employees", + type: "row", + "Employee Level": ["Apprentice"], + "Start Date": "2014-08-30T12:00:00.000", + }, + { + "First Name": "Brayden", + "Last Name": "Carpenter", + Email: "brayden.carpenter@example.com", + Address: "8755 The Drive", + City: "Bradford", + Postcode: "YH5 8RY", + Phone: "015395 12426", + "Created At": "2022-11-10T17:56:18.354Z", + "Updated At": "2022-11-10T20:41:26.977Z", + tableId: "ta_bb_employees", + type: "row", + "Employee Level": ["Contractor"], + "Start Date": "2022-11-09T12:00:00.000", + }, +] diff --git a/packages/server/src/db/defaultData/expensesImport.js b/packages/server/src/db/defaultData/expensesImport.js new file mode 100644 index 0000000000..2afa147321 --- /dev/null +++ b/packages/server/src/db/defaultData/expensesImport.js @@ -0,0 +1,114 @@ +exports.expensesImport = [ + { + "Date Paid": "2022-11-12T12:00:00.000", + "Payment Due": "2022-11-01T12:00:00.000", + Cost: 117.4, + Notes: "Two vans needed a top up", + Attachment: [], + tableId: "ta_bb_expenses", + "Created At": "2022-11-10T19:07:14.714Z", + "Updated At": "2022-11-10T20:02:14.440Z", + type: "row", + "Expense Tags": ["Fuel", "Equipment"], + }, + { + "Date Paid": "2022-11-11T12:00:00.000", + Cost: 217, + Notes: "3 branded work bags and safety equipment for the new hires", + Attachment: [], + tableId: "ta_bb_expenses", + "Created At": "2022-11-10T19:10:35.459Z", + "Updated At": "2022-11-10T19:10:35.459Z", + type: "row", + "Expense Tags": ["Materials"], + }, + { + "Date Paid": "2022-11-25T12:00:00.000", + Cost: 420.68, + Notes: "Monthly games night", + Attachment: [], + tableId: "ta_bb_expenses", + "Created At": "2022-11-10T19:20:08.264Z", + "Updated At": "2022-11-10T19:27:14.141Z", + type: "row", + "Expense Tags": ["Food"], + }, + { + "Date Paid": "2022-11-24T12:00:00.000", + "Payment Due": "2022-11-24T12:00:00.000", + Cost: 45, + Notes: "Work van", + Attachment: [], + tableId: "ta_bb_expenses", + "Created At": "2022-11-10T18:20:16.709Z", + "Updated At": "2022-11-10T20:02:05.293Z", + type: "row", + "Expense Tags": ["Fuel", "Equipment"], + }, + { + "Payment Due": "2022-11-25T12:00:00.000", + Cost: 200, + Notes: "Accountant payroll management", + Attachment: [], + tableId: "ta_bb_expenses", + "Created At": "2022-11-10T19:06:16.014Z", + "Updated At": "2022-11-10T19:06:16.014Z", + type: "row", + "Expense Tags": ["Fees", "Service"], + }, + { + "Payment Due": "2022-11-26T12:00:00.000", + Cost: 28, + Notes: "Circular saw needed a new plug", + Attachment: [], + tableId: "ta_bb_expenses", + "Created At": "2022-11-10T20:03:18.051Z", + "Updated At": "2022-11-10T20:03:18.051Z", + type: "row", + "Expense Tags": ["Equipment", "Repair"], + }, + { + "Payment Due": "2022-11-11T12:00:00.000", + Cost: 131.75, + Notes: "Solicitor contract reviews for employees", + Attachment: [], + tableId: "ta_bb_expenses", + "Created At": "2022-11-10T18:56:16.111Z", + "Updated At": "2022-11-10T19:20:58.681Z", + type: "row", + "Expense Tags": ["Fees", "Service"], + }, + { + Cost: 2500, + Notes: "New Laptop for the office. ", + Attachment: [], + tableId: "ta_bb_expenses", + "Created At": "2022-11-10T18:04:11.401Z", + "Updated At": "2022-11-10T20:08:16.459Z", + type: "row", + "Date Paid": "2022-11-09T12:00:00.000", + "Expense Tags": ["Equipment"], + }, + { + "Date Paid": "2022-10-25T12:00:00.000", + Cost: 275, + Notes: "Accountant payroll. Added new hire", + Attachment: [], + tableId: "ta_bb_expenses", + "Created At": "2022-11-10T20:01:31.783Z", + "Updated At": "2022-11-10T20:01:31.783Z", + type: "row", + "Expense Tags": ["Fees", "Service"], + }, + { + "Payment Due": "2022-11-19T12:00:00.000", + Cost: 250, + Notes: "200 new branded pens and 40 beanie hats. ", + Attachment: [], + tableId: "ta_bb_expenses", + "Created At": "2022-11-10T19:09:08.074Z", + "Updated At": "2022-11-10T19:09:08.074Z", + type: "row", + "Expense Tags": ["Service"], + }, +] diff --git a/packages/server/src/db/defaultData/inventoryImport.js b/packages/server/src/db/defaultData/inventoryImport.js new file mode 100644 index 0000000000..3d4cf98ee4 --- /dev/null +++ b/packages/server/src/db/defaultData/inventoryImport.js @@ -0,0 +1,106 @@ +exports.inventoryImport = [ + { + Status: ["Available"], + "Item Name": "Little Blue Van", + SKU: "", + Notes: "MAX PAYLOAD 595 kg \nMAX LOAD LENGTH 1620 mm", + tableId: "ta_bb_inventory", + "Created At": "2022-11-10T19:11:40.141Z", + "Updated At": "2022-11-10T20:05:04.608Z", + type: "row", + "Purchase Date": "2022-10-10T12:00:00.000", + "Purchase Price": 39995, + "Item Tags": ["Vehicle"], + }, + { + Status: ["Available"], + "Item Name": "Masonry Drill", + SKU: "ABC-123", + Notes: "Making a burning smell", + tableId: "ta_bb_inventory", + "Created At": "2022-11-10T18:46:10.820Z", + "Updated At": "2022-11-10T20:11:23.766Z", + type: "row", + "Purchase Date": "1992-11-19T12:00:00.000", + "Item Tags": ["Electrical", "Tools"], + "Purchase Price": 250, + }, + { + Status: ["Repair"], + "Item Name": "Circular saw", + SKU: "AB2-100", + Notes: "", + tableId: "ta_bb_inventory", + "Created At": "2022-11-10T19:04:38.805Z", + "Updated At": "2022-11-10T20:20:24.000Z", + type: "row", + "Purchase Date": "2012-11-15T12:00:00.000", + "Item Tags": ["Electrical"], + "Purchase Price": 300, + }, + { + "Item Tags": ["Electrical"], + "Purchase Price": 210, + "Purchase Date": "2022-10-17T12:00:00.000", + Status: ["Available"], + "Item Name": "Tablet Device (5g)", + SKU: "PH-001", + Notes: "Android tablet for use on site", + tableId: "ta_bb_inventory", + "Created At": "2022-11-10T20:21:56.332Z", + "Updated At": "2022-11-10T20:21:56.332Z", + type: "row", + }, + { + "Item Tags": ["Tools", "Electrical"], + "Purchase Price": 200, + "Purchase Date": "2022-10-12T12:00:00.000", + Status: ["Available"], + "Item Name": "Power Screwdriver", + SKU: "TKIT-002-A", + Notes: "", + tableId: "ta_bb_inventory", + "Created At": "2022-11-10T20:10:51.129Z", + "Updated At": "2022-11-10T20:13:37.821Z", + type: "row", + }, + { + Status: ["Available"], + "Item Name": "Large Blue Van", + SKU: "", + Notes: "MAX LOAD LENGTH 4256 mm", + tableId: "ta_bb_inventory", + "Created At": "2022-11-10T19:03:41.698Z", + "Updated At": "2022-11-10T20:04:57.932Z", + type: "row", + "Purchase Date": "2022-10-10T12:00:00.000", + "Purchase Price": 65995, + "Item Tags": ["Vehicle"], + }, + { + "Purchase Price": 2500, + "Purchase Date": "2022-11-09T12:00:00.000", + Status: ["Available"], + "Item Name": "Office Laptop", + SKU: "PC-123-ABC", + Notes: "Office Laptop \n", + tableId: "ta_bb_inventory", + "Created At": "2022-11-10T20:06:14.463Z", + "Updated At": "2022-11-10T20:07:02.532Z", + type: "row", + "Item Tags": ["Electrical", "Office"], + }, + { + Status: ["Available"], + "Item Name": "Little Red Van", + SKU: "", + Notes: "MAX PAYLOAD 595 kg \nMAX LOAD LENGTH 1620 mm", + tableId: "ta_bb_inventory", + "Created At": "2022-11-10T19:55:02.367Z", + "Updated At": "2022-11-10T20:05:13.504Z", + type: "row", + "Purchase Date": "2022-07-17T12:00:00.000", + "Purchase Price": 39995, + "Item Tags": ["Vehicle"], + }, +] diff --git a/packages/server/src/db/defaultData/jobsImport.js b/packages/server/src/db/defaultData/jobsImport.js new file mode 100644 index 0000000000..537cc2a006 --- /dev/null +++ b/packages/server/src/db/defaultData/jobsImport.js @@ -0,0 +1,158 @@ +exports.jobsImport = [ + { + "Works End": "2023-01-28T12:00:00.000", + "Customer Email": "susie.peterson@example.com", + "Customer Phone": "016973 88386", + Notes: + "Bring the large van as recycling has been requested. \nAlso, they have a large dog.", + "Customer Name": "Susie Peterson", + Address: "5452 The Crescent\nBrighton and Hove\nAI7G 7BN", + "Works Start": "2023-01-26T12:00:00.000", + "Quote Price": 4200, + "Quote Date": "2022-11-11T12:00:00.000", + tableId: "ta_bb_jobs", + "Created At": "2022-11-10T18:00:29.510Z", + "Updated At": "2022-11-10T20:37:45.120Z", + type: "row", + }, + { + "Updated Price": 307, + "Works End": "2022-11-19T12:00:00.000", + "Customer Email": "micheal.murphy@example.co", + "Customer Phone": "07344 867816", + Notes: + "Adding new utils and tearing down the dividing walls. Bring large blue van.\n\nThe customer can be difficult. Avoid", + "Customer Name": "Micheal Murphy", + Address: "5266 York Road\nOxford\nG2 8EP", + "Works Start": "2022-11-10T12:00:00.000", + "Quote Price": 1231, + "Quote Date": "2022-10-04T12:00:00.000", + tableId: "ta_bb_jobs", + "Created At": "2022-11-10T20:53:39.882Z", + "Updated At": "2022-11-10T20:59:49.435Z", + type: "row", + }, + { + "Customer Email": "", + "Customer Phone": "07374 594595", + Notes: + "Removal and recycle requested of all units.\n\nStill awaiting feedback. If this is still around after next wednesday, just delete it.", + "Customer Name": "Charlotte Carpenter", + Address: "7780 Mill Lane\nGreater Manchester\nDU57 3GA", + "Quote Price": 500, + "Quote Date": "2022-11-08T12:00:00.000", + tableId: "ta_bb_jobs", + "Created At": "2022-11-10T21:03:11.782Z", + "Updated At": "2022-11-10T21:03:11.782Z", + type: "row", + }, + { + "Updated Price": 2001, + "Works End": "2022-11-16T12:00:00.000", + "Customer Email": "leah.freeman@example.com", + "Customer Phone": "07844 42134", + Notes: + "Original quote too high. Material costs dropped.\nFull system installation.", + "Customer Name": "Leah Freeman", + Address: "4252 Fairview Road\nChester\nW62 7JH", + "Works Start": "2022-11-09T12:00:00.000", + "Quote Price": 3000, + "Quote Date": "2022-10-04T12:00:00.000", + tableId: "ta_bb_jobs", + "Created At": "2022-11-10T20:25:44.284Z", + "Updated At": "2022-11-10T20:54:21.655Z", + type: "row", + }, + { + "Works End": "2022-11-13T12:00:00.000", + "Customer Email": "scarlett.gibson@example.co", + "Customer Phone": "07572 745859", + Notes: + "This address has a service dog.\n\nQuote didn't account for a sinkhole at the property. Amended", + "Customer Name": "Scarlett Gibson", + Address: "5624 The Drive\nArmagh\nNU0 5DW", + "Works Start": "2022-11-12T12:00:00.000", + "Quote Price": 120, + "Quote Date": "2022-11-11T12:00:00.000", + tableId: "ta_bb_jobs", + "Created At": "2022-11-10T19:50:55.215Z", + "Updated At": "2022-11-10T20:44:12.004Z", + type: "row", + "Updated Price": 175, + }, + { + "Customer Email": "lester.rose@example.com", + "Customer Phone": "07103 009138", + Notes: "4 Radiators Removed\nMany cats in the house", + "Customer Name": "Lester Rose", + Address: "8543 Albert Road\nNewport\nLancashire\nUnited Kingdom\nS58 5YW", + "Quote Price": 3543, + "Quote Date": "2022-11-10T12:00:00.000", + tableId: "ta_bb_jobs", + "Created At": "2022-11-10T18:43:21.110Z", + "Updated At": "2022-11-10T20:40:48.241Z", + type: "row", + }, + { + "Works End": "2022-11-24T12:00:00.000", + "Customer Email": "joel.owens@example.com", + "Customer Phone": "07216 548317", + Notes: + "Full retrofit of current installation. Will need big blue van. \n\nThere's a decent coffee place nearby. Ensure you buy enough for everyone.", + "Customer Name": "Joel Owens", + Address: "5516 Oaks Cross\nNewry\nT6V 9SL", + "Works Start": "2022-11-24T12:00:00.000", + "Quote Price": 789, + "Quote Date": "2022-11-10T12:00:00.000", + tableId: "ta_bb_jobs", + "Created At": "2022-11-10T21:07:28.365Z", + "Updated At": "2022-11-10T21:08:18.661Z", + type: "row", + }, + { + "Customer Email": "freddie.franklin@example.com", + "Customer Phone": "016977 48298", + Notes: + "Equipment updates and some general maintenance.\n\nHouse has 3 walls.", + "Customer Name": "Freddie Franklin", + Address: "2035 Brick Kiln Road\nCoventry\nTS81 7AW", + "Quote Price": 302, + "Quote Date": "2022-11-10T12:00:00.000", + tableId: "ta_bb_jobs", + "Created At": "2022-11-10T18:33:57.850Z", + "Updated At": "2022-11-10T20:57:54.015Z", + type: "row", + }, + { + "Works End": "2022-11-12T12:00:00.000", + "Customer Email": "diane.henry@example.com", + "Customer Phone": "07635 514491", + Notes: "Large van required, recycling requested. \nNew customer", + "Customer Name": "Diane Henry", + Address: + "3518 Station Road\nSunderland\nCounty Down\nUnited Kingdom\nXC67 8ES", + "Works Start": "2022-11-11T12:00:00.000", + "Quote Price": 2039, + "Quote Date": "2022-11-10T12:00:00.000", + tableId: "ta_bb_jobs", + "Created At": "2022-11-10T19:23:08.036Z", + "Updated At": "2022-11-10T20:45:40.523Z", + type: "row", + }, + { + "Works End": "2022-09-23T12:00:00.000", + "Customer Email": "warren.alvarez@example.com", + "Customer Phone": "07768 90794", + Notes: + "System restoration and upgrades. \nCustomer is a smoker, bring cleaning equipment", + "Customer Name": "Warren Alvarez", + Address: "867 High Street\nBath\nKF8 6ZS", + "Works Start": "2022-09-23T12:00:00.000", + "Quote Price": 1412, + "Quote Date": "2022-09-20T12:00:00.000", + tableId: "ta_bb_jobs", + "Created At": "2022-11-10T20:57:00.124Z", + "Updated At": "2022-11-10T21:08:00.446Z", + type: "row", + }, +] diff --git a/packages/server/src/db/linkedRows/LinkController.js b/packages/server/src/db/linkedRows/LinkController.js index 32782df162..e7c338f709 100644 --- a/packages/server/src/db/linkedRows/LinkController.js +++ b/packages/server/src/db/linkedRows/LinkController.js @@ -1,55 +1,9 @@ const { IncludeDocs, getLinkDocuments } = require("./linkUtils") -const { - generateLinkID, - InternalTables, - getUserMetadataParams, -} = require("../utils") +const { InternalTables, getUserMetadataParams } = require("../utils") const Sentry = require("@sentry/node") const { FieldTypes, RelationshipTypes } = require("../../constants") const { getAppDB } = require("@budibase/backend-core/context") - -/** - * Creates a new link document structure which can be put to the database. It is important to - * note that while this talks about linker/linked the link is bi-directional and for all intent - * and purposes it does not matter from which direction the link was initiated. - * @param {string} tableId1 The ID of the first table (the linker). - * @param {string} tableId2 The ID of the second table (the linked). - * @param {string} fieldName1 The name of the field in the linker table. - * @param {string} fieldName2 The name of the field in the linked table. - * @param {string} rowId1 The ID of the row which is acting as the linker. - * @param {string} rowId2 The ID of the row which is acting as the linked. - * @constructor - */ -function LinkDocument( - tableId1, - fieldName1, - rowId1, - tableId2, - fieldName2, - rowId2 -) { - // build the ID out of unique references to this link document - this._id = generateLinkID( - tableId1, - tableId2, - rowId1, - rowId2, - fieldName1, - fieldName2 - ) - // required for referencing in view - this.type = FieldTypes.LINK - this.doc1 = { - tableId: tableId1, - fieldName: fieldName1, - rowId: rowId1, - } - this.doc2 = { - tableId: tableId2, - fieldName: fieldName2, - rowId: rowId2, - } -} +const LinkDocument = require("./LinkDocument") class LinkController { constructor({ tableId, row, table, oldTable }) { diff --git a/packages/server/src/db/linkedRows/LinkDocument.js b/packages/server/src/db/linkedRows/LinkDocument.js new file mode 100644 index 0000000000..58aa630adc --- /dev/null +++ b/packages/server/src/db/linkedRows/LinkDocument.js @@ -0,0 +1,47 @@ +const { generateLinkID } = require("../utils") +const { FieldTypes } = require("../../constants") + +/** + * Creates a new link document structure which can be put to the database. It is important to + * note that while this talks about linker/linked the link is bi-directional and for all intent + * and purposes it does not matter from which direction the link was initiated. + * @param {string} tableId1 The ID of the first table (the linker). + * @param {string} tableId2 The ID of the second table (the linked). + * @param {string} fieldName1 The name of the field in the linker table. + * @param {string} fieldName2 The name of the field in the linked table. + * @param {string} rowId1 The ID of the row which is acting as the linker. + * @param {string} rowId2 The ID of the row which is acting as the linked. + * @constructor + */ +function LinkDocument( + tableId1, + fieldName1, + rowId1, + tableId2, + fieldName2, + rowId2 +) { + // build the ID out of unique references to this link document + this._id = generateLinkID( + tableId1, + tableId2, + rowId1, + rowId2, + fieldName1, + fieldName2 + ) + // required for referencing in view + this.type = FieldTypes.LINK + this.doc1 = { + tableId: tableId1, + fieldName: fieldName1, + rowId: rowId1, + } + this.doc2 = { + tableId: tableId2, + fieldName: fieldName2, + rowId: rowId2, + } +} + +module.exports = LinkDocument diff --git a/packages/server/src/db/utils.ts b/packages/server/src/db/utils.ts index 58ea76c5ae..13bf6eb3b5 100644 --- a/packages/server/src/db/utils.ts +++ b/packages/server/src/db/utils.ts @@ -15,7 +15,7 @@ export const SearchIndexes = { export const BudibaseInternalDB = { _id: "bb_internal", - type: "budibase", + type: dbCore.BUDIBASE_DATASOURCE_TYPE, name: "Budibase DB", source: "BUDIBASE", config: {}, diff --git a/packages/server/src/sdk/app/tables/index.ts b/packages/server/src/sdk/app/tables/index.ts index 15bf02cf62..98c7fc6a8b 100644 --- a/packages/server/src/sdk/app/tables/index.ts +++ b/packages/server/src/sdk/app/tables/index.ts @@ -19,7 +19,7 @@ async function getAllInternalTables(db?: Database): Promise { return internalTables.rows.map((tableDoc: any) => ({ ...tableDoc.doc, type: "internal", - sourceId: BudibaseInternalDB._id, + sourceId: tableDoc.doc.sourceId || BudibaseInternalDB._id, })) } diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 0d4006b6e0..9dddbe8ea3 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.31": - version "2.1.31" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.31.tgz#ba85cb70b71e0c1758b3e3d77f04562484aa3f26" - integrity sha512-k/LNehcX8JcjaWVP9PBySiOlFwnq3iE0a3H8SpXhSeMMNzPWM6hDhOKnnoV4Nvi82JUZQ/PH6qljL6NrvZqYRQ== +"@budibase/backend-core@2.1.32-alpha.3": + version "2.1.32-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.3.tgz#d65f97f6c147e75aa83cfb4c22a5b3bd568bf62d" + integrity sha512-CSRn29z64bLEW3GLo6cTwpGjvTgIsfDOBwAiStEOlezzMNlDslvcOBCW0pQUo/0rf5C4zsTy4U1oHDElz7JJ2w== dependencies: - "@budibase/types" "^2.1.31" + "@budibase/types" "2.1.32-alpha.3" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1293,6 +1293,7 @@ koa-passport "4.1.4" lodash "4.17.21" lodash.isarguments "3.1.0" + nano "^10.1.0" node-fetch "2.6.7" passport-google-auth "1.0.2" passport-google-oauth "2.0.0" @@ -1360,13 +1361,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.31": - version "2.1.31" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.31.tgz#98e7f2d39511981c0da0df9378c3ce5a6e7dce6b" - integrity sha512-bWbuuAvdASugA1+45upQsr1nCg7RAtWHRM0qdY6rbGIZVM/7NuNtYzzWPanKQQ4WYjlm2BO4XWPcI7CnkNebCw== +"@budibase/pro@2.1.32-alpha.3": + version "2.1.32-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.3.tgz#32d67f5fe3aa6a993022e685f55a298b4fc364b5" + integrity sha512-FwaWZLI8NVSH3Y4RcSvD1ySJXa5yWFgfGha5Zz5rvy3Tw3oSr/AfH91VW4ZLyzpuBQrMJHxLtDmaz3Ywd/jSkQ== dependencies: - "@budibase/backend-core" "2.1.31" - "@budibase/types" "2.1.31" + "@budibase/backend-core" "2.1.32-alpha.3" + "@budibase/types" "2.1.32-alpha.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1391,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.31", "@budibase/types@^2.1.31": - version "2.1.31" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.31.tgz#a644ff4eda77717fccf7572423739db53707ce1e" - integrity sha512-7N+ekrefxSH6tVB9624Z5fnwjpg5w9MxwvKQ9vpIuez7AEwx7th3qYKkDRaN6yuiarpejEzcrwZ73ngN6AnFPw== +"@budibase/types@2.1.32-alpha.3": + version "2.1.32-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.3.tgz#87d53d7b5730f0067c1526a62f85afb13db82a51" + integrity sha512-4MGPfe63IKJMSS+4HdznyjEnExKGk1rMa2sfVOvRAZWzdVhgo5m0UarwoKf49lDF3NPiqTLdXQnB4p7AmwQbbg== "@bull-board/api@3.7.0": version "3.7.0" @@ -3417,7 +3418,7 @@ "@types/cookiejar" "*" "@types/node" "*" -"@types/tough-cookie@*": +"@types/tough-cookie@*", "@types/tough-cookie@^4.0.2": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== @@ -4302,6 +4303,15 @@ axios@^0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" +axios@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" + integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + babel-jest@27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444" @@ -7006,6 +7016,11 @@ follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.8, fo resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== +follow-redirects@^1.15.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + for-each@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -7780,6 +7795,13 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== +http-cookie-agent@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/http-cookie-agent/-/http-cookie-agent-4.0.2.tgz#dcdaae18ed1f7452d81ae4d5cd80b227d6831b69" + integrity sha512-noTmxdH5CuytTnLj/Qv3Z84e/YFq8yLXAw3pqIYZ25Edhb9pQErIAC+ednw40Cic6Le/h9ryph5/TqsvkOaUCw== + dependencies: + agent-base "^6.0.2" + http-errors@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" @@ -10747,6 +10769,18 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== +nano@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/nano/-/nano-10.1.0.tgz#afdd5a7440e62f09a8e23f41fcea328d27383922" + integrity sha512-COeN2TpLcHuSN44QLnPmfZCoCsKAg8/aelPOVqqm/2/MvRHDEA11/Kld5C4sLzDlWlhFZ3SO2WGJGevCsvcEzQ== + dependencies: + "@types/tough-cookie" "^4.0.2" + axios "^1.1.3" + http-cookie-agent "^4.0.2" + node-abort-controller "^3.0.1" + qs "^6.11.0" + tough-cookie "^4.1.2" + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -10809,6 +10843,11 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-abort-controller@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.0.1.tgz#f91fa50b1dee3f909afabb7e261b1e1d6b0cb74e" + integrity sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw== + node-addon-api@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" @@ -12169,6 +12208,11 @@ protobufjs@6.11.3, protobufjs@^6.11.2, protobufjs@^6.11.3, protobufjs@^6.8.6: "@types/node" ">=13.7.0" long "^4.0.0" +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -12231,6 +12275,13 @@ q@^1.1.2: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== +qs@^6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" + qs@^6.4.0, qs@^6.5.1: version "6.10.5" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4" @@ -14214,6 +14265,16 @@ tough-cookie@^3.0.1: psl "^1.1.28" punycode "^2.1.1" +tough-cookie@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" + integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" @@ -14494,6 +14555,11 @@ universalify@^0.1.0, universalify@^0.1.2: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 87311a7372..fd8fbbbeb1 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.32-alpha.1", + "version": "2.1.32-alpha.3", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 430dc1dfdc..2d689c56b7 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.32-alpha.1", + "version": "2.1.32-alpha.3", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 47ba88ef3b..3e41075cb8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.32-alpha.1", + "version": "2.1.32-alpha.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.1.32-alpha.1", - "@budibase/pro": "2.1.31", - "@budibase/string-templates": "2.1.32-alpha.1", - "@budibase/types": "2.1.32-alpha.1", + "@budibase/backend-core": "2.1.32-alpha.3", + "@budibase/pro": "2.1.32-alpha.3", + "@budibase/string-templates": "2.1.32-alpha.3", + "@budibase/types": "2.1.32-alpha.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/packages/worker/src/api/routes/global/configs.js b/packages/worker/src/api/routes/global/configs.js index bcbaa5caa2..fe8b1f97af 100644 --- a/packages/worker/src/api/routes/global/configs.js +++ b/packages/worker/src/api/routes/global/configs.js @@ -3,7 +3,7 @@ const controller = require("../../controllers/global/configs") const { joiValidator } = require("@budibase/backend-core/auth") const { adminOnly } = require("@budibase/backend-core/auth") const Joi = require("joi") -const { Config } = require("../../../constants") +const { Config } = require("@budibase/backend-core/constants") const router = new Router() diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 19d52a0a8c..ecc432d8e6 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.31": - version "2.1.31" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.31.tgz#ba85cb70b71e0c1758b3e3d77f04562484aa3f26" - integrity sha512-k/LNehcX8JcjaWVP9PBySiOlFwnq3iE0a3H8SpXhSeMMNzPWM6hDhOKnnoV4Nvi82JUZQ/PH6qljL6NrvZqYRQ== +"@budibase/backend-core@2.1.32-alpha.3": + version "2.1.32-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.3.tgz#d65f97f6c147e75aa83cfb4c22a5b3bd568bf62d" + integrity sha512-CSRn29z64bLEW3GLo6cTwpGjvTgIsfDOBwAiStEOlezzMNlDslvcOBCW0pQUo/0rf5C4zsTy4U1oHDElz7JJ2w== dependencies: - "@budibase/types" "^2.1.31" + "@budibase/types" "2.1.32-alpha.3" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -490,6 +490,7 @@ koa-passport "4.1.4" lodash "4.17.21" lodash.isarguments "3.1.0" + nano "^10.1.0" node-fetch "2.6.7" passport-google-auth "1.0.2" passport-google-oauth "2.0.0" @@ -507,22 +508,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.31": - version "2.1.31" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.31.tgz#98e7f2d39511981c0da0df9378c3ce5a6e7dce6b" - integrity sha512-bWbuuAvdASugA1+45upQsr1nCg7RAtWHRM0qdY6rbGIZVM/7NuNtYzzWPanKQQ4WYjlm2BO4XWPcI7CnkNebCw== +"@budibase/pro@2.1.32-alpha.3": + version "2.1.32-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.3.tgz#32d67f5fe3aa6a993022e685f55a298b4fc364b5" + integrity sha512-FwaWZLI8NVSH3Y4RcSvD1ySJXa5yWFgfGha5Zz5rvy3Tw3oSr/AfH91VW4ZLyzpuBQrMJHxLtDmaz3Ywd/jSkQ== dependencies: - "@budibase/backend-core" "2.1.31" - "@budibase/types" "2.1.31" + "@budibase/backend-core" "2.1.32-alpha.3" + "@budibase/types" "2.1.32-alpha.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.31", "@budibase/types@^2.1.31": - version "2.1.31" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.31.tgz#a644ff4eda77717fccf7572423739db53707ce1e" - integrity sha512-7N+ekrefxSH6tVB9624Z5fnwjpg5w9MxwvKQ9vpIuez7AEwx7th3qYKkDRaN6yuiarpejEzcrwZ73ngN6AnFPw== +"@budibase/types@2.1.32-alpha.3": + version "2.1.32-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.3.tgz#87d53d7b5730f0067c1526a62f85afb13db82a51" + integrity sha512-4MGPfe63IKJMSS+4HdznyjEnExKGk1rMa2sfVOvRAZWzdVhgo5m0UarwoKf49lDF3NPiqTLdXQnB4p7AmwQbbg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" @@ -1540,6 +1541,11 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== +"@types/tough-cookie@^4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" + integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== + "@types/uuid@8.3.4": version "8.3.4" resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" @@ -1687,7 +1693,7 @@ after-all-results@^2.0.0: resolved "https://registry.yarnpkg.com/after-all-results/-/after-all-results-2.0.0.tgz#6ac2fc202b500f88da8f4f5530cfa100f4c6a2d0" integrity sha512-2zHEyuhSJOuCrmas9YV0YL/MFCWLxe1dS6k/ENhgYrb/JqyMnadLN4iIAc9kkZrbElMDyyAGH/0J18OPErOWLg== -agent-base@6: +agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== @@ -1917,6 +1923,15 @@ axios@0.24.0: dependencies: follow-redirects "^1.14.4" +axios@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" + integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + babel-jest@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5" @@ -3422,6 +3437,11 @@ follow-redirects@^1.14.4: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== +follow-redirects@^1.15.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -3846,6 +3866,13 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== +http-cookie-agent@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/http-cookie-agent/-/http-cookie-agent-4.0.2.tgz#dcdaae18ed1f7452d81ae4d5cd80b227d6831b69" + integrity sha512-noTmxdH5CuytTnLj/Qv3Z84e/YFq8yLXAw3pqIYZ25Edhb9pQErIAC+ednw40Cic6Le/h9ryph5/TqsvkOaUCw== + dependencies: + agent-base "^6.0.2" + http-errors@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" @@ -5515,6 +5542,18 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +nano@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/nano/-/nano-10.1.0.tgz#afdd5a7440e62f09a8e23f41fcea328d27383922" + integrity sha512-COeN2TpLcHuSN44QLnPmfZCoCsKAg8/aelPOVqqm/2/MvRHDEA11/Kld5C4sLzDlWlhFZ3SO2WGJGevCsvcEzQ== + dependencies: + "@types/tough-cookie" "^4.0.2" + axios "^1.1.3" + http-cookie-agent "^4.0.2" + node-abort-controller "^3.0.1" + qs "^6.11.0" + tough-cookie "^4.1.2" + napi-macros@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b" @@ -5550,6 +5589,11 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-abort-controller@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.0.1.tgz#f91fa50b1dee3f909afabb7e261b1e1d6b0cb74e" + integrity sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw== + node-addon-api@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" @@ -6386,6 +6430,11 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -6453,6 +6502,13 @@ qs@^6.10.3, qs@^6.4.0: dependencies: side-channel "^1.0.4" +qs@^6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" + qs@~6.5.2: version "6.5.3" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" @@ -6463,6 +6519,11 @@ querystring@0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g== +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -6684,6 +6745,11 @@ require-in-the-middle@^5.0.3: module-details-from-path "^1.0.3" resolve "^1.22.1" +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + resolve-alpn@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" @@ -7439,6 +7505,16 @@ touch@^3.1.0: punycode "^2.1.1" universalify "^0.1.2" +tough-cookie@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" + integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" @@ -7632,6 +7708,11 @@ universalify@^0.1.2: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + unpipe@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -7694,6 +7775,14 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + url@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"