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

Merge branch 'master' of github.com:Budibase/budibase into reenable-isolatedvm

This commit is contained in:
mike12345567 2024-02-16 11:06:05 +00:00
parent 81035f6d03 101caf323a
commit 28e3e8d6ed
355 changed files with 7570 additions and 3595 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hosting/docker-compose.yaml
View File

@ -98,7 +98,6 @@ services:
couchdb-service:
restart: unless-stopped
image: budibase/couchdb
pull_policy: always
environment:
- COUCHDB_PASSWORD=${COUCH_DB_PASSWORD}
- COUCHDB_USER=${COUCH_DB_USER}

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "2.19.1",
"version": "2.19.5",
"npmClient": "yarn",
"packages": [
"packages/*",

3
package.json
View File

@ -58,7 +58,7 @@
"lint": "yarn run lint:eslint && yarn run lint:prettier",
"lint:fix:eslint": "eslint --fix --max-warnings=0 packages qa-core",
"lint:fix:prettier": "prettier --write \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\" && prettier --write \"qa-core/**/*.{js,ts,svelte}\"",
"lint:fix": "yarn run lint:fix:prettier && yarn run lint:fix:eslint",
"lint:fix": "yarn run lint:fix:eslint && yarn run lint:fix:prettier",
"build:specs": "lerna run --stream specs",
"build:docker:airgap": "node hosting/scripts/airgapped/airgappedDockerBuild",
"build:docker:airgap:single": "SINGLE_IMAGE=1 node hosting/scripts/airgapped/airgappedDockerBuild",
@ -106,7 +106,6 @@
"axios": "1.6.3",
"xml2js": "0.6.2",
"unset-value": "2.0.1",
"got": "13.0.0",
"passport": "0.6.0"
},
"engines": {

2
packages/account-portal

@ -1 +1 @@
Subproject commit 8cbe73c9dc39d0bda3dbca3dac345a4a1f916f18
Subproject commit 8c446c4ba385592127fa31755d3b64467b291882

7
packages/backend-core/src/logging/correlation/correlation.ts
View File

@ -2,11 +2,12 @@ import { Header } from "../../constants"
const correlator = require("correlation-id")
export const setHeader = (headers: any) => {
export const setHeader = (headers: Record<string, string>) => {
const correlationId = correlator.getId()
if (correlationId) {
headers[Header.CORRELATION_ID] = correlationId
if (!correlationId) {
return
}
headers[Header.CORRELATION_ID] = correlationId
}
export function getId() {

BIN
packages/builder/assets/n8n_square.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

1
packages/builder/package.json
View File

@ -23,7 +23,6 @@
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/internals/mocks/fileMock.js",
"\\.(css|less|sass|scss)$": "identity-obj-proxy",
"components(.*)$": "<rootDir>/src/components$1",
"builderStore(.*)$": "<rootDir>/src/builderStore$1",
"stores(.*)$": "<rootDir>/src/stores$1",
"analytics(.*)$": "<rootDir>/src/analytics$1",
"constants/backend": "<rootDir>/src/constants/backend/index.js"

4
packages/builder/src/api.js
View File

@ -3,14 +3,14 @@ import {
CookieUtils,
Constants,
} from "@budibase/frontend-core"
import { store } from "./builderStore"
import { appStore } from "stores/builder"
import { get } from "svelte/store"
import { auth, navigation } from "./stores/portal"
export const API = createAPIClient({
attachHeaders: headers => {
// Attach app ID header from store
let appId = get(store).appId
let appId = get(appStore).appId
if (appId) {
headers["x-budibase-app-id"] = appId
}

158
packages/builder/src/builderStore/index.js
View File

@ -1,158 +0,0 @@
import { getFrontendStore } from "./store/frontend"
import { getAutomationStore } from "./store/automation"
import { getTemporalStore } from "./store/temporal"
import { getThemeStore } from "./store/theme"
import { getUserStore } from "./store/users"
import { getDeploymentStore } from "./store/deployments"
import { derived, get } from "svelte/store"
import { findComponent, findComponentPath } from "./componentUtils"
import { RoleUtils } from "@budibase/frontend-core"
import { createHistoryStore } from "builderStore/store/history"
import { cloneDeep } from "lodash/fp"
import { getHoverStore } from "./store/hover"
export const store = getFrontendStore()
export const automationStore = getAutomationStore()
export const themeStore = getThemeStore()
export const temporalStore = getTemporalStore()
export const userStore = getUserStore()
export const deploymentStore = getDeploymentStore()
export const hoverStore = getHoverStore()
// Setup history for screens
export const screenHistoryStore = createHistoryStore({
getDoc: id => get(store).screens?.find(screen => screen._id === id),
selectDoc: store.actions.screens.select,
afterAction: () => {
// Ensure a valid component is selected
if (!get(selectedComponent)) {
store.update(state => ({
...state,
selectedComponentId: get(selectedScreen)?.props._id,
}))
}
},
})
store.actions.screens.save = screenHistoryStore.wrapSaveDoc(
store.actions.screens.save
)
store.actions.screens.delete = screenHistoryStore.wrapDeleteDoc(
store.actions.screens.delete
)
// Setup history for automations
export const automationHistoryStore = createHistoryStore({
getDoc: automationStore.actions.getDefinition,
selectDoc: automationStore.actions.select,
})
automationStore.actions.save = automationHistoryStore.wrapSaveDoc(
automationStore.actions.save
)
automationStore.actions.delete = automationHistoryStore.wrapDeleteDoc(
automationStore.actions.delete
)
export const selectedScreen = derived(store, $store => {
return $store.screens.find(screen => screen._id === $store.selectedScreenId)
})
export const selectedLayout = derived(store, $store => {
return $store.layouts?.find(layout => layout._id === $store.selectedLayoutId)
})
export const selectedComponent = derived(
[store, selectedScreen],
([$store, $selectedScreen]) => {
if (
$selectedScreen &&
$store.selectedComponentId?.startsWith(`${$selectedScreen._id}-`)
) {
return $selectedScreen?.props
}
if (!$selectedScreen || !$store.selectedComponentId) {
return null
}
const selected = findComponent(
$selectedScreen?.props,
$store.selectedComponentId
)
const clone = selected ? cloneDeep(selected) : selected
store.actions.components.migrateSettings(clone)
return clone
}
)
// For legacy compatibility only, but with the new design UI this is just
// the selected screen
export const currentAsset = selectedScreen
export const sortedScreens = derived(store, $store => {
return $store.screens.slice().sort((a, b) => {
// Sort by role first
const roleA = RoleUtils.getRolePriority(a.routing.roleId)
const roleB = RoleUtils.getRolePriority(b.routing.roleId)
if (roleA !== roleB) {
return roleA > roleB ? -1 : 1
}
// Then put home screens first
const homeA = !!a.routing.homeScreen
const homeB = !!b.routing.homeScreen
if (homeA !== homeB) {
return homeA ? -1 : 1
}
// Then sort alphabetically by each URL param
const aParams = a.routing.route.split("/")
const bParams = b.routing.route.split("/")
let minParams = Math.min(aParams.length, bParams.length)
for (let i = 0; i < minParams; i++) {
if (aParams[i] === bParams[i]) {
continue
}
return aParams[i] < bParams[i] ? -1 : 1
}
// Then sort by the fewest amount of URL params
return aParams.length < bParams.length ? -1 : 1
})
})
export const selectedComponentPath = derived(
[store, selectedScreen],
([$store, $selectedScreen]) => {
return findComponentPath(
$selectedScreen?.props,
$store.selectedComponentId
).map(component => component._id)
}
)
// Derived automation state
export const selectedAutomation = derived(automationStore, $automationStore => {
if (!$automationStore.selectedAutomationId) {
return null
}
return $automationStore.automations?.find(
x => x._id === $automationStore.selectedAutomationId
)
})
// Derive map of resource IDs to other users.
// We only ever care about a single user in each resource, so if multiple users
// share the same datasource we can just overwrite them.
export const userSelectedResourceMap = derived(userStore, $userStore => {
let map = {}
$userStore.forEach(user => {
const resource = user.builderMetadata?.selectedResourceId
if (resource) {
if (!map[resource]) {
map[resource] = []
}
map[resource].push(user)
}
})
return map
})
export const isOnlyUser = derived(userStore, $userStore => {
return $userStore.length < 2
})

1507
packages/builder/src/builderStore/store/frontend.js
View File

File diff suppressed because it is too large Load Diff

27
packages/builder/src/builderStore/store/hover.js
View File

@ -1,27 +0,0 @@
import { get, writable } from "svelte/store"
import { store as builder } from "builderStore"
export const getHoverStore = () => {
const initialValue = {
componentId: null,
}
const store = writable(initialValue)
const update = (componentId, notifyClient = true) => {
if (componentId === get(store).componentId) {
return
}
store.update(state => {
state.componentId = componentId
return state
})
if (notifyClient) {
builder.actions.preview.sendEvent("hover-component", componentId)
}
}
return {
subscribe: store.subscribe,
actions: { update },
}
}

545
packages/builder/src/builderStore/tests/dataBinding.test.js
View File

@ -1,545 +0,0 @@
import { expect, describe, it, vi } from "vitest"
import {
runtimeToReadableBinding,
readableToRuntimeBinding,
updateReferencesInObject,
} from "../dataBinding"
vi.mock("@budibase/frontend-core")
vi.mock("builderStore/componentUtils")
vi.mock("builderStore/store")
vi.mock("builderStore/store/theme")
vi.mock("builderStore/store/temporal")
describe("runtimeToReadableBinding", () => {
const bindableProperties = [
{
category: "Current User",
icon: "User",
providerId: "user",
readableBinding: "Current User.firstName",
runtimeBinding: "[user].[firstName]",
type: "context",
},
{
category: "Bindings",
icon: "Brackets",
readableBinding: "Binding.count",
runtimeBinding: "count",
type: "context",
},
]
it("should convert a runtime binding to a readable one", () => {
const textWithBindings = `Hello {{ [user].[firstName] }}! The count is {{ count }}.`
expect(
runtimeToReadableBinding(
bindableProperties,
textWithBindings,
"readableBinding"
)
).toEqual(
`Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.`
)
})
it("should not convert to readable binding if it is already readable", () => {
const textWithBindings = `Hello {{ [user].[firstName] }}! The count is {{ Binding.count }}.`
expect(
runtimeToReadableBinding(
bindableProperties,
textWithBindings,
"readableBinding"
)
).toEqual(
`Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.`
)
})
})
describe("readableToRuntimeBinding", () => {
const bindableProperties = [
{
category: "Current User",
icon: "User",
providerId: "user",
readableBinding: "Current User.firstName",
runtimeBinding: "[user].[firstName]",
type: "context",
},
{
category: "Bindings",
icon: "Brackets",
readableBinding: "Binding.count",
runtimeBinding: "count",
type: "context",
},
]
it("should convert a readable binding to a runtime one", () => {
const textWithBindings = `Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.`
expect(
readableToRuntimeBinding(
bindableProperties,
textWithBindings,
"runtimeBinding"
)
).toEqual(`Hello {{ [user].[firstName] }}! The count is {{ count }}.`)
})
})
describe("updateReferencesInObject", () => {
it("should increment steps in sequence on 'add'", () => {
let obj = [
{
id: "a0",
parameters: {
text: "Alpha",
},
},
{
id: "a1",
parameters: {
text: "Apple",
},
},
{
id: "b2",
parameters: {
text: "Banana {{ actions.1.row }}",
},
},
{
id: "c3",
parameters: {
text: "Carrot {{ actions.1.row }}",
},
},
{
id: "d4",
parameters: {
text: "Dog {{ actions.3.row }}",
},
},
{
id: "e5",
parameters: {
text: "Eagle {{ actions.4.row }}",
},
},
]
updateReferencesInObject({
obj,
modifiedIndex: 0,
action: "add",
label: "actions",
})
expect(obj).toEqual([
{
id: "a0",
parameters: {
text: "Alpha",
},
},
{
id: "a1",
parameters: {
text: "Apple",
},
},
{
id: "b2",
parameters: {
text: "Banana {{ actions.2.row }}",
},
},
{
id: "c3",
parameters: {
text: "Carrot {{ actions.2.row }}",
},
},
{
id: "d4",
parameters: {
text: "Dog {{ actions.4.row }}",
},
},
{
id: "e5",
parameters: {
text: "Eagle {{ actions.5.row }}",
},
},
])
})
it("should decrement steps in sequence on 'delete'", () => {
let obj = [
{
id: "a1",
parameters: {
text: "Apple",
},
},
{
id: "b2",
parameters: {
text: "Banana {{ actions.1.row }}",
},
},
{
id: "d4",
parameters: {
text: "Dog {{ actions.3.row }}",
},
},
{
id: "e5",
parameters: {
text: "Eagle {{ actions.4.row }}",
},
},
]
updateReferencesInObject({
obj,
modifiedIndex: 2,
action: "delete",
label: "actions",
})
expect(obj).toEqual([
{
id: "a1",
parameters: {
text: "Apple",
},
},
{
id: "b2",
parameters: {
text: "Banana {{ actions.1.row }}",
},
},
{
id: "d4",
parameters: {
text: "Dog {{ actions.2.row }}",
},
},
{
id: "e5",
parameters: {
text: "Eagle {{ actions.3.row }}",
},
},
])
})
it("should handle on 'move' to a lower index", () => {
let obj = [
{
id: "a1",
parameters: {
text: "Apple",
},
},
{
id: "b2",
parameters: {
text: "Banana {{ actions.0.row }}",
},
},
{
id: "e5",
parameters: {
text: "Eagle {{ actions.3.row }}",
},
},
{
id: "c3",
parameters: {
text: "Carrot {{ actions.0.row }}",
},
},
{
id: "d4",
parameters: {
text: "Dog {{ actions.2.row }}",
},
},
]
updateReferencesInObject({
obj,
modifiedIndex: 2,
action: "move",
label: "actions",
originalIndex: 4,
})
expect(obj).toEqual([
{
id: "a1",
parameters: {
text: "Apple",
},
},
{
id: "b2",
parameters: {
text: "Banana {{ actions.0.row }}",
},
},
{
id: "e5",
parameters: {
text: "Eagle {{ actions.4.row }}",
},
},
{
id: "c3",
parameters: {
text: "Carrot {{ actions.0.row }}",
},
},
{
id: "d4",
parameters: {
text: "Dog {{ actions.3.row }}",
},
},
])
})
it("should handle on 'move' to a higher index", () => {
let obj = [
{
id: "b2",
parameters: {
text: "Banana {{ actions.0.row }}",
},
},
{
id: "c3",
parameters: {
text: "Carrot {{ actions.0.row }}",
},
},
{
id: "a1",
parameters: {
text: "Apple",
},
},
{
id: "d4",
parameters: {
text: "Dog {{ actions.2.row }}",
},
},
{
id: "e5",
parameters: {
text: "Eagle {{ actions.3.row }}",
},
},
]
updateReferencesInObject({
obj,
modifiedIndex: 2,
action: "move",
label: "actions",
originalIndex: 0,
})
expect(obj).toEqual([
{
id: "b2",
parameters: {
text: "Banana {{ actions.2.row }}",
},
},
{
id: "c3",
parameters: {
text: "Carrot {{ actions.2.row }}",
},
},
{
id: "a1",
parameters: {
text: "Apple",
},
},
{
id: "d4",
parameters: {
text: "Dog {{ actions.1.row }}",
},
},
{
id: "e5",
parameters: {
text: "Eagle {{ actions.3.row }}",
},
},
])
})
it("should handle on 'move' of action being referenced, dragged to a higher index", () => {
let obj = [
{
"##eventHandlerType": "Validate Form",
id: "cCD0Dwcnq",
},
{
"##eventHandlerType": "Close Screen Modal",
id: "3fbbIOfN0H",
},
{
"##eventHandlerType": "Save Row",
parameters: {
tableId: "ta_bb_employee",
},
id: "aehg5cTmhR",
},
{
"##eventHandlerType": "Close Side Panel",
id: "mzkpf86cxo",
},
{
"##eventHandlerType": "Navigate To",
id: "h0uDFeJa8A",
},
{
parameters: {
autoDismiss: true,
type: "success",
message: "{{ actions.1.row }}",
},
"##eventHandlerType": "Show Notification",
id: "JEI5lAyJZ",
},
]
updateReferencesInObject({
obj,
modifiedIndex: 2,
action: "move",
label: "actions",
originalIndex: 1,
})
expect(obj).toEqual([
{
"##eventHandlerType": "Validate Form",
id: "cCD0Dwcnq",
},
{
"##eventHandlerType": "Close Screen Modal",
id: "3fbbIOfN0H",
},
{
"##eventHandlerType": "Save Row",
parameters: {
tableId: "ta_bb_employee",
},
id: "aehg5cTmhR",
},
{
"##eventHandlerType": "Close Side Panel",
id: "mzkpf86cxo",
},
{
"##eventHandlerType": "Navigate To",
id: "h0uDFeJa8A",
},
{
parameters: {
autoDismiss: true,
type: "success",
message: "{{ actions.2.row }}",
},
"##eventHandlerType": "Show Notification",
id: "JEI5lAyJZ",
},
])
})
it("should handle on 'move' of action being referenced, dragged to a lower index", () => {
let obj = [
{
"##eventHandlerType": "Save Row",
parameters: {
tableId: "ta_bb_employee",
},
id: "aehg5cTmhR",
},
{
"##eventHandlerType": "Validate Form",
id: "cCD0Dwcnq",
},
{
"##eventHandlerType": "Close Screen Modal",
id: "3fbbIOfN0H",
},
{
"##eventHandlerType": "Close Side Panel",
id: "mzkpf86cxo",
},
{
"##eventHandlerType": "Navigate To",
id: "h0uDFeJa8A",
},
{
parameters: {
autoDismiss: true,
type: "success",
message: "{{ actions.4.row }}",
},
"##eventHandlerType": "Show Notification",
id: "JEI5lAyJZ",
},
]
updateReferencesInObject({
obj,
modifiedIndex: 0,
action: "move",
label: "actions",
originalIndex: 4,
})
expect(obj).toEqual([
{
"##eventHandlerType": "Save Row",
parameters: {
tableId: "ta_bb_employee",
},
id: "aehg5cTmhR",
},
{
"##eventHandlerType": "Validate Form",
id: "cCD0Dwcnq",
},
{
"##eventHandlerType": "Close Screen Modal",
id: "3fbbIOfN0H",
},
{
"##eventHandlerType": "Close Side Panel",
id: "mzkpf86cxo",
},
{
"##eventHandlerType": "Navigate To",
id: "h0uDFeJa8A",
},
{
parameters: {
autoDismiss: true,
type: "success",
message: "{{ actions.0.row }}",
},
"##eventHandlerType": "Show Notification",
id: "JEI5lAyJZ",
},
])
})
})

2
packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
View File

@ -1,5 +1,5 @@
<script>
import { selectedAutomation } from "builderStore"
import { selectedAutomation } from "stores/builder"
import Flowchart from "./FlowChart/FlowChart.svelte"
</script>

10
packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
View File

@ -9,11 +9,11 @@
Tags,
Tag,
} from "@budibase/bbui"
import { automationStore, selectedAutomation } from "builderStore"
import { automationStore, selectedAutomation } from "stores/builder"
import { admin, licensing } from "stores/portal"
import { externalActions } from "./ExternalActions"
import { TriggerStepID, ActionStepID } from "constants/backend/automations"
import { checkForCollectStep } from "builderStore/utils"
import { checkForCollectStep } from "helpers/utils"
export let blockIdx
export let lastStep
@ -128,10 +128,10 @@
>
<div class="item-body">
<img
width="20"
height="20"
width={20}
height={20}
src={externalActions[action.stepId].icon}
alt="zapier"
alt={externalActions[action.stepId].name}
/>
<span class="icon-spacing">
<Body size="XS">

2
packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
View File

@ -1,7 +1,7 @@
<script>
import { processStringSync } from "@budibase/string-templates"
import { get } from "lodash/fp"
import { tables } from "stores/backend"
import { tables } from "stores/builder"
export let block

2
packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js
View File

@ -1,5 +1,6 @@
import DiscordLogo from "assets/discord.svg"
import ZapierLogo from "assets/zapier.png"
import n8nLogo from "assets/n8n_square.png"
import MakeLogo from "assets/make.svg"
import SlackLogo from "assets/slack.svg"
@ -8,4 +9,5 @@ export const externalActions = {
discord: { name: "discord", icon: DiscordLogo },
slack: { name: "slack", icon: SlackLogo },
integromat: { name: "integromat", icon: MakeLogo },
n8n: { name: "n8n", icon: n8nLogo },
}

2
packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
View File

@ -3,7 +3,7 @@
automationStore,
selectedAutomation,
automationHistoryStore,
} from "builderStore"
} from "stores/builder"
import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import FlowItem from "./FlowItem.svelte"
import TestDataModal from "./TestDataModal.svelte"

7
packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
View File

@ -1,5 +1,9 @@
<script>
import { automationStore, selectedAutomation } from "builderStore"
import {
automationStore,
selectedAutomation,
permissions,
} from "stores/builder"
import {
Icon,
Divider,
@ -17,7 +21,6 @@
import FlowItemHeader from "./FlowItemHeader.svelte"
import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
import { ActionStepID, TriggerStepID } from "constants/backend/automations"
import { permissions } from "stores/backend"
export let block
export let testDataModal

4
packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
View File

@ -1,6 +1,6 @@
<script>
import { automationStore, selectedAutomation } from "builderStore"
import { Icon, Body, StatusLight, AbsTooltip } from "@budibase/bbui"
import { automationStore, selectedAutomation } from "stores/builder"
import { Icon, Body, AbsTooltip, StatusLight } from "@budibase/bbui"
import { externalActions } from "./ExternalActions"
import { createEventDispatcher } from "svelte"
import { Features } from "constants/backend/automations"

2
packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
View File

@ -5,7 +5,7 @@
notifications,
ActionButton,
} from "@budibase/bbui"
import { automationStore, selectedAutomation } from "builderStore"
import { automationStore, selectedAutomation } from "stores/builder"
import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
import { cloneDeep } from "lodash/fp"

2
packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
View File

@ -1,7 +1,7 @@
<script>
import { Icon, Divider } from "@budibase/bbui"
import TestDisplay from "./TestDisplay.svelte"
import { automationStore } from "builderStore"
import { automationStore } from "stores/builder"
export let automation
</script>

2
packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
View File

@ -4,7 +4,7 @@
automationStore,
selectedAutomation,
userSelectedResourceMap,
} from "builderStore"
} from "stores/builder"
import NavItem from "components/common/NavItem.svelte"
import EditAutomationPopover from "./EditAutomationPopover.svelte"
import { notifications } from "@budibase/bbui"

2
packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
View File

@ -7,7 +7,7 @@
automationStore,
selectedAutomation,
userSelectedResourceMap,
} from "builderStore"
} from "stores/builder"
import NavItem from "components/common/NavItem.svelte"
import EditAutomationPopover from "./EditAutomationPopover.svelte"

2
packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
View File

@ -1,5 +1,5 @@
<script>
import { automationStore } from "builderStore"
import { automationStore } from "stores/builder"
import {
notifications,
Input,

2
packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
View File

@ -1,5 +1,5 @@
<script>
import { automationStore } from "builderStore"
import { automationStore } from "stores/builder"
import { ActionMenu, MenuItem, notifications, Icon } from "@budibase/bbui"
import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import UpdateAutomationModal from "components/automation/AutomationPanel/UpdateAutomationModal.svelte"

2
packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
View File

@ -1,5 +1,5 @@
<script>
import { automationStore } from "builderStore"
import { automationStore } from "stores/builder"
import {
notifications,
Icon,

13
packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
View File

@ -17,8 +17,7 @@
DatePicker,
} from "@budibase/bbui"
import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
import { automationStore, selectedAutomation } from "builderStore"
import { tables } from "stores/backend"
import { automationStore, selectedAutomation, tables } from "stores/builder"
import { environment, licensing } from "stores/portal"
import WebhookDisplay from "../Shared/WebhookDisplay.svelte"
import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
@ -44,7 +43,7 @@
import {
getSchemaForDatasourcePlus,
getEnvironmentBindings,
} from "builderStore/dataBinding"
} from "dataBinding"
import { TriggerStepID, ActionStepID } from "constants/backend/automations"
import { onMount } from "svelte"
import { cloneDeep } from "lodash/fp"
@ -80,6 +79,7 @@
disableWrapping: true,
})
$: editingJs = codeMode === EditorModes.JS
$: requiredProperties = block.schema.inputs.required || []
$: stepCompletions =
codeMode === EditorModes.Handlebars
@ -360,6 +360,11 @@
)
}
function getFieldLabel(key, value) {
const requiredSuffix = requiredProperties.includes(key) ? "*" : ""
return `${value.title || (key === "row" ? "Table" : key)} ${requiredSuffix}`
}
onMount(async () => {
try {
await environment.loadVariables()
@ -377,7 +382,7 @@
<Label
tooltip={value.title === "Binding / Value"
? "If using the String input type, please use a comma or newline separated string"
: null}>{value.title || (key === "row" ? "Table" : key)}</Label
: null}>{getFieldLabel(key, value)}</Label
>
{/if}
<div class:field-width={shouldRenderField(value)}>

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

@ -1,7 +1,7 @@
<script>
import { Select, Label } from "@budibase/bbui"
import { createEventDispatcher } from "svelte"
import { automationStore, selectedAutomation } from "builderStore"
import { automationStore, selectedAutomation } from "stores/builder"
import { TriggerStepID } from "constants/backend/automations"
import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"

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

@ -1,7 +1,7 @@
<script>
import { Button, Select, Input, Label } from "@budibase/bbui"
import { onMount, createEventDispatcher } from "svelte"
import { flags } from "stores/backend"
import { flags } from "stores/builder"
import { helpers, REBOOT_CRON } from "@budibase/shared-core"
const dispatch = createEventDispatcher()

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

@ -1,6 +1,6 @@
<script>
import { createEventDispatcher } from "svelte"
import { queries } from "stores/backend"
import { queries } from "stores/builder"
import { Select, Label } from "@budibase/bbui"
import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"

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

@ -1,5 +1,5 @@
<script>
import { queries } from "stores/backend"
import { queries } from "stores/builder"
import { Select } from "@budibase/bbui"
export let value

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

@ -1,5 +1,5 @@
<script>
import { tables } from "stores/backend"
import { tables } from "stores/builder"
import { Select, Checkbox, Label } from "@budibase/bbui"
import { createEventDispatcher } from "svelte"
import RowSelectorTypes from "./RowSelectorTypes.svelte"

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

@ -1,5 +1,5 @@
<script>
import { tables } from "stores/backend"
import { tables } from "stores/builder"
import { Select } from "@budibase/bbui"
import { createEventDispatcher } from "svelte"
import { TableNames } from "constants"

2
packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
View File

@ -1,6 +1,6 @@
<script>
import { Icon, notifications, ModalContent } from "@budibase/bbui"
import { automationStore, selectedAutomation } from "builderStore"
import { automationStore, selectedAutomation } from "stores/builder"
import WebhookDisplay from "./WebhookDisplay.svelte"
import { onMount, onDestroy } from "svelte"

2
packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
View File

@ -1,7 +1,7 @@
<script>
import { API } from "api"
import Table from "./Table.svelte"
import { tables } from "stores/backend"
import { tables } from "stores/builder"
import { notifications } from "@budibase/bbui"
export let tableId

9
packages/builder/src/components/backend/DataTable/TableDataTable.svelte
View File

@ -1,10 +1,9 @@
<script>
import { datasources, tables, integrations } from "stores/backend"
import { datasources, tables, integrations, appStore } from "stores/builder"
import EditRolesButton from "./buttons/EditRolesButton.svelte"
import { TableNames } from "constants"
import { Grid } from "@budibase/frontend-core"
import { API } from "api"
import { store } from "builderStore"
import GridAddColumnModal from "components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte"
import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
import GridEditUserModal from "components/backend/DataTable/modals/grid/GridEditUserModal.svelte"
@ -59,14 +58,14 @@
datasource={gridDatasource}
canAddRows={!isUsersTable}
canDeleteRows={!isUsersTable}
canEditRows={!isUsersTable || !$store.features.disableUserMetadata}
canEditColumns={!isUsersTable || !$store.features.disableUserMetadata}
canEditRows={!isUsersTable || !$appStore.features.disableUserMetadata}
canEditColumns={!isUsersTable || !$appStore.features.disableUserMetadata}
schemaOverrides={isUsersTable ? userSchemaOverrides : null}
showAvatars={false}
on:updatedatasource={handleGridTableUpdate}
>
<svelte:fragment slot="filter">
{#if isUsersTable && $store.features.disableUserMetadata}
{#if isUsersTable && $appStore.features.disableUserMetadata}
<GridUsersTableButton />
{/if}
<GridFilterButton />

2
packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
View File

@ -1,6 +1,6 @@
<script>
import { API } from "api"
import { tables } from "stores/backend"
import { tables } from "stores/builder"
import Table from "./Table.svelte"
import CalculateButton from "./buttons/CalculateButton.svelte"

2
packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
View File

@ -1,5 +1,5 @@
<script>
import { viewsV2 } from "stores/backend"
import { viewsV2 } from "stores/builder"
import { Grid } from "@budibase/frontend-core"
import { API } from "api"
import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"

6
packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
View File

@ -1,10 +1,8 @@
<script>
import { ActionButton, notifications } from "@budibase/bbui"
import CreateEditRelationshipModal from "../../Datasources/CreateEditRelationshipModal.svelte"
import {
datasources,
tables as tablesStore,
} from "../../../../stores/backend"
import { datasources, tables as tablesStore } from "stores/builder"
import { createEventDispatcher } from "svelte"
export let table

2
packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
View File

@ -1,6 +1,6 @@
<script>
import { ActionButton, Modal } from "@budibase/bbui"
import { permissions } from "stores/backend"
import { permissions } from "stores/builder"
import ManageAccessModal from "../modals/ManageAccessModal.svelte"
export let resourceId

2
packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
View File

@ -1,5 +1,5 @@
<script>
import { roles } from "stores/backend"
import { roles } from "stores/builder"
export let value

2
packages/builder/src/components/backend/DataTable/formula.js
View File

@ -1,5 +1,5 @@
import { FIELDS } from "constants/backend"
import { tables } from "stores/backend"
import { tables } from "stores/builder"
import { get as svelteGet } from "svelte/store"
// currently supported level of relationship depth (server side)

2
packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
View File

@ -1,6 +1,6 @@
<script>
import { Select, Label, notifications, ModalContent } from "@budibase/bbui"
import { tables, views } from "stores/backend"
import { tables, views } from "stores/builder"
import { FIELDS } from "constants/backend"
const CALCULATIONS = [

4
packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
View File

@ -15,7 +15,7 @@
} from "@budibase/bbui"
import { createEventDispatcher, getContext, onMount } from "svelte"
import { cloneDeep } from "lodash/fp"
import { tables, datasources } from "stores/backend"
import { tables, datasources } from "stores/builder"
import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
import {
FIELDS,
@ -28,7 +28,7 @@
PrettyRelationshipDefinitions,
DB_TYPE_EXTERNAL,
} from "constants/backend"
import { getAutoColumnInformation, buildAutoColumn } from "builderStore/utils"
import { getAutoColumnInformation, buildAutoColumn } from "helpers/utils"
import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
import { getBindings } from "components/backend/DataTable/formula"

2
packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
View File

@ -1,6 +1,6 @@
<script>
import { createEventDispatcher } from "svelte"
import { tables } from "stores/backend"
import { tables } from "stores/builder"
import { ModalContent, keepOpen, notifications } from "@budibase/bbui"
import RowFieldControl from "../RowFieldControl.svelte"
import { API } from "api"

2
packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
View File

@ -1,6 +1,6 @@
<script>
import { createEventDispatcher } from "svelte"
import { tables, roles } from "stores/backend"
import { tables, roles } from "stores/builder"
import {
notifications,
keepOpen,

2
packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
View File

@ -10,7 +10,7 @@
import { onMount } from "svelte"
import { API } from "api"
import ErrorsBox from "components/common/ErrorsBox.svelte"
import { roles } from "stores/backend"
import { roles } from "stores/builder"
const BASE_ROLE = { _id: "", inherits: "BASIC", permissionId: "write" }

2
packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
View File

@ -10,7 +10,7 @@
notifications,
Icon,
} from "@budibase/bbui"
import { tables, views } from "stores/backend"
import { tables, views } from "stores/builder"
const CONDITIONS = [
{

2
packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte
View File

@ -1,6 +1,6 @@
<script>
import { Select, ModalContent, notifications } from "@budibase/bbui"
import { tables, views } from "stores/backend"
import { tables, views } from "stores/builder"
import { FIELDS } from "constants/backend"
export let view = {}

2
packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
View File

@ -13,7 +13,7 @@
} from "@budibase/bbui"
import { onMount, createEventDispatcher } from "svelte"
import { FIELDS } from "constants/backend"
import { generate } from "builderStore/schemaGenerator"
import { generate } from "helpers/schemaGenerator"
export let schema = {}
export let json

2
packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
View File

@ -1,6 +1,6 @@
<script>
import { PermissionSource } from "@budibase/types"
import { roles, permissions as permissionsStore } from "stores/backend"
import { roles, permissions as permissionsStore } from "stores/builder"
import {
Label,
Input,

2
packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte
View File

@ -2,7 +2,7 @@
import { getContext } from "svelte"
import { Input, notifications, ModalContent } from "@budibase/bbui"
import { goto } from "@roxi/routify"
import { viewsV2 } from "stores/backend"
import { viewsV2 } from "stores/builder"
const { filter, sort, definition } = getContext("grid")

7
packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte
View File

@ -1,15 +1,12 @@
<script>
import { ActionButton, Popover, Heading, Body, Button } from "@budibase/bbui"
import { store } from "builderStore"
import { builderStore } from "stores/builder"
let anchor
let open = false
const openSidePanel = () => {
store.update(state => ({
...state,
builderSidePanel: true,
}))
builderStore.showBuilderSidePanel()
open = false
}
</script>

125
packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
View File

@ -3,13 +3,13 @@
import { Layout } from "@budibase/bbui"
import { BUDIBASE_INTERNAL_DB_ID } from "constants/backend"
import {
database,
datasources,
queries,
tables,
views,
viewsV2,
} from "stores/backend"
userSelectedResourceMap,
} from "stores/builder"
import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte"
import EditQueryPopover from "./popovers/EditQueryPopover.svelte"
import NavItem from "components/common/NavItem.svelte"
@ -21,7 +21,6 @@
} from "helpers/data/utils"
import IntegrationIcon from "./IntegrationIcon.svelte"
import { TableNames } from "constants"
import { userSelectedResourceMap } from "builderStore"
import { enrichDatasources } from "./datasourceUtils"
import { onMount } from "svelte"
@ -75,69 +74,67 @@
searchTerm && !showAppUsersTable && !enrichedDataSources.find(ds => ds.show)
</script>
{#if $database?._id}
<div class="hierarchy-items-container">
{#if showAppUsersTable}
<NavItem
icon="UserGroup"
text={appUsersTableName}
selected={$isActive("./table/:tableId") &&
$tables.selected?._id === TableNames.USERS}
on:click={() => selectTable(TableNames.USERS)}
selectedBy={$userSelectedResourceMap[TableNames.USERS]}
/>
{/if}
{#each enrichedDataSources.filter(ds => ds.show) as datasource}
<NavItem
border
text={datasource.name}
opened={datasource.open}
selected={$isActive("./datasource") && datasource.selected}
withArrow={true}
on:click={() => selectDatasource(datasource)}
on:iconClick={() => toggleNode(datasource)}
selectedBy={$userSelectedResourceMap[datasource._id]}
>
<div class="datasource-icon" slot="icon">
<IntegrationIcon
integrationType={datasource.source}
schema={datasource.schema}
size="18"
/>
</div>
{#if datasource._id !== BUDIBASE_INTERNAL_DB_ID}
<EditDatasourcePopover {datasource} />
{/if}
</NavItem>
{#if datasource.open}
<TableNavigator tables={datasource.tables} {selectTable} />
{#each datasource.queries as query}
<NavItem
indentLevel={1}
icon="SQLQuery"
iconText={customQueryIconText(datasource, query)}
iconColor={customQueryIconColor(datasource, query)}
text={customQueryText(datasource, query)}
selected={$isActive("./query/:queryId") &&
$queries.selectedQueryId === query._id}
on:click={() => $goto(`./query/${query._id}`)}
selectedBy={$userSelectedResourceMap[query._id]}
>
<EditQueryPopover {query} />
</NavItem>
{/each}
<div class="hierarchy-items-container">
{#if showAppUsersTable}
<NavItem
icon="UserGroup"
text={appUsersTableName}
selected={$isActive("./table/:tableId") &&
$tables.selected?._id === TableNames.USERS}
on:click={() => selectTable(TableNames.USERS)}
selectedBy={$userSelectedResourceMap[TableNames.USERS]}
/>
{/if}
{#each enrichedDataSources.filter(ds => ds.show) as datasource}
<NavItem
border
text={datasource.name}
opened={datasource.open}
selected={$isActive("./datasource") && datasource.selected}
withArrow={true}
on:click={() => selectDatasource(datasource)}
on:iconClick={() => toggleNode(datasource)}
selectedBy={$userSelectedResourceMap[datasource._id]}
>
<div class="datasource-icon" slot="icon">
<IntegrationIcon
integrationType={datasource.source}
schema={datasource.schema}
size="18"
/>
</div>
{#if datasource._id !== BUDIBASE_INTERNAL_DB_ID}
<EditDatasourcePopover {datasource} />
{/if}
{/each}
{#if showNoResults}
<Layout paddingY="none" paddingX="L">
<div class="no-results">
There aren't any datasources matching that name
</div>
</Layout>
</NavItem>
{#if datasource.open}
<TableNavigator tables={datasource.tables} {selectTable} />
{#each datasource.queries as query}
<NavItem
indentLevel={1}
icon="SQLQuery"
iconText={customQueryIconText(datasource, query)}
iconColor={customQueryIconColor(datasource, query)}
text={customQueryText(datasource, query)}
selected={$isActive("./query/:queryId") &&
$queries.selectedQueryId === query._id}
on:click={() => $goto(`./query/${query._id}`)}
selectedBy={$userSelectedResourceMap[query._id]}
>
<EditQueryPopover {query} />
</NavItem>
{/each}
{/if}
</div>
{/if}
{/each}
{#if showNoResults}
<Layout paddingY="none" paddingX="L">
<div class="no-results">
There aren't any datasources matching that name
</div>
</Layout>
{/if}
</div>
<style>
.hierarchy-items-container {

2
packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
View File

@ -16,7 +16,7 @@ import Firebase from "./Firebase.svelte"
import Redis from "./Redis.svelte"
import Snowflake from "./Snowflake.svelte"
import Custom from "./Custom.svelte"
import { integrations } from "stores/backend"
import { integrations } from "stores/builder"
import { get } from "svelte/store"
const ICONS = {

2
packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
View File

@ -12,7 +12,7 @@
TextArea,
Dropzone,
} from "@budibase/bbui"
import { datasources, queries } from "stores/backend"
import { datasources, queries } from "stores/builder"
import { writable } from "svelte/store"
export let navigateDatasource = false

2
packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
View File

@ -1,6 +1,6 @@
<script>
import { get } from "svelte/store"
import { datasources, integrations } from "stores/backend"
import { datasources, integrations } from "stores/builder"
import { notifications, Input, ModalContent, Modal } from "@budibase/bbui"
import { integrationForDatasource } from "stores/selectors"

2
packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
View File

@ -1,6 +1,6 @@
<script>
import { goto } from "@roxi/routify"
import { datasources } from "stores/backend"
import { datasources } from "stores/builder"
import { notifications, ActionMenu, MenuItem, Icon } from "@budibase/bbui"
import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import UpdateDatasourceModal from "components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte"

2
packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryPopover.svelte
View File

@ -2,7 +2,7 @@
import { goto } from "@roxi/routify"
import { ActionMenu, MenuItem, Icon, notifications } from "@budibase/bbui"
import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import { datasources, queries } from "stores/backend"
import { datasources, queries } from "stores/builder"
export let query

2
packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
View File

@ -13,7 +13,7 @@
Body,
Helpers,
} from "@budibase/bbui"
import { tables } from "stores/backend"
import { tables } from "stores/builder"
import { RelationshipErrorChecker } from "./relationshipErrors"
import { onMount } from "svelte"
import RelationshipSelector from "components/common/RelationshipSelector.svelte"

2
packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
View File

@ -2,7 +2,7 @@
import { Modal } from "@budibase/bbui"
import { get } from "svelte/store"
import CreateEditRelationship from "./CreateEditRelationship.svelte"
import { integrations, datasources } from "stores/backend"
import { integrations, datasources } from "stores/builder"
import { integrationForDatasource } from "stores/selectors"
export let datasource

2
packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
View File

@ -1,6 +1,6 @@
import { derived, writable, get } from "svelte/store"
import { keepOpen, notifications } from "@budibase/bbui"
import { datasources, tables } from "stores/backend"
import { datasources, tables } from "stores/builder"
export const createTableSelectionStore = (integration, datasource) => {
const tableNamesStore = writable([])

73
packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
View File

@ -3,14 +3,13 @@
tables as tablesStore,
views,
viewsV2,
database,
} from "stores/backend"
userSelectedResourceMap,
} from "stores/builder"
import { TableNames } from "constants"
import EditTablePopover from "./popovers/EditTablePopover.svelte"
import EditViewPopover from "./popovers/EditViewPopover.svelte"
import NavItem from "components/common/NavItem.svelte"
import { goto, isActive } from "@roxi/routify"
import { userSelectedResourceMap } from "builderStore"
export let tables
export let selectTable
@ -29,42 +28,40 @@
}
</script>
{#if $database?._id}
<div class="hierarchy-items-container">
{#each sortedTables as table, idx}
<div class="hierarchy-items-container">
{#each sortedTables as table, idx}
<NavItem
indentLevel={1}
border={idx > 0}
icon={table._id === TableNames.USERS ? "UserGroup" : "Table"}
text={table.name}
selected={$isActive("./table/:tableId") &&
$tablesStore.selected?._id === table._id}
on:click={() => selectTable(table._id)}
selectedBy={$userSelectedResourceMap[table._id]}
>
{#if table._id !== TableNames.USERS}
<EditTablePopover {table} />
{/if}
</NavItem>
{#each [...Object.entries(table.views || {})].sort() as [name, view], idx (idx)}
<NavItem
indentLevel={1}
border={idx > 0}
icon={table._id === TableNames.USERS ? "UserGroup" : "Table"}
text={table.name}
selected={$isActive("./table/:tableId") &&
$tablesStore.selected?._id === table._id}
on:click={() => selectTable(table._id)}
selectedBy={$userSelectedResourceMap[table._id]}
indentLevel={2}
icon="Remove"
text={name}
selected={isViewActive(view, $isActive, $views, $viewsV2)}
on:click={() => {
if (view.version === 2) {
$goto(`./view/v2/${encodeURIComponent(view.id)}`)
} else {
$goto(`./view/v1/${encodeURIComponent(name)}`)
}
}}
selectedBy={$userSelectedResourceMap[name] ||
$userSelectedResourceMap[view.id]}
>
{#if table._id !== TableNames.USERS}
<EditTablePopover {table} />
{/if}
<EditViewPopover {view} />
</NavItem>
{#each [...Object.entries(table.views || {})].sort() as [name, view], idx (idx)}
<NavItem
indentLevel={2}
icon="Remove"
text={name}
selected={isViewActive(view, $isActive, $views, $viewsV2)}
on:click={() => {
if (view.version === 2) {
$goto(`./view/v2/${encodeURIComponent(view.id)}`)
} else {
$goto(`./view/v1/${encodeURIComponent(name)}`)
}
}}
selectedBy={$userSelectedResourceMap[name] ||
$userSelectedResourceMap[view.id]}
>
<EditViewPopover {view} />
</NavItem>
{/each}
{/each}
</div>
{/if}
{/each}
</div>

2
packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
View File

@ -1,6 +1,6 @@
<script>
import { goto, url } from "@roxi/routify"
import { tables, datasources } from "stores/backend"
import { tables, datasources } from "stores/builder"
import {
notifications,
Input,

7
packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
View File

@ -1,8 +1,7 @@
<script>
import { goto, params } from "@roxi/routify"
import { store } from "builderStore"
import { cloneDeep } from "lodash/fp"
import { tables, datasources } from "stores/backend"
import { tables, datasources, screenStore } from "stores/builder"
import {
ActionMenu,
Icon,
@ -32,7 +31,7 @@
$: allowDeletion = !externalTable || table?.created
function showDeleteModal() {
templateScreens = $store.screens.filter(
templateScreens = $screenStore.screens.filter(
screen => screen.autoTableId === table._id
)
willBeDeleted = ["All table data"].concat(
@ -47,7 +46,7 @@
await tables.delete(table)
// Screens need deleted one at a time because of undo/redo
for (let screen of templateScreens) {
await store.actions.screens.delete(screen)
await screenStore.delete(screen)
}
if (table.sourceType === DB_TYPE_EXTERNAL) {
await datasources.fetch()

2
packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
View File

@ -1,5 +1,5 @@
<script>
import { views, viewsV2 } from "stores/backend"
import { views, viewsV2 } from "stores/builder"
import { cloneDeep } from "lodash/fp"
import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import {

24
packages/builder/src/components/commandPalette/CommandPalette.svelte
View File

@ -10,12 +10,17 @@
import { API } from "api"
import { goto } from "@roxi/routify"
import {
store,
sortedScreens,
automationStore,
themeStore,
} from "builderStore"
import { datasources, queries, tables, views } from "stores/backend"
previewStore,
builderStore,
sortedScreens,
appStore,
datasources,
queries,
tables,
views,
} from "stores/builder"
import { themeStore } from "stores/portal"
import { getContext } from "svelte"
import { Constants } from "@budibase/frontend-core"
@ -26,8 +31,7 @@
name: "Invite users and manage app access",
description: "",
icon: "User",
action: () =>
store.update(state => ({ ...state, builderSidePanel: true })),
action: () => builderStore.showBuilderSidePanel(),
},
{
type: "Navigate",
@ -69,13 +73,13 @@
name: "App",
description: "",
icon: "Play",
action: () => store.update(state => ({ ...state, showPreview: true })),
action: () => previewStore.showPreview(true),
},
{
type: "Preview",
name: "Published App",
icon: "Play",
action: () => window.open(`/app${$store.url}`),
action: () => window.open(`/app${$appStore.url}`),
},
{
type: "Support",
@ -216,7 +220,7 @@
async function deployApp() {
try {
await API.publishAppChanges($store.appId)
await API.publishAppChanges($appStore.appId)
notifications.success("App published successfully")
} catch (error) {
notifications.error("Error publishing app")

2
packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
View File

@ -43,7 +43,7 @@
import { Compartment } from "@codemirror/state"
import { javascript } from "@codemirror/lang-javascript"
import { EditorModes, getDefaultTheme } from "./"
import { themeStore } from "builderStore"
import { themeStore } from "stores/portal"
export let label
export let completions = []

2
packages/builder/src/components/common/CodeMirrorEditor.svelte
View File

@ -27,7 +27,7 @@
<script>
import { Label } from "@budibase/bbui"
import CodeMirror from "components/integration/codemirror"
import { themeStore } from "builderStore"
import { themeStore } from "stores/portal"
import { createEventDispatcher, onMount } from "svelte"
export let mode = EditorModes.JS

4
packages/builder/src/components/common/LinkedRowSelector.svelte
View File

@ -1,8 +1,8 @@
<script>
import { tables } from "stores/backend"
import { tables } from "stores/builder"
import { API } from "api"
import { Select, Label, Multiselect } from "@budibase/bbui"
import { capitalise } from "../../helpers"
import { capitalise } from "helpers"
import { createEventDispatcher } from "svelte"
export let schema

2
packages/builder/src/components/common/RoleSelect.svelte
View File

@ -1,6 +1,6 @@
<script>
import { Select, FancySelect } from "@budibase/bbui"
import { roles } from "stores/backend"
import { roles } from "stores/builder"
import { licensing } from "stores/portal"
import { Constants, RoleUtils } from "@budibase/frontend-core"

2
packages/builder/src/components/common/bindings/BindableCombobox.svelte
View File

@ -3,7 +3,7 @@
import {
readableToRuntimeBinding,
runtimeToReadableBinding,
} from "builderStore/dataBinding"
} from "dataBinding"
import { createEventDispatcher } from "svelte"
import { isJSBinding } from "@budibase/string-templates"

2
packages/builder/src/components/common/bindings/BindingPanel.svelte
View File

@ -19,7 +19,7 @@
import {
readableToRuntimeBinding,
runtimeToReadableBinding,
} from "builderStore/dataBinding"
} from "dataBinding"
import { admin } from "stores/portal"
import CodeEditor from "../CodeEditor/CodeEditor.svelte"

2
packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
View File

@ -3,7 +3,7 @@
import {
readableToRuntimeBinding,
runtimeToReadableBinding,
} from "builderStore/dataBinding"
} from "dataBinding"
import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
import { createEventDispatcher, setContext } from "svelte"
import { isJSBinding } from "@budibase/string-templates"

13
packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
View File

@ -3,11 +3,12 @@
import {
readableToRuntimeBinding,
runtimeToReadableBinding,
} from "builderStore/dataBinding"
} from "dataBinding"
import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
import { createEventDispatcher, setContext } from "svelte"
import { isJSBinding } from "@budibase/string-templates"
import { builderStore } from "stores/builder"
export let panel = ClientBindingPanel
export let value = ""
@ -21,6 +22,7 @@
export let allowHelpers = true
export let updateOnChange = true
export let drawerLeft
export let key
export let disableBindings = false
const dispatch = createEventDispatcher()
@ -35,6 +37,7 @@
const saveBinding = () => {
onChange(tempValue)
onBlur()
builderStore.propertyFocus()
bindingDrawer.hide()
}
@ -50,6 +53,11 @@
const onBlur = () => {
dispatch("blur", currentVal)
}
const onDrawerHide = e => {
builderStore.propertyFocus()
dispatch("drawerHide", e.detail)
}
</script>
<div class="control" class:disabled>
@ -67,6 +75,7 @@
<div
class="icon"
on:click={() => {
builderStore.propertyFocus(key)
bindingDrawer.show()
}}
>
@ -75,7 +84,7 @@
{/if}
</div>
<Drawer
on:drawerHide
on:drawerHide={onDrawerHide}
on:drawerShow
{fillWidth}
bind:this={bindingDrawer}

2
packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
View File

@ -3,7 +3,7 @@
import {
readableToRuntimeBinding,
runtimeToReadableBinding,
} from "builderStore/dataBinding"
} from "dataBinding"
import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
import { createEventDispatcher, setContext } from "svelte"

2
packages/builder/src/components/common/bindings/ModalBindableInput.svelte
View File

@ -3,7 +3,7 @@
import {
readableToRuntimeBinding,
runtimeToReadableBinding,
} from "builderStore/dataBinding"
} from "dataBinding"
import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
import { createEventDispatcher } from "svelte"
import { isJSBinding } from "@budibase/string-templates"

5
packages/builder/src/components/common/users/PasswordRepeatInput.svelte
View File

@ -1,9 +1,6 @@
<script>
import { Layout, Input } from "@budibase/bbui"
import {
createValidationStore,
requiredValidator,
} from "../../../helpers/validation"
import { createValidationStore, requiredValidator } from "helpers/validation"
export let password
export let error

45
packages/builder/src/components/deploy/AppActions.svelte
View File

@ -21,11 +21,14 @@
import { API } from "api"
import { apps } from "stores/portal"
import {
deploymentStore,
store,
previewStore,
builderStore,
isOnlyUser,
appStore,
deploymentStore,
initialise,
sortedScreens,
} from "builderStore"
} from "stores/builder"
import TourWrap from "components/portal/onboarding/TourWrap.svelte"
import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js"
import { goto } from "@roxi/routify"
@ -50,15 +53,15 @@
$: isPublished =
selectedApp?.status === "published" && latestDeployments?.length > 0
$: updateAvailable =
$store.upgradableVersion &&
$store.version &&
$store.upgradableVersion !== $store.version
$appStore.upgradableVersion &&
$appStore.version &&
$appStore.upgradableVersion !== $appStore.version
$: canPublish = !publishing && loaded && $sortedScreens.length > 0
$: lastDeployed = getLastDeployedString($deploymentStore)
const initialiseApp = async () => {
const applicationPkg = await API.fetchAppPackage($store.devId)
await store.actions.initialise(applicationPkg)
const applicationPkg = await API.fetchAppPackage($appStore.devId)
await initialise(applicationPkg)
}
const getLastDeployedString = deployments => {
@ -71,10 +74,7 @@
}
const previewApp = () => {
store.update(state => ({
...state,
showPreview: true,
}))
previewStore.showPreview(true)
}
const viewApp = () => {
@ -92,7 +92,7 @@
async function publishApp() {
try {
publishing = true
await API.publishAppChanges($store.appId)
await API.publishAppChanges($appStore.appId)
notifications.send("App published successfully", {
type: "success",
icon: "GlobeCheck",
@ -142,7 +142,7 @@
const completePublish = async () => {
try {
await apps.load()
await deploymentStore.actions.load()
await deploymentStore.load()
} catch (err) {
notifications.error("Error refreshing app")
}
@ -162,7 +162,7 @@
</div>
{/if}
<TourWrap
tourStepKey={$store.onboarding
tourStepKey={$builderStore.onboarding
? TOUR_STEP_KEYS.BUILDER_USER_MANAGEMENT
: TOUR_STEP_KEYS.FEATURE_USER_MANAGEMENT}
>
@ -172,10 +172,7 @@
quiet
icon="UserGroup"
on:click={() => {
store.update(state => {
state.builderSidePanel = true
return state
})
builderStore.showBuilderSidePanel()
}}
>
Users
@ -248,7 +245,7 @@
}
}}
>
{$store.url}
{$appStore.url}
{#if isPublished}
<Icon size="S" name="LinkOut" />
{:else}
@ -329,10 +326,10 @@
<Modal bind:this={updateAppModal} padding={false} width="600px">
<UpdateAppModal
app={{
name: $store.name,
url: $store.url,
icon: $store.icon,
appId: $store.appId,
name: $appStore.name,
url: $appStore.url,
icon: $appStore.icon,
appId: $appStore.appId,
}}
onUpdateComplete={async () => {
await initialiseApp()

2
packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
View File

@ -1,5 +1,5 @@
<script>
import { automationStore } from "builderStore"
import { automationStore } from "stores/builder"
import { ModalContent } from "@budibase/bbui"
import { onMount } from "svelte"
import WebhookDisplay from "../automation/Shared/WebhookDisplay.svelte"

13
packages/builder/src/components/deploy/DeleteModal.svelte
View File

@ -1,9 +1,9 @@
<script>
import { Input, notifications } from "@budibase/bbui"
import { goto } from "@roxi/routify"
import { store } from "builderStore"
import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import { apps } from "stores/portal"
import { appStore } from "stores/builder"
import { API } from "api"
export const show = () => {
@ -19,7 +19,7 @@
const deleteApp = async () => {
try {
await API.deleteApp($store.appId)
await API.deleteApp($appStore.appId)
apps.load()
notifications.success("App deleted successfully")
$goto("/builder")
@ -35,11 +35,14 @@
okText="Delete"
onOk={deleteApp}
onCancel={() => (deletionConfirmationAppName = null)}
disabled={deletionConfirmationAppName !== $store.name}
disabled={deletionConfirmationAppName !== $appStore.name}
>
Are you sure you want to delete <b>{$store.name}</b>?
Are you sure you want to delete <b>{$appStore.name}</b>?
<br />
Please enter the app name below to confirm.
<br /><br />
<Input bind:value={deletionConfirmationAppName} placeholder={$store.name} />
<Input
bind:value={deletionConfirmationAppName}
placeholder={$appStore.name}
/>
</ConfirmDialog>

8
packages/builder/src/components/deploy/RevertModal.svelte
View File

@ -1,6 +1,6 @@
<script>
import { Input, Modal, notifications, ModalContent } from "@budibase/bbui"
import { store } from "builderStore"
import { appStore, initialise } from "stores/builder"
import { API } from "api"
export let onComplete = () => {}
@ -8,7 +8,7 @@
let revertModal
let appName
$: appId = $store.appId
$: appId = $appStore.appId
const revert = async () => {
try {
@ -16,7 +16,7 @@
// Reset frontend state after revert
const applicationPkg = await API.fetchAppPackage(appId)
await store.actions.initialise(applicationPkg)
await initialise(applicationPkg)
notifications.info("Changes reverted successfully")
onComplete()
} catch (error) {
@ -38,7 +38,7 @@
title="Revert Changes"
confirmText="Revert"
onConfirm={revert}
disabled={appName !== $store.name}
disabled={appName !== $appStore.name}
>
<span
>The changes you have made will be deleted and the application reverted

29
packages/builder/src/components/deploy/VersionModal.svelte
View File

@ -7,7 +7,7 @@
Button,
StatusLight,
} from "@budibase/bbui"
import { store } from "builderStore"
import { appStore, initialise } from "stores/builder"
import { API } from "api"
export function show() {
@ -23,17 +23,17 @@
let updateModal
$: appId = $store.appId
$: appId = $appStore.appId
$: updateAvailable =
$store.upgradableVersion &&
$store.version &&
$store.upgradableVersion !== $store.version
$: revertAvailable = $store.revertableVersion != null
$appStore.upgradableVersion &&
$appStore.version &&
$appStore.upgradableVersion !== $appStore.version
$: revertAvailable = $appStore.revertableVersion != null
const refreshAppPackage = async () => {
try {
const pkg = await API.fetchAppPackage(appId)
await store.actions.initialise(pkg)
await initialise(pkg)
} catch (error) {
notifications.error("Error fetching app package")
}
@ -46,7 +46,7 @@
// Don't wait for the async refresh, since this causes modal flashing
refreshAppPackage()
notifications.success(
`App updated successfully to version ${$store.upgradableVersion}`
`App updated successfully to version ${$appStore.upgradableVersion}`
)
onComplete()
} catch (err) {
@ -62,7 +62,7 @@
// Don't wait for the async refresh, since this causes modal flashing
refreshAppPackage()
notifications.success(
`App reverted successfully to version ${$store.revertableVersion}`
`App reverted successfully to version ${$appStore.revertableVersion}`
)
} catch (err) {
notifications.error(`Error reverting app: ${err}`)
@ -89,20 +89,21 @@
</div>
{#if updateAvailable}
<Body size="S">
This app is currently using version <b>{$store.version}</b>, but version
<b>{$store.upgradableVersion}</b> is available. Updates can contain new features,
performance improvements and bug fixes.
This app is currently using version <b>{$appStore.version}</b>, but
version
<b>{$appStore.upgradableVersion}</b> is available. Updates can contain new
features, performance improvements and bug fixes.
</Body>
{:else}
<Body size="S">
This app is currently using version <b>{$store.version}</b> which is the
This app is currently using version <b>{$appStore.version}</b> which is the
latest version available.
</Body>
{/if}
{#if revertAvailable}
<Body size="S">
You can revert this app to version
<b>{$store.revertableVersion}</b>
<b>{$appStore.revertableVersion}</b>
if you're experiencing issues with the current version.
</Body>
{/if}

6
packages/builder/src/components/design/ScreenDetailsModal.svelte
View File

@ -1,8 +1,8 @@
<script>
import { ModalContent, Input } from "@budibase/bbui"
import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl"
import sanitizeUrl from "helpers/sanitizeUrl"
import { get } from "svelte/store"
import { store } from "builderStore"
import { screenStore } from "stores/builder"
export let onConfirm
export let onCancel
@ -36,7 +36,7 @@
if (!screenRole) {
return false
}
return get(store).screens.some(
return get(screenStore).screens.some(
screen =>
screen.routing.route.toLowerCase() === url.toLowerCase() &&
screen.routing.roleId === screenRole

2
packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
View File

@ -16,7 +16,7 @@
getActionBindings,
makeStateBinding,
updateReferencesInObject,
} from "builderStore/dataBinding"
} from "dataBinding"
import { cloneDeep } from "lodash/fp"
const flipDurationMs = 150

8
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
View File

@ -1,7 +1,7 @@
<script>
import { Select, Label } from "@budibase/bbui"
import { currentAsset, store } from "builderStore"
import { getActionProviders } from "builderStore/dataBinding"
import { selectedScreen, componentStore } from "stores/builder"
import { getActionProviders } from "dataBinding"
import { onMount } from "svelte"
import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
@ -10,8 +10,8 @@
export let nested
$: actionProviders = getActionProviders(
$currentAsset,
$store.selectedComponentId,
$selectedScreen,
$componentStore.selectedComponentId,
"ChangeFormStep",
{ includeSelf: nested }
)

8
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
View File

@ -1,14 +1,14 @@
<script>
import { Select, Label } from "@budibase/bbui"
import { currentAsset, store } from "builderStore"
import { getActionProviders } from "builderStore/dataBinding"
import { selectedScreen, componentStore } from "stores/builder"
import { getActionProviders } from "dataBinding"
export let parameters
export let nested
$: actionProviders = getActionProviders(
$currentAsset,
$store.selectedComponentId,
$selectedScreen,
$componentStore.selectedComponentId,
"ClearForm",
{ includeSelf: nested }
)

55
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearRowSelection.svelte Normal file
View File

@ -0,0 +1,55 @@
<script>
import { Label, Select, Body } from "@budibase/bbui"
import { findAllMatchingComponents } from "helpers/components"
import { selectedScreen } from "stores/builder"
export let parameters
$: tables = findAllMatchingComponents($selectedScreen?.props, component =>
component._component.endsWith("table")
).map(table => ({
label: table._instanceName,
value: table._id,
}))
$: tableBlocks = findAllMatchingComponents(
$selectedScreen?.props,
component => component._component.endsWith("tableblock")
).map(block => ({
label: block._instanceName,
value: `${block._id}-table`,
}))
$: componentOptions = tables.concat(tableBlocks)
</script>
<div class="root">
<Body size="S">Clear the row selection from the selected table.</Body>
<div class="params">
<Label small>Table</Label>
<Select bind:value={parameters.componentId} options={componentOptions} />
</div>
</div>
<style>
.root {
width: 100%;
max-width: 500px;
margin: 0 auto;
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: stretch;
gap: var(--spacing-xl);
}
.root :global(p) {
line-height: 1.5;
}
.params {
display: grid;
column-gap: var(--spacing-xs);
row-gap: var(--spacing-s);
grid-template-columns: 90px 1fr;
align-items: center;
}
</style>

2
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
View File

@ -1,6 +1,6 @@
<script>
import { Select, Label, Checkbox, Input, Body } from "@budibase/bbui"
import { tables, viewsV2 } from "stores/backend"
import { tables, viewsV2 } from "stores/builder"
import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
export let parameters

14
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
View File

@ -1,8 +1,12 @@
<script>
import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
import { store, currentAsset } from "builderStore"
import { tables, viewsV2 } from "stores/backend"
import { getSchemaForDatasourcePlus } from "builderStore/dataBinding"
import {
selectedScreen,
componentStore,
tables,
viewsV2,
} from "stores/builder"
import { getSchemaForDatasourcePlus } from "dataBinding"
import SaveFields from "./SaveFields.svelte"
import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
@ -11,8 +15,8 @@
export let nested
$: providerOptions = getDatasourceLikeProviders({
asset: $currentAsset,
componentId: $store.selectedComponentId,
asset: $selectedScreen,
componentId: $componentStore.selectedComponentId,
nested,
})
$: schemaFields = getSchemaFields(parameters?.tableId)

2
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
View File

@ -1,6 +1,6 @@
<script>
import { Select, Layout, Input, Checkbox } from "@budibase/bbui"
import { datasources, integrations, queries } from "stores/backend"
import { datasources, integrations, queries } from "stores/builder"
import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
import IntegrationQueryEditor from "components/integration/index.svelte"
import {

25
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
View File

@ -1,15 +1,9 @@
<script>
import { Label, Select, Body, Multiselect } from "@budibase/bbui"
import {
findAllMatchingComponents,
findComponent,
} from "builderStore/componentUtils"
import { currentAsset } from "builderStore"
import { findAllMatchingComponents, findComponent } from "helpers/components"
import { selectedScreen } from "stores/builder"
import { onMount } from "svelte"
import {
getDatasourceForProvider,
getSchemaForDatasource,
} from "builderStore/dataBinding"
import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
export let parameters
@ -24,14 +18,15 @@
},
]
$: tables = findAllMatchingComponents($currentAsset?.props, component =>
$: tables = findAllMatchingComponents($selectedScreen?.props, component =>
component._component.endsWith("table")
).map(table => ({
label: table._instanceName,
value: table._id,
}))
$: tableBlocks = findAllMatchingComponents($currentAsset?.props, component =>
component._component.endsWith("tableblock")
$: tableBlocks = findAllMatchingComponents(
$selectedScreen?.props,
component => component._component.endsWith("tableblock")
).map(block => ({
label: block._instanceName,
value: `${block._id}-table`,
@ -44,9 +39,9 @@
if (tableId?.includes("-")) {
tableId = tableId.split("-")[0]
}
const selectedTable = findComponent($currentAsset?.props, tableId)
const datasource = getDatasourceForProvider($currentAsset, selectedTable)
const { schema } = getSchemaForDatasource($currentAsset, datasource)
const selectedTable = findComponent($selectedScreen?.props, tableId)
const datasource = getDatasourceForProvider($selectedScreen, selectedTable)
const { schema } = getSchemaForDatasource($selectedScreen, datasource)
return Object.keys(schema || {})
}

2
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte
View File

@ -1,6 +1,6 @@
<script>
import { Select, Label } from "@budibase/bbui"
import { tables, viewsV2 } from "stores/backend"
import { tables, viewsV2 } from "stores/builder"
import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
export let parameters

4
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
View File

@ -1,5 +1,5 @@
<script>
import { store } from "builderStore"
import { screenStore } from "stores/builder"
import { onMount } from "svelte"
import { Label, Checkbox, Select } from "@budibase/bbui"
import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
@ -8,7 +8,7 @@
export let parameters
export let bindings = []
$: urlOptions = $store.screens
$: urlOptions = $screenStore.screens
.map(screen => screen.routing?.route)
.filter(x => x != null)

4
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte
View File

@ -1,7 +1,7 @@
<script>
import { Select, Label } from "@budibase/bbui"
import { selectedScreen } from "builderStore"
import { findAllMatchingComponents } from "builderStore/componentUtils"
import { selectedScreen } from "stores/builder"
import { findAllMatchingComponents } from "helpers/components"
export let parameters

8
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
View File

@ -1,14 +1,14 @@
<script>
import { Select, Label } from "@budibase/bbui"
import { currentAsset, store } from "builderStore"
import { getActionProviders } from "builderStore/dataBinding"
import { selectedScreen, componentStore } from "stores/builder"
import { getActionProviders } from "dataBinding"
export let parameters
export let nested
$: actionProviders = getActionProviders(
$currentAsset,
$store.selectedComponentId,
$selectedScreen,
$componentStore.selectedComponentId,
"RefreshDatasource",
{ includeSelf: nested }
)

6
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
View File

@ -1,11 +1,11 @@
<script>
import { Select, Label } from "@budibase/bbui"
import { currentAsset } from "builderStore"
import { findAllMatchingComponents } from "builderStore/componentUtils"
import { selectedScreen } from "stores/builder"
import { findAllMatchingComponents } from "helpers/components"
export let parameters
$: components = findAllMatchingComponents($currentAsset?.props, component =>
$: components = findAllMatchingComponents($selectedScreen?.props, component =>
component._component.endsWith("s3upload")
)
</script>

14
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
View File

@ -1,8 +1,12 @@
<script>
import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
import { store, currentAsset } from "builderStore"
import { tables, viewsV2 } from "stores/backend"
import { getSchemaForDatasourcePlus } from "builderStore/dataBinding"
import {
selectedScreen,
componentStore,
tables,
viewsV2,
} from "stores/builder"
import { getSchemaForDatasourcePlus } from "dataBinding"
import SaveFields from "./SaveFields.svelte"
import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
@ -11,8 +15,8 @@
export let nested
$: providerOptions = getDatasourceLikeProviders({
asset: $currentAsset,
componentId: $store.selectedComponentId,
asset: $selectedScreen,
componentId: $componentStore.selectedComponentId,
nested,
})
$: schemaFields = getSchemaFields(parameters?.tableId)

12
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
View File

@ -1,21 +1,21 @@
<script>
import { currentAsset, store } from "builderStore"
import { selectedScreen, componentStore } from "stores/builder"
import { Label, Combobox, Select } from "@budibase/bbui"
import { getActionProviders, buildFormSchema } from "builderStore/dataBinding"
import { findComponent } from "builderStore/componentUtils"
import { getActionProviders, buildFormSchema } from "dataBinding"
import { findComponent } from "helpers/components"
export let parameters
export let nested
$: formComponent = getFormComponent(
$currentAsset.props,
$selectedScreen.props,
parameters.componentId
)
$: formSchema = buildFormSchema(formComponent)
$: fieldOptions = Object.keys(formSchema || {})
$: actionProviders = getActionProviders(
$currentAsset,
$store.selectedComponentId,
$selectedScreen,
$componentStore.selectedComponentId,
"ScrollTo",
{ includeSelf: nested }
)

2
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
View File

@ -1,6 +1,6 @@
<script>
import { Select, Label, Input, Checkbox, Icon, Body } from "@budibase/bbui"
import { automationStore } from "builderStore"
import { automationStore } from "stores/builder"
import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
import { TriggerStepID, ActionStepID } from "constants/backend/automations"

Some files were not shown because too many files have changed in this diff Show More