Merge branch 'develop' of github.com:Budibase/budibase into side-panel
This commit is contained in:
Andrew Kingston
commit
0137796a20
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "2.1.22-alpha.1",
|
||||
"version": "2.1.22-alpha.2",
|
||||
"npmClient": "yarn",
|
||||
"packages": [
|
||||
"packages/*"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/backend-core",
|
||||
"version": "2.1.22-alpha.1",
|
||||
"version": "2.1.22-alpha.2",
|
||||
"description": "Budibase backend core libraries used in server and worker",
|
||||
"main": "dist/src/index.js",
|
||||
"types": "dist/src/index.d.ts",
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
"test:watch": "jest --watchAll"
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/types": "2.1.22-alpha.1",
|
||||
"@budibase/types": "2.1.22-alpha.2",
|
||||
"@shopify/jest-koa-mocks": "5.0.1",
|
||||
"@techpass/passport-openidconnect": "0.3.2",
|
||||
"aws-sdk": "2.1030.0",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/bbui",
|
||||
"description": "A UI solution used in the different Budibase projects.",
|
||||
"version": "2.1.22-alpha.1",
|
||||
"version": "2.1.22-alpha.2",
|
||||
"license": "MPL-2.0",
|
||||
"svelte": "src/index.js",
|
||||
"module": "dist/bbui.es.js",
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
],
|
||||
"dependencies": {
|
||||
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
|
||||
"@budibase/string-templates": "2.1.22-alpha.1",
|
||||
"@budibase/string-templates": "2.1.22-alpha.2",
|
||||
"@spectrum-css/actionbutton": "^1.0.1",
|
||||
"@spectrum-css/actiongroup": "^1.0.1",
|
||||
"@spectrum-css/avatar": "^3.0.2",
|
||||
|
|
|
|||
|
|
@ -781,7 +781,7 @@ Cypress.Commands.add("selectExternalDatasource", datasourceName => {
|
|||
cy.navigateToDataSection()
|
||||
// Open Datasource modal
|
||||
cy.get(".nav").within(() => {
|
||||
cy.get(".add-button").click()
|
||||
cy.get("[data-cy='new-datasource']").click()
|
||||
})
|
||||
// Clicks specified datasource & continue
|
||||
cy.get(".item-list", { timeout: 1000 }).contains(datasourceName).click()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/builder",
|
||||
"version": "2.1.22-alpha.1",
|
||||
"version": "2.1.22-alpha.2",
|
||||
"license": "GPL-3.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
|
@ -71,10 +71,10 @@
|
|||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "2.1.22-alpha.1",
|
||||
"@budibase/client": "2.1.22-alpha.1",
|
||||
"@budibase/frontend-core": "2.1.22-alpha.1",
|
||||
"@budibase/string-templates": "2.1.22-alpha.1",
|
||||
"@budibase/bbui": "2.1.22-alpha.2",
|
||||
"@budibase/client": "2.1.22-alpha.2",
|
||||
"@budibase/frontend-core": "2.1.22-alpha.2",
|
||||
"@budibase/string-templates": "2.1.22-alpha.2",
|
||||
"@sentry/browser": "5.19.1",
|
||||
"@spectrum-css/page": "^3.0.1",
|
||||
"@spectrum-css/vars": "^3.0.1",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<script>
|
||||
import AutomationList from "./AutomationList.svelte"
|
||||
import CreateAutomationModal from "./CreateAutomationModal.svelte"
|
||||
import { Icon, Modal, Tabs, Tab } from "@budibase/bbui"
|
||||
import { Modal, Tabs, Tab, Button, Layout } from "@budibase/bbui"
|
||||
|
||||
export let modal
|
||||
export let webhookModal
|
||||
|
|
@ -10,23 +10,18 @@
|
|||
<div class="nav">
|
||||
<Tabs selected="Automations">
|
||||
<Tab title="Automations">
|
||||
<Layout paddingX="L" paddingY="L" gap="S">
|
||||
<Button cta wide on:click={modal.show}>Add automation</Button>
|
||||
</Layout>
|
||||
<AutomationList />
|
||||
<Modal bind:this={modal}>
|
||||
<CreateAutomationModal {webhookModal} />
|
||||
</Modal>
|
||||
</Tab>
|
||||
</Tabs>
|
||||
<div class="add-button">
|
||||
<Icon hoverable name="AddCircle" on:click={modal.show} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.add-button {
|
||||
position: absolute;
|
||||
top: var(--spacing-l);
|
||||
right: var(--spacing-xl);
|
||||
}
|
||||
.nav {
|
||||
overflow-y: auto;
|
||||
background: var(--background);
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
</Body>
|
||||
<Input
|
||||
bind:value={name}
|
||||
on:change={() => (nameTouched = true)}
|
||||
on:input={() => (nameTouched = true)}
|
||||
bind:error={nameError}
|
||||
label="Name"
|
||||
/>
|
||||
|
|
@ -124,11 +124,14 @@
|
|||
padding: var(--spectrum-alias-item-padding-s);
|
||||
background: var(--spectrum-alias-background-color-secondary);
|
||||
transition: 0.3s all;
|
||||
border: solid var(--spectrum-alias-border-color);
|
||||
border-radius: 5px;
|
||||
box-sizing: border-box;
|
||||
border-width: 2px;
|
||||
}
|
||||
|
||||
.item:hover {
|
||||
background: var(--spectrum-alias-background-color-tertiary);
|
||||
}
|
||||
.selected {
|
||||
background: var(--spectrum-alias-background-color-tertiary);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
export let meta
|
||||
export let value = defaultValue || (meta.type === "boolean" ? false : "")
|
||||
export let readonly
|
||||
export let error
|
||||
|
||||
const resolveTimeStamp = timestamp => {
|
||||
if (!timestamp) {
|
||||
|
|
@ -50,6 +51,7 @@
|
|||
/>
|
||||
{:else if type === "datetime"}
|
||||
<DatePicker
|
||||
{error}
|
||||
{label}
|
||||
timeOnly={isTimeStamp}
|
||||
enableTime={!meta?.dateOnly}
|
||||
|
|
@ -57,18 +59,23 @@
|
|||
bind:value
|
||||
/>
|
||||
{:else if type === "attachment"}
|
||||
<Dropzone {label} bind:value />
|
||||
<Dropzone {label} {error} bind:value />
|
||||
{:else if type === "boolean"}
|
||||
<Toggle text={label} bind:value data-cy="{meta.name}-input" />
|
||||
<Toggle text={label} {error} bind:value data-cy="{meta.name}-input" />
|
||||
{:else if type === "array" && meta.constraints.inclusion.length !== 0}
|
||||
<Multiselect bind:value {label} options={meta.constraints.inclusion} />
|
||||
<Multiselect
|
||||
bind:value
|
||||
{error}
|
||||
{label}
|
||||
options={meta.constraints.inclusion}
|
||||
/>
|
||||
{:else if type === "link"}
|
||||
<LinkedRowSelector bind:linkedRows={value} schema={meta} />
|
||||
<LinkedRowSelector {error} bind:linkedRows={value} schema={meta} />
|
||||
{:else if type === "longform"}
|
||||
{#if meta.useRichText}
|
||||
<RichTextField {label} height="150px" bind:value />
|
||||
<RichTextField {error} {label} height="150px" bind:value />
|
||||
{:else}
|
||||
<TextArea {label} height="150px" bind:value />
|
||||
<TextArea {error} {label} height="150px" bind:value />
|
||||
{/if}
|
||||
{:else if type === "json"}
|
||||
<Label>{label}</Label>
|
||||
|
|
@ -77,12 +84,14 @@
|
|||
mode="json"
|
||||
on:change={({ detail }) => (value = detail.value)}
|
||||
value={stringVal}
|
||||
{error}
|
||||
/>
|
||||
{:else}
|
||||
<Input
|
||||
{label}
|
||||
data-cy="{meta.name}-input"
|
||||
{type}
|
||||
{error}
|
||||
bind:value
|
||||
disabled={readonly}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
$: text = `${item}${selectedRows?.length === 1 ? "" : "s"}`
|
||||
</script>
|
||||
|
||||
<Button icon="Delete" size="s" primary quiet on:click={modal.show}>
|
||||
<Button icon="Delete" size="s" warning quiet on:click={modal.show}>
|
||||
Delete
|
||||
{selectedRows.length}
|
||||
{text}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
import RowFieldControl from "../RowFieldControl.svelte"
|
||||
import { API } from "api"
|
||||
import { ModalContent } from "@budibase/bbui"
|
||||
import ErrorsBox from "components/common/ErrorsBox.svelte"
|
||||
import { FIELDS } from "constants/backend"
|
||||
|
||||
const FORMULA_TYPE = FIELDS.FORMULA.type
|
||||
|
|
@ -32,13 +31,15 @@
|
|||
if (error.handled) {
|
||||
const response = error.json
|
||||
if (response?.errors) {
|
||||
errors = Object.entries(response.errors)
|
||||
.map(([key, error]) => ({ dataPath: key, message: error }))
|
||||
.flat()
|
||||
} else if (error.status === 400 && response?.validationErrors) {
|
||||
errors = Object.keys(response.validationErrors).map(field => ({
|
||||
message: `${field} ${response.validationErrors[field][0]}`,
|
||||
}))
|
||||
errors = response.errors
|
||||
} else if (response?.validationErrors) {
|
||||
const mappedErrors = {}
|
||||
for (let field in response.validationErrors) {
|
||||
mappedErrors[
|
||||
field
|
||||
] = `${field} ${response.validationErrors[field][0]}`
|
||||
}
|
||||
errors = mappedErrors
|
||||
}
|
||||
} else {
|
||||
notifications.error("Failed to save row")
|
||||
|
|
@ -54,11 +55,10 @@
|
|||
confirmText={creating ? "Create Row" : "Save Row"}
|
||||
onConfirm={saveRow}
|
||||
>
|
||||
<ErrorsBox {errors} />
|
||||
{#each tableSchema as [key, meta]}
|
||||
{#if !meta.autocolumn && meta.type !== FORMULA_TYPE}
|
||||
<div>
|
||||
<RowFieldControl {meta} bind:value={row[key]} />
|
||||
<RowFieldControl error={errors[key]} {meta} bind:value={row[key]} />
|
||||
</div>
|
||||
{/if}
|
||||
{/each}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
var(--spectrum-alias-item-padding-m);
|
||||
background: var(--spectrum-alias-background-color-secondary);
|
||||
transition: background 0.13s ease-out;
|
||||
border: solid var(--spectrum-alias-border-color);
|
||||
border-radius: 5px;
|
||||
box-sizing: border-box;
|
||||
border-width: 2px;
|
||||
|
|
|
|||
|
|
@ -201,7 +201,6 @@
|
|||
var(--spectrum-alias-item-padding-m);
|
||||
background: var(--spectrum-alias-background-color-secondary);
|
||||
transition: background 0.13s ease-out;
|
||||
border: solid var(--spectrum-alias-border-color);
|
||||
border-radius: 5px;
|
||||
box-sizing: border-box;
|
||||
border-width: 2px;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<script>
|
||||
import { redirect, params } from "@roxi/routify"
|
||||
import { Icon, Tabs, Tab } from "@budibase/bbui"
|
||||
import { Button, Tabs, Tab, Layout } from "@budibase/bbui"
|
||||
import { BUDIBASE_INTERNAL_DB } from "constants"
|
||||
import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
|
||||
import CreateDatasourceModal from "components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte"
|
||||
|
|
@ -23,18 +23,15 @@
|
|||
<div class="nav">
|
||||
<Tabs {selected} on:select={selectFirstDatasource}>
|
||||
<Tab title="Sources">
|
||||
<DatasourceNavigator />
|
||||
<Layout paddingX="L" paddingY="L" gap="S">
|
||||
<Button dataCy={`new-datasource`} cta wide on:click={modal.show}
|
||||
>Add source</Button
|
||||
>
|
||||
</Layout>
|
||||
<CreateDatasourceModal bind:modal />
|
||||
<DatasourceNavigator />
|
||||
</Tab>
|
||||
</Tabs>
|
||||
<div
|
||||
class="add-button"
|
||||
data-cy={`new-${isExternal ? "datasource" : "table"}`}
|
||||
>
|
||||
{#if modal}
|
||||
<Icon hoverable name="AddCircle" on:click={modal.show} />
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
<div class="content">
|
||||
<slot />
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/cli",
|
||||
"version": "2.1.22-alpha.1",
|
||||
"version": "2.1.22-alpha.2",
|
||||
"description": "Budibase CLI, for developers, self hosting and migrations.",
|
||||
"main": "src/index.js",
|
||||
"bin": {
|
||||
|
|
@ -26,9 +26,9 @@
|
|||
"outputPath": "build"
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/backend-core": "2.1.22-alpha.1",
|
||||
"@budibase/string-templates": "2.1.22-alpha.1",
|
||||
"@budibase/types": "2.1.22-alpha.1",
|
||||
"@budibase/backend-core": "2.1.22-alpha.2",
|
||||
"@budibase/string-templates": "2.1.22-alpha.2",
|
||||
"@budibase/types": "2.1.22-alpha.2",
|
||||
"axios": "0.21.2",
|
||||
"chalk": "4.1.0",
|
||||
"cli-progress": "3.11.2",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/client",
|
||||
"version": "2.1.22-alpha.1",
|
||||
"version": "2.1.22-alpha.2",
|
||||
"license": "MPL-2.0",
|
||||
"module": "dist/budibase-client.js",
|
||||
"main": "dist/budibase-client.js",
|
||||
|
|
@ -19,9 +19,9 @@
|
|||
"dev:builder": "rollup -cw"
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "2.1.22-alpha.1",
|
||||
"@budibase/frontend-core": "2.1.22-alpha.1",
|
||||
"@budibase/string-templates": "2.1.22-alpha.1",
|
||||
"@budibase/bbui": "2.1.22-alpha.2",
|
||||
"@budibase/frontend-core": "2.1.22-alpha.2",
|
||||
"@budibase/string-templates": "2.1.22-alpha.2",
|
||||
"@spectrum-css/button": "^3.0.3",
|
||||
"@spectrum-css/card": "^3.0.3",
|
||||
"@spectrum-css/divider": "^1.0.3",
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "@budibase/frontend-core",
|
||||
"version": "2.1.22-alpha.1",
|
||||
"version": "2.1.22-alpha.2",
|
||||
"description": "Budibase frontend core libraries used in builder and client",
|
||||
"author": "Budibase",
|
||||
"license": "MPL-2.0",
|
||||
"svelte": "src/index.js",
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "2.1.22-alpha.1",
|
||||
"@budibase/bbui": "2.1.22-alpha.2",
|
||||
"lodash": "^4.17.21",
|
||||
"svelte": "^3.46.2"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/sdk",
|
||||
"version": "2.1.22-alpha.1",
|
||||
"version": "2.1.22-alpha.2",
|
||||
"description": "Budibase Public API SDK",
|
||||
"author": "Budibase",
|
||||
"license": "MPL-2.0",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/server",
|
||||
"email": "hi@budibase.com",
|
||||
"version": "2.1.22-alpha.1",
|
||||
"version": "2.1.22-alpha.2",
|
||||
"description": "Budibase Web Server",
|
||||
"main": "src/index.ts",
|
||||
"repository": {
|
||||
|
|
@ -77,11 +77,11 @@
|
|||
"license": "GPL-3.0",
|
||||
"dependencies": {
|
||||
"@apidevtools/swagger-parser": "10.0.3",
|
||||
"@budibase/backend-core": "2.1.22-alpha.1",
|
||||
"@budibase/client": "2.1.22-alpha.1",
|
||||
"@budibase/pro": "2.1.22-alpha.1",
|
||||
"@budibase/string-templates": "2.1.22-alpha.1",
|
||||
"@budibase/types": "2.1.22-alpha.1",
|
||||
"@budibase/backend-core": "2.1.22-alpha.2",
|
||||
"@budibase/client": "2.1.22-alpha.2",
|
||||
"@budibase/pro": "2.1.22-alpha.2",
|
||||
"@budibase/string-templates": "2.1.22-alpha.2",
|
||||
"@budibase/types": "2.1.22-alpha.2",
|
||||
"@bull-board/api": "3.7.0",
|
||||
"@bull-board/koa": "3.9.4",
|
||||
"@elastic/elasticsearch": "7.10.0",
|
||||
|
|
|
|||
|
|
@ -1094,12 +1094,12 @@
|
|||
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
|
||||
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
||||
|
||||
"@budibase/backend-core@2.1.22-alpha.1":
|
||||
version "2.1.22-alpha.1"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.22-alpha.1.tgz#76637eabbe765b710eded41b82a721c829489298"
|
||||
integrity sha512-nqRa+3SLdweXmyGVWxpBxLeMoWetSM4odHpCIsahcQhmfVzo5Skbn5OBCgsdpbsQ5oanr7ZdsQzE7Kvpb9ylOA==
|
||||
"@budibase/backend-core@2.1.22-alpha.2":
|
||||
version "2.1.22-alpha.2"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.22-alpha.2.tgz#ab24716f769eb67815d12feeea58ba67394dc724"
|
||||
integrity sha512-dzFj3siXLOKUX9wyPRFT2Or7BHGoSla919n5SAjI/OmyS2X9R5Xlc2pkYzMB4HpOAs1nY1Fexl1IvDr12cIV8w==
|
||||
dependencies:
|
||||
"@budibase/types" "2.1.22-alpha.1"
|
||||
"@budibase/types" "2.1.22-alpha.2"
|
||||
"@shopify/jest-koa-mocks" "5.0.1"
|
||||
"@techpass/passport-openidconnect" "0.3.2"
|
||||
aws-sdk "2.1030.0"
|
||||
|
|
@ -1181,13 +1181,13 @@
|
|||
svelte-flatpickr "^3.2.3"
|
||||
svelte-portal "^1.0.0"
|
||||
|
||||
"@budibase/pro@2.1.22-alpha.1":
|
||||
version "2.1.22-alpha.1"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.22-alpha.1.tgz#78413a59e0709e17252008b264de09421a81b1d7"
|
||||
integrity sha512-9607AHjqwH+456vATATJBky7RzWElOWaJFDwOBv2vG1WlnqRZacLEU/cqHKAsboh4hOhrJE5HhNOQzretalvSg==
|
||||
"@budibase/pro@2.1.22-alpha.2":
|
||||
version "2.1.22-alpha.2"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.22-alpha.2.tgz#a0e98d209deb0889f36a408ad2bd2d050d43ed74"
|
||||
integrity sha512-2IHdKumc4+yINUK5CVGGuzm0eLMSrViwUCPztRHJedIRuRXJh37Nj5jEmOBq7xzjHPVm1VgUjvsuEd78Z5xYpQ==
|
||||
dependencies:
|
||||
"@budibase/backend-core" "2.1.22-alpha.1"
|
||||
"@budibase/types" "2.1.22-alpha.1"
|
||||
"@budibase/backend-core" "2.1.22-alpha.2"
|
||||
"@budibase/types" "2.1.22-alpha.2"
|
||||
"@koa/router" "8.0.8"
|
||||
bull "4.10.1"
|
||||
joi "17.6.0"
|
||||
|
|
@ -1211,10 +1211,10 @@
|
|||
svelte-apexcharts "^1.0.2"
|
||||
svelte-flatpickr "^3.1.0"
|
||||
|
||||
"@budibase/types@2.1.22-alpha.1":
|
||||
version "2.1.22-alpha.1"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.22-alpha.1.tgz#b3f8203a216904b9d5cae2032ab54425862fe18a"
|
||||
integrity sha512-wuiIZ+4Yg6WcBShSKIbWvkqG+TQcu9kWXxcOL2/76dAq9W3QsuVml8xIjtC22F7SqSUCsWbwSvGioOkFJznDrg==
|
||||
"@budibase/types@2.1.22-alpha.2":
|
||||
version "2.1.22-alpha.2"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.22-alpha.2.tgz#f7c069273049a8f9f52c3a93a9387654c5a74699"
|
||||
integrity sha512-qQGzthMfsMtBcTLzLwjSR2jAd7pUj4A54yliVXYuxFRscJOegeTcagoWOZPE6cPdWPdRey+UWUtPBMrQ/X5xAA==
|
||||
|
||||
"@bull-board/api@3.7.0":
|
||||
version "3.7.0"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/string-templates",
|
||||
"version": "2.1.22-alpha.1",
|
||||
"version": "2.1.22-alpha.2",
|
||||
"description": "Handlebars wrapper for Budibase templating.",
|
||||
"main": "src/index.cjs",
|
||||
"module": "dist/bundle.mjs",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/types",
|
||||
"version": "2.1.22-alpha.1",
|
||||
"version": "2.1.22-alpha.2",
|
||||
"description": "Budibase types",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/worker",
|
||||
"email": "hi@budibase.com",
|
||||
"version": "2.1.22-alpha.1",
|
||||
"version": "2.1.22-alpha.2",
|
||||
"description": "Budibase background service",
|
||||
"main": "src/index.ts",
|
||||
"repository": {
|
||||
|
|
@ -36,10 +36,10 @@
|
|||
"author": "Budibase",
|
||||
"license": "GPL-3.0",
|
||||
"dependencies": {
|
||||
"@budibase/backend-core": "2.1.22-alpha.1",
|
||||
"@budibase/pro": "2.1.22-alpha.1",
|
||||
"@budibase/string-templates": "2.1.22-alpha.1",
|
||||
"@budibase/types": "2.1.22-alpha.1",
|
||||
"@budibase/backend-core": "2.1.22-alpha.2",
|
||||
"@budibase/pro": "2.1.22-alpha.2",
|
||||
"@budibase/string-templates": "2.1.22-alpha.2",
|
||||
"@budibase/types": "2.1.22-alpha.2",
|
||||
"@koa/router": "8.0.8",
|
||||
"@sentry/node": "6.17.7",
|
||||
"@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"
|
||||
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
||||
|
||||
"@budibase/backend-core@2.1.22-alpha.1":
|
||||
version "2.1.22-alpha.1"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.22-alpha.1.tgz#76637eabbe765b710eded41b82a721c829489298"
|
||||
integrity sha512-nqRa+3SLdweXmyGVWxpBxLeMoWetSM4odHpCIsahcQhmfVzo5Skbn5OBCgsdpbsQ5oanr7ZdsQzE7Kvpb9ylOA==
|
||||
"@budibase/backend-core@2.1.22-alpha.2":
|
||||
version "2.1.22-alpha.2"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.22-alpha.2.tgz#ab24716f769eb67815d12feeea58ba67394dc724"
|
||||
integrity sha512-dzFj3siXLOKUX9wyPRFT2Or7BHGoSla919n5SAjI/OmyS2X9R5Xlc2pkYzMB4HpOAs1nY1Fexl1IvDr12cIV8w==
|
||||
dependencies:
|
||||
"@budibase/types" "2.1.22-alpha.1"
|
||||
"@budibase/types" "2.1.22-alpha.2"
|
||||
"@shopify/jest-koa-mocks" "5.0.1"
|
||||
"@techpass/passport-openidconnect" "0.3.2"
|
||||
aws-sdk "2.1030.0"
|
||||
|
|
@ -328,22 +328,22 @@
|
|||
uuid "8.3.2"
|
||||
zlib "1.0.5"
|
||||
|
||||
"@budibase/pro@2.1.22-alpha.1":
|
||||
version "2.1.22-alpha.1"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.22-alpha.1.tgz#78413a59e0709e17252008b264de09421a81b1d7"
|
||||
integrity sha512-9607AHjqwH+456vATATJBky7RzWElOWaJFDwOBv2vG1WlnqRZacLEU/cqHKAsboh4hOhrJE5HhNOQzretalvSg==
|
||||
"@budibase/pro@2.1.22-alpha.2":
|
||||
version "2.1.22-alpha.2"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.22-alpha.2.tgz#a0e98d209deb0889f36a408ad2bd2d050d43ed74"
|
||||
integrity sha512-2IHdKumc4+yINUK5CVGGuzm0eLMSrViwUCPztRHJedIRuRXJh37Nj5jEmOBq7xzjHPVm1VgUjvsuEd78Z5xYpQ==
|
||||
dependencies:
|
||||
"@budibase/backend-core" "2.1.22-alpha.1"
|
||||
"@budibase/types" "2.1.22-alpha.1"
|
||||
"@budibase/backend-core" "2.1.22-alpha.2"
|
||||
"@budibase/types" "2.1.22-alpha.2"
|
||||
"@koa/router" "8.0.8"
|
||||
bull "4.10.1"
|
||||
joi "17.6.0"
|
||||
node-fetch "^2.6.1"
|
||||
|
||||
"@budibase/types@2.1.22-alpha.1":
|
||||
version "2.1.22-alpha.1"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.22-alpha.1.tgz#b3f8203a216904b9d5cae2032ab54425862fe18a"
|
||||
integrity sha512-wuiIZ+4Yg6WcBShSKIbWvkqG+TQcu9kWXxcOL2/76dAq9W3QsuVml8xIjtC22F7SqSUCsWbwSvGioOkFJznDrg==
|
||||
"@budibase/types@2.1.22-alpha.2":
|
||||
version "2.1.22-alpha.2"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.22-alpha.2.tgz#f7c069273049a8f9f52c3a93a9387654c5a74699"
|
||||
integrity sha512-qQGzthMfsMtBcTLzLwjSR2jAd7pUj4A54yliVXYuxFRscJOegeTcagoWOZPE6cPdWPdRey+UWUtPBMrQ/X5xAA==
|
||||
|
||||
"@cspotcode/source-map-consumer@0.8.0":
|
||||
version "0.8.0"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import { Application } from "@budibase/server/api/controllers/public/mapping/typ
|
|||
import { App } from "@budibase/types"
|
||||
import { Response } from "node-fetch"
|
||||
import InternalAPIClient from "./InternalAPIClient"
|
||||
import FormData from "form-data"
|
||||
import { RouteConfig } from "../fixtures/types/routing"
|
||||
import { AppPackageResponse } from "../fixtures/types/appPackage"
|
||||
import { DeployConfig } from "../fixtures/types/deploy"
|
||||
|
|
@ -11,32 +10,52 @@ import { UnpublishAppResponse } from "../fixtures/types/unpublishAppResponse"
|
|||
|
||||
export default class AppApi {
|
||||
api: InternalAPIClient
|
||||
|
||||
constructor(apiClient: InternalAPIClient) {
|
||||
this.api = apiClient
|
||||
}
|
||||
|
||||
async fetch(): Promise<[Response, Application[]]> {
|
||||
async fetchEmptyAppList(): Promise<[Response, Application[]]> {
|
||||
const response = await this.api.get(`/applications?status=all`)
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(json.length).toEqual(0)
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
async fetchAllApplications(): Promise<[Response, Application[]]> {
|
||||
const response = await this.api.get(`/applications?status=all`)
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(json.length).toBeGreaterThanOrEqual(1)
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
async canRender(): Promise<[Response, boolean]> {
|
||||
const response = await this.api.get("/routing/client")
|
||||
const json = await response.json()
|
||||
return [response, Object.keys(json.routes).length > 0]
|
||||
const publishedAppRenders = Object.keys(json.routes).length > 0
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(publishedAppRenders).toBe(true)
|
||||
return [response, publishedAppRenders]
|
||||
}
|
||||
|
||||
async getAppPackage(appId: string): Promise<[Response, AppPackageResponse]> {
|
||||
const response = await this.api.get(`/applications/${appId}/appPackage`)
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(json.application.appId).toEqual(appId)
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
async publish(): Promise<[Response, DeployConfig]> {
|
||||
async publish(appUrl: string): Promise<[Response, DeployConfig]> {
|
||||
const response = await this.api.post("/deploy")
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(json).toEqual({
|
||||
_id: expect.any(String),
|
||||
appUrl: appUrl,
|
||||
status: "SUCCESS",
|
||||
})
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
|
|
@ -57,9 +76,11 @@ export default class AppApi {
|
|||
async sync(appId: string): Promise<[Response, responseMessage]> {
|
||||
const response = await this.api.post(`/applications/${appId}/sync`)
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
// TODO
|
||||
async updateClient(
|
||||
appId: string,
|
||||
body: any
|
||||
|
|
@ -72,21 +93,41 @@ export default class AppApi {
|
|||
return [response, json]
|
||||
}
|
||||
|
||||
async revert(appId: string): Promise<[Response, responseMessage]> {
|
||||
async revertPublished(appId: string): Promise<[Response, responseMessage]> {
|
||||
const response = await this.api.post(`/dev/${appId}/revert`)
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(json).toEqual({
|
||||
message: "Reverted changes successfully.",
|
||||
})
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
async revertUnpublished(appId: string): Promise<[Response, responseMessage]> {
|
||||
const response = await this.api.post(`/dev/${appId}/revert`)
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(400)
|
||||
expect(json).toEqual({
|
||||
message: "App has not yet been deployed",
|
||||
status: 400,
|
||||
})
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
|
||||
|
||||
async delete(appId: string): Promise<[Response, any]> {
|
||||
const response = await this.api.del(`/applications/${appId}`)
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
async update(appId: string, body: any): Promise<[Response, Application]> {
|
||||
async update(appId: string, oldName: string, body: any): Promise<[Response, Application]> {
|
||||
const response = await this.api.put(`/applications/${appId}`, { body })
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(json.name).not.toEqual(oldName)
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
|
|
@ -96,9 +137,17 @@ export default class AppApi {
|
|||
return [response, json]
|
||||
}
|
||||
|
||||
async getRoutes(): Promise<[Response, RouteConfig]> {
|
||||
async getRoutes(screenExists?: boolean): Promise<[Response, RouteConfig]> {
|
||||
const response = await this.api.get(`/routing`)
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
if (screenExists) {
|
||||
|
||||
expect(json.routes["/test"]).toBeTruthy()
|
||||
} else {
|
||||
expect(json.routes["/test"]).toBeUndefined()
|
||||
}
|
||||
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,25 +4,36 @@ import InternalAPIClient from "./InternalAPIClient"
|
|||
|
||||
export default class RowsApi {
|
||||
api: InternalAPIClient
|
||||
|
||||
rowAdded: boolean
|
||||
constructor(apiClient: InternalAPIClient) {
|
||||
this.api = apiClient
|
||||
this.rowAdded = false
|
||||
}
|
||||
|
||||
async getAll(tableId: string): Promise<[Response, Row[]]> {
|
||||
const response = await this.api.get(`/${tableId}/rows`)
|
||||
const json = await response.json()
|
||||
if (this.rowAdded) {
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(json.length).toEqual(1)
|
||||
}
|
||||
return [response, json]
|
||||
}
|
||||
async add(tableId: string, body: any): Promise<[Response, Row]> {
|
||||
const response = await this.api.post(`/${tableId}/rows`, { body })
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(json._id).toBeDefined()
|
||||
expect(json._rev).toBeDefined()
|
||||
expect(json.tableId).toEqual(tableId)
|
||||
this.rowAdded = true
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
async delete(tableId: string, body: any): Promise<[Response, Row[]]> {
|
||||
const response = await this.api.del(`/${tableId}/rows/`, { body })
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
return [response, json]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,12 +12,16 @@ export default class ScreenApi {
|
|||
async create(body: any): Promise<[Response, Screen]> {
|
||||
const response = await this.api.post(`/screens`, { body })
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(json._id).toBeDefined()
|
||||
expect(json.routing.roleId).toBe(body.routing.roleId)
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
async delete(screenId: string, rev: string): Promise<[Response, Screen]> {
|
||||
const response = await this.api.del(`/screens/${screenId}/${rev}`)
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
return [response, json]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,12 +21,21 @@ export default class TablesApi {
|
|||
async getTableById(id: string): Promise<[Response, Table]> {
|
||||
const response = await this.api.get(`/tables/${id}`)
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(json._id).toEqual(id)
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
async save(body: any): Promise<[Response, Table]> {
|
||||
async save(body: any, columnAdded?: boolean): Promise<[Response, Table]> {
|
||||
const response = await this.api.post(`/tables`, { body })
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(json._id).toBeDefined()
|
||||
expect(json._rev).toBeDefined()
|
||||
if (columnAdded) {
|
||||
expect(json.schema.TestColumn).toBeDefined()
|
||||
}
|
||||
|
||||
return [response, json]
|
||||
}
|
||||
|
||||
|
|
@ -36,6 +45,10 @@ export default class TablesApi {
|
|||
): Promise<[Response, responseMessage]> {
|
||||
const response = await this.api.del(`/tables/${id}/${revId}`)
|
||||
const json = await response.json()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(json.message).toEqual(
|
||||
`Table ${id} deleted.`
|
||||
)
|
||||
return [response, json]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
import generator from "../../generator"
|
||||
import { Application } from "@budibase/server/api/controllers/public/mapping/types"
|
||||
|
||||
|
||||
const generate = (
|
||||
overrides: Partial<Application> = {}
|
||||
): Partial<Application> => ({
|
||||
name: generator.word(),
|
||||
url: `/${generator.word()}`,
|
||||
name: generator.word() + generator.hash(),
|
||||
url: `/${generator.word() + generator.hash()}`,
|
||||
...overrides,
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,159 @@
|
|||
import TestConfiguration from "../../../config/internal-api/TestConfiguration"
|
||||
import { Application } from "@budibase/server/api/controllers/public/mapping/types"
|
||||
import { db } from "@budibase/backend-core"
|
||||
import InternalAPIClient from "../../../config/internal-api/TestConfiguration/InternalAPIClient"
|
||||
import generateApp from "../../../config/internal-api/fixtures/applications"
|
||||
import generator from "../../../config/generator"
|
||||
import generateScreen from "../../../config/internal-api/fixtures/screens"
|
||||
|
||||
describe("Internal API - Application creation, update, publish and delete", () => {
|
||||
const api = new InternalAPIClient()
|
||||
const config = new TestConfiguration<Application>(api)
|
||||
|
||||
beforeAll(async () => {
|
||||
await config.beforeAll()
|
||||
})
|
||||
|
||||
afterAll(async () => {
|
||||
await config.afterAll()
|
||||
})
|
||||
|
||||
async function createAppFromTemplate() {
|
||||
return config.applications.create({
|
||||
name: generator.word(),
|
||||
url: `/${generator.word()}`,
|
||||
useTemplate: "true",
|
||||
templateName: "Near Miss Register",
|
||||
templateKey: "app/near-miss-register",
|
||||
templateFile: undefined,
|
||||
})
|
||||
}
|
||||
it("Get applications without applications", async () => {
|
||||
await config.applications.fetchEmptyAppList()
|
||||
})
|
||||
|
||||
it("Get all Applications after creating an application", async () => {
|
||||
await config.applications.create({
|
||||
...generateApp(),
|
||||
useTemplate: false,
|
||||
})
|
||||
|
||||
await config.applications.fetchAllApplications()
|
||||
})
|
||||
|
||||
it("Get application details", async () => {
|
||||
const app = await config.applications.create({
|
||||
...generateApp(),
|
||||
useTemplate: false,
|
||||
})
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
const [appPackageResponse, appPackageJson] = await config.applications.getAppPackage(<string>app.appId)
|
||||
expect(appPackageJson.application.name).toEqual(app.name)
|
||||
expect(appPackageJson.application.version).toEqual(app.version)
|
||||
expect(appPackageJson.application.url).toEqual(app.url)
|
||||
expect(appPackageJson.application.tenantId).toEqual(app.tenantId)
|
||||
expect(appPackageJson.application.status).toEqual(app.status)
|
||||
})
|
||||
|
||||
it("Publish app", async () => {
|
||||
// create the app
|
||||
const appName = generator.word()
|
||||
const app = await createAppFromTemplate()
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
// check preview renders
|
||||
await config.applications.canRender()
|
||||
|
||||
// publish app
|
||||
await config.applications.publish(<string>app.url)
|
||||
|
||||
// check published app renders
|
||||
config.applications.api.appId = db.getProdAppID(app.appId)
|
||||
await config.applications.canRender()
|
||||
|
||||
|
||||
// unpublish app
|
||||
await config.applications.unpublish(<string>app.appId)
|
||||
})
|
||||
|
||||
it("POST - Sync application before deployment", async () => {
|
||||
const app = await config.applications.create(generateApp())
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
const [syncResponse, sync] = await config.applications.sync(
|
||||
<string>app.appId
|
||||
)
|
||||
expect(sync).toEqual({
|
||||
message: "App sync not required, app not deployed.",
|
||||
})
|
||||
})
|
||||
|
||||
it("POST - Sync application after deployment", async () => {
|
||||
const app = await config.applications.create(generateApp())
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
// publish app
|
||||
await config.applications.publish(<string>app.url)
|
||||
|
||||
const [syncResponse, sync] = await config.applications.sync(
|
||||
<string>app.appId
|
||||
)
|
||||
expect(sync).toEqual({
|
||||
message: "App sync completed successfully.",
|
||||
})
|
||||
})
|
||||
|
||||
it("PUT - Update an application", async () => {
|
||||
const app = await config.applications.create(generateApp())
|
||||
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
await config.applications.update(
|
||||
<string>app.appId,
|
||||
<string>app.name,
|
||||
{
|
||||
name: generator.word(),
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
it("POST - Revert Changes without changes", async () => {
|
||||
const app = await config.applications.create(generateApp())
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
await config.applications.revertUnpublished(
|
||||
<string>app.appId
|
||||
)
|
||||
})
|
||||
|
||||
it("POST - Revert Changes", async () => {
|
||||
const app = await config.applications.create(generateApp())
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
// publish app
|
||||
await config.applications.publish(<string>app.url)
|
||||
|
||||
|
||||
// Change/add component to the app
|
||||
await config.screen.create(
|
||||
generateScreen("BASIC")
|
||||
)
|
||||
|
||||
// // Revert the app to published state
|
||||
await config.applications.revertPublished(
|
||||
<string>app.appId
|
||||
)
|
||||
|
||||
// Check screen is removed
|
||||
await config.applications.getRoutes()
|
||||
|
||||
})
|
||||
|
||||
it("DELETE - Delete an application", async () => {
|
||||
const app = await config.applications.create(generateApp())
|
||||
|
||||
await config.applications.delete(<string>app.appId)
|
||||
})
|
||||
|
||||
})
|
||||
|
|
@ -1,266 +0,0 @@
|
|||
import TestConfiguration from "../../../config/internal-api/TestConfiguration"
|
||||
import { Application } from "@budibase/server/api/controllers/public/mapping/types"
|
||||
import { db } from "@budibase/backend-core"
|
||||
import InternalAPIClient from "../../../config/internal-api/TestConfiguration/InternalAPIClient"
|
||||
import generateApp from "../../../config/internal-api/fixtures/applications"
|
||||
import generator from "../../../config/generator"
|
||||
import generateScreen from "../../../config/internal-api/fixtures/screens"
|
||||
import {
|
||||
generateTable,
|
||||
generateNewColumnForTable,
|
||||
} from "../../../config/internal-api/fixtures/table"
|
||||
import { generateNewRowForTable } from "../../../config/internal-api/fixtures/rows"
|
||||
|
||||
describe("Internal API - /applications endpoints", () => {
|
||||
const api = new InternalAPIClient()
|
||||
const config = new TestConfiguration<Application>(api)
|
||||
|
||||
beforeAll(async () => {
|
||||
await config.beforeAll()
|
||||
})
|
||||
|
||||
afterAll(async () => {
|
||||
await config.afterAll()
|
||||
})
|
||||
|
||||
async function createAppFromTemplate() {
|
||||
return config.applications.create({
|
||||
name: generator.word(),
|
||||
url: `/${generator.word()}`,
|
||||
useTemplate: "true",
|
||||
templateName: "Near Miss Register",
|
||||
templateKey: "app/near-miss-register",
|
||||
templateFile: undefined,
|
||||
})
|
||||
}
|
||||
|
||||
it("GET - fetch applications", async () => {
|
||||
await config.applications.create({
|
||||
...generateApp(),
|
||||
useTemplate: false,
|
||||
})
|
||||
const [response, apps] = await config.applications.fetch()
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(apps.length).toBeGreaterThanOrEqual(1)
|
||||
})
|
||||
|
||||
it("POST - Create an application", async () => {
|
||||
config.applications.create(generateApp())
|
||||
})
|
||||
|
||||
it("POST - Publish application", async () => {
|
||||
// create app
|
||||
const app = await config.applications.create(generateApp())
|
||||
|
||||
// publish app
|
||||
config.applications.api.appId = app.appId
|
||||
const [publishResponse, publish] = await config.applications.publish()
|
||||
expect(publishResponse).toHaveStatusCode(200)
|
||||
expect(publish).toEqual({
|
||||
_id: expect.any(String),
|
||||
appUrl: app.url,
|
||||
status: "SUCCESS",
|
||||
})
|
||||
})
|
||||
|
||||
it("Publish app flow", async () => {
|
||||
// create the app
|
||||
const appName = generator.word()
|
||||
const app = await createAppFromTemplate()
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
// check preview renders
|
||||
const [previewResponse, previewRenders] =
|
||||
await config.applications.canRender()
|
||||
expect(previewResponse).toHaveStatusCode(200)
|
||||
expect(previewRenders).toBe(true)
|
||||
|
||||
// publish app
|
||||
await config.applications.publish()
|
||||
|
||||
// check published app renders
|
||||
config.applications.api.appId = db.getProdAppID(app.appId)
|
||||
const [publishedAppResponse, publishedAppRenders] =
|
||||
await config.applications.canRender()
|
||||
expect(publishedAppRenders).toBe(true)
|
||||
|
||||
// unpublish app
|
||||
await config.applications.unpublish(<string>app.appId)
|
||||
})
|
||||
|
||||
it("POST - Sync application before deployment", async () => {
|
||||
const app = await config.applications.create(generateApp())
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
const [syncResponse, sync] = await config.applications.sync(
|
||||
<string>app.appId
|
||||
)
|
||||
expect(syncResponse).toHaveStatusCode(200)
|
||||
expect(sync).toEqual({
|
||||
message: "App sync not required, app not deployed.",
|
||||
})
|
||||
})
|
||||
|
||||
it("POST - Sync application after deployment", async () => {
|
||||
const app = await config.applications.create(generateApp())
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
// publish app
|
||||
await config.applications.publish()
|
||||
|
||||
const [syncResponse, sync] = await config.applications.sync(
|
||||
<string>app.appId
|
||||
)
|
||||
expect(syncResponse).toHaveStatusCode(200)
|
||||
expect(sync).toEqual({
|
||||
message: "App sync completed successfully.",
|
||||
})
|
||||
})
|
||||
|
||||
it("PUT - Update an application", async () => {
|
||||
const app = await config.applications.create(generateApp())
|
||||
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
const [updateResponse, updatedApp] = await config.applications.update(
|
||||
<string>app.appId,
|
||||
{
|
||||
name: generator.word(),
|
||||
}
|
||||
)
|
||||
expect(updateResponse).toHaveStatusCode(200)
|
||||
expect(updatedApp.name).not.toEqual(app.name)
|
||||
})
|
||||
|
||||
it("POST - Revert Changes without changes", async () => {
|
||||
const app = await config.applications.create(generateApp())
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
const [revertResponse, revert] = await config.applications.revert(
|
||||
<string>app.appId
|
||||
)
|
||||
expect(revertResponse).toHaveStatusCode(400)
|
||||
expect(revert).toEqual({
|
||||
message: "App has not yet been deployed",
|
||||
status: 400,
|
||||
})
|
||||
})
|
||||
|
||||
it("POST - Revert Changes", async () => {
|
||||
const app = await config.applications.create(generateApp())
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
// publish app
|
||||
const [publishResponse, publish] = await config.applications.publish()
|
||||
expect(publishResponse).toHaveStatusCode(200)
|
||||
expect(publish.status).toEqual("SUCCESS")
|
||||
|
||||
// Change/add component to the app
|
||||
const [screenResponse, screen] = await config.applications.addScreentoApp(
|
||||
generateScreen("BASIC")
|
||||
)
|
||||
expect(screenResponse).toHaveStatusCode(200)
|
||||
expect(screen._id).toBeDefined()
|
||||
|
||||
// // Revert the app to published state
|
||||
const [revertResponse, revert] = await config.applications.revert(
|
||||
<string>app.appId
|
||||
)
|
||||
expect(revertResponse).toHaveStatusCode(200)
|
||||
expect(revert).toEqual({
|
||||
message: "Reverted changes successfully.",
|
||||
})
|
||||
|
||||
// Check screen is removed
|
||||
const [routesResponse, routes] = await config.applications.getRoutes()
|
||||
expect(routesResponse).toHaveStatusCode(200)
|
||||
expect(routes.routes["/test"]).toBeUndefined()
|
||||
})
|
||||
|
||||
it("DELETE - Delete an application", async () => {
|
||||
const app = await config.applications.create(generateApp())
|
||||
|
||||
const [deleteResponse] = await config.applications.delete(<string>app.appId)
|
||||
expect(deleteResponse).toHaveStatusCode(200)
|
||||
})
|
||||
|
||||
it("Operations on Tables", async () => {
|
||||
// create the app
|
||||
const appName = generator.word()
|
||||
const app = await createAppFromTemplate()
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
// Get current tables: expect 2 in this template
|
||||
await config.tables.getAll(2)
|
||||
|
||||
// Add new table
|
||||
const [createdTableResponse, createdTableData] = await config.tables.save(
|
||||
generateTable()
|
||||
)
|
||||
expect(createdTableResponse).toHaveStatusCode(200)
|
||||
expect(createdTableData._id).toBeDefined()
|
||||
expect(createdTableData._rev).toBeDefined()
|
||||
|
||||
//Table was added
|
||||
await config.tables.getAll(3)
|
||||
|
||||
//Get information about the table
|
||||
const [tableInfoResponse, tableInfo] = await config.tables.getTableById(
|
||||
<string>createdTableData._id
|
||||
)
|
||||
expect(tableInfoResponse).toHaveStatusCode(200)
|
||||
expect(tableInfo._id).toEqual(createdTableData._id)
|
||||
|
||||
//Add Column to table
|
||||
const newColumn = generateNewColumnForTable(createdTableData)
|
||||
const [addColumnResponse, addColumnData] = await config.tables.save(
|
||||
newColumn
|
||||
)
|
||||
expect(addColumnResponse).toHaveStatusCode(200)
|
||||
expect(addColumnData._id).toEqual(createdTableData._id)
|
||||
expect(addColumnData.schema.TestColumn).toBeDefined()
|
||||
|
||||
//Add Row to table
|
||||
const newRow = generateNewRowForTable(<string>addColumnData._id)
|
||||
const [addRowResponse, addRowData] = await config.rows.add(
|
||||
<string>addColumnData._id,
|
||||
newRow
|
||||
)
|
||||
console.log(addRowData)
|
||||
expect(addRowResponse).toHaveStatusCode(200)
|
||||
expect(addRowData._id).toBeDefined()
|
||||
expect(addRowData._rev).toBeDefined()
|
||||
expect(addRowData.tableId).toEqual(addColumnData._id)
|
||||
|
||||
//Get Row from table
|
||||
const [getRowResponse, getRowData] = await config.rows.getAll(
|
||||
<string>addColumnData._id
|
||||
)
|
||||
expect(getRowResponse).toHaveStatusCode(200)
|
||||
expect(getRowData.length).toEqual(1)
|
||||
|
||||
//Delete Row from table
|
||||
const rowToDelete = {
|
||||
rows: [getRowData[0]],
|
||||
}
|
||||
const [deleteRowResponse, deleteRowData] = await config.rows.delete(
|
||||
<string>addColumnData._id,
|
||||
rowToDelete
|
||||
)
|
||||
expect(deleteRowResponse).toHaveStatusCode(200)
|
||||
expect(deleteRowData[0]._id).toEqual(getRowData[0]._id)
|
||||
|
||||
//Delete the table
|
||||
const [deleteTableResponse, deleteTable] = await config.tables.delete(
|
||||
<string>addColumnData._id,
|
||||
<string>addColumnData._rev
|
||||
)
|
||||
expect(deleteTableResponse).toHaveStatusCode(200)
|
||||
expect(deleteTable.message).toEqual(
|
||||
`Table ${createdTableData._id} deleted.`
|
||||
)
|
||||
|
||||
//Table was deleted
|
||||
await config.tables.getAll(2)
|
||||
})
|
||||
})
|
||||
|
|
@ -29,8 +29,6 @@ describe("Internal API - /screens endpoints", () => {
|
|||
const [response, screen] = await config.screen.create(
|
||||
generateScreen(roleArray[role])
|
||||
)
|
||||
expect(response).toHaveStatusCode(200)
|
||||
expect(screen.routing.roleId).toEqual(roleArray[role])
|
||||
}
|
||||
})
|
||||
|
||||
|
|
@ -40,14 +38,12 @@ describe("Internal API - /screens endpoints", () => {
|
|||
|
||||
// Create Screen
|
||||
appConfig.applications.api.appId = app.appId
|
||||
const [response, screen] = await config.screen.create(
|
||||
await config.screen.create(
|
||||
generateScreen("BASIC")
|
||||
)
|
||||
|
||||
// Check screen exists
|
||||
const [routesResponse, routes] = await appConfig.applications.getRoutes()
|
||||
expect(routesResponse).toHaveStatusCode(200)
|
||||
expect(routes.routes["/test"]).toBeTruthy()
|
||||
await appConfig.applications.getRoutes(true)
|
||||
})
|
||||
|
||||
it("DELETE - Delete a screen", async () => {
|
||||
|
|
@ -61,7 +57,7 @@ describe("Internal API - /screens endpoints", () => {
|
|||
)
|
||||
|
||||
// Delete Screen
|
||||
const [response] = await config.screen.delete(screen._id!, screen._rev!)
|
||||
expect(response).toHaveStatusCode(200)
|
||||
await config.screen.delete(screen._id!, screen._rev!)
|
||||
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,95 @@
|
|||
import TestConfiguration from "../../../config/internal-api/TestConfiguration"
|
||||
import { Application } from "@budibase/server/api/controllers/public/mapping/types"
|
||||
import InternalAPIClient from "../../../config/internal-api/TestConfiguration/InternalAPIClient"
|
||||
import generator from "../../../config/generator"
|
||||
import {
|
||||
generateTable,
|
||||
generateNewColumnForTable,
|
||||
} from "../../../config/internal-api/fixtures/table"
|
||||
import { generateNewRowForTable } from "../../../config/internal-api/fixtures/rows"
|
||||
|
||||
describe("Internal API - Application creation, update, publish and delete", () => {
|
||||
const api = new InternalAPIClient()
|
||||
const config = new TestConfiguration<Application>(api)
|
||||
|
||||
beforeAll(async () => {
|
||||
await config.beforeAll()
|
||||
})
|
||||
|
||||
afterAll(async () => {
|
||||
await config.afterAll()
|
||||
})
|
||||
|
||||
async function createAppFromTemplate() {
|
||||
return config.applications.create({
|
||||
name: generator.word(),
|
||||
url: `/${generator.word()}`,
|
||||
useTemplate: "true",
|
||||
templateName: "Near Miss Register",
|
||||
templateKey: "app/near-miss-register",
|
||||
templateFile: undefined,
|
||||
})
|
||||
}
|
||||
|
||||
it("Operations on Tables", async () => {
|
||||
// create the app
|
||||
const appName = generator.word()
|
||||
const app = await createAppFromTemplate()
|
||||
config.applications.api.appId = app.appId
|
||||
|
||||
// Get current tables: expect 2 in this template
|
||||
await config.tables.getAll(2)
|
||||
|
||||
// Add new table
|
||||
const [createdTableResponse, createdTableData] = await config.tables.save(
|
||||
generateTable()
|
||||
)
|
||||
|
||||
//Table was added
|
||||
await config.tables.getAll(3)
|
||||
|
||||
//Get information about the table
|
||||
await config.tables.getTableById(
|
||||
<string>createdTableData._id
|
||||
)
|
||||
|
||||
//Add Column to table
|
||||
const newColumn = generateNewColumnForTable(createdTableData)
|
||||
const [addColumnResponse, addColumnData] = await config.tables.save(
|
||||
newColumn,
|
||||
true
|
||||
)
|
||||
|
||||
//Add Row to table
|
||||
const newRow = generateNewRowForTable(<string>addColumnData._id)
|
||||
await config.rows.add(
|
||||
<string>addColumnData._id,
|
||||
newRow
|
||||
)
|
||||
|
||||
//Get Row from table
|
||||
const [getRowResponse, getRowData] = await config.rows.getAll(
|
||||
<string>addColumnData._id
|
||||
)
|
||||
|
||||
//Delete Row from table
|
||||
const rowToDelete = {
|
||||
rows: [getRowData[0]],
|
||||
}
|
||||
const [deleteRowResponse, deleteRowData] = await config.rows.delete(
|
||||
<string>addColumnData._id,
|
||||
rowToDelete
|
||||
)
|
||||
expect(deleteRowData[0]._id).toEqual(getRowData[0]._id)
|
||||
|
||||
//Delete the table
|
||||
const [deleteTableResponse, deleteTable] = await config.tables.delete(
|
||||
<string>addColumnData._id,
|
||||
<string>addColumnData._rev
|
||||
)
|
||||
|
||||
|
||||
//Table was deleted
|
||||
await config.tables.getAll(2)
|
||||
})
|
||||
})
|
||||
Loading…
Reference in New Issue