diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index 42fb35b5e4..a3e4790430 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -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 }} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index 6324256780..44bbb8aa20 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -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 }} diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index 05d2d5e276..726df7585b 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -112,6 +112,9 @@ globals: # elasticApmEnabled: # elasticApmSecretToken: # elasticApmServerUrl: +# globalAgentHttpProxy: +# globalAgentHttpsProxy: +# globalAgentNoProxy: services: budibaseVersion: latest diff --git a/lerna.json b/lerna.json index 818467f623..801a673af9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.43-alpha.15", + "version": "2.1.45", "npmClient": "yarn", "packages": [ "packages/*" @@ -15,4 +15,4 @@ ] } } -} +} \ No newline at end of file diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index db74a11144..269f183492 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -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", @@ -78,4 +78,4 @@ "typescript": "4.7.3" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 9ba976ccc3..0462ad0b0d 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.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", @@ -89,4 +89,4 @@ "loader-utils": "1.4.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/builder/package.json b/packages/builder/package.json index cabad91e4c..6e6617ed89 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -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", @@ -123,4 +123,4 @@ "vite": "^3.0.8" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" -} +} \ No newline at end of file diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte index d5a365311b..4f5c3375bd 100644 --- a/packages/builder/src/components/backend/DataTable/DataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte @@ -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() + }