Merge branch 'develop' of github.com:Budibase/budibase into feature/app-backups
This commit is contained in:
mike12345567
commit
5e802ceb10
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "2.0.30-alpha.3",
|
"version": "2.0.30-alpha.7",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"packages": [
|
"packages": [
|
||||||
"packages/*"
|
"packages/*"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
"private": true,
|
"private": true,
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@rollup/plugin-json": "^4.0.2",
|
"@rollup/plugin-json": "^4.0.2",
|
||||||
"@types/mongodb": "3.6.3",
|
|
||||||
"@typescript-eslint/parser": "4.28.0",
|
"@typescript-eslint/parser": "4.28.0",
|
||||||
"babel-eslint": "^10.0.3",
|
"babel-eslint": "^10.0.3",
|
||||||
"eslint": "^7.28.0",
|
"eslint": "^7.28.0",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@budibase/backend-core",
|
"name": "@budibase/backend-core",
|
||||||
"version": "2.0.30-alpha.3",
|
"version": "2.0.30-alpha.7",
|
||||||
"description": "Budibase backend core libraries used in server and worker",
|
"description": "Budibase backend core libraries used in server and worker",
|
||||||
"main": "dist/src/index.js",
|
"main": "dist/src/index.js",
|
||||||
"types": "dist/src/index.d.ts",
|
"types": "dist/src/index.d.ts",
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
"test:watch": "jest --watchAll"
|
"test:watch": "jest --watchAll"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@budibase/types": "2.0.30-alpha.3",
|
"@budibase/types": "2.0.30-alpha.7",
|
||||||
"@shopify/jest-koa-mocks": "5.0.1",
|
"@shopify/jest-koa-mocks": "5.0.1",
|
||||||
"@techpass/passport-openidconnect": "0.3.2",
|
"@techpass/passport-openidconnect": "0.3.2",
|
||||||
"aws-sdk": "2.1030.0",
|
"aws-sdk": "2.1030.0",
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "@budibase/bbui",
|
"name": "@budibase/bbui",
|
||||||
"description": "A UI solution used in the different Budibase projects.",
|
"description": "A UI solution used in the different Budibase projects.",
|
||||||
"version": "2.0.30-alpha.3",
|
"version": "2.0.30-alpha.7",
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"svelte": "src/index.js",
|
"svelte": "src/index.js",
|
||||||
"module": "dist/bbui.es.js",
|
"module": "dist/bbui.es.js",
|
||||||
|
|
@ -38,7 +38,7 @@
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
|
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
|
||||||
"@budibase/string-templates": "2.0.30-alpha.3",
|
"@budibase/string-templates": "2.0.30-alpha.7",
|
||||||
"@spectrum-css/actionbutton": "^1.0.1",
|
"@spectrum-css/actionbutton": "^1.0.1",
|
||||||
"@spectrum-css/actiongroup": "^1.0.1",
|
"@spectrum-css/actiongroup": "^1.0.1",
|
||||||
"@spectrum-css/avatar": "^3.0.2",
|
"@spectrum-css/avatar": "^3.0.2",
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ filterTests(["smoke", "all"], () => {
|
||||||
cy.wait("@queryError")
|
cy.wait("@queryError")
|
||||||
cy.get("@queryError")
|
cy.get("@queryError")
|
||||||
.its("response.body")
|
.its("response.body")
|
||||||
.should("have.property", "message", "Invalid URL: http://random text?")
|
.should("have.property", "message", "Invalid URL: http://random text")
|
||||||
cy.get("@queryError")
|
cy.get("@queryError")
|
||||||
.its("response.body")
|
.its("response.body")
|
||||||
.should("have.property", "status", 400)
|
.should("have.property", "status", 400)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@budibase/builder",
|
"name": "@budibase/builder",
|
||||||
"version": "2.0.30-alpha.3",
|
"version": "2.0.30-alpha.7",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
@ -71,10 +71,10 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@budibase/bbui": "2.0.30-alpha.3",
|
"@budibase/bbui": "2.0.30-alpha.7",
|
||||||
"@budibase/client": "2.0.30-alpha.3",
|
"@budibase/client": "2.0.30-alpha.7",
|
||||||
"@budibase/frontend-core": "2.0.30-alpha.3",
|
"@budibase/frontend-core": "2.0.30-alpha.7",
|
||||||
"@budibase/string-templates": "2.0.30-alpha.3",
|
"@budibase/string-templates": "2.0.30-alpha.7",
|
||||||
"@sentry/browser": "5.19.1",
|
"@sentry/browser": "5.19.1",
|
||||||
"@spectrum-css/page": "^3.0.1",
|
"@spectrum-css/page": "^3.0.1",
|
||||||
"@spectrum-css/vars": "^3.0.1",
|
"@spectrum-css/vars": "^3.0.1",
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,8 @@
|
||||||
import sanitizeUrl from "./utils/sanitizeUrl"
|
import sanitizeUrl from "./utils/sanitizeUrl"
|
||||||
import { Screen } from "./utils/Screen"
|
import { Screen } from "./utils/Screen"
|
||||||
import { Component } from "./utils/Component"
|
import { Component } from "./utils/Component"
|
||||||
import {
|
import { makeBreadcrumbContainer } from "./utils/commonComponents"
|
||||||
makeBreadcrumbContainer,
|
import { getSchemaForDatasource } from "../../dataBinding"
|
||||||
makeMainForm,
|
|
||||||
makeTitleContainer,
|
|
||||||
makeSaveButton,
|
|
||||||
makeDatasourceFormComponents,
|
|
||||||
} from "./utils/commonComponents"
|
|
||||||
|
|
||||||
export default function (tables) {
|
export default function (tables) {
|
||||||
return tables.map(table => {
|
return tables.map(table => {
|
||||||
|
|
@ -23,48 +18,55 @@ export default function (tables) {
|
||||||
export const newRowUrl = table => sanitizeUrl(`/${table.name}/new/row`)
|
export const newRowUrl = table => sanitizeUrl(`/${table.name}/new/row`)
|
||||||
export const NEW_ROW_TEMPLATE = "NEW_ROW_TEMPLATE"
|
export const NEW_ROW_TEMPLATE = "NEW_ROW_TEMPLATE"
|
||||||
|
|
||||||
function generateTitleContainer(table, formId) {
|
const rowListUrl = table => sanitizeUrl(`/${table.name}`)
|
||||||
return makeTitleContainer("New Row").addChild(makeSaveButton(table, formId))
|
|
||||||
|
const getFields = schema => {
|
||||||
|
let columns = []
|
||||||
|
Object.entries(schema || {}).forEach(([field, fieldSchema]) => {
|
||||||
|
if (!field || !fieldSchema) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!fieldSchema?.autocolumn) {
|
||||||
|
columns.push(field)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return columns
|
||||||
}
|
}
|
||||||
|
|
||||||
const createScreen = table => {
|
const generateFormBlock = table => {
|
||||||
const screen = new Screen()
|
const datasource = { type: "table", tableId: table._id }
|
||||||
.instanceName(`${table.name} - New`)
|
const { schema } = getSchemaForDatasource(null, datasource, {
|
||||||
.customProps({
|
formSchema: true,
|
||||||
hAlign: "center",
|
})
|
||||||
})
|
const formBlock = new Component("@budibase/standard-components/formblock")
|
||||||
.route(newRowUrl(table))
|
formBlock
|
||||||
|
|
||||||
const form = makeMainForm()
|
|
||||||
.instanceName("Form")
|
|
||||||
.customProps({
|
.customProps({
|
||||||
|
title: "New row",
|
||||||
actionType: "Create",
|
actionType: "Create",
|
||||||
|
actionUrl: rowListUrl(table),
|
||||||
|
showDeleteButton: false,
|
||||||
|
showSaveButton: true,
|
||||||
|
fields: getFields(schema),
|
||||||
dataSource: {
|
dataSource: {
|
||||||
label: table.name,
|
label: table.name,
|
||||||
tableId: table._id,
|
tableId: table._id,
|
||||||
type: "table",
|
type: "table",
|
||||||
},
|
},
|
||||||
|
labelPosition: "left",
|
||||||
size: "spectrum--medium",
|
size: "spectrum--medium",
|
||||||
})
|
})
|
||||||
|
.instanceName(`${table.name} - Form block`)
|
||||||
const fieldGroup = new Component("@budibase/standard-components/fieldgroup")
|
return formBlock
|
||||||
.instanceName("Field Group")
|
}
|
||||||
.customProps({
|
|
||||||
labelPosition: "left",
|
const createScreen = table => {
|
||||||
})
|
const formBlock = generateFormBlock(table)
|
||||||
|
const screen = new Screen()
|
||||||
// Add all form fields from this schema to the field group
|
.instanceName(`${table.name} - New`)
|
||||||
const datasource = { type: "table", tableId: table._id }
|
.route(newRowUrl(table))
|
||||||
makeDatasourceFormComponents(datasource).forEach(component => {
|
|
||||||
fieldGroup.addChild(component)
|
return screen
|
||||||
})
|
.addChild(makeBreadcrumbContainer(table.name, "New row"))
|
||||||
|
.addChild(formBlock)
|
||||||
// Add all children to the form
|
.json()
|
||||||
const formId = form._json._id
|
|
||||||
form
|
|
||||||
.addChild(makeBreadcrumbContainer(table.name, "New"))
|
|
||||||
.addChild(generateTitleContainer(table, formId))
|
|
||||||
.addChild(fieldGroup)
|
|
||||||
|
|
||||||
return screen.addChild(form).json()
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,8 @@
|
||||||
import sanitizeUrl from "./utils/sanitizeUrl"
|
import sanitizeUrl from "./utils/sanitizeUrl"
|
||||||
import { rowListUrl } from "./rowListScreen"
|
|
||||||
import { Screen } from "./utils/Screen"
|
import { Screen } from "./utils/Screen"
|
||||||
import { Component } from "./utils/Component"
|
import { Component } from "./utils/Component"
|
||||||
import { makePropSafe } from "@budibase/string-templates"
|
import { makeBreadcrumbContainer } from "./utils/commonComponents"
|
||||||
import {
|
import { getSchemaForDatasource } from "../../dataBinding"
|
||||||
makeBreadcrumbContainer,
|
|
||||||
makeTitleContainer,
|
|
||||||
makeSaveButton,
|
|
||||||
makeMainForm,
|
|
||||||
makeDatasourceFormComponents,
|
|
||||||
} from "./utils/commonComponents"
|
|
||||||
|
|
||||||
export default function (tables) {
|
export default function (tables) {
|
||||||
return tables.map(table => {
|
return tables.map(table => {
|
||||||
|
|
@ -25,125 +18,53 @@ export default function (tables) {
|
||||||
export const ROW_DETAIL_TEMPLATE = "ROW_DETAIL_TEMPLATE"
|
export const ROW_DETAIL_TEMPLATE = "ROW_DETAIL_TEMPLATE"
|
||||||
export const rowDetailUrl = table => sanitizeUrl(`/${table.name}/:id`)
|
export const rowDetailUrl = table => sanitizeUrl(`/${table.name}/:id`)
|
||||||
|
|
||||||
function generateTitleContainer(table, title, formId, repeaterId) {
|
const rowListUrl = table => sanitizeUrl(`/${table.name}`)
|
||||||
const saveButton = makeSaveButton(table, formId)
|
|
||||||
const deleteButton = new Component("@budibase/standard-components/button")
|
|
||||||
.text("Delete")
|
|
||||||
.customProps({
|
|
||||||
type: "secondary",
|
|
||||||
quiet: true,
|
|
||||||
size: "M",
|
|
||||||
onClick: [
|
|
||||||
{
|
|
||||||
parameters: {
|
|
||||||
tableId: table._id,
|
|
||||||
rowId: `{{ ${makePropSafe(repeaterId)}.${makePropSafe("_id")} }}`,
|
|
||||||
revId: `{{ ${makePropSafe(repeaterId)}.${makePropSafe("_rev")} }}`,
|
|
||||||
confirm: true,
|
|
||||||
},
|
|
||||||
"##eventHandlerType": "Delete Row",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
parameters: {
|
|
||||||
url: rowListUrl(table),
|
|
||||||
},
|
|
||||||
"##eventHandlerType": "Navigate To",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
.instanceName("Delete Button")
|
|
||||||
|
|
||||||
const buttons = new Component("@budibase/standard-components/container")
|
const getFields = schema => {
|
||||||
.instanceName("Button Container")
|
let columns = []
|
||||||
.customProps({
|
Object.entries(schema || {}).forEach(([field, fieldSchema]) => {
|
||||||
direction: "row",
|
if (!field || !fieldSchema) {
|
||||||
hAlign: "right",
|
return
|
||||||
vAlign: "middle",
|
}
|
||||||
size: "shrink",
|
if (!fieldSchema?.autocolumn) {
|
||||||
gap: "M",
|
columns.push(field)
|
||||||
})
|
}
|
||||||
.addChild(deleteButton)
|
})
|
||||||
.addChild(saveButton)
|
return columns
|
||||||
|
}
|
||||||
|
|
||||||
return makeTitleContainer(title).addChild(buttons)
|
const generateFormBlock = table => {
|
||||||
|
const datasource = { type: "table", tableId: table._id }
|
||||||
|
const { schema } = getSchemaForDatasource(null, datasource, {
|
||||||
|
formSchema: true,
|
||||||
|
})
|
||||||
|
|
||||||
|
const formBlock = new Component("@budibase/standard-components/formblock")
|
||||||
|
formBlock
|
||||||
|
.customProps({
|
||||||
|
title: "Edit row",
|
||||||
|
actionType: "Update",
|
||||||
|
actionUrl: rowListUrl(table),
|
||||||
|
showDeleteButton: true,
|
||||||
|
showSaveButton: true,
|
||||||
|
fields: getFields(schema),
|
||||||
|
dataSource: {
|
||||||
|
label: table.name,
|
||||||
|
tableId: table._id,
|
||||||
|
type: "table",
|
||||||
|
},
|
||||||
|
labelPosition: "left",
|
||||||
|
size: "spectrum--medium",
|
||||||
|
})
|
||||||
|
.instanceName(`${table.name} - Form block`)
|
||||||
|
return formBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
const createScreen = table => {
|
const createScreen = table => {
|
||||||
const provider = new Component("@budibase/standard-components/dataprovider")
|
|
||||||
.instanceName(`Data Provider`)
|
|
||||||
.customProps({
|
|
||||||
dataSource: {
|
|
||||||
label: table.name,
|
|
||||||
name: table._id,
|
|
||||||
tableId: table._id,
|
|
||||||
type: "table",
|
|
||||||
},
|
|
||||||
filter: [
|
|
||||||
{
|
|
||||||
field: "_id",
|
|
||||||
operator: "equal",
|
|
||||||
type: "string",
|
|
||||||
value: `{{ ${makePropSafe("url")}.${makePropSafe("id")} }}`,
|
|
||||||
valueType: "Binding",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
limit: 1,
|
|
||||||
paginate: false,
|
|
||||||
})
|
|
||||||
|
|
||||||
const repeater = new Component("@budibase/standard-components/repeater")
|
|
||||||
.instanceName("Repeater")
|
|
||||||
.customProps({
|
|
||||||
dataProvider: `{{ literal ${makePropSafe(provider._json._id)} }}`,
|
|
||||||
noRowsMessage: "We couldn't find a row to display",
|
|
||||||
})
|
|
||||||
|
|
||||||
const form = makeMainForm()
|
|
||||||
.instanceName("Form")
|
|
||||||
.customProps({
|
|
||||||
actionType: "Update",
|
|
||||||
size: "spectrum--medium",
|
|
||||||
dataSource: {
|
|
||||||
label: table.name,
|
|
||||||
tableId: table._id,
|
|
||||||
type: "table",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const fieldGroup = new Component("@budibase/standard-components/fieldgroup")
|
|
||||||
.instanceName("Field Group")
|
|
||||||
.customProps({
|
|
||||||
labelPosition: "left",
|
|
||||||
})
|
|
||||||
|
|
||||||
// Add all form fields from this schema to the field group
|
|
||||||
const datasource = { type: "table", tableId: table._id }
|
|
||||||
makeDatasourceFormComponents(datasource).forEach(component => {
|
|
||||||
fieldGroup.addChild(component)
|
|
||||||
})
|
|
||||||
|
|
||||||
// Add all children to the form
|
|
||||||
const formId = form._json._id
|
|
||||||
const repeaterId = repeater._json._id
|
|
||||||
const heading = table.primaryDisplay
|
|
||||||
? `{{ ${makePropSafe(repeaterId)}.${makePropSafe(table.primaryDisplay)} }}`
|
|
||||||
: null
|
|
||||||
form
|
|
||||||
.addChild(makeBreadcrumbContainer(table.name, heading || "Edit"))
|
|
||||||
.addChild(
|
|
||||||
generateTitleContainer(table, heading || "Edit Row", formId, repeaterId)
|
|
||||||
)
|
|
||||||
.addChild(fieldGroup)
|
|
||||||
|
|
||||||
repeater.addChild(form)
|
|
||||||
provider.addChild(repeater)
|
|
||||||
|
|
||||||
return new Screen()
|
return new Screen()
|
||||||
.instanceName(`${table.name} - Detail`)
|
.instanceName(`${table.name} - Detail`)
|
||||||
.route(rowDetailUrl(table))
|
.route(rowDetailUrl(table))
|
||||||
.customProps({
|
.addChild(makeBreadcrumbContainer(table.name, "Edit row"))
|
||||||
hAlign: "center",
|
.addChild(generateFormBlock(table))
|
||||||
})
|
|
||||||
.addChild(provider)
|
|
||||||
.json()
|
.json()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ import sanitizeUrl from "./utils/sanitizeUrl"
|
||||||
import { newRowUrl } from "./newRowScreen"
|
import { newRowUrl } from "./newRowScreen"
|
||||||
import { Screen } from "./utils/Screen"
|
import { Screen } from "./utils/Screen"
|
||||||
import { Component } from "./utils/Component"
|
import { Component } from "./utils/Component"
|
||||||
import { makePropSafe } from "@budibase/string-templates"
|
|
||||||
|
|
||||||
export default function (tables) {
|
export default function (tables) {
|
||||||
return tables.map(table => {
|
return tables.map(table => {
|
||||||
|
|
@ -18,48 +17,17 @@ export default function (tables) {
|
||||||
export const ROW_LIST_TEMPLATE = "ROW_LIST_TEMPLATE"
|
export const ROW_LIST_TEMPLATE = "ROW_LIST_TEMPLATE"
|
||||||
export const rowListUrl = table => sanitizeUrl(`/${table.name}`)
|
export const rowListUrl = table => sanitizeUrl(`/${table.name}`)
|
||||||
|
|
||||||
function generateTitleContainer(table) {
|
const generateTableBlock = table => {
|
||||||
const newButton = new Component("@budibase/standard-components/button")
|
const tableBlock = new Component("@budibase/standard-components/tableblock")
|
||||||
.text("Create New")
|
tableBlock
|
||||||
.customProps({
|
|
||||||
size: "M",
|
|
||||||
type: "primary",
|
|
||||||
onClick: [
|
|
||||||
{
|
|
||||||
parameters: {
|
|
||||||
url: newRowUrl(table),
|
|
||||||
},
|
|
||||||
"##eventHandlerType": "Navigate To",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
.instanceName("New Button")
|
|
||||||
|
|
||||||
const heading = new Component("@budibase/standard-components/heading")
|
|
||||||
.instanceName("Title")
|
|
||||||
.text(table.name)
|
|
||||||
.customProps({
|
|
||||||
size: "M",
|
|
||||||
align: "left",
|
|
||||||
})
|
|
||||||
|
|
||||||
return new Component("@budibase/standard-components/container")
|
|
||||||
.customProps({
|
|
||||||
direction: "row",
|
|
||||||
hAlign: "stretch",
|
|
||||||
vAlign: "middle",
|
|
||||||
size: "shrink",
|
|
||||||
gap: "M",
|
|
||||||
})
|
|
||||||
.instanceName("Title Container")
|
|
||||||
.addChild(heading)
|
|
||||||
.addChild(newButton)
|
|
||||||
}
|
|
||||||
|
|
||||||
const createScreen = table => {
|
|
||||||
const provider = new Component("@budibase/standard-components/dataprovider")
|
|
||||||
.instanceName(`Data Provider`)
|
|
||||||
.customProps({
|
.customProps({
|
||||||
|
linkRows: true,
|
||||||
|
linkURL: `${rowListUrl(table)}/:id`,
|
||||||
|
showAutoColumns: false,
|
||||||
|
showTitleButton: true,
|
||||||
|
titleButtonText: "Create new",
|
||||||
|
titleButtonURL: newRowUrl(table),
|
||||||
|
title: table.name,
|
||||||
dataSource: {
|
dataSource: {
|
||||||
label: table.name,
|
label: table.name,
|
||||||
name: table._id,
|
name: table._id,
|
||||||
|
|
@ -68,41 +36,16 @@ const createScreen = table => {
|
||||||
},
|
},
|
||||||
size: "spectrum--medium",
|
size: "spectrum--medium",
|
||||||
paginate: true,
|
paginate: true,
|
||||||
limit: 8,
|
|
||||||
})
|
|
||||||
|
|
||||||
const spectrumTable = new Component("@budibase/standard-components/table")
|
|
||||||
.customProps({
|
|
||||||
dataProvider: `{{ literal ${makePropSafe(provider._json._id)} }}`,
|
|
||||||
showAutoColumns: false,
|
|
||||||
quiet: false,
|
|
||||||
rowCount: 8,
|
rowCount: 8,
|
||||||
})
|
})
|
||||||
.instanceName(`${table.name} Table`)
|
.instanceName(`${table.name} - Table block`)
|
||||||
|
return tableBlock
|
||||||
const safeTableId = makePropSafe(spectrumTable._json._id)
|
}
|
||||||
const safeRowId = makePropSafe("_id")
|
|
||||||
const viewLink = new Component("@budibase/standard-components/link")
|
|
||||||
.customProps({
|
|
||||||
text: "View",
|
|
||||||
url: `${rowListUrl(table)}/{{ ${safeTableId}.${safeRowId} }}`,
|
|
||||||
size: "S",
|
|
||||||
color: "var(--spectrum-global-color-gray-600)",
|
|
||||||
align: "left",
|
|
||||||
})
|
|
||||||
.normalStyle({
|
|
||||||
["margin-left"]: "16px",
|
|
||||||
["margin-right"]: "16px",
|
|
||||||
})
|
|
||||||
.instanceName("View Link")
|
|
||||||
|
|
||||||
spectrumTable.addChild(viewLink)
|
|
||||||
provider.addChild(spectrumTable)
|
|
||||||
|
|
||||||
|
const createScreen = table => {
|
||||||
return new Screen()
|
return new Screen()
|
||||||
.route(rowListUrl(table))
|
.route(rowListUrl(table))
|
||||||
.instanceName(`${table.name} - List`)
|
.instanceName(`${table.name} - List`)
|
||||||
.addChild(generateTitleContainer(table))
|
.addChild(generateTableBlock(table))
|
||||||
.addChild(provider)
|
|
||||||
.json()
|
.json()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -65,6 +65,11 @@ export function makeBreadcrumbContainer(tableName, text) {
|
||||||
vAlign: "middle",
|
vAlign: "middle",
|
||||||
size: "shrink",
|
size: "shrink",
|
||||||
})
|
})
|
||||||
|
.normalStyle({
|
||||||
|
width: "600px",
|
||||||
|
"margin-right": "auto",
|
||||||
|
"margin-left": "auto",
|
||||||
|
})
|
||||||
.instanceName("Breadcrumbs")
|
.instanceName("Breadcrumbs")
|
||||||
.addChild(link)
|
.addChild(link)
|
||||||
.addChild(arrowText)
|
.addChild(arrowText)
|
||||||
|
|
@ -138,6 +143,7 @@ const fieldTypeToComponentMap = {
|
||||||
attachment: "attachmentfield",
|
attachment: "attachmentfield",
|
||||||
link: "relationshipfield",
|
link: "relationshipfield",
|
||||||
json: "jsonfield",
|
json: "jsonfield",
|
||||||
|
barcodeqr: "codescanner",
|
||||||
}
|
}
|
||||||
|
|
||||||
export function makeDatasourceFormComponents(datasource) {
|
export function makeDatasourceFormComponents(datasource) {
|
||||||
|
|
|
||||||
|
|
@ -261,6 +261,7 @@
|
||||||
} else {
|
} else {
|
||||||
return [
|
return [
|
||||||
FIELDS.STRING,
|
FIELDS.STRING,
|
||||||
|
FIELDS.BARCODEQR,
|
||||||
FIELDS.LONGFORM,
|
FIELDS.LONGFORM,
|
||||||
FIELDS.OPTIONS,
|
FIELDS.OPTIONS,
|
||||||
FIELDS.DATETIME,
|
FIELDS.DATETIME,
|
||||||
|
|
|
||||||
|
|
@ -124,6 +124,14 @@
|
||||||
label: "Multi-select",
|
label: "Multi-select",
|
||||||
value: FIELDS.ARRAY.type,
|
value: FIELDS.ARRAY.type,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: "Barcode/QR",
|
||||||
|
value: FIELDS.BARCODEQR.type,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Long Form Text",
|
||||||
|
value: FIELDS.LONGFORM.type,
|
||||||
|
},
|
||||||
]
|
]
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,7 @@ const componentMap = {
|
||||||
"field/link": FormFieldSelect,
|
"field/link": FormFieldSelect,
|
||||||
"field/array": FormFieldSelect,
|
"field/array": FormFieldSelect,
|
||||||
"field/json": FormFieldSelect,
|
"field/json": FormFieldSelect,
|
||||||
|
"field/barcode/qr": FormFieldSelect,
|
||||||
// Some validation types are the same as others, so not all types are
|
// Some validation types are the same as others, so not all types are
|
||||||
// explicitly listed here. e.g. options uses string validation
|
// explicitly listed here. e.g. options uses string validation
|
||||||
"validation/string": ValidationEditor,
|
"validation/string": ValidationEditor,
|
||||||
|
|
|
||||||
|
|
@ -24,18 +24,17 @@
|
||||||
|
|
||||||
const getOptions = (schema, type) => {
|
const getOptions = (schema, type) => {
|
||||||
let entries = Object.entries(schema ?? {})
|
let entries = Object.entries(schema ?? {})
|
||||||
|
|
||||||
let types = []
|
let types = []
|
||||||
if (type === "field/options") {
|
if (type === "field/options" || type === "field/barcode/qr") {
|
||||||
// allow options to be used on both options and string fields
|
// allow options to be used on both options and string fields
|
||||||
types = [type, "field/string"]
|
types = [type, "field/string"]
|
||||||
} else {
|
} else {
|
||||||
types = [type]
|
types = [type]
|
||||||
}
|
}
|
||||||
|
|
||||||
types = types.map(type => type.split("/")[1])
|
types = types.map(type => type.slice(type.indexOf("/") + 1))
|
||||||
entries = entries.filter(entry => types.includes(entry[1].type))
|
|
||||||
|
|
||||||
|
entries = entries.filter(entry => types.includes(entry[1].type))
|
||||||
return entries.map(entry => entry[0])
|
return entries.map(entry => entry[0])
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,16 @@
|
||||||
<script>
|
<script>
|
||||||
import Editor from "./QueryEditor.svelte"
|
import Editor from "./QueryEditor.svelte"
|
||||||
import FieldsBuilder from "./QueryFieldsBuilder.svelte"
|
import FieldsBuilder from "./QueryFieldsBuilder.svelte"
|
||||||
import { Label, Input } from "@budibase/bbui"
|
import {
|
||||||
|
Label,
|
||||||
|
Input,
|
||||||
|
Select,
|
||||||
|
Divider,
|
||||||
|
Layout,
|
||||||
|
Icon,
|
||||||
|
Button,
|
||||||
|
ActionButton,
|
||||||
|
} from "@budibase/bbui"
|
||||||
|
|
||||||
const QueryTypes = {
|
const QueryTypes = {
|
||||||
SQL: "sql",
|
SQL: "sql",
|
||||||
|
|
@ -15,6 +24,8 @@
|
||||||
export let editable = true
|
export let editable = true
|
||||||
export let height = 500
|
export let height = 500
|
||||||
|
|
||||||
|
let stepEditors = []
|
||||||
|
|
||||||
$: urlDisplay =
|
$: urlDisplay =
|
||||||
schema.urlDisplay &&
|
schema.urlDisplay &&
|
||||||
`${datasource.config.url}${
|
`${datasource.config.url}${
|
||||||
|
|
@ -24,6 +35,39 @@
|
||||||
function updateQuery({ detail }) {
|
function updateQuery({ detail }) {
|
||||||
query.fields[schema.type] = detail.value
|
query.fields[schema.type] = detail.value
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateEditorsOnDelete(deleteIndex) {
|
||||||
|
for (let i = deleteIndex; i < query.fields.steps?.length - 1; i++) {
|
||||||
|
stepEditors[i].update(query.fields.steps[i + 1].value?.value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function updateEditorsOnSwap(actionIndex, targetIndex) {
|
||||||
|
const target = query.fields.steps[targetIndex].value?.value
|
||||||
|
stepEditors[targetIndex].update(
|
||||||
|
query.fields.steps[actionIndex].value?.value
|
||||||
|
)
|
||||||
|
stepEditors[actionIndex].update(target)
|
||||||
|
}
|
||||||
|
|
||||||
|
function setEditorTemplate(fromKey, toKey, index) {
|
||||||
|
const currentValue = query.fields.steps[index].value?.value
|
||||||
|
if (
|
||||||
|
!currentValue ||
|
||||||
|
currentValue.toString().replace("\\s", "").length < 3 ||
|
||||||
|
schema.steps.filter(step => step.key === fromKey)[0]?.template ===
|
||||||
|
currentValue
|
||||||
|
) {
|
||||||
|
query.fields.steps[index].value.value = schema.steps.filter(
|
||||||
|
step => step.key === toKey
|
||||||
|
)[0]?.template
|
||||||
|
stepEditors[index].update(query.fields.steps[index].value.value)
|
||||||
|
}
|
||||||
|
query.fields.steps[index].key = toKey
|
||||||
|
}
|
||||||
|
|
||||||
|
$: shouldDisplayJsonBox =
|
||||||
|
schema.type === QueryTypes.JSON &&
|
||||||
|
query.fields.extra?.actionType !== "pipeline"
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if schema}
|
{#if schema}
|
||||||
|
|
@ -38,7 +82,7 @@
|
||||||
value={query.fields.sql}
|
value={query.fields.sql}
|
||||||
parameters={query.parameters}
|
parameters={query.parameters}
|
||||||
/>
|
/>
|
||||||
{:else if schema.type === QueryTypes.JSON}
|
{:else if shouldDisplayJsonBox}
|
||||||
<Editor
|
<Editor
|
||||||
editorHeight={height}
|
editorHeight={height}
|
||||||
label="Query"
|
label="Query"
|
||||||
|
|
@ -56,6 +100,118 @@
|
||||||
<Input thin outline disabled value={urlDisplay} />
|
<Input thin outline disabled value={urlDisplay} />
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
{:else if query.fields.extra?.actionType === "pipeline"}
|
||||||
|
<br />
|
||||||
|
{#if !query.fields.steps?.length}
|
||||||
|
<div class="controls">
|
||||||
|
<Button
|
||||||
|
secondary
|
||||||
|
slot="buttons"
|
||||||
|
on:click={() => {
|
||||||
|
query.fields.steps = [
|
||||||
|
{
|
||||||
|
key: "$match",
|
||||||
|
value: "{\n\t\n}",
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}}>Add stage</Button
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
<br />
|
||||||
|
{:else}
|
||||||
|
{#each query.fields.steps ?? [] as step, index}
|
||||||
|
<div class="block">
|
||||||
|
<div class="subblock">
|
||||||
|
<Divider noMargin />
|
||||||
|
<div class="blockSection">
|
||||||
|
<div class="block-options">
|
||||||
|
Stage {index + 1}
|
||||||
|
<div class="block-actions">
|
||||||
|
<div style="margin-right: 24px;">
|
||||||
|
{#if index > 0}
|
||||||
|
<ActionButton
|
||||||
|
quiet
|
||||||
|
on:click={() => {
|
||||||
|
updateEditorsOnSwap(index, index - 1)
|
||||||
|
const target = query.fields.steps[index - 1].key
|
||||||
|
query.fields.steps[index - 1].key =
|
||||||
|
query.fields.steps[index].key
|
||||||
|
query.fields.steps[index].key = target
|
||||||
|
}}
|
||||||
|
icon="ChevronUp"
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
{#if index < query.fields.steps.length - 1}
|
||||||
|
<ActionButton
|
||||||
|
quiet
|
||||||
|
on:click={() => {
|
||||||
|
updateEditorsOnSwap(index, index + 1)
|
||||||
|
const target = query.fields.steps[index + 1].key
|
||||||
|
query.fields.steps[index + 1].key =
|
||||||
|
query.fields.steps[index].key
|
||||||
|
query.fields.steps[index].key = target
|
||||||
|
}}
|
||||||
|
icon="ChevronDown"
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
<ActionButton
|
||||||
|
on:click={() => {
|
||||||
|
updateEditorsOnDelete(index)
|
||||||
|
query.fields.steps.splice(index, 1)
|
||||||
|
query.fields.steps = [...query.fields.steps]
|
||||||
|
}}
|
||||||
|
icon="DeleteOutline"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<Layout noPadding gap="S">
|
||||||
|
<div class="fields">
|
||||||
|
<div class="block-field">
|
||||||
|
<Select
|
||||||
|
value={step.key}
|
||||||
|
options={schema.steps.map(s => s.key)}
|
||||||
|
on:change={({ detail }) => {
|
||||||
|
setEditorTemplate(step.key, detail, index)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Editor
|
||||||
|
bind:this={stepEditors[index]}
|
||||||
|
editorHeight={height / 2}
|
||||||
|
mode="json"
|
||||||
|
value={typeof step.value === "string"
|
||||||
|
? step.value
|
||||||
|
: step.value.value}
|
||||||
|
on:change={({ detail }) => {
|
||||||
|
query.fields.steps[index].value = detail
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Layout>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="separator" />
|
||||||
|
{#if index === query.fields.steps.length - 1}
|
||||||
|
<Icon
|
||||||
|
hoverable
|
||||||
|
name="AddCircle"
|
||||||
|
size="S"
|
||||||
|
on:click={() => {
|
||||||
|
query.fields.steps = [
|
||||||
|
...query.fields.steps,
|
||||||
|
{
|
||||||
|
key: "$match",
|
||||||
|
value: "{\n\t\n}",
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<br />
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
{/key}
|
{/key}
|
||||||
{/if}
|
{/if}
|
||||||
|
|
@ -67,4 +223,57 @@
|
||||||
grid-gap: var(--spacing-l);
|
grid-gap: var(--spacing-l);
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
.blockSection {
|
||||||
|
padding: var(--spacing-xl);
|
||||||
|
}
|
||||||
|
.block {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: center;
|
||||||
|
margin-top: -6px;
|
||||||
|
}
|
||||||
|
.subblock {
|
||||||
|
width: 480px;
|
||||||
|
font-size: 16px;
|
||||||
|
background-color: var(--background);
|
||||||
|
border: 1px solid var(--spectrum-global-color-gray-300);
|
||||||
|
border-radius: 4px 4px 4px 4px;
|
||||||
|
}
|
||||||
|
.block-options {
|
||||||
|
justify-content: space-between;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
padding-bottom: 24px;
|
||||||
|
}
|
||||||
|
.block-actions {
|
||||||
|
justify-content: space-between;
|
||||||
|
display: flex;
|
||||||
|
align-items: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fields {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: stretch;
|
||||||
|
gap: var(--spacing-s);
|
||||||
|
}
|
||||||
|
.block-field {
|
||||||
|
display: grid;
|
||||||
|
grid-gap: 5px;
|
||||||
|
}
|
||||||
|
.separator {
|
||||||
|
width: 1px;
|
||||||
|
height: 25px;
|
||||||
|
border-left: 1px dashed var(--grey-4);
|
||||||
|
color: var(--grey-4);
|
||||||
|
/* center horizontally */
|
||||||
|
align-self: center;
|
||||||
|
}
|
||||||
|
.controls {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: right;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,15 @@ export const FIELDS = {
|
||||||
presence: false,
|
presence: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
BARCODEQR: {
|
||||||
|
name: "Barcode/QR",
|
||||||
|
type: "barcodeqr",
|
||||||
|
constraints: {
|
||||||
|
type: "string",
|
||||||
|
length: {},
|
||||||
|
presence: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
LONGFORM: {
|
LONGFORM: {
|
||||||
name: "Long Form Text",
|
name: "Long Form Text",
|
||||||
type: "longform",
|
type: "longform",
|
||||||
|
|
@ -148,6 +157,7 @@ export const ALLOWABLE_STRING_OPTIONS = [
|
||||||
FIELDS.STRING,
|
FIELDS.STRING,
|
||||||
FIELDS.OPTIONS,
|
FIELDS.OPTIONS,
|
||||||
FIELDS.LONGFORM,
|
FIELDS.LONGFORM,
|
||||||
|
FIELDS.BARCODEQR,
|
||||||
]
|
]
|
||||||
export const ALLOWABLE_STRING_TYPES = ALLOWABLE_STRING_OPTIONS.map(
|
export const ALLOWABLE_STRING_TYPES = ALLOWABLE_STRING_OPTIONS.map(
|
||||||
opt => opt.type
|
opt => opt.type
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,16 @@
|
||||||
<script>
|
<script>
|
||||||
import { store, automationStore } from "builderStore"
|
import { store, automationStore } from "builderStore"
|
||||||
import { roles, flags } from "stores/backend"
|
import { roles, flags } from "stores/backend"
|
||||||
import { Icon, Tabs, Tab, Heading, notifications } from "@budibase/bbui"
|
import { apps } from "stores/portal"
|
||||||
|
import {
|
||||||
|
ActionMenu,
|
||||||
|
MenuItem,
|
||||||
|
Icon,
|
||||||
|
Tabs,
|
||||||
|
Tab,
|
||||||
|
Heading,
|
||||||
|
notifications,
|
||||||
|
} from "@budibase/bbui"
|
||||||
import RevertModal from "components/deploy/RevertModal.svelte"
|
import RevertModal from "components/deploy/RevertModal.svelte"
|
||||||
import VersionModal from "components/deploy/VersionModal.svelte"
|
import VersionModal from "components/deploy/VersionModal.svelte"
|
||||||
import DeployNavigation from "components/deploy/DeployNavigation.svelte"
|
import DeployNavigation from "components/deploy/DeployNavigation.svelte"
|
||||||
|
|
@ -54,6 +63,9 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$: isPublished =
|
||||||
|
$apps.find(app => app.devId === application)?.status === "published"
|
||||||
|
|
||||||
onMount(async () => {
|
onMount(async () => {
|
||||||
if (!hasSynced && application) {
|
if (!hasSynced && application) {
|
||||||
try {
|
try {
|
||||||
|
|
@ -83,12 +95,43 @@
|
||||||
<div class="root">
|
<div class="root">
|
||||||
<div class="top-nav">
|
<div class="top-nav">
|
||||||
<div class="topleftnav">
|
<div class="topleftnav">
|
||||||
<Icon
|
<ActionMenu>
|
||||||
size="M"
|
<div slot="control">
|
||||||
name="ArrowLeft"
|
<Icon size="M" hoverable name="ShowMenu" />
|
||||||
hoverable
|
</div>
|
||||||
on:click={() => $goto("../../portal/apps")}
|
<MenuItem on:click={() => $goto("../../portal/apps")}>
|
||||||
/>
|
Exit to portal
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem
|
||||||
|
on:click={() => $goto(`../../portal/overview/${application}`)}
|
||||||
|
>
|
||||||
|
Overview
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem
|
||||||
|
on:click={() =>
|
||||||
|
$goto(`../../portal/overview/${application}?tab=Access`)}
|
||||||
|
>
|
||||||
|
Access
|
||||||
|
</MenuItem>
|
||||||
|
{#if isPublished}
|
||||||
|
<MenuItem
|
||||||
|
on:click={() =>
|
||||||
|
$goto(
|
||||||
|
`../../portal/overview/${application}?tab=${encodeURIComponent(
|
||||||
|
"Automation History"
|
||||||
|
)}`
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
Automation history
|
||||||
|
</MenuItem>
|
||||||
|
{/if}
|
||||||
|
<MenuItem
|
||||||
|
on:click={() =>
|
||||||
|
$goto(`../../portal/overview/${application}?tab=Settings`)}
|
||||||
|
>
|
||||||
|
Settings
|
||||||
|
</MenuItem>
|
||||||
|
</ActionMenu>
|
||||||
<Heading size="XS">{$store.name || "App"}</Heading>
|
<Heading size="XS">{$store.name || "App"}</Heading>
|
||||||
</div>
|
</div>
|
||||||
<div class="topcenternav">
|
<div class="topcenternav">
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,8 @@
|
||||||
"relationshipfield",
|
"relationshipfield",
|
||||||
"datetimefield",
|
"datetimefield",
|
||||||
"multifieldselect",
|
"multifieldselect",
|
||||||
"s3upload"
|
"s3upload",
|
||||||
|
"codescanner"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@budibase/cli",
|
"name": "@budibase/cli",
|
||||||
"version": "2.0.30-alpha.3",
|
"version": "2.0.30-alpha.7",
|
||||||
"description": "Budibase CLI, for developers, self hosting and migrations.",
|
"description": "Budibase CLI, for developers, self hosting and migrations.",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|
@ -26,9 +26,9 @@
|
||||||
"outputPath": "build"
|
"outputPath": "build"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@budibase/backend-core": "2.0.30-alpha.3",
|
"@budibase/backend-core": "2.0.30-alpha.7",
|
||||||
"@budibase/string-templates": "2.0.30-alpha.3",
|
"@budibase/string-templates": "2.0.30-alpha.7",
|
||||||
"@budibase/types": "2.0.30-alpha.3",
|
"@budibase/types": "2.0.30-alpha.7",
|
||||||
"axios": "0.21.2",
|
"axios": "0.21.2",
|
||||||
"chalk": "4.1.0",
|
"chalk": "4.1.0",
|
||||||
"cli-progress": "3.11.2",
|
"cli-progress": "3.11.2",
|
||||||
|
|
|
||||||
|
|
@ -3157,6 +3157,56 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"codescanner": {
|
||||||
|
"name": "Barcode/QR Scanner",
|
||||||
|
"icon": "Camera",
|
||||||
|
"styles": [
|
||||||
|
"size"
|
||||||
|
],
|
||||||
|
"illegalChildren": [
|
||||||
|
"section"
|
||||||
|
],
|
||||||
|
"settings": [
|
||||||
|
{
|
||||||
|
"type": "field/barcode/qr",
|
||||||
|
"label": "Field",
|
||||||
|
"key": "field",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "text",
|
||||||
|
"label": "Label",
|
||||||
|
"key": "label"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "text",
|
||||||
|
"label": "Button text",
|
||||||
|
"key": "scanButtonText"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "text",
|
||||||
|
"label": "Default value",
|
||||||
|
"key": "defaultValue"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "boolean",
|
||||||
|
"label": "Disabled",
|
||||||
|
"key": "disabled",
|
||||||
|
"defaultValue": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "boolean",
|
||||||
|
"label": "Allow manual entry",
|
||||||
|
"key": "allowManualEntry",
|
||||||
|
"defaultValue": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "validation/string",
|
||||||
|
"label": "Validation",
|
||||||
|
"key": "validation"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
"embeddedmap": {
|
"embeddedmap": {
|
||||||
"name": "Embedded Map",
|
"name": "Embedded Map",
|
||||||
"icon": "Location",
|
"icon": "Location",
|
||||||
|
|
@ -4399,7 +4449,9 @@
|
||||||
"formblock": {
|
"formblock": {
|
||||||
"name": "Form Block",
|
"name": "Form Block",
|
||||||
"icon": "Form",
|
"icon": "Form",
|
||||||
"styles": ["size"],
|
"styles": [
|
||||||
|
"size"
|
||||||
|
],
|
||||||
"block": true,
|
"block": true,
|
||||||
"info": "Form blocks are only compatible with internal or SQL tables",
|
"info": "Form blocks are only compatible with internal or SQL tables",
|
||||||
"settings": [
|
"settings": [
|
||||||
|
|
@ -4407,7 +4459,11 @@
|
||||||
"type": "select",
|
"type": "select",
|
||||||
"label": "Type",
|
"label": "Type",
|
||||||
"key": "actionType",
|
"key": "actionType",
|
||||||
"options": ["Create", "Update", "View"],
|
"options": [
|
||||||
|
"Create",
|
||||||
|
"Update",
|
||||||
|
"View"
|
||||||
|
],
|
||||||
"defaultValue": "Create"
|
"defaultValue": "Create"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@budibase/client",
|
"name": "@budibase/client",
|
||||||
"version": "2.0.30-alpha.3",
|
"version": "2.0.30-alpha.7",
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"module": "dist/budibase-client.js",
|
"module": "dist/budibase-client.js",
|
||||||
"main": "dist/budibase-client.js",
|
"main": "dist/budibase-client.js",
|
||||||
|
|
@ -19,9 +19,9 @@
|
||||||
"dev:builder": "rollup -cw"
|
"dev:builder": "rollup -cw"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@budibase/bbui": "2.0.30-alpha.3",
|
"@budibase/bbui": "2.0.30-alpha.7",
|
||||||
"@budibase/frontend-core": "2.0.30-alpha.3",
|
"@budibase/frontend-core": "2.0.30-alpha.7",
|
||||||
"@budibase/string-templates": "2.0.30-alpha.3",
|
"@budibase/string-templates": "2.0.30-alpha.7",
|
||||||
"@spectrum-css/button": "^3.0.3",
|
"@spectrum-css/button": "^3.0.3",
|
||||||
"@spectrum-css/card": "^3.0.3",
|
"@spectrum-css/card": "^3.0.3",
|
||||||
"@spectrum-css/divider": "^1.0.3",
|
"@spectrum-css/divider": "^1.0.3",
|
||||||
|
|
@ -33,6 +33,7 @@
|
||||||
"apexcharts": "^3.22.1",
|
"apexcharts": "^3.22.1",
|
||||||
"dayjs": "^1.10.5",
|
"dayjs": "^1.10.5",
|
||||||
"downloadjs": "1.4.7",
|
"downloadjs": "1.4.7",
|
||||||
|
"html5-qrcode": "^2.2.1",
|
||||||
"leaflet": "^1.7.1",
|
"leaflet": "^1.7.1",
|
||||||
"regexparam": "^1.3.0",
|
"regexparam": "^1.3.0",
|
||||||
"sanitize-html": "^2.7.0",
|
"sanitize-html": "^2.7.0",
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,15 @@ export default {
|
||||||
file: `./dist/budibase-client.js`,
|
file: `./dist/budibase-client.js`,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
onwarn(warning, warn) {
|
||||||
|
if (
|
||||||
|
warning.code === "THIS_IS_UNDEFINED" ||
|
||||||
|
warning.code === "CIRCULAR_DEPENDENCY"
|
||||||
|
) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
warn(warning)
|
||||||
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
alias({
|
alias({
|
||||||
entries: [
|
entries: [
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
<script>
|
<script>
|
||||||
import { screenStore, routeStore, builderStore } from "stores"
|
import { screenStore, routeStore, builderStore } from "stores"
|
||||||
|
import { get } from "svelte/store"
|
||||||
import Component from "./Component.svelte"
|
import Component from "./Component.svelte"
|
||||||
import Provider from "./context/Provider.svelte"
|
import Provider from "./context/Provider.svelte"
|
||||||
import { onMount, getContext } from "svelte"
|
import { onMount, getContext } from "svelte"
|
||||||
|
|
@ -15,24 +16,30 @@
|
||||||
// Get the screen definition for the current route
|
// Get the screen definition for the current route
|
||||||
$: screenDefinition = $screenStore.activeScreen?.props
|
$: screenDefinition = $screenStore.activeScreen?.props
|
||||||
|
|
||||||
onMount(() => {
|
$: runOnLoadActions(params)
|
||||||
// Mark the router as loaded whenever the screen mounts
|
|
||||||
if (!$routeStore.routerLoaded) {
|
|
||||||
routeStore.actions.setRouterLoaded()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Enrich and execute and on load actions.
|
// Enrich and execute any on load actions.
|
||||||
// We manually construct the full context here as this component is the
|
// We manually construct the full context here as this component is the
|
||||||
// one that provides the url context, so it is not available in $context yet
|
// one that provides the url context, so it is not available in $context yet
|
||||||
if ($screenStore.activeScreen?.onLoad && !$builderStore.inBuilder) {
|
const runOnLoadActions = params => {
|
||||||
const actions = enrichButtonActions($screenStore.activeScreen.onLoad, {
|
const screenState = get(screenStore)
|
||||||
...$context,
|
|
||||||
|
if (screenState.activeScreen?.onLoad && !get(builderStore).inBuilder) {
|
||||||
|
const actions = enrichButtonActions(screenState.activeScreen.onLoad, {
|
||||||
|
...get(context),
|
||||||
url: params,
|
url: params,
|
||||||
})
|
})
|
||||||
if (actions != null) {
|
if (actions != null) {
|
||||||
actions()
|
actions()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
// Mark the router as loaded whenever the screen mounts
|
||||||
|
if (!$routeStore.routerLoaded) {
|
||||||
|
routeStore.actions.setRouterLoaded()
|
||||||
|
}
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
export let rowId
|
export let rowId
|
||||||
export let actionUrl
|
export let actionUrl
|
||||||
|
|
||||||
const { fetchDatasourceSchema, builderStore } = getContext("sdk")
|
const { fetchDatasourceSchema } = getContext("sdk")
|
||||||
const FieldTypeToComponentMap = {
|
const FieldTypeToComponentMap = {
|
||||||
string: "stringfield",
|
string: "stringfield",
|
||||||
number: "numberfield",
|
number: "numberfield",
|
||||||
|
|
@ -29,6 +29,7 @@
|
||||||
attachment: "attachmentfield",
|
attachment: "attachmentfield",
|
||||||
link: "relationshipfield",
|
link: "relationshipfield",
|
||||||
json: "jsonfield",
|
json: "jsonfield",
|
||||||
|
barcodeqr: "codescanner",
|
||||||
}
|
}
|
||||||
|
|
||||||
let schema
|
let schema
|
||||||
|
|
@ -80,7 +81,7 @@
|
||||||
field: "_id",
|
field: "_id",
|
||||||
operator: "equal",
|
operator: "equal",
|
||||||
type: "string",
|
type: "string",
|
||||||
value: rowId,
|
value: !rowId ? `{{ ${safe("url")}.${safe("id")} }}` : rowId,
|
||||||
valueType: "Binding",
|
valueType: "Binding",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
@ -118,7 +119,7 @@
|
||||||
props={{
|
props={{
|
||||||
dataSource,
|
dataSource,
|
||||||
filter,
|
filter,
|
||||||
limit: rowId ? 1 : $builderStore.inBuilder ? 1 : 0,
|
limit: 1,
|
||||||
paginate: false,
|
paginate: false,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|
@ -129,6 +130,8 @@
|
||||||
props={{
|
props={{
|
||||||
dataProvider,
|
dataProvider,
|
||||||
noRowsMessage: "We couldn't find a row to display",
|
noRowsMessage: "We couldn't find a row to display",
|
||||||
|
direction: "column",
|
||||||
|
hAlign: "center",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<BlockComponent
|
<BlockComponent
|
||||||
|
|
@ -139,6 +142,11 @@
|
||||||
size,
|
size,
|
||||||
disabled: disabled || actionType === "View",
|
disabled: disabled || actionType === "View",
|
||||||
}}
|
}}
|
||||||
|
styles={{
|
||||||
|
normal: {
|
||||||
|
width: "600px",
|
||||||
|
},
|
||||||
|
}}
|
||||||
context="form"
|
context="form"
|
||||||
bind:id={formId}
|
bind:id={formId}
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,234 @@
|
||||||
|
<script>
|
||||||
|
import { ModalContent, Modal, Icon, ActionButton } from "@budibase/bbui"
|
||||||
|
import { Input, Button, StatusLight } from "@budibase/bbui"
|
||||||
|
import { Html5Qrcode } from "html5-qrcode"
|
||||||
|
import { createEventDispatcher } from "svelte"
|
||||||
|
|
||||||
|
export let value
|
||||||
|
export let disabled = false
|
||||||
|
export let allowManualEntry = false
|
||||||
|
export let scanButtonText = "Scan code"
|
||||||
|
const dispatch = createEventDispatcher()
|
||||||
|
|
||||||
|
let videoEle
|
||||||
|
let camModal
|
||||||
|
let manualMode = false
|
||||||
|
let cameraEnabled
|
||||||
|
let cameraStarted = false
|
||||||
|
let html5QrCode
|
||||||
|
let cameraSetting = { facingMode: "environment" }
|
||||||
|
let cameraConfig = {
|
||||||
|
fps: 25,
|
||||||
|
qrbox: { width: 250, height: 250 },
|
||||||
|
}
|
||||||
|
const onScanSuccess = decodedText => {
|
||||||
|
if (value != decodedText) {
|
||||||
|
dispatch("change", decodedText)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const initReader = async () => {
|
||||||
|
if (html5QrCode) {
|
||||||
|
html5QrCode.stop()
|
||||||
|
}
|
||||||
|
html5QrCode = new Html5Qrcode("reader")
|
||||||
|
return new Promise(resolve => {
|
||||||
|
html5QrCode
|
||||||
|
.start(cameraSetting, cameraConfig, onScanSuccess)
|
||||||
|
.then(() => {
|
||||||
|
resolve({ initialised: true })
|
||||||
|
})
|
||||||
|
.catch(err => {
|
||||||
|
console.log("There was a problem scanning the image", err)
|
||||||
|
resolve({ initialised: false })
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const checkCamera = async () => {
|
||||||
|
return new Promise(resolve => {
|
||||||
|
Html5Qrcode.getCameras()
|
||||||
|
.then(devices => {
|
||||||
|
if (devices && devices.length) {
|
||||||
|
resolve({ enabled: true })
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(e => {
|
||||||
|
console.error(e)
|
||||||
|
resolve({ enabled: false })
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const start = async () => {
|
||||||
|
const status = await initReader()
|
||||||
|
cameraStarted = status.initialised
|
||||||
|
}
|
||||||
|
|
||||||
|
$: if (cameraEnabled && videoEle && !cameraStarted) {
|
||||||
|
start()
|
||||||
|
}
|
||||||
|
|
||||||
|
const showReaderModal = async () => {
|
||||||
|
camModal.show()
|
||||||
|
const camStatus = await checkCamera()
|
||||||
|
cameraEnabled = camStatus.enabled
|
||||||
|
}
|
||||||
|
|
||||||
|
const hideReaderModal = async () => {
|
||||||
|
cameraEnabled = undefined
|
||||||
|
cameraStarted = false
|
||||||
|
if (html5QrCode) {
|
||||||
|
await html5QrCode.stop()
|
||||||
|
html5QrCode = undefined
|
||||||
|
}
|
||||||
|
camModal.hide()
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="scanner-video-wrapper">
|
||||||
|
{#if value && !manualMode}
|
||||||
|
<div class="scanner-value field-display">
|
||||||
|
<StatusLight positive />
|
||||||
|
{value}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if allowManualEntry && manualMode}
|
||||||
|
<div class="manual-input">
|
||||||
|
<Input
|
||||||
|
bind:value
|
||||||
|
on:change={() => {
|
||||||
|
dispatch("change", value)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if value}
|
||||||
|
<ActionButton
|
||||||
|
on:click={() => {
|
||||||
|
dispatch("change", "")
|
||||||
|
}}
|
||||||
|
{disabled}
|
||||||
|
>
|
||||||
|
Clear
|
||||||
|
</ActionButton>
|
||||||
|
{:else}
|
||||||
|
<ActionButton
|
||||||
|
icon="Camera"
|
||||||
|
on:click={() => {
|
||||||
|
showReaderModal()
|
||||||
|
}}
|
||||||
|
{disabled}
|
||||||
|
>
|
||||||
|
{scanButtonText}
|
||||||
|
</ActionButton>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-wrap">
|
||||||
|
<Modal bind:this={camModal} on:hide={hideReaderModal}>
|
||||||
|
<ModalContent
|
||||||
|
title={scanButtonText}
|
||||||
|
showConfirmButton={false}
|
||||||
|
showCancelButton={false}
|
||||||
|
>
|
||||||
|
<div id="reader" class="container" bind:this={videoEle}>
|
||||||
|
<div class="camera-placeholder">
|
||||||
|
<Icon size="XXL" name="Camera" />
|
||||||
|
{#if cameraEnabled === false}
|
||||||
|
<div>Your camera is disabled.</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{#if cameraEnabled === true}
|
||||||
|
<div class="code-wrap">
|
||||||
|
{#if value}
|
||||||
|
<div class="scanner-value">
|
||||||
|
<StatusLight positive />
|
||||||
|
{value}
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="scanner-value">
|
||||||
|
<StatusLight neutral />
|
||||||
|
Searching for code...
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<div slot="footer">
|
||||||
|
<div class="footer-buttons">
|
||||||
|
{#if allowManualEntry && !manualMode}
|
||||||
|
<Button
|
||||||
|
group
|
||||||
|
secondary
|
||||||
|
newStyles
|
||||||
|
on:click={() => {
|
||||||
|
manualMode = true
|
||||||
|
camModal.hide()
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Enter manually
|
||||||
|
</Button>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<Button
|
||||||
|
group
|
||||||
|
cta
|
||||||
|
on:click={() => {
|
||||||
|
camModal.hide()
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Confirm
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</ModalContent>
|
||||||
|
</Modal>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
#reader :global(video) {
|
||||||
|
border-radius: 4px;
|
||||||
|
border: 2px solid var(--spectrum-global-color-gray-300);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
.field-display :global(.spectrum-Tags-item) {
|
||||||
|
margin: 0px;
|
||||||
|
}
|
||||||
|
.footer-buttons {
|
||||||
|
display: flex;
|
||||||
|
grid-area: buttonGroup;
|
||||||
|
gap: var(--spectrum-global-dimension-static-size-200);
|
||||||
|
}
|
||||||
|
.scanner-value {
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
.field-display {
|
||||||
|
padding-top: var(
|
||||||
|
--spectrum-fieldlabel-side-m-padding-top,
|
||||||
|
var(--spectrum-global-dimension-size-100)
|
||||||
|
);
|
||||||
|
margin-bottom: var(--spacing-m);
|
||||||
|
}
|
||||||
|
.camera-placeholder {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border-radius: 4px;
|
||||||
|
border: 2px solid var(--spectrum-global-color-gray-300);
|
||||||
|
background-color: var(--spectrum-global-color-gray-200);
|
||||||
|
flex-direction: column;
|
||||||
|
gap: var(--spectrum-global-dimension-static-size-200);
|
||||||
|
}
|
||||||
|
.container,
|
||||||
|
.camera-placeholder {
|
||||||
|
width: 100%;
|
||||||
|
min-height: 240px;
|
||||||
|
}
|
||||||
|
.manual-input {
|
||||||
|
padding-bottom: var(--spacing-m);
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
@ -0,0 +1,47 @@
|
||||||
|
<script>
|
||||||
|
import Field from "./Field.svelte"
|
||||||
|
import CodeScanner from "./CodeScanner.svelte"
|
||||||
|
|
||||||
|
export let field
|
||||||
|
export let label
|
||||||
|
export let type = "barcodeqr"
|
||||||
|
export let disabled = false
|
||||||
|
export let validation
|
||||||
|
export let defaultValue = ""
|
||||||
|
export let onChange
|
||||||
|
export let allowManualEntry
|
||||||
|
export let scanButtonText
|
||||||
|
|
||||||
|
let fieldState
|
||||||
|
let fieldApi
|
||||||
|
|
||||||
|
$: scanText = scanButtonText || "Scan code"
|
||||||
|
|
||||||
|
const handleUpdate = e => {
|
||||||
|
const changed = fieldApi.setValue(e.detail)
|
||||||
|
if (onChange && changed) {
|
||||||
|
onChange({ value: e.detail })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Field
|
||||||
|
{label}
|
||||||
|
{field}
|
||||||
|
{disabled}
|
||||||
|
{validation}
|
||||||
|
{defaultValue}
|
||||||
|
{type}
|
||||||
|
bind:fieldState
|
||||||
|
bind:fieldApi
|
||||||
|
>
|
||||||
|
{#if fieldState}
|
||||||
|
<CodeScanner
|
||||||
|
value={fieldState.value}
|
||||||
|
on:change={handleUpdate}
|
||||||
|
disabled={fieldState.disabled}
|
||||||
|
{allowManualEntry}
|
||||||
|
scanButtonText={scanText}
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
</Field>
|
||||||
|
|
@ -13,3 +13,4 @@ export { default as passwordfield } from "./PasswordField.svelte"
|
||||||
export { default as formstep } from "./FormStep.svelte"
|
export { default as formstep } from "./FormStep.svelte"
|
||||||
export { default as jsonfield } from "./JSONField.svelte"
|
export { default as jsonfield } from "./JSONField.svelte"
|
||||||
export { default as s3upload } from "./S3Upload.svelte"
|
export { default as s3upload } from "./S3Upload.svelte"
|
||||||
|
export { default as codescanner } from "./CodeScannerField.svelte"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
export const FieldTypes = {
|
export const FieldTypes = {
|
||||||
STRING: "string",
|
STRING: "string",
|
||||||
|
BARCODEQR: "barcodeqr",
|
||||||
LONGFORM: "longform",
|
LONGFORM: "longform",
|
||||||
OPTIONS: "options",
|
OPTIONS: "options",
|
||||||
NUMBER: "number",
|
NUMBER: "number",
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "@budibase/frontend-core",
|
"name": "@budibase/frontend-core",
|
||||||
"version": "2.0.30-alpha.3",
|
"version": "2.0.30-alpha.7",
|
||||||
"description": "Budibase frontend core libraries used in builder and client",
|
"description": "Budibase frontend core libraries used in builder and client",
|
||||||
"author": "Budibase",
|
"author": "Budibase",
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"svelte": "src/index.js",
|
"svelte": "src/index.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@budibase/bbui": "2.0.30-alpha.3",
|
"@budibase/bbui": "2.0.30-alpha.7",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"svelte": "^3.46.2"
|
"svelte": "^3.46.2"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@budibase/sdk",
|
"name": "@budibase/sdk",
|
||||||
"version": "2.0.30-alpha.3",
|
"version": "2.0.30-alpha.7",
|
||||||
"description": "Budibase Public API SDK",
|
"description": "Budibase Public API SDK",
|
||||||
"author": "Budibase",
|
"author": "Budibase",
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ module MongoMock {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
mongodb.ObjectID = jest.requireActual("mongodb").ObjectID
|
mongodb.ObjectId = jest.requireActual("mongodb").ObjectId
|
||||||
|
|
||||||
module.exports = mongodb
|
module.exports = mongodb
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "@budibase/server",
|
"name": "@budibase/server",
|
||||||
"email": "hi@budibase.com",
|
"email": "hi@budibase.com",
|
||||||
"version": "2.0.30-alpha.3",
|
"version": "2.0.30-alpha.7",
|
||||||
"description": "Budibase Web Server",
|
"description": "Budibase Web Server",
|
||||||
"main": "src/index.ts",
|
"main": "src/index.ts",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
@ -77,11 +77,11 @@
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@apidevtools/swagger-parser": "10.0.3",
|
"@apidevtools/swagger-parser": "10.0.3",
|
||||||
"@budibase/backend-core": "2.0.30-alpha.3",
|
"@budibase/backend-core": "2.0.30-alpha.7",
|
||||||
"@budibase/client": "2.0.30-alpha.3",
|
"@budibase/client": "2.0.30-alpha.7",
|
||||||
"@budibase/pro": "2.0.30-alpha.3",
|
"@budibase/pro": "2.0.30-alpha.7",
|
||||||
"@budibase/string-templates": "2.0.30-alpha.3",
|
"@budibase/string-templates": "2.0.30-alpha.7",
|
||||||
"@budibase/types": "2.0.30-alpha.3",
|
"@budibase/types": "2.0.30-alpha.7",
|
||||||
"@bull-board/api": "3.7.0",
|
"@bull-board/api": "3.7.0",
|
||||||
"@bull-board/koa": "3.9.4",
|
"@bull-board/koa": "3.9.4",
|
||||||
"@elastic/elasticsearch": "7.10.0",
|
"@elastic/elasticsearch": "7.10.0",
|
||||||
|
|
@ -123,7 +123,7 @@
|
||||||
"koa2-ratelimit": "1.1.1",
|
"koa2-ratelimit": "1.1.1",
|
||||||
"lodash": "4.17.21",
|
"lodash": "4.17.21",
|
||||||
"memorystream": "0.3.1",
|
"memorystream": "0.3.1",
|
||||||
"mongodb": "3.6.3",
|
"mongodb": "4.9",
|
||||||
"mssql": "6.2.3",
|
"mssql": "6.2.3",
|
||||||
"mysql2": "2.3.3",
|
"mysql2": "2.3.3",
|
||||||
"node-fetch": "2.6.7",
|
"node-fetch": "2.6.7",
|
||||||
|
|
@ -166,7 +166,6 @@
|
||||||
"@types/koa": "2.13.5",
|
"@types/koa": "2.13.5",
|
||||||
"@types/koa__router": "8.0.11",
|
"@types/koa__router": "8.0.11",
|
||||||
"@types/lodash": "4.14.180",
|
"@types/lodash": "4.14.180",
|
||||||
"@types/mongodb": "3.6.3",
|
|
||||||
"@types/node": "14.18.20",
|
"@types/node": "14.18.20",
|
||||||
"@types/node-fetch": "2.6.1",
|
"@types/node-fetch": "2.6.1",
|
||||||
"@types/oracledb": "5.2.2",
|
"@types/oracledb": "5.2.2",
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ exports.NoEmptyFilterStrings = [
|
||||||
|
|
||||||
exports.FieldTypes = {
|
exports.FieldTypes = {
|
||||||
STRING: "string",
|
STRING: "string",
|
||||||
|
BARCODEQR: "barcodeqr",
|
||||||
LONGFORM: "longform",
|
LONGFORM: "longform",
|
||||||
OPTIONS: "options",
|
OPTIONS: "options",
|
||||||
NUMBER: "number",
|
NUMBER: "number",
|
||||||
|
|
@ -47,6 +48,7 @@ exports.CanSwitchTypes = [
|
||||||
exports.FieldTypes.STRING,
|
exports.FieldTypes.STRING,
|
||||||
exports.FieldTypes.OPTIONS,
|
exports.FieldTypes.OPTIONS,
|
||||||
exports.FieldTypes.LONGFORM,
|
exports.FieldTypes.LONGFORM,
|
||||||
|
exports.FieldTypes.BARCODEQR,
|
||||||
],
|
],
|
||||||
[exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER],
|
[exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER],
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,7 @@ function generateSchema(
|
||||||
case FieldTypes.STRING:
|
case FieldTypes.STRING:
|
||||||
case FieldTypes.OPTIONS:
|
case FieldTypes.OPTIONS:
|
||||||
case FieldTypes.LONGFORM:
|
case FieldTypes.LONGFORM:
|
||||||
|
case FieldTypes.BARCODEQR:
|
||||||
schema.text(key)
|
schema.text(key)
|
||||||
break
|
break
|
||||||
case FieldTypes.NUMBER:
|
case FieldTypes.NUMBER:
|
||||||
|
|
|
||||||
|
|
@ -6,13 +6,12 @@ import {
|
||||||
} from "@budibase/types"
|
} from "@budibase/types"
|
||||||
import {
|
import {
|
||||||
MongoClient,
|
MongoClient,
|
||||||
ObjectID,
|
ObjectId,
|
||||||
FilterQuery,
|
Filter,
|
||||||
UpdateQuery,
|
UpdateFilter,
|
||||||
FindOneAndUpdateOption,
|
FindOneAndUpdateOptions,
|
||||||
UpdateOneOptions,
|
UpdateOptions,
|
||||||
UpdateManyOptions,
|
OperationOptions,
|
||||||
CommonOptions,
|
|
||||||
} from "mongodb"
|
} from "mongodb"
|
||||||
|
|
||||||
interface MongoDBConfig {
|
interface MongoDBConfig {
|
||||||
|
|
@ -57,6 +56,232 @@ const SCHEMA: Integration = {
|
||||||
delete: {
|
delete: {
|
||||||
type: QueryType.JSON,
|
type: QueryType.JSON,
|
||||||
},
|
},
|
||||||
|
aggregate: {
|
||||||
|
type: QueryType.JSON,
|
||||||
|
steps: [
|
||||||
|
{
|
||||||
|
key: "$addFields",
|
||||||
|
template: "{\n\t\n}",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$bucket",
|
||||||
|
template: `{
|
||||||
|
"groupBy": "",
|
||||||
|
"boundaries": [],
|
||||||
|
"default": "",
|
||||||
|
"output": {}
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$bucketAuto",
|
||||||
|
template: `{
|
||||||
|
"groupBy": "",
|
||||||
|
"buckets": 1,
|
||||||
|
"output": {},
|
||||||
|
"granularity": "R5"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$changeStream",
|
||||||
|
template: `{
|
||||||
|
"allChangesForCluster": true,
|
||||||
|
"fullDocument": "",
|
||||||
|
"fullDocumentBeforeChange": "",
|
||||||
|
"resumeAfter": 1,
|
||||||
|
"showExpandedEvents": true,
|
||||||
|
"startAfter": {},
|
||||||
|
"startAtOperationTime": ""
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$collStats",
|
||||||
|
template: `{
|
||||||
|
"latencyStats": { "histograms": true } },
|
||||||
|
"storageStats": { "scale": 1 } },
|
||||||
|
"count": {},
|
||||||
|
"queryExecStats": {}
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$count",
|
||||||
|
template: ``,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$densify",
|
||||||
|
template: `{
|
||||||
|
"field": "",
|
||||||
|
"partitionByFields": [],
|
||||||
|
"range": {
|
||||||
|
"step": 1,
|
||||||
|
"unit": 1,
|
||||||
|
"bounds": "full"
|
||||||
|
}
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$documents",
|
||||||
|
template: `[]`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$facet",
|
||||||
|
template: `{\n\t\n}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$fill",
|
||||||
|
template: `{
|
||||||
|
"partitionBy": "",
|
||||||
|
"partitionByFields": [],
|
||||||
|
"sortBy": {},
|
||||||
|
"output": {}
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$geoNear",
|
||||||
|
template: `{
|
||||||
|
"near": {
|
||||||
|
"type": "Point",
|
||||||
|
"coordinates": [
|
||||||
|
-73.98142, 40.71782
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"key": "location",
|
||||||
|
"distanceField": "dist.calculated",
|
||||||
|
"query": { "category": "Parks" }
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$graphLookup",
|
||||||
|
template: `{
|
||||||
|
"from": "",
|
||||||
|
"startWith": "",
|
||||||
|
"connectFromField": "",
|
||||||
|
"connectToField": "",
|
||||||
|
"as": "",
|
||||||
|
"maxDepth": 1,
|
||||||
|
"depthField": "",
|
||||||
|
"restrictSearchWithMatch": {}
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$group",
|
||||||
|
template: `{
|
||||||
|
"_id": ""
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$indexStats",
|
||||||
|
template: "{\n\t\n}",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$limit",
|
||||||
|
template: `1`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$listLocalSessions",
|
||||||
|
template: `{\n\t\n}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$listSessions",
|
||||||
|
template: `{\n\t\n}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$lookup",
|
||||||
|
template: `{
|
||||||
|
"from": "",
|
||||||
|
"localField": "",
|
||||||
|
"foreignField": "",
|
||||||
|
"as": ""
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$match",
|
||||||
|
template: "{\n\t\n}",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$merge",
|
||||||
|
template: `{
|
||||||
|
"into": {},
|
||||||
|
"on": "_id",
|
||||||
|
"whenMatched": "replace",
|
||||||
|
"whenNotMatched": "insert"
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$out",
|
||||||
|
template: `{
|
||||||
|
"db": "",
|
||||||
|
"coll": ""
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$planCacheStats",
|
||||||
|
template: "{\n\t\n}",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$project",
|
||||||
|
template: "{\n\t\n}",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$redact",
|
||||||
|
template: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$replaceRoot",
|
||||||
|
template: `{ "newRoot": "" }`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$replaceWith",
|
||||||
|
template: ``,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$sample",
|
||||||
|
template: `{ "size": 3 }`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$set",
|
||||||
|
template: "{\n\t\n}",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$setWindowFields",
|
||||||
|
template: `{
|
||||||
|
"partitionBy": "",
|
||||||
|
"sortBy": {},
|
||||||
|
"output": {}
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$skip",
|
||||||
|
template: `1`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$sort",
|
||||||
|
template: "{\n\t\n}",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$sortByCount",
|
||||||
|
template: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$unionWith",
|
||||||
|
template: `{
|
||||||
|
"coll": "",
|
||||||
|
"pipeline": []
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$unset",
|
||||||
|
template: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "$unwind",
|
||||||
|
template: `{
|
||||||
|
"path": "",
|
||||||
|
"includeArrayIndex": "",
|
||||||
|
"preserveNullAndEmptyArrays": true
|
||||||
|
}`,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
},
|
},
|
||||||
extra: {
|
extra: {
|
||||||
collection: {
|
collection: {
|
||||||
|
|
@ -64,8 +289,8 @@ const SCHEMA: Integration = {
|
||||||
type: DatasourceFieldType.STRING,
|
type: DatasourceFieldType.STRING,
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
actionTypes: {
|
actionType: {
|
||||||
displayName: "Action Types",
|
displayName: "Query Type",
|
||||||
type: DatasourceFieldType.LIST,
|
type: DatasourceFieldType.LIST,
|
||||||
required: true,
|
required: true,
|
||||||
data: {
|
data: {
|
||||||
|
|
@ -73,6 +298,7 @@ const SCHEMA: Integration = {
|
||||||
create: ["insertOne", "insertMany"],
|
create: ["insertOne", "insertMany"],
|
||||||
update: ["updateOne", "updateMany"],
|
update: ["updateOne", "updateMany"],
|
||||||
delete: ["deleteOne", "deleteMany"],
|
delete: ["deleteOne", "deleteMany"],
|
||||||
|
aggregate: ["json", "pipeline"],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -104,7 +330,7 @@ class MongoIntegration implements IntegrationBase {
|
||||||
) {
|
) {
|
||||||
const id = json[field].match(/(?<=objectid\(['"]).*(?=['"]\))/gi)?.[0]
|
const id = json[field].match(/(?<=objectid\(['"]).*(?=['"]\))/gi)?.[0]
|
||||||
if (id) {
|
if (id) {
|
||||||
json[field] = ObjectID.createFromHexString(id)
|
json[field] = ObjectId.createFromHexString(id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -168,7 +394,7 @@ class MongoIntegration implements IntegrationBase {
|
||||||
|
|
||||||
// For mongodb we add an extra actionType to specify
|
// For mongodb we add an extra actionType to specify
|
||||||
// which method we want to call on the collection
|
// which method we want to call on the collection
|
||||||
switch (query.extra.actionTypes) {
|
switch (query.extra.actionType) {
|
||||||
case "insertOne": {
|
case "insertOne": {
|
||||||
return await collection.insertOne(json)
|
return await collection.insertOne(json)
|
||||||
}
|
}
|
||||||
|
|
@ -177,7 +403,7 @@ class MongoIntegration implements IntegrationBase {
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`actionType ${query.extra.actionTypes} does not exist on DB for create`
|
`actionType ${query.extra.actionType} does not exist on DB for create`
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -196,7 +422,7 @@ class MongoIntegration implements IntegrationBase {
|
||||||
const collection = db.collection(query.extra.collection)
|
const collection = db.collection(query.extra.collection)
|
||||||
let json = this.createObjectIds(query.json)
|
let json = this.createObjectIds(query.json)
|
||||||
|
|
||||||
switch (query.extra.actionTypes) {
|
switch (query.extra.actionType) {
|
||||||
case "find": {
|
case "find": {
|
||||||
return await collection.find(json).toArray()
|
return await collection.find(json).toArray()
|
||||||
}
|
}
|
||||||
|
|
@ -208,9 +434,9 @@ class MongoIntegration implements IntegrationBase {
|
||||||
json = this.parseQueryParams(query.json, "update")
|
json = this.parseQueryParams(query.json, "update")
|
||||||
}
|
}
|
||||||
let findAndUpdateJson = this.createObjectIds(json) as {
|
let findAndUpdateJson = this.createObjectIds(json) as {
|
||||||
filter: FilterQuery<any>
|
filter: Filter<any>
|
||||||
update: UpdateQuery<any>
|
update: UpdateFilter<any>
|
||||||
options: FindOneAndUpdateOption<any>
|
options: FindOneAndUpdateOptions
|
||||||
}
|
}
|
||||||
return await collection.findOneAndUpdate(
|
return await collection.findOneAndUpdate(
|
||||||
findAndUpdateJson.filter,
|
findAndUpdateJson.filter,
|
||||||
|
|
@ -226,7 +452,7 @@ class MongoIntegration implements IntegrationBase {
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`actionType ${query.extra.actionTypes} does not exist on DB for read`
|
`actionType ${query.extra.actionType} does not exist on DB for read`
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -248,29 +474,29 @@ class MongoIntegration implements IntegrationBase {
|
||||||
queryJson = this.parseQueryParams(queryJson, "update")
|
queryJson = this.parseQueryParams(queryJson, "update")
|
||||||
}
|
}
|
||||||
let json = this.createObjectIds(queryJson) as {
|
let json = this.createObjectIds(queryJson) as {
|
||||||
filter: FilterQuery<any>
|
filter: Filter<any>
|
||||||
update: UpdateQuery<any>
|
update: UpdateFilter<any>
|
||||||
options: object
|
options: object
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (query.extra.actionTypes) {
|
switch (query.extra.actionType) {
|
||||||
case "updateOne": {
|
case "updateOne": {
|
||||||
return await collection.updateOne(
|
return await collection.updateOne(
|
||||||
json.filter,
|
json.filter,
|
||||||
json.update,
|
json.update,
|
||||||
json.options as UpdateOneOptions
|
json.options as UpdateOptions
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
case "updateMany": {
|
case "updateMany": {
|
||||||
return await collection.updateMany(
|
return await collection.updateMany(
|
||||||
json.filter,
|
json.filter,
|
||||||
json.update,
|
json.update,
|
||||||
json.options as UpdateManyOptions
|
json.options as UpdateOptions
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`actionType ${query.extra.actionTypes} does not exist on DB for update`
|
`actionType ${query.extra.actionType} does not exist on DB for update`
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -292,8 +518,8 @@ class MongoIntegration implements IntegrationBase {
|
||||||
queryJson = this.parseQueryParams(queryJson, "delete")
|
queryJson = this.parseQueryParams(queryJson, "delete")
|
||||||
}
|
}
|
||||||
let json = this.createObjectIds(queryJson) as {
|
let json = this.createObjectIds(queryJson) as {
|
||||||
filter: FilterQuery<any>
|
filter: Filter<any>
|
||||||
options: CommonOptions
|
options: OperationOptions
|
||||||
}
|
}
|
||||||
if (!json.options) {
|
if (!json.options) {
|
||||||
json = {
|
json = {
|
||||||
|
|
@ -302,7 +528,7 @@ class MongoIntegration implements IntegrationBase {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (query.extra.actionTypes) {
|
switch (query.extra.actionType) {
|
||||||
case "deleteOne": {
|
case "deleteOne": {
|
||||||
return await collection.deleteOne(json.filter, json.options)
|
return await collection.deleteOne(json.filter, json.options)
|
||||||
}
|
}
|
||||||
|
|
@ -311,7 +537,7 @@ class MongoIntegration implements IntegrationBase {
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`actionType ${query.extra.actionTypes} does not exist on DB for delete`
|
`actionType ${query.extra.actionType} does not exist on DB for delete`
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -322,6 +548,43 @@ class MongoIntegration implements IntegrationBase {
|
||||||
await this.client.close()
|
await this.client.close()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async aggregate(query: {
|
||||||
|
json: object
|
||||||
|
steps: any[]
|
||||||
|
extra: { [key: string]: string }
|
||||||
|
}) {
|
||||||
|
try {
|
||||||
|
await this.connect()
|
||||||
|
const db = this.client.db(this.config.db)
|
||||||
|
const collection = db.collection(query.extra.collection)
|
||||||
|
let response = []
|
||||||
|
if (query.extra?.actionType === "pipeline") {
|
||||||
|
for await (const doc of collection.aggregate(
|
||||||
|
query.steps.map(({ key, value }) => {
|
||||||
|
let temp: any = {}
|
||||||
|
temp[key] = JSON.parse(value.value)
|
||||||
|
return this.createObjectIds(temp)
|
||||||
|
})
|
||||||
|
)) {
|
||||||
|
response.push(doc)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const stages: Array<any> = query.json as Array<any>
|
||||||
|
for await (const doc of collection.aggregate(
|
||||||
|
stages ? this.createObjectIds(stages) : []
|
||||||
|
)) {
|
||||||
|
response.push(doc)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return response
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Error writing to mongodb", err)
|
||||||
|
throw err
|
||||||
|
} finally {
|
||||||
|
await this.client.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ describe("MongoDB Integration", () => {
|
||||||
await config.integration.create({
|
await config.integration.create({
|
||||||
index: indexName,
|
index: indexName,
|
||||||
json: body,
|
json: body,
|
||||||
extra: { collection: "testCollection", actionTypes: "insertOne" },
|
extra: { collection: "testCollection", actionType: "insertOne" },
|
||||||
})
|
})
|
||||||
expect(config.integration.client.insertOne).toHaveBeenCalledWith(body)
|
expect(config.integration.client.insertOne).toHaveBeenCalledWith(body)
|
||||||
})
|
})
|
||||||
|
|
@ -44,7 +44,7 @@ describe("MongoDB Integration", () => {
|
||||||
json: {
|
json: {
|
||||||
address: "test",
|
address: "test",
|
||||||
},
|
},
|
||||||
extra: { collection: "testCollection", actionTypes: "find" },
|
extra: { collection: "testCollection", actionType: "find" },
|
||||||
}
|
}
|
||||||
const response = await config.integration.read(query)
|
const response = await config.integration.read(query)
|
||||||
expect(config.integration.client.find).toHaveBeenCalledWith(query.json)
|
expect(config.integration.client.find).toHaveBeenCalledWith(query.json)
|
||||||
|
|
@ -61,7 +61,7 @@ describe("MongoDB Integration", () => {
|
||||||
opt: "option",
|
opt: "option",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
extra: { collection: "testCollection", actionTypes: "deleteOne" },
|
extra: { collection: "testCollection", actionType: "deleteOne" },
|
||||||
}
|
}
|
||||||
await config.integration.delete(query)
|
await config.integration.delete(query)
|
||||||
expect(config.integration.client.deleteOne).toHaveBeenCalledWith(
|
expect(config.integration.client.deleteOne).toHaveBeenCalledWith(
|
||||||
|
|
@ -83,7 +83,7 @@ describe("MongoDB Integration", () => {
|
||||||
upsert: false,
|
upsert: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
extra: { collection: "testCollection", actionTypes: "updateOne" },
|
extra: { collection: "testCollection", actionType: "updateOne" },
|
||||||
}
|
}
|
||||||
await config.integration.update(query)
|
await config.integration.update(query)
|
||||||
expect(config.integration.client.updateOne).toHaveBeenCalledWith(
|
expect(config.integration.client.updateOne).toHaveBeenCalledWith(
|
||||||
|
|
@ -97,7 +97,7 @@ describe("MongoDB Integration", () => {
|
||||||
const restore = disableConsole()
|
const restore = disableConsole()
|
||||||
|
|
||||||
const query = {
|
const query = {
|
||||||
extra: { collection: "testCollection", actionTypes: "deleteOne" },
|
extra: { collection: "testCollection", actionType: "deleteOne" },
|
||||||
}
|
}
|
||||||
|
|
||||||
let error = null
|
let error = null
|
||||||
|
|
@ -125,19 +125,19 @@ describe("MongoDB Integration", () => {
|
||||||
upsert: false,
|
upsert: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
extra: { collection: "testCollection", actionTypes: "updateOne" },
|
extra: { collection: "testCollection", actionType: "updateOne" },
|
||||||
}
|
}
|
||||||
await config.integration.update(query)
|
await config.integration.update(query)
|
||||||
expect(config.integration.client.updateOne).toHaveBeenCalled()
|
expect(config.integration.client.updateOne).toHaveBeenCalled()
|
||||||
|
|
||||||
const args = config.integration.client.updateOne.mock.calls[0]
|
const args = config.integration.client.updateOne.mock.calls[0]
|
||||||
expect(args[0]).toEqual({
|
expect(args[0]).toEqual({
|
||||||
_id: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
|
_id: mongo.ObjectId.createFromHexString("ACBD12345678ABCD12345678"),
|
||||||
name: mongo.ObjectID.createFromHexString("BBBB12345678ABCD12345678"),
|
name: mongo.ObjectId.createFromHexString("BBBB12345678ABCD12345678"),
|
||||||
})
|
})
|
||||||
expect(args[1]).toEqual({
|
expect(args[1]).toEqual({
|
||||||
_id: mongo.ObjectID.createFromHexString("FFFF12345678ABCD12345678"),
|
_id: mongo.ObjectId.createFromHexString("FFFF12345678ABCD12345678"),
|
||||||
name: mongo.ObjectID.createFromHexString("CCCC12345678ABCD12345678"),
|
name: mongo.ObjectId.createFromHexString("CCCC12345678ABCD12345678"),
|
||||||
})
|
})
|
||||||
expect(args[2]).toEqual({
|
expect(args[2]).toEqual({
|
||||||
upsert: false,
|
upsert: false,
|
||||||
|
|
@ -161,7 +161,7 @@ describe("MongoDB Integration", () => {
|
||||||
upsert: true,
|
upsert: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
extra: { collection: "testCollection", actionTypes: "updateOne" },
|
extra: { collection: "testCollection", actionType: "updateOne" },
|
||||||
}
|
}
|
||||||
await config.integration.update(query)
|
await config.integration.update(query)
|
||||||
expect(config.integration.client.updateOne).toHaveBeenCalled()
|
expect(config.integration.client.updateOne).toHaveBeenCalled()
|
||||||
|
|
@ -169,12 +169,12 @@ describe("MongoDB Integration", () => {
|
||||||
const args = config.integration.client.updateOne.mock.calls[0]
|
const args = config.integration.client.updateOne.mock.calls[0]
|
||||||
expect(args[0]).toEqual({
|
expect(args[0]).toEqual({
|
||||||
_id: {
|
_id: {
|
||||||
$eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
|
$eq: mongo.ObjectId.createFromHexString("ACBD12345678ABCD12345678"),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
expect(args[1]).toEqual({
|
expect(args[1]).toEqual({
|
||||||
$set: {
|
$set: {
|
||||||
_id: mongo.ObjectID.createFromHexString("FFFF12345678ABCD12345678"),
|
_id: mongo.ObjectId.createFromHexString("FFFF12345678ABCD12345678"),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
expect(args[2]).toEqual({
|
expect(args[2]).toEqual({
|
||||||
|
|
@ -200,7 +200,7 @@ describe("MongoDB Integration", () => {
|
||||||
upsert: false,
|
upsert: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
extra: { collection: "testCollection", actionTypes: "findOneAndUpdate" },
|
extra: { collection: "testCollection", actionType: "findOneAndUpdate" },
|
||||||
}
|
}
|
||||||
await config.integration.read(query)
|
await config.integration.read(query)
|
||||||
expect(config.integration.client.findOneAndUpdate).toHaveBeenCalled()
|
expect(config.integration.client.findOneAndUpdate).toHaveBeenCalled()
|
||||||
|
|
@ -208,7 +208,7 @@ describe("MongoDB Integration", () => {
|
||||||
const args = config.integration.client.findOneAndUpdate.mock.calls[0]
|
const args = config.integration.client.findOneAndUpdate.mock.calls[0]
|
||||||
expect(args[0]).toEqual({
|
expect(args[0]).toEqual({
|
||||||
_id: {
|
_id: {
|
||||||
$eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
|
$eq: mongo.ObjectId.createFromHexString("ACBD12345678ABCD12345678"),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
expect(args[1]).toEqual({
|
expect(args[1]).toEqual({
|
||||||
|
|
@ -245,7 +245,7 @@ describe("MongoDB Integration", () => {
|
||||||
{
|
{
|
||||||
"upsert": true
|
"upsert": true
|
||||||
}`,
|
}`,
|
||||||
extra: { collection: "testCollection", actionTypes: "updateOne" },
|
extra: { collection: "testCollection", actionType: "updateOne" },
|
||||||
}
|
}
|
||||||
await config.integration.update(query)
|
await config.integration.update(query)
|
||||||
expect(config.integration.client.updateOne).toHaveBeenCalled()
|
expect(config.integration.client.updateOne).toHaveBeenCalled()
|
||||||
|
|
@ -253,7 +253,7 @@ describe("MongoDB Integration", () => {
|
||||||
const args = config.integration.client.updateOne.mock.calls[0]
|
const args = config.integration.client.updateOne.mock.calls[0]
|
||||||
expect(args[0]).toEqual({
|
expect(args[0]).toEqual({
|
||||||
_id: {
|
_id: {
|
||||||
$eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
|
$eq: mongo.ObjectId.createFromHexString("ACBD12345678ABCD12345678"),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
expect(args[1]).toEqual({
|
expect(args[1]).toEqual({
|
||||||
|
|
@ -300,7 +300,7 @@ describe("MongoDB Integration", () => {
|
||||||
"upsert": true,
|
"upsert": true,
|
||||||
"extra": "ad\\"{\\"d"
|
"extra": "ad\\"{\\"d"
|
||||||
}`,
|
}`,
|
||||||
extra: { collection: "testCollection", actionTypes: "updateOne" },
|
extra: { collection: "testCollection", actionType: "updateOne" },
|
||||||
}
|
}
|
||||||
await config.integration.update(query)
|
await config.integration.update(query)
|
||||||
expect(config.integration.client.updateOne).toHaveBeenCalled()
|
expect(config.integration.client.updateOne).toHaveBeenCalled()
|
||||||
|
|
@ -308,7 +308,7 @@ describe("MongoDB Integration", () => {
|
||||||
const args = config.integration.client.updateOne.mock.calls[0]
|
const args = config.integration.client.updateOne.mock.calls[0]
|
||||||
expect(args[0]).toEqual({
|
expect(args[0]).toEqual({
|
||||||
_id: {
|
_id: {
|
||||||
$eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
|
$eq: mongo.ObjectId.createFromHexString("ACBD12345678ABCD12345678"),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
expect(args[1]).toEqual({
|
expect(args[1]).toEqual({
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ const { FieldTypes } = require("../constants")
|
||||||
const VALIDATORS = {
|
const VALIDATORS = {
|
||||||
[FieldTypes.STRING]: () => true,
|
[FieldTypes.STRING]: () => true,
|
||||||
[FieldTypes.OPTIONS]: () => true,
|
[FieldTypes.OPTIONS]: () => true,
|
||||||
|
[FieldTypes.BARCODEQR]: () => true,
|
||||||
[FieldTypes.NUMBER]: attribute => {
|
[FieldTypes.NUMBER]: attribute => {
|
||||||
// allow not to be present
|
// allow not to be present
|
||||||
if (!attribute) {
|
if (!attribute) {
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,11 @@ const TYPE_TRANSFORM_MAP = {
|
||||||
[null]: "",
|
[null]: "",
|
||||||
[undefined]: undefined,
|
[undefined]: undefined,
|
||||||
},
|
},
|
||||||
|
[FieldTypes.BARCODEQR]: {
|
||||||
|
"": "",
|
||||||
|
[null]: "",
|
||||||
|
[undefined]: undefined,
|
||||||
|
},
|
||||||
[FieldTypes.FORMULA]: {
|
[FieldTypes.FORMULA]: {
|
||||||
"": "",
|
"": "",
|
||||||
[null]: "",
|
[null]: "",
|
||||||
|
|
|
||||||
|
|
@ -1094,12 +1094,12 @@
|
||||||
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
|
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
|
||||||
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
||||||
|
|
||||||
"@budibase/backend-core@2.0.30-alpha.3":
|
"@budibase/backend-core@2.0.30-alpha.7":
|
||||||
version "2.0.30-alpha.3"
|
version "2.0.30-alpha.7"
|
||||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.3.tgz#42235b33676c3357d8cf8e181e619c4c92065fd0"
|
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.7.tgz#a46ddcda96c6ecead6574cb0e2751e4ed858371d"
|
||||||
integrity sha512-ixE28ddY8FqvCcaCkqsxUI5UjkFKxFu23MgNARJ8VSpj5NLq6d8qAR+xE0E2pJ58hm5r1KLn2yAZiNXZzu0dzg==
|
integrity sha512-aX41o4QE7OlS+JeKIDt3bJGGsbddI4eRAram+2bYlHONbupkbTAVs9DFBkV9BkMCQ8zk9FSDY90Le0GEuiI+sw==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@budibase/types" "2.0.30-alpha.3"
|
"@budibase/types" "2.0.30-alpha.7"
|
||||||
"@shopify/jest-koa-mocks" "5.0.1"
|
"@shopify/jest-koa-mocks" "5.0.1"
|
||||||
"@techpass/passport-openidconnect" "0.3.2"
|
"@techpass/passport-openidconnect" "0.3.2"
|
||||||
aws-sdk "2.1030.0"
|
aws-sdk "2.1030.0"
|
||||||
|
|
@ -1180,13 +1180,13 @@
|
||||||
svelte-flatpickr "^3.2.3"
|
svelte-flatpickr "^3.2.3"
|
||||||
svelte-portal "^1.0.0"
|
svelte-portal "^1.0.0"
|
||||||
|
|
||||||
"@budibase/pro@2.0.30-alpha.3":
|
"@budibase/pro@2.0.30-alpha.7":
|
||||||
version "2.0.30-alpha.3"
|
version "2.0.30-alpha.7"
|
||||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.3.tgz#ad8f8aa5ced2b5200e05b98e392267b9f84c8177"
|
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.7.tgz#1432b47141b305666dc005c5fc5a02d9cd38cf6a"
|
||||||
integrity sha512-Cw7XUGVVbHCxKo3tJFvG5EKUvO0zdOoU/baFArjMiNHAivlZvFVWCsxptIua+qtFkaUpjQneTHihFiQnY9g83A==
|
integrity sha512-F8qkj+Uy2Pqi/FeJYDBEdNAT7zEx/dw19x8o+3vHmTnQhwLbuSOHGyy9C6PgSW5Gmm0GgxjOycDVOq7ewnwWDA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@budibase/backend-core" "2.0.30-alpha.3"
|
"@budibase/backend-core" "2.0.30-alpha.7"
|
||||||
"@budibase/types" "2.0.30-alpha.3"
|
"@budibase/types" "2.0.30-alpha.7"
|
||||||
"@koa/router" "8.0.8"
|
"@koa/router" "8.0.8"
|
||||||
joi "17.6.0"
|
joi "17.6.0"
|
||||||
node-fetch "^2.6.1"
|
node-fetch "^2.6.1"
|
||||||
|
|
@ -1209,10 +1209,10 @@
|
||||||
svelte-apexcharts "^1.0.2"
|
svelte-apexcharts "^1.0.2"
|
||||||
svelte-flatpickr "^3.1.0"
|
svelte-flatpickr "^3.1.0"
|
||||||
|
|
||||||
"@budibase/types@2.0.30-alpha.3":
|
"@budibase/types@2.0.30-alpha.7":
|
||||||
version "2.0.30-alpha.3"
|
version "2.0.30-alpha.7"
|
||||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.3.tgz#cb55bcced75b711cc8a675284fbacaa8ebf1c0f2"
|
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.7.tgz#fe85563eb42ce01869e653a790a7f213ea2d6308"
|
||||||
integrity sha512-rHeFVuNbSSE4fMnX6uyrM2r47m+neqFXlVNOkhHU9i7KoIcIZbEYInU8CjUFR2da3ruST9ajXjJ5UenX2+MnTg==
|
integrity sha512-WL+2LPQyYq1BwPGgkM7wRnIv4/QXMX1ivXpzoy9lzi1yCJw0rxg8MBpfUuVU0cmDOAnmHkTh2nBQNUhLYPyvVA==
|
||||||
|
|
||||||
"@bull-board/api@3.7.0":
|
"@bull-board/api@3.7.0":
|
||||||
version "3.7.0"
|
version "3.7.0"
|
||||||
|
|
@ -2649,7 +2649,7 @@
|
||||||
"@types/connect" "*"
|
"@types/connect" "*"
|
||||||
"@types/node" "*"
|
"@types/node" "*"
|
||||||
|
|
||||||
"@types/bson@*", "@types/bson@4.2.0":
|
"@types/bson@4.2.0":
|
||||||
version "4.2.0"
|
version "4.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/@types/bson/-/bson-4.2.0.tgz#a2f71e933ff54b2c3bf267b67fa221e295a33337"
|
resolved "https://registry.yarnpkg.com/@types/bson/-/bson-4.2.0.tgz#a2f71e933ff54b2c3bf267b67fa221e295a33337"
|
||||||
integrity sha512-ELCPqAdroMdcuxqwMgUpifQyRoTpyYCNr1V9xKyF40VsBobsj+BbWNRvwGchMgBPGqkw655ypkjj2MEF5ywVwg==
|
integrity sha512-ELCPqAdroMdcuxqwMgUpifQyRoTpyYCNr1V9xKyF40VsBobsj+BbWNRvwGchMgBPGqkw655ypkjj2MEF5ywVwg==
|
||||||
|
|
@ -2889,14 +2889,6 @@
|
||||||
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
|
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
|
||||||
integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
|
integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
|
||||||
|
|
||||||
"@types/mongodb@3.6.3":
|
|
||||||
version "3.6.3"
|
|
||||||
resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.6.3.tgz#5655af409d9e32d5d5ae9a653abf3e5f9c83eb7a"
|
|
||||||
integrity sha512-6YNqGP1hk5bjUFaim+QoFFuI61WjHiHE1BNeB41TA00Xd2K7zG4lcWyLLq/XtIp36uMavvS5hoAUJ+1u/GcX2Q==
|
|
||||||
dependencies:
|
|
||||||
"@types/bson" "*"
|
|
||||||
"@types/node" "*"
|
|
||||||
|
|
||||||
"@types/node-fetch@2.6.1":
|
"@types/node-fetch@2.6.1":
|
||||||
version "2.6.1"
|
version "2.6.1"
|
||||||
resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
|
resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
|
||||||
|
|
@ -3036,6 +3028,19 @@
|
||||||
dependencies:
|
dependencies:
|
||||||
"@types/node" "*"
|
"@types/node" "*"
|
||||||
|
|
||||||
|
"@types/webidl-conversions@*":
|
||||||
|
version "6.1.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-6.1.1.tgz#e33bc8ea812a01f63f90481c666334844b12a09e"
|
||||||
|
integrity sha512-XAahCdThVuCFDQLT7R7Pk/vqeObFNL3YqRyFZg+AqAP/W1/w3xHaIxuW7WszQqTbIBOPRcItYJIou3i/mppu3Q==
|
||||||
|
|
||||||
|
"@types/whatwg-url@^8.2.1":
|
||||||
|
version "8.2.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.2.tgz#749d5b3873e845897ada99be4448041d4cc39e63"
|
||||||
|
integrity sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==
|
||||||
|
dependencies:
|
||||||
|
"@types/node" "*"
|
||||||
|
"@types/webidl-conversions" "*"
|
||||||
|
|
||||||
"@types/yargs-parser@*":
|
"@types/yargs-parser@*":
|
||||||
version "21.0.0"
|
version "21.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
|
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
|
||||||
|
|
@ -4152,14 +4157,6 @@ bl@^1.0.0:
|
||||||
readable-stream "^2.3.5"
|
readable-stream "^2.3.5"
|
||||||
safe-buffer "^5.1.1"
|
safe-buffer "^5.1.1"
|
||||||
|
|
||||||
bl@^2.2.1:
|
|
||||||
version "2.2.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5"
|
|
||||||
integrity sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==
|
|
||||||
dependencies:
|
|
||||||
readable-stream "^2.3.5"
|
|
||||||
safe-buffer "^5.1.1"
|
|
||||||
|
|
||||||
bl@^3.0.0:
|
bl@^3.0.0:
|
||||||
version "3.0.1"
|
version "3.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f"
|
resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f"
|
||||||
|
|
@ -4309,10 +4306,12 @@ bson@*:
|
||||||
dependencies:
|
dependencies:
|
||||||
buffer "^5.6.0"
|
buffer "^5.6.0"
|
||||||
|
|
||||||
bson@^1.1.4:
|
bson@^4.7.0:
|
||||||
version "1.1.6"
|
version "4.7.0"
|
||||||
resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.6.tgz#fb819be9a60cd677e0853aee4ca712a785d6618a"
|
resolved "https://registry.yarnpkg.com/bson/-/bson-4.7.0.tgz#7874a60091ffc7a45c5dd2973b5cad7cded9718a"
|
||||||
integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==
|
integrity sha512-VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA==
|
||||||
|
dependencies:
|
||||||
|
buffer "^5.6.0"
|
||||||
|
|
||||||
buffer-alloc-unsafe@^1.1.0:
|
buffer-alloc-unsafe@^1.1.0:
|
||||||
version "1.1.0"
|
version "1.1.0"
|
||||||
|
|
@ -5305,7 +5304,7 @@ delegates@^1.0.0:
|
||||||
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
|
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
|
||||||
integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
|
integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
|
||||||
|
|
||||||
denque@^1.1.0, denque@^1.4.1:
|
denque@^1.1.0:
|
||||||
version "1.5.1"
|
version "1.5.1"
|
||||||
resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf"
|
resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf"
|
||||||
integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==
|
integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==
|
||||||
|
|
@ -5315,6 +5314,11 @@ denque@^2.0.1:
|
||||||
resolved "https://registry.yarnpkg.com/denque/-/denque-2.0.1.tgz#bcef4c1b80dc32efe97515744f21a4229ab8934a"
|
resolved "https://registry.yarnpkg.com/denque/-/denque-2.0.1.tgz#bcef4c1b80dc32efe97515744f21a4229ab8934a"
|
||||||
integrity sha512-tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ==
|
integrity sha512-tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ==
|
||||||
|
|
||||||
|
denque@^2.1.0:
|
||||||
|
version "2.1.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
|
||||||
|
integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
|
||||||
|
|
||||||
depd@2.0.0, depd@^2.0.0, depd@~2.0.0:
|
depd@2.0.0, depd@^2.0.0, depd@~2.0.0:
|
||||||
version "2.0.0"
|
version "2.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
|
resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
|
||||||
|
|
@ -7676,6 +7680,11 @@ ip-regex@^2.1.0:
|
||||||
resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
|
resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
|
||||||
integrity sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==
|
integrity sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==
|
||||||
|
|
||||||
|
ip@^2.0.0:
|
||||||
|
version "2.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
|
||||||
|
integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
|
||||||
|
|
||||||
is-accessor-descriptor@^0.1.6:
|
is-accessor-descriptor@^0.1.6:
|
||||||
version "0.1.6"
|
version "0.1.6"
|
||||||
resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
|
resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
|
||||||
|
|
@ -10216,18 +10225,25 @@ moment-timezone@^0.5.15:
|
||||||
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
|
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
|
||||||
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
|
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
|
||||||
|
|
||||||
mongodb@3.6.3:
|
mongodb-connection-string-url@^2.5.3:
|
||||||
version "3.6.3"
|
version "2.5.3"
|
||||||
resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.3.tgz#eddaed0cc3598474d7a15f0f2a5b04848489fd05"
|
resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.3.tgz#c0c572b71570e58be2bd52b33dffd1330cfb6990"
|
||||||
integrity sha512-rOZuR0QkodZiM+UbQE5kDsJykBqWi0CL4Ec2i1nrGrUI3KO11r6Fbxskqmq3JK2NH7aW4dcccBuUujAP0ERl5w==
|
integrity sha512-f+/WsED+xF4B74l3k9V/XkTVj5/fxFH2o5ToKXd8Iyi5UhM+sO9u0Ape17Mvl/GkZaFtM0HQnzAG5OTmhKw+tQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
bl "^2.2.1"
|
"@types/whatwg-url" "^8.2.1"
|
||||||
bson "^1.1.4"
|
whatwg-url "^11.0.0"
|
||||||
denque "^1.4.1"
|
|
||||||
require_optional "^1.0.1"
|
mongodb@4.9:
|
||||||
safe-buffer "^5.1.2"
|
version "4.9.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.9.0.tgz#58618439b721f2d6f7d38bb10a4612e29d7f1c8a"
|
||||||
|
integrity sha512-tJJEFJz7OQTQPZeVHZJIeSOjMRqc5eSyXTt86vSQENEErpkiG7279tM/GT5AVZ7TgXNh9HQxoa2ZkbrANz5GQw==
|
||||||
|
dependencies:
|
||||||
|
bson "^4.7.0"
|
||||||
|
denque "^2.1.0"
|
||||||
|
mongodb-connection-string-url "^2.5.3"
|
||||||
|
socks "^2.7.0"
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
saslprep "^1.0.0"
|
saslprep "^1.0.3"
|
||||||
|
|
||||||
monitor-event-loop-delay@^1.0.0:
|
monitor-event-loop-delay@^1.0.0:
|
||||||
version "1.0.0"
|
version "1.0.0"
|
||||||
|
|
@ -12240,14 +12256,6 @@ require-main-filename@^2.0.0:
|
||||||
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
|
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
|
||||||
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
|
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
|
||||||
|
|
||||||
require_optional@^1.0.1:
|
|
||||||
version "1.0.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.1.tgz#4cf35a4247f64ca3df8c2ef208cc494b1ca8fc2e"
|
|
||||||
integrity sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==
|
|
||||||
dependencies:
|
|
||||||
resolve-from "^2.0.0"
|
|
||||||
semver "^5.1.0"
|
|
||||||
|
|
||||||
requires-port@^1.0.0:
|
requires-port@^1.0.0:
|
||||||
version "1.0.0"
|
version "1.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
|
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
|
||||||
|
|
@ -12260,11 +12268,6 @@ resolve-cwd@^3.0.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
resolve-from "^5.0.0"
|
resolve-from "^5.0.0"
|
||||||
|
|
||||||
resolve-from@^2.0.0:
|
|
||||||
version "2.0.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
|
|
||||||
integrity sha512-qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ==
|
|
||||||
|
|
||||||
resolve-from@^4.0.0:
|
resolve-from@^4.0.0:
|
||||||
version "4.0.0"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
|
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
|
||||||
|
|
@ -12451,7 +12454,7 @@ sanitize-s3-objectkey@0.0.1:
|
||||||
resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e"
|
resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e"
|
||||||
integrity sha512-ZTk7aqLxy4sD40GWcYWoLfbe05XLmkKvh6vGKe13ADlei24xlezcvjgKy1qRArlaIbIMYaqK7PCalvZtulZlaQ==
|
integrity sha512-ZTk7aqLxy4sD40GWcYWoLfbe05XLmkKvh6vGKe13ADlei24xlezcvjgKy1qRArlaIbIMYaqK7PCalvZtulZlaQ==
|
||||||
|
|
||||||
saslprep@^1.0.0:
|
saslprep@^1.0.3:
|
||||||
version "1.0.3"
|
version "1.0.3"
|
||||||
resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226"
|
resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226"
|
||||||
integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==
|
integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==
|
||||||
|
|
@ -12513,7 +12516,7 @@ semver-diff@^3.1.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
semver "^6.3.0"
|
semver "^6.3.0"
|
||||||
|
|
||||||
"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
|
"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
|
||||||
version "5.7.1"
|
version "5.7.1"
|
||||||
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
|
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
|
||||||
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
|
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
|
||||||
|
|
@ -12701,6 +12704,11 @@ slice-ansi@^2.1.0:
|
||||||
astral-regex "^1.0.0"
|
astral-regex "^1.0.0"
|
||||||
is-fullwidth-code-point "^2.0.0"
|
is-fullwidth-code-point "^2.0.0"
|
||||||
|
|
||||||
|
smart-buffer@^4.2.0:
|
||||||
|
version "4.2.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
|
||||||
|
integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
|
||||||
|
|
||||||
snapdragon-node@^2.0.1:
|
snapdragon-node@^2.0.1:
|
||||||
version "2.1.1"
|
version "2.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
|
resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
|
||||||
|
|
@ -12801,6 +12809,14 @@ socket.io@^4.5.1:
|
||||||
socket.io-adapter "~2.4.0"
|
socket.io-adapter "~2.4.0"
|
||||||
socket.io-parser "~4.2.0"
|
socket.io-parser "~4.2.0"
|
||||||
|
|
||||||
|
socks@^2.7.0:
|
||||||
|
version "2.7.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0"
|
||||||
|
integrity sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA==
|
||||||
|
dependencies:
|
||||||
|
ip "^2.0.0"
|
||||||
|
smart-buffer "^4.2.0"
|
||||||
|
|
||||||
sonic-boom@^1.0.2:
|
sonic-boom@^1.0.2:
|
||||||
version "1.4.1"
|
version "1.4.1"
|
||||||
resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-1.4.1.tgz#d35d6a74076624f12e6f917ade7b9d75e918f53e"
|
resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-1.4.1.tgz#d35d6a74076624f12e6f917ade7b9d75e918f53e"
|
||||||
|
|
@ -13805,6 +13821,13 @@ tr46@^2.1.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
punycode "^2.1.1"
|
punycode "^2.1.1"
|
||||||
|
|
||||||
|
tr46@^3.0.0:
|
||||||
|
version "3.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
|
||||||
|
integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
|
||||||
|
dependencies:
|
||||||
|
punycode "^2.1.1"
|
||||||
|
|
||||||
tr46@~0.0.3:
|
tr46@~0.0.3:
|
||||||
version "0.0.3"
|
version "0.0.3"
|
||||||
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
|
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
|
||||||
|
|
@ -14364,6 +14387,11 @@ webidl-conversions@^6.1.0:
|
||||||
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
|
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
|
||||||
integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
|
integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
|
||||||
|
|
||||||
|
webidl-conversions@^7.0.0:
|
||||||
|
version "7.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
|
||||||
|
integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
|
||||||
|
|
||||||
webpack-cli@^4.9.1:
|
webpack-cli@^4.9.1:
|
||||||
version "4.9.2"
|
version "4.9.2"
|
||||||
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d"
|
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d"
|
||||||
|
|
@ -14445,6 +14473,14 @@ whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0:
|
||||||
resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
|
resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
|
||||||
integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
|
integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
|
||||||
|
|
||||||
|
whatwg-url@^11.0.0:
|
||||||
|
version "11.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
|
||||||
|
integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
|
||||||
|
dependencies:
|
||||||
|
tr46 "^3.0.0"
|
||||||
|
webidl-conversions "^7.0.0"
|
||||||
|
|
||||||
whatwg-url@^5.0.0:
|
whatwg-url@^5.0.0:
|
||||||
version "5.0.0"
|
version "5.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
|
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@budibase/string-templates",
|
"name": "@budibase/string-templates",
|
||||||
"version": "2.0.30-alpha.3",
|
"version": "2.0.30-alpha.7",
|
||||||
"description": "Handlebars wrapper for Budibase templating.",
|
"description": "Handlebars wrapper for Budibase templating.",
|
||||||
"main": "src/index.cjs",
|
"main": "src/index.cjs",
|
||||||
"module": "dist/bundle.mjs",
|
"module": "dist/bundle.mjs",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@budibase/types",
|
"name": "@budibase/types",
|
||||||
"version": "2.0.30-alpha.3",
|
"version": "2.0.30-alpha.7",
|
||||||
"description": "Budibase types",
|
"description": "Budibase types",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"types": "dist/index.d.ts",
|
"types": "dist/index.d.ts",
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ export enum QueryType {
|
||||||
|
|
||||||
export enum DatasourceFieldType {
|
export enum DatasourceFieldType {
|
||||||
STRING = "string",
|
STRING = "string",
|
||||||
|
CODE = "code",
|
||||||
LONGFORM = "longForm",
|
LONGFORM = "longForm",
|
||||||
BOOLEAN = "boolean",
|
BOOLEAN = "boolean",
|
||||||
NUMBER = "number",
|
NUMBER = "number",
|
||||||
|
|
@ -70,6 +71,11 @@ export enum FilterType {
|
||||||
ONE_OF = "oneOf",
|
ONE_OF = "oneOf",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface StepDefinition {
|
||||||
|
key: string
|
||||||
|
template: string
|
||||||
|
}
|
||||||
|
|
||||||
export interface QueryDefinition {
|
export interface QueryDefinition {
|
||||||
type: QueryType
|
type: QueryType
|
||||||
displayName?: string
|
displayName?: string
|
||||||
|
|
@ -77,6 +83,7 @@ export interface QueryDefinition {
|
||||||
customisable?: boolean
|
customisable?: boolean
|
||||||
fields?: object
|
fields?: object
|
||||||
urlDisplay?: boolean
|
urlDisplay?: boolean
|
||||||
|
steps?: Array<StepDefinition>
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ExtraQueryConfig {
|
export interface ExtraQueryConfig {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "@budibase/worker",
|
"name": "@budibase/worker",
|
||||||
"email": "hi@budibase.com",
|
"email": "hi@budibase.com",
|
||||||
"version": "2.0.30-alpha.3",
|
"version": "2.0.30-alpha.7",
|
||||||
"description": "Budibase background service",
|
"description": "Budibase background service",
|
||||||
"main": "src/index.ts",
|
"main": "src/index.ts",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
@ -36,10 +36,10 @@
|
||||||
"author": "Budibase",
|
"author": "Budibase",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@budibase/backend-core": "2.0.30-alpha.3",
|
"@budibase/backend-core": "2.0.30-alpha.7",
|
||||||
"@budibase/pro": "2.0.30-alpha.3",
|
"@budibase/pro": "2.0.30-alpha.7",
|
||||||
"@budibase/string-templates": "2.0.30-alpha.3",
|
"@budibase/string-templates": "2.0.30-alpha.7",
|
||||||
"@budibase/types": "2.0.30-alpha.3",
|
"@budibase/types": "2.0.30-alpha.7",
|
||||||
"@koa/router": "8.0.8",
|
"@koa/router": "8.0.8",
|
||||||
"@sentry/node": "6.17.7",
|
"@sentry/node": "6.17.7",
|
||||||
"@techpass/passport-openidconnect": "0.3.2",
|
"@techpass/passport-openidconnect": "0.3.2",
|
||||||
|
|
|
||||||
|
|
@ -291,12 +291,12 @@
|
||||||
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
|
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
|
||||||
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
||||||
|
|
||||||
"@budibase/backend-core@2.0.30-alpha.3":
|
"@budibase/backend-core@2.0.30-alpha.7":
|
||||||
version "2.0.30-alpha.3"
|
version "2.0.30-alpha.7"
|
||||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.3.tgz#42235b33676c3357d8cf8e181e619c4c92065fd0"
|
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30-alpha.7.tgz#a46ddcda96c6ecead6574cb0e2751e4ed858371d"
|
||||||
integrity sha512-ixE28ddY8FqvCcaCkqsxUI5UjkFKxFu23MgNARJ8VSpj5NLq6d8qAR+xE0E2pJ58hm5r1KLn2yAZiNXZzu0dzg==
|
integrity sha512-aX41o4QE7OlS+JeKIDt3bJGGsbddI4eRAram+2bYlHONbupkbTAVs9DFBkV9BkMCQ8zk9FSDY90Le0GEuiI+sw==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@budibase/types" "2.0.30-alpha.3"
|
"@budibase/types" "2.0.30-alpha.7"
|
||||||
"@shopify/jest-koa-mocks" "5.0.1"
|
"@shopify/jest-koa-mocks" "5.0.1"
|
||||||
"@techpass/passport-openidconnect" "0.3.2"
|
"@techpass/passport-openidconnect" "0.3.2"
|
||||||
aws-sdk "2.1030.0"
|
aws-sdk "2.1030.0"
|
||||||
|
|
@ -327,21 +327,21 @@
|
||||||
uuid "8.3.2"
|
uuid "8.3.2"
|
||||||
zlib "1.0.5"
|
zlib "1.0.5"
|
||||||
|
|
||||||
"@budibase/pro@2.0.30-alpha.3":
|
"@budibase/pro@2.0.30-alpha.7":
|
||||||
version "2.0.30-alpha.3"
|
version "2.0.30-alpha.7"
|
||||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.3.tgz#ad8f8aa5ced2b5200e05b98e392267b9f84c8177"
|
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30-alpha.7.tgz#1432b47141b305666dc005c5fc5a02d9cd38cf6a"
|
||||||
integrity sha512-Cw7XUGVVbHCxKo3tJFvG5EKUvO0zdOoU/baFArjMiNHAivlZvFVWCsxptIua+qtFkaUpjQneTHihFiQnY9g83A==
|
integrity sha512-F8qkj+Uy2Pqi/FeJYDBEdNAT7zEx/dw19x8o+3vHmTnQhwLbuSOHGyy9C6PgSW5Gmm0GgxjOycDVOq7ewnwWDA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@budibase/backend-core" "2.0.30-alpha.3"
|
"@budibase/backend-core" "2.0.30-alpha.7"
|
||||||
"@budibase/types" "2.0.30-alpha.3"
|
"@budibase/types" "2.0.30-alpha.7"
|
||||||
"@koa/router" "8.0.8"
|
"@koa/router" "8.0.8"
|
||||||
joi "17.6.0"
|
joi "17.6.0"
|
||||||
node-fetch "^2.6.1"
|
node-fetch "^2.6.1"
|
||||||
|
|
||||||
"@budibase/types@2.0.30-alpha.3":
|
"@budibase/types@2.0.30-alpha.7":
|
||||||
version "2.0.30-alpha.3"
|
version "2.0.30-alpha.7"
|
||||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.3.tgz#cb55bcced75b711cc8a675284fbacaa8ebf1c0f2"
|
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30-alpha.7.tgz#fe85563eb42ce01869e653a790a7f213ea2d6308"
|
||||||
integrity sha512-rHeFVuNbSSE4fMnX6uyrM2r47m+neqFXlVNOkhHU9i7KoIcIZbEYInU8CjUFR2da3ruST9ajXjJ5UenX2+MnTg==
|
integrity sha512-WL+2LPQyYq1BwPGgkM7wRnIv4/QXMX1ivXpzoy9lzi1yCJw0rxg8MBpfUuVU0cmDOAnmHkTh2nBQNUhLYPyvVA==
|
||||||
|
|
||||||
"@cspotcode/source-map-consumer@0.8.0":
|
"@cspotcode/source-map-consumer@0.8.0":
|
||||||
version "0.8.0"
|
version "0.8.0"
|
||||||
|
|
|
||||||
29
yarn.lock
29
yarn.lock
|
|
@ -986,13 +986,6 @@
|
||||||
estree-walker "^1.0.1"
|
estree-walker "^1.0.1"
|
||||||
picomatch "^2.2.2"
|
picomatch "^2.2.2"
|
||||||
|
|
||||||
"@types/bson@*":
|
|
||||||
version "4.2.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/@types/bson/-/bson-4.2.0.tgz#a2f71e933ff54b2c3bf267b67fa221e295a33337"
|
|
||||||
integrity sha512-ELCPqAdroMdcuxqwMgUpifQyRoTpyYCNr1V9xKyF40VsBobsj+BbWNRvwGchMgBPGqkw655ypkjj2MEF5ywVwg==
|
|
||||||
dependencies:
|
|
||||||
bson "*"
|
|
||||||
|
|
||||||
"@types/estree@0.0.39":
|
"@types/estree@0.0.39":
|
||||||
version "0.0.39"
|
version "0.0.39"
|
||||||
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
|
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
|
||||||
|
|
@ -1008,19 +1001,6 @@
|
||||||
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
|
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
|
||||||
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
|
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
|
||||||
|
|
||||||
"@types/mongodb@3.6.3":
|
|
||||||
version "3.6.3"
|
|
||||||
resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.6.3.tgz#5655af409d9e32d5d5ae9a653abf3e5f9c83eb7a"
|
|
||||||
integrity sha512-6YNqGP1hk5bjUFaim+QoFFuI61WjHiHE1BNeB41TA00Xd2K7zG4lcWyLLq/XtIp36uMavvS5hoAUJ+1u/GcX2Q==
|
|
||||||
dependencies:
|
|
||||||
"@types/bson" "*"
|
|
||||||
"@types/node" "*"
|
|
||||||
|
|
||||||
"@types/node@*":
|
|
||||||
version "17.0.33"
|
|
||||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.33.tgz#3c1879b276dc63e73030bb91165e62a4509cd506"
|
|
||||||
integrity sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ==
|
|
||||||
|
|
||||||
"@types/node@>= 8":
|
"@types/node@>= 8":
|
||||||
version "18.0.0"
|
version "18.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a"
|
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a"
|
||||||
|
|
@ -1466,13 +1446,6 @@ braces@^3.0.2:
|
||||||
dependencies:
|
dependencies:
|
||||||
fill-range "^7.0.1"
|
fill-range "^7.0.1"
|
||||||
|
|
||||||
bson@*:
|
|
||||||
version "4.6.3"
|
|
||||||
resolved "https://registry.yarnpkg.com/bson/-/bson-4.6.3.tgz#d1a9a0b84b9e84b62390811fc5580f6a8b1d858c"
|
|
||||||
integrity sha512-rAqP5hcUVJhXP2MCSNVsf0oM2OGU1So6A9pVRDYayvJ5+hygXHQApf87wd5NlhPM1J9RJnbqxIG/f8QTzRoQ4A==
|
|
||||||
dependencies:
|
|
||||||
buffer "^5.6.0"
|
|
||||||
|
|
||||||
btoa-lite@^1.0.0:
|
btoa-lite@^1.0.0:
|
||||||
version "1.0.0"
|
version "1.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
|
resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
|
||||||
|
|
@ -1483,7 +1456,7 @@ buffer-from@^1.0.0:
|
||||||
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
|
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
|
||||||
integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
|
integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
|
||||||
|
|
||||||
buffer@^5.5.0, buffer@^5.6.0:
|
buffer@^5.5.0:
|
||||||
version "5.7.1"
|
version "5.7.1"
|
||||||
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
|
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
|
||||||
integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
|
integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue