diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index 024b97597f..b3385c2ccd 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -69,10 +69,13 @@ jobs: env: KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}' + - name: Set the base64 kubeconfig + run: echo 'RELEASE_KUBECONFIG=${{ secrets.RELEASE_KUBECONFIG }}' | base64 + - name: Re roll the services uses: actions-hub/kubectl@master env: - KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG }} + KUBE_CONFIG: ${{ env.RELEASE_KUBECONFIG }} with: args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 067d0eb0dd..8d3e9f4021 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -120,11 +120,14 @@ jobs: ] env: KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}' + + - name: Set the base64 kubeconfig + run: echo 'RELEASE_KUBECONFIG=${{ secrets.RELEASE_KUBECONFIG }}' | base64 - name: Re roll the services uses: actions-hub/kubectl@master env: - KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG }} + KUBE_CONFIG: ${{ env.RELEASE_KUBECONFIG }} with: args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase diff --git a/lerna.json b/lerna.json index 7c2189d70a..72d1757935 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.41-alpha.3", + "version": "1.2.43", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 490da9c19c..45cb5dd2bb 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.41-alpha.3", + "version": "1.2.43", "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": "1.2.41-alpha.3", + "@budibase/types": "^1.2.43", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6f4703fc26..4e8a5d15eb 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": "1.2.41-alpha.3", + "version": "1.2.43", "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": "1.2.41-alpha.3", + "@budibase/string-templates": "^1.2.43", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 33104ad8f6..d51e75335f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.41-alpha.3", + "version": "1.2.43", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.41-alpha.3", - "@budibase/client": "1.2.41-alpha.3", - "@budibase/frontend-core": "1.2.41-alpha.3", - "@budibase/string-templates": "1.2.41-alpha.3", + "@budibase/bbui": "^1.2.43", + "@budibase/client": "^1.2.43", + "@budibase/frontend-core": "^1.2.43", + "@budibase/string-templates": "^1.2.43", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index bebd06c6d7..13b749e19f 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -502,11 +502,11 @@ const getRoleBindings = () => { } /** - * Gets all bindable properties exposed in a button actions flow up until + * Gets all bindable properties exposed in an event action flow up until * the specified action ID, as well as context provided for the action * setting as a whole by the component. */ -export const getButtonContextBindings = ( +export const getEventContextBindings = ( asset, componentId, settingKey, @@ -520,10 +520,7 @@ export const getButtonContextBindings = ( const component = findComponent(asset.props, componentId) const settings = getComponentSettings(component?._component) const eventSetting = settings.find(setting => setting.key === settingKey) - if (!eventSetting) { - return bindings - } - if (eventSetting.context?.length) { + if (eventSetting?.context?.length) { eventSetting.context.forEach(contextEntry => { bindings.push({ readableBinding: contextEntry.label, diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte index 31962077fc..69d5fe60b4 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte @@ -11,7 +11,7 @@ } from "@budibase/bbui" import { getAvailableActions } from "./index" import { generate } from "shortid" - import { getButtonContextBindings } from "builderStore/dataBinding" + import { getEventContextBindings } from "builderStore/dataBinding" import { currentAsset, store } from "builderStore" const flipDurationMs = 150 @@ -41,14 +41,14 @@ }, {}) // These are ephemeral bindings which only exist while executing actions - $: buttonContextBindings = getButtonContextBindings( + $: eventContexBindings = getEventContextBindings( $currentAsset, $store.selectedComponentId, key, actions, selectedAction?.id ) - $: allBindings = buttonContextBindings.concat(bindings) + $: allBindings = eventContexBindings.concat(bindings) // Assign a unique ID to each action $: { diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte index b40b33744f..c386a52cb7 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte @@ -112,7 +112,7 @@ Constants.OperatorOptions.NotEmpty.value, ] condition.noValue = noValueOptions.includes(newOperator) - if (condition.noValue) { + if (condition.noValue || newOperator === "oneOf") { condition.referenceValue = null condition.valueType = "string" } @@ -206,7 +206,7 @@ on:change={e => onOperatorChange(condition, e.detail)} />