This commit is contained in:
Martin McKeaveney 2022-12-09 13:35:18 +00:00
commit bfab6fc335
22 changed files with 169 additions and 115 deletions

View File

@ -159,6 +159,18 @@ spec:
- name: ELASTIC_APM_SERVER_URL
value: {{ .Values.globals.elasticApmServerUrl | quote }}
{{ end }}
{{ if .Values.globals.globalAgentHttpProxy }}
- name: GLOBAL_AGENT_HTTP_PROXY
value: {{ .Values.globals.globalAgentHttpProxy | quote }}
{{ end }}
{{ if .Values.globals.globalAgentHttpsProxy }}
- name: GLOBAL_AGENT_HTTPS_PROXY
value: {{ .Values.globals.globalAgentHttpsProxy | quote }}
{{ end }}
{{ if .Values.globals.globalAgentNoProxy }}
- name: GLOBAL_AGENT_NO_PROXY
value: {{ .Values.globals.globalAgentNoProxy | quote }}
{{ end }}
- name: CDN_URL
value: {{ .Values.globals.cdnUrl }}
{{ if .Values.services.tlsRejectUnauthorized }}

View File

@ -150,6 +150,18 @@ spec:
- name: ELASTIC_APM_SERVER_URL
value: {{ .Values.globals.elasticApmServerUrl | quote }}
{{ end }}
{{ if .Values.globals.globalAgentHttpProxy }}
- name: GLOBAL_AGENT_HTTP_PROXY
value: {{ .Values.globals.globalAgentHttpProxy | quote }}
{{ end }}
{{ if .Values.globals.globalAgentHttpsProxy }}
- name: GLOBAL_AGENT_HTTPS_PROXY
value: {{ .Values.globals.globalAgentHttpsProxy | quote }}
{{ end }}
{{ if .Values.globals.globalAgentNoProxy }}
- name: GLOBAL_AGENT_NO_PROXY
value: {{ .Values.globals.globalAgentNoProxy | quote }}
{{ end }}
- name: CDN_URL
value: {{ .Values.globals.cdnUrl }}
{{ if .Values.services.tlsRejectUnauthorized }}

View File

@ -112,6 +112,9 @@ globals:
# elasticApmEnabled:
# elasticApmSecretToken:
# elasticApmServerUrl:
# globalAgentHttpProxy:
# globalAgentHttpsProxy:
# globalAgentNoProxy:
services:
budibaseVersion: latest

View File

@ -1,5 +1,5 @@
{
"version": "2.1.43-alpha.15",
"version": "2.1.45",
"npmClient": "yarn",
"packages": [
"packages/*"

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "2.1.43-alpha.15",
"version": "2.1.45",
"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.43-alpha.15",
"@budibase/types": "^2.1.45",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",

View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "2.1.43-alpha.15",
"version": "2.1.45",
"license": "MPL-2.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",
@ -38,34 +38,34 @@
],
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
"@budibase/string-templates": "2.1.43-alpha.15",
"@spectrum-css/actionbutton": "1.0.1",
"@spectrum-css/actiongroup": "1.0.1",
"@spectrum-css/avatar": "3.0.2",
"@spectrum-css/button": "3.0.1",
"@spectrum-css/buttongroup": "3.0.2",
"@spectrum-css/checkbox": "3.0.2",
"@spectrum-css/dialog": "3.0.1",
"@spectrum-css/divider": "1.0.3",
"@spectrum-css/dropzone": "3.0.2",
"@spectrum-css/fieldgroup": "3.0.2",
"@spectrum-css/fieldlabel": "3.0.1",
"@spectrum-css/icon": "3.0.1",
"@spectrum-css/illustratedmessage": "3.0.2",
"@spectrum-css/inlinealert": "2.0.1",
"@spectrum-css/inputgroup": "3.0.2",
"@spectrum-css/label": "2.0.10",
"@spectrum-css/link": "3.1.1",
"@spectrum-css/menu": "3.0.1",
"@spectrum-css/modal": "3.0.1",
"@spectrum-css/pagination": "3.0.3",
"@spectrum-css/picker": "1.0.1",
"@spectrum-css/popover": "3.0.1",
"@spectrum-css/progressbar": "1.0.2",
"@spectrum-css/progresscircle": "1.0.2",
"@spectrum-css/radio": "3.0.2",
"@spectrum-css/search": "3.0.2",
"@spectrum-css/sidenav": "3.0.2",
"@budibase/string-templates": "^2.1.45",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",
"@spectrum-css/button": "^3.0.1",
"@spectrum-css/buttongroup": "^3.0.2",
"@spectrum-css/checkbox": "^3.0.2",
"@spectrum-css/dialog": "^3.0.1",
"@spectrum-css/divider": "^1.0.3",
"@spectrum-css/dropzone": "^3.0.2",
"@spectrum-css/fieldgroup": "^3.0.2",
"@spectrum-css/fieldlabel": "^3.0.1",
"@spectrum-css/icon": "^3.0.1",
"@spectrum-css/illustratedmessage": "^3.0.2",
"@spectrum-css/inlinealert": "^2.0.1",
"@spectrum-css/inputgroup": "^3.0.2",
"@spectrum-css/label": "^2.0.10",
"@spectrum-css/link": "^3.1.1",
"@spectrum-css/menu": "^3.0.1",
"@spectrum-css/modal": "^3.0.1",
"@spectrum-css/pagination": "^3.0.3",
"@spectrum-css/picker": "^1.0.1",
"@spectrum-css/popover": "^3.0.1",
"@spectrum-css/progressbar": "^1.0.2",
"@spectrum-css/progresscircle": "^1.0.2",
"@spectrum-css/radio": "^3.0.2",
"@spectrum-css/search": "^3.0.2",
"@spectrum-css/sidenav": "^3.0.2",
"@spectrum-css/slider": "3.0.1",
"@spectrum-css/statuslight": "3.0.2",
"@spectrum-css/stepper": "3.0.3",

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "2.1.43-alpha.15",
"version": "2.1.45",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -71,10 +71,10 @@
}
},
"dependencies": {
"@budibase/bbui": "2.1.43-alpha.15",
"@budibase/client": "2.1.43-alpha.15",
"@budibase/frontend-core": "2.1.43-alpha.15",
"@budibase/string-templates": "2.1.43-alpha.15",
"@budibase/bbui": "^2.1.45",
"@budibase/client": "^2.1.45",
"@budibase/frontend-core": "^2.1.45",
"@budibase/string-templates": "^2.1.45",
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",

View File

@ -120,6 +120,12 @@
const onUpdateRows = () => {
fetch.refresh()
}
// When importing new rows it is better to reinitialise request/paging data.
// Not doing so causes inconsistency in paging behaviour and content.
const onImportData = () => {
fetch.getInitialData()
}
</script>
<div>
@ -172,7 +178,7 @@
<ImportButton
disabled={$tables.selected?._id === "ta_users"}
tableId={$tables.selected?._id}
on:updaterows={onUpdateRows}
on:importrows={onImportData}
/>
<ExportButton
disabled={!hasRows || !hasCols}

View File

@ -12,5 +12,5 @@
Import
</ActionButton>
<Modal bind:this={modal}>
<ImportModal {tableId} on:updaterows />
<ImportModal {tableId} on:importrows />
</Modal>

View File

@ -29,7 +29,7 @@
}
// Always refresh rows just to be sure
dispatch("updaterows")
dispatch("importrows")
}
</script>

View File

@ -1,6 +1,7 @@
<script>
import { goto } from "@roxi/routify"
import { store } from "builderStore"
import { cloneDeep } from "lodash/fp"
import { tables, datasources } from "stores/backend"
import {
ActionMenu,
@ -18,7 +19,10 @@
let editorModal
let confirmDeleteDialog
let error = ""
let originalName = table.name
let originalName
let updatedName
let templateScreens
let willBeDeleted
let deleteTableName
@ -59,7 +63,9 @@
}
async function save() {
await tables.save(table)
const updatedTable = cloneDeep(table)
updatedTable.name = updatedName
await tables.save(updatedTable)
notifications.success("Table renamed successfully")
}
@ -70,6 +76,11 @@
? `Table with name ${tableName} already exists. Please choose another name.`
: ""
}
const initForm = () => {
originalName = table.name + ""
updatedName = table.name + ""
}
</script>
{#if allowDeletion}
@ -84,17 +95,17 @@
</ActionMenu>
{/if}
<Modal bind:this={editorModal}>
<Modal bind:this={editorModal} on:show={initForm}>
<ModalContent
title="Edit Table"
confirmText="Save"
onConfirm={save}
disabled={table.name === originalName || error}
disabled={updatedName === originalName || error}
>
<Input
label="Table Name"
thin
bind:value={table.name}
bind:value={updatedName}
on:input={checkValid}
{error}
/>

View File

@ -1,6 +1,7 @@
<script>
import { goto } from "@roxi/routify"
import { views } from "stores/backend"
import { cloneDeep } from "lodash/fp"
import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import {
notifications,
@ -15,13 +16,17 @@
export let view
let editorModal
let originalName = view.name
let originalName
let updatedName
let confirmDeleteDialog
async function save() {
const updatedView = cloneDeep(view)
updatedView.name = updatedName
await views.save({
originalName,
...view,
...updatedView,
})
notifications.success("View renamed successfully")
}
@ -37,6 +42,11 @@
notifications.error("Error deleting view")
}
}
const initForm = () => {
updatedName = view.name + ""
originalName = view.name + ""
}
</script>
<ActionMenu>
@ -46,9 +56,9 @@
<MenuItem icon="Edit" on:click={editorModal.show}>Edit</MenuItem>
<MenuItem icon="Delete" on:click={confirmDeleteDialog.show}>Delete</MenuItem>
</ActionMenu>
<Modal bind:this={editorModal}>
<Modal bind:this={editorModal} on:show={initForm}>
<ModalContent title="Edit View" onConfirm={save} confirmText="Save">
<Input label="View Name" thin bind:value={view.name} />
<Input label="View Name" thin bind:value={updatedName} />
</ModalContent>
</Modal>
<ConfirmDialog

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "2.1.43-alpha.15",
"version": "2.1.45",
"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.43-alpha.15",
"@budibase/string-templates": "2.1.43-alpha.15",
"@budibase/types": "2.1.43-alpha.15",
"@budibase/backend-core": "^2.1.45",
"@budibase/string-templates": "^2.1.45",
"@budibase/types": "^2.1.45",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "2.1.43-alpha.15",
"version": "2.1.45",
"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.43-alpha.15",
"@budibase/frontend-core": "2.1.43-alpha.15",
"@budibase/string-templates": "2.1.43-alpha.15",
"@budibase/bbui": "^2.1.45",
"@budibase/frontend-core": "^2.1.45",
"@budibase/string-templates": "^2.1.45",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

View File

@ -1,12 +1,12 @@
{
"name": "@budibase/frontend-core",
"version": "2.1.43-alpha.15",
"version": "2.1.45",
"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.43-alpha.15",
"@budibase/bbui": "^2.1.45",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/sdk",
"version": "2.1.43-alpha.15",
"version": "2.1.45",
"description": "Budibase Public API SDK",
"author": "Budibase",
"license": "MPL-2.0",

View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "2.1.43-alpha.15",
"version": "2.1.45",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -43,11 +43,11 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "2.1.43-alpha.15",
"@budibase/client": "2.1.43-alpha.15",
"@budibase/pro": "2.1.43-alpha.15",
"@budibase/string-templates": "2.1.43-alpha.15",
"@budibase/types": "2.1.43-alpha.15",
"@budibase/backend-core": "^2.1.45",
"@budibase/client": "^2.1.45",
"@budibase/pro": "2.1.45",
"@budibase/string-templates": "^2.1.45",
"@budibase/types": "^2.1.45",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

View File

@ -1273,12 +1273,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.1.43-alpha.15":
version "2.1.43-alpha.15"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.43-alpha.15.tgz#0c1d3ca30010fac5c4828ddac0bda38c0ed2e473"
integrity sha512-zUj/+q4mOGXTmElpJ3B9hBngKnw+qDGLp5wEMqQGSjmcBq/SOCJBpM1yHSqDbMWBJguSmshPMrEjGMe78r+BOQ==
"@budibase/backend-core@2.1.45":
version "2.1.45"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.45.tgz#49c515ab103fc1716df881fae0dd277fa12aeb71"
integrity sha512-eVUThmOXsAfsCPqrEvyJsxiPiQ/4Il2BEOmdgL3hI1O51mthUZ0X2Es9gLnccBZF32g8FFs3WSeYE9F4Mv+hzg==
dependencies:
"@budibase/types" "2.1.43-alpha.15"
"@budibase/types" "^2.1.45"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -1360,13 +1360,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@2.1.43-alpha.15":
version "2.1.43-alpha.15"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.43-alpha.15.tgz#2ad444af59a0f28794c0dcf3f1112e74b5b1eb1c"
integrity sha512-s7PNnWe9Mx5poF9+hgnTgY4B1zZqLlmJT9o7IY99uDf1sYCf6CRX4uJ+WG9+ROL/UcKPXtllZQuxompreyA8ow==
"@budibase/pro@2.1.45":
version "2.1.45"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.45.tgz#64c6382be3ef68f5107ab94043c285d458d6f0c6"
integrity sha512-QO/qknEhHyjgjgLgOYUnEpgqxC6TLKIYyEwG/Yj5lCfAVjXQX/kKgJ0KAyM0c2+TWGn4YNokIDXURvMyDcsjig==
dependencies:
"@budibase/backend-core" "2.1.43-alpha.15"
"@budibase/types" "2.1.43-alpha.15"
"@budibase/backend-core" "2.1.45"
"@budibase/types" "2.1.45"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
@ -1390,10 +1390,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@2.1.43-alpha.15":
version "2.1.43-alpha.15"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.43-alpha.15.tgz#0d5b372d615f1f9509a606fb952f4eeabeda19c7"
integrity sha512-ATh/UyYGZ567UDcQo9/tuDa6SXm7a5WcXBMsIZVLlGSg56dECpiz7SIerr+sOtjtAgdHqIy4aYcQmgA5k9eWdg==
"@budibase/types@2.1.45", "@budibase/types@^2.1.45":
version "2.1.45"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.45.tgz#8cbb82130262d60a5988233381f8666d7dac068b"
integrity sha512-slW1wzDzcdit/qv3Jp5Fa+M7ZYxBYLSldfsGEnDIJ7g23ewWhBuRF1khYxoy2OxG1pfcxLjo0s2ZaUjc2uVV4w==
"@bull-board/api@3.7.0":
version "3.7.0"

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "2.1.43-alpha.15",
"version": "2.1.45",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "2.1.43-alpha.15",
"version": "2.1.45",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "2.1.43-alpha.15",
"version": "2.1.45",
"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.43-alpha.15",
"@budibase/pro": "2.1.43-alpha.15",
"@budibase/string-templates": "2.1.43-alpha.15",
"@budibase/types": "2.1.43-alpha.15",
"@budibase/backend-core": "^2.1.45",
"@budibase/pro": "2.1.45",
"@budibase/string-templates": "^2.1.45",
"@budibase/types": "^2.1.45",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

View File

@ -470,12 +470,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.1.43-alpha.15":
version "2.1.43-alpha.15"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.43-alpha.15.tgz#0c1d3ca30010fac5c4828ddac0bda38c0ed2e473"
integrity sha512-zUj/+q4mOGXTmElpJ3B9hBngKnw+qDGLp5wEMqQGSjmcBq/SOCJBpM1yHSqDbMWBJguSmshPMrEjGMe78r+BOQ==
"@budibase/backend-core@2.1.45":
version "2.1.45"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.45.tgz#49c515ab103fc1716df881fae0dd277fa12aeb71"
integrity sha512-eVUThmOXsAfsCPqrEvyJsxiPiQ/4Il2BEOmdgL3hI1O51mthUZ0X2Es9gLnccBZF32g8FFs3WSeYE9F4Mv+hzg==
dependencies:
"@budibase/types" "2.1.43-alpha.15"
"@budibase/types" "^2.1.45"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -507,22 +507,22 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/pro@2.1.43-alpha.15":
version "2.1.43-alpha.15"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.43-alpha.15.tgz#2ad444af59a0f28794c0dcf3f1112e74b5b1eb1c"
integrity sha512-s7PNnWe9Mx5poF9+hgnTgY4B1zZqLlmJT9o7IY99uDf1sYCf6CRX4uJ+WG9+ROL/UcKPXtllZQuxompreyA8ow==
"@budibase/pro@2.1.45":
version "2.1.45"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.45.tgz#64c6382be3ef68f5107ab94043c285d458d6f0c6"
integrity sha512-QO/qknEhHyjgjgLgOYUnEpgqxC6TLKIYyEwG/Yj5lCfAVjXQX/kKgJ0KAyM0c2+TWGn4YNokIDXURvMyDcsjig==
dependencies:
"@budibase/backend-core" "2.1.43-alpha.15"
"@budibase/types" "2.1.43-alpha.15"
"@budibase/backend-core" "2.1.45"
"@budibase/types" "2.1.45"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@2.1.43-alpha.15":
version "2.1.43-alpha.15"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.43-alpha.15.tgz#0d5b372d615f1f9509a606fb952f4eeabeda19c7"
integrity sha512-ATh/UyYGZ567UDcQo9/tuDa6SXm7a5WcXBMsIZVLlGSg56dECpiz7SIerr+sOtjtAgdHqIy4aYcQmgA5k9eWdg==
"@budibase/types@2.1.45", "@budibase/types@^2.1.45":
version "2.1.45"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.45.tgz#8cbb82130262d60a5988233381f8666d7dac068b"
integrity sha512-slW1wzDzcdit/qv3Jp5Fa+M7ZYxBYLSldfsGEnDIJ7g23ewWhBuRF1khYxoy2OxG1pfcxLjo0s2ZaUjc2uVV4w==
"@cspotcode/source-map-support@^0.8.0":
version "0.8.1"