MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9548 from Budibase/fix/peter-fixes 

Fixes for multiple issues
This commit is contained in:
Peter Clement 2023-02-06 19:54:13 +00:00 committed by GitHub
parent 7e0c723730 2df1d52fbd
commit ac9247cb66
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/bbui/src/Form/Core/EnvDropdown.svelte
View File

@ -25,7 +25,7 @@
let open = false let open = false
//eslint-disable-next-line //eslint-disable-next-line
const STRIP_NAME_REGEX = /(?<=\.)(.*?)(?=\ })/g const STRIP_NAME_REGEX = /(\w+?)(?=\ })/g
// Strips the name out of the value which is {{ env.Variable }} resulting in an array like ["Variable"] // Strips the name out of the value which is {{ env.Variable }} resulting in an array like ["Variable"]
$: hbsValue = String(value)?.match(STRIP_NAME_REGEX) || [] $: hbsValue = String(value)?.match(STRIP_NAME_REGEX) || []

2
packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
View File

@ -70,7 +70,7 @@
return Number(value) return Number(value)
} }
if (type === "options") { if (type === "options") {
return [value] return value
} }
if (type === "array") { if (type === "array") {
if (Array.isArray(value)) { if (Array.isArray(value)) {

17
packages/builder/src/stores/portal/environment.js
View File

@ -1,6 +1,7 @@
import { writable } from "svelte/store" import { writable, get } from "svelte/store"
import { API } from "api" import { API } from "api"
import { Constants } from "@budibase/frontend-core" import { Constants } from "@budibase/frontend-core"
import { licensing } from "stores/portal"
export function createEnvironmentStore() { export function createEnvironmentStore() {
const { subscribe, update } = writable({ const { subscribe, update } = writable({
@ -17,12 +18,14 @@ export function createEnvironmentStore() {
} }
async function loadVariables() { async function loadVariables() {
const envVars = await API.fetchEnvironmentVariables() if (get(licensing).environmentVariablesEnabled) {
const mappedVars = envVars.variables.map(name => ({ name })) const envVars = await API.fetchEnvironmentVariables()
update(store => { const mappedVars = envVars.variables.map(name => ({ name }))
store.variables = mappedVars update(store => {
return store store.variables = mappedVars
}) return store
})
}
} }
async function createVariable(data) { async function createVariable(data) {

2
qa-core/src/config/internal-api/TestConfiguration/applications.ts
View File

@ -112,7 +112,7 @@ export default class AppApi {
async delete(appId: string): Promise<Response> { async delete(appId: string): Promise<Response> {
const response = await this.api.del(`/applications/${appId}`) const response = await this.api.del(`/applications/${appId}`)
expect(response).toHaveStatusCode(204) expect(response).toHaveStatusCode(200)
return response return response
} }