From 74aa91d1203277078d194bcc1fc142a75c524d85 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 4 Nov 2024 09:35:13 +0000 Subject: [PATCH 1/3] Update color picker to account for new theme values --- .../bbui/src/ColorPicker/ColorPicker.svelte | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/packages/bbui/src/ColorPicker/ColorPicker.svelte b/packages/bbui/src/ColorPicker/ColorPicker.svelte index 7bedc769c8..a5c619671a 100644 --- a/packages/bbui/src/ColorPicker/ColorPicker.svelte +++ b/packages/bbui/src/ColorPicker/ColorPicker.svelte @@ -6,6 +6,11 @@ import Icon from "../Icon/Icon.svelte" import Input from "../Form/Input.svelte" import { capitalise } from "../helpers" + import { + ensureValidTheme, + getThemeClassNames, + DefaultAppTheme, + } from "@budibase/shared-core" export let value export let size = "M" @@ -18,6 +23,7 @@ $: customValue = getCustomValue(value) $: checkColor = getCheckColor(value) + $: themeClasses = getThemeClasses(spectrumTheme) const dispatch = createEventDispatcher() const categories = [ @@ -91,6 +97,14 @@ }, ] + const getThemeClasses = theme => { + if (!theme) { + return "" + } + theme = ensureValidTheme(theme, DefaultAppTheme) + return getThemeClassNames(theme) + } + const onChange = value => { dispatch("change", value) dropdown.hide() @@ -147,7 +161,7 @@ }} >
@@ -171,7 +185,7 @@ title={prettyPrint(color)} >
{#if value === `var(--spectrum-global-color-${color})`} From f457e9788d213483c9ed8ff4aa2963b7c2d5da10 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Mon, 4 Nov 2024 10:51:11 +0000 Subject: [PATCH 2/3] Deploy all camunda processes (#14936) * Deploy all camunda processes * Add debug config for camunda workers --- .vscode/launch.json | 10 ++++++++++ scripts/deploy-camunda.sh | 11 ++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 2fda61345b..543d1e6179 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -20,6 +20,16 @@ "args": ["${workspaceFolder}/packages/worker/src/index.ts"], "cwd": "${workspaceFolder}/packages/worker" }, + { + "name": "Camunda Worker", + "type": "node", + "request": "launch", + "runtimeArgs": ["--nolazy", "-r", "ts-node/register/transpile-only"], + "args": [ + "${workspaceFolder}/packages/account-portal/packages/server/src/v2/run.ts" + ], + "cwd": "${workspaceFolder}/packages/account-portal/packages/server" + }, { "type": "chrome", "request": "launch", diff --git a/scripts/deploy-camunda.sh b/scripts/deploy-camunda.sh index 440de65bb2..66c505a6f0 100755 --- a/scripts/deploy-camunda.sh +++ b/scripts/deploy-camunda.sh @@ -17,15 +17,12 @@ echo "waiting for Camunda to be ready..." while is_camunda_ready -eq 0; do sleep 1; done -cd src/main/resources/models - echo "deploy processes..." -zbctl deploy resource offboarding.bpmn --insecure -zbctl deploy resource onboarding.bpmn --insecure -zbctl deploy resource free_trial.bpmn --insecure -zbctl deploy resource verify_sso_login.bpmn --insecure +for file in src/main/resources/models/*; do + zbctl deploy resource $file --insecure +done -cd ../../../../../budibase/packages/pro +cd ../budibase/packages/pro yarn && yarn build cd ../account-portal/packages/server From b8c10d4765e42f32b55d16e16db240090a0da5c3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 4 Nov 2024 11:45:56 +0000 Subject: [PATCH 3/3] Bump version to 3.0.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 2f9e66675b..e4b72979b9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "3.0.0", + "version": "3.0.1", "npmClient": "yarn", "packages": [ "packages/*",