This commit is contained in:
Dean 2024-01-17 17:40:09 +00:00
parent 30db237071
commit 1779a5ee19
17 changed files with 31 additions and 28 deletions

View File

@ -2,6 +2,7 @@
import { Button, Select, Input, Label } from "@budibase/bbui" import { Button, Select, Input, Label } from "@budibase/bbui"
import { onMount, createEventDispatcher } from "svelte" import { onMount, createEventDispatcher } from "svelte"
import { flags } from "stores/builder" import { flags } from "stores/builder"
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
export let value export let value

View File

@ -1,10 +1,9 @@
<script> <script>
import { datasources, tables, integrations } from "stores/builder" import { datasources, tables, integrations, appStore } from "stores/builder"
import EditRolesButton from "./buttons/EditRolesButton.svelte" import EditRolesButton from "./buttons/EditRolesButton.svelte"
import { TableNames } from "constants" import { TableNames } from "constants"
import { Grid } from "@budibase/frontend-core" import { Grid } from "@budibase/frontend-core"
import { API } from "api" import { API } from "api"
import { appStore } from "stores/builder"
import GridAddColumnModal from "components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte" import GridAddColumnModal from "components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte"
import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte" import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
import GridEditUserModal from "components/backend/DataTable/modals/grid/GridEditUserModal.svelte" import GridEditUserModal from "components/backend/DataTable/modals/grid/GridEditUserModal.svelte"

View File

@ -2,7 +2,15 @@
import { goto, isActive, params } from "@roxi/routify" import { goto, isActive, params } from "@roxi/routify"
import { Layout } from "@budibase/bbui" import { Layout } from "@budibase/bbui"
import { BUDIBASE_INTERNAL_DB_ID } from "constants/backend" import { BUDIBASE_INTERNAL_DB_ID } from "constants/backend"
import { datasources, queries, tables, views, viewsV2 } from "stores/builder" import {
datasources,
queries,
tables,
views,
viewsV2,
userSelectedResourceMap,
database,
} from "stores/builder"
import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte" import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte"
import EditQueryPopover from "./popovers/EditQueryPopover.svelte" import EditQueryPopover from "./popovers/EditQueryPopover.svelte"
import NavItem from "components/common/NavItem.svelte" import NavItem from "components/common/NavItem.svelte"
@ -14,7 +22,6 @@
} from "helpers/data/utils" } from "helpers/data/utils"
import IntegrationIcon from "./IntegrationIcon.svelte" import IntegrationIcon from "./IntegrationIcon.svelte"
import { TableNames } from "constants" import { TableNames } from "constants"
import { userSelectedResourceMap, database } from "stores/builder"
import { enrichDatasources } from "./datasourceUtils" import { enrichDatasources } from "./datasourceUtils"
import { onMount } from "svelte" import { onMount } from "svelte"

View File

@ -14,7 +14,7 @@
Button, Button,
FancySelect, FancySelect,
} from "@budibase/bbui" } from "@budibase/bbui"
import { builderStore, appStore } from "stores/builder" import { builderStore, appStore, roles } from "stores/builder"
import { groups, licensing, apps, users, auth, admin } from "stores/portal" import { groups, licensing, apps, users, auth, admin } from "stores/portal"
import { import {
fetchData, fetchData,
@ -28,7 +28,6 @@
import RoleSelect from "components/common/RoleSelect.svelte" import RoleSelect from "components/common/RoleSelect.svelte"
import UpgradeModal from "components/common/users/UpgradeModal.svelte" import UpgradeModal from "components/common/users/UpgradeModal.svelte"
import { emailValidator } from "helpers/validation" import { emailValidator } from "helpers/validation"
import { roles } from "stores/builder"
import { fly } from "svelte/transition" import { fly } from "svelte/transition"
let query = null let query = null

View File

@ -2,11 +2,10 @@
import { Button, Heading, Body, Layout, Modal, Divider } from "@budibase/bbui" import { Button, Heading, Body, Layout, Modal, Divider } from "@budibase/bbui"
import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte" import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
import ICONS from "components/backend/DatasourceNavigator/icons" import ICONS from "components/backend/DatasourceNavigator/icons"
import { tables, datasources } from "stores/builder" import { tables, datasources, builderStore } from "stores/builder"
import { goto } from "@roxi/routify" import { goto } from "@roxi/routify"
import { DEFAULT_BB_DATASOURCE_ID, DB_TYPE_EXTERNAL } from "constants/backend" import { DEFAULT_BB_DATASOURCE_ID, DB_TYPE_EXTERNAL } from "constants/backend"
import { onMount } from "svelte" import { onMount } from "svelte"
import { builderStore } from "stores/builder"
let modal let modal

View File

@ -1,9 +1,8 @@
<script> <script>
import { queries } from "stores/builder" import { queries, builderStore } from "stores/builder"
import { syncURLToState } from "helpers/urlStateSync" import { syncURLToState } from "helpers/urlStateSync"
import * as routify from "@roxi/routify" import * as routify from "@roxi/routify"
import { onDestroy } from "svelte" import { onDestroy } from "svelte"
import { builderStore } from "stores/builder"
$: queryId = $queries.selectedQueryId $: queryId = $queries.selectedQueryId
$: builderStore.selectResource(queryId) $: builderStore.selectResource(queryId)

View File

@ -1,10 +1,9 @@
<script> <script>
import { queries, datasources } from "stores/builder" import { queries, datasources, database } from "stores/builder"
import QueryViewer from "components/integration/QueryViewer.svelte" import QueryViewer from "components/integration/QueryViewer.svelte"
import RestQueryViewer from "components/integration/RestQueryViewer.svelte" import RestQueryViewer from "components/integration/RestQueryViewer.svelte"
import { IntegrationTypes } from "constants/backend" import { IntegrationTypes } from "constants/backend"
import { cloneDeep } from "lodash/fp" import { cloneDeep } from "lodash/fp"
import { database } from "stores/builder"
$: query = $queries.selected $: query = $queries.selected
$: editableQuery = cloneDeep(query) $: editableQuery = cloneDeep(query)

View File

@ -1,9 +1,8 @@
<script> <script>
import { syncURLToState } from "helpers/urlStateSync" import { syncURLToState } from "helpers/urlStateSync"
import { tables } from "stores/builder" import { tables, builderStore } from "stores/builder"
import * as routify from "@roxi/routify" import * as routify from "@roxi/routify"
import { onDestroy } from "svelte" import { onDestroy } from "svelte"
import { builderStore } from "stores/builder"
$: tableId = $tables.selectedTableId $: tableId = $tables.selectedTableId
$: builderStore.selectResource(tableId) $: builderStore.selectResource(tableId)

View File

@ -1,9 +1,8 @@
<script> <script>
import { views } from "stores/builder" import { views, builderStore } from "stores/builder"
import { syncURLToState } from "helpers/urlStateSync" import { syncURLToState } from "helpers/urlStateSync"
import * as routify from "@roxi/routify" import * as routify from "@roxi/routify"
import { onDestroy } from "svelte" import { onDestroy } from "svelte"
import { builderStore } from "stores/builder"
$: name = $views.selectedViewName $: name = $views.selectedViewName
$: builderStore.selectResource(name) $: builderStore.selectResource(name)

View File

@ -1,9 +1,8 @@
<script> <script>
import { viewsV2 } from "stores/builder" import { viewsV2, builderStore } from "stores/builder"
import { syncURLToState } from "helpers/urlStateSync" import { syncURLToState } from "helpers/urlStateSync"
import * as routify from "@roxi/routify" import * as routify from "@roxi/routify"
import { onDestroy } from "svelte" import { onDestroy } from "svelte"
import { builderStore } from "stores/builder"
$: id = $viewsV2.selectedViewId $: id = $viewsV2.selectedViewId
$: builderStore.selectResource(id) $: builderStore.selectResource(id)

View File

@ -9,13 +9,12 @@
import DesignSection from "./DesignSection.svelte" import DesignSection from "./DesignSection.svelte"
import CustomStylesSection from "./CustomStylesSection.svelte" import CustomStylesSection from "./CustomStylesSection.svelte"
import ConditionalUISection from "./ConditionalUISection.svelte" import ConditionalUISection from "./ConditionalUISection.svelte"
import { notifications } from "@budibase/bbui"
import { getComponentName } from "stores/builder/components/utils" import { getComponentName } from "stores/builder/components/utils"
import { import {
getBindableProperties, getBindableProperties,
getComponentBindableProperties, getComponentBindableProperties,
} from "builder/dataBinding" } from "builder/dataBinding"
import { ActionButton } from "@budibase/bbui" import { ActionButton, notifications } from "@budibase/bbui"
import { capitalise } from "helpers" import { capitalise } from "helpers"
const onUpdateName = async value => { const onUpdateName = async value => {

View File

@ -1,13 +1,17 @@
<script> <script>
import { syncURLToState } from "helpers/urlStateSync" import { syncURLToState } from "helpers/urlStateSync"
import { builderStore, screenStore, selectedScreen } from "stores/builder" import {
builderStore,
screenStore,
selectedScreen,
componentStore,
} from "stores/builder"
import * as routify from "@roxi/routify" import * as routify from "@roxi/routify"
import { onDestroy } from "svelte" import { onDestroy } from "svelte"
import { findComponent } from "stores/builder/components/utils" import { findComponent } from "stores/builder/components/utils"
import ComponentSettingsPanel from "./_components/Component/ComponentSettingsPanel.svelte" import ComponentSettingsPanel from "./_components/Component/ComponentSettingsPanel.svelte"
import NavigationPanel from "./_components/Navigation/index.svelte" import NavigationPanel from "./_components/Navigation/index.svelte"
import ScreenSettingsPanel from "./_components/Screen/index.svelte" import ScreenSettingsPanel from "./_components/Screen/index.svelte"
import { componentStore } from "stores/builder"
$: componentId = $componentStore.selectedComponentId $: componentId = $componentStore.selectedComponentId
$: builderStore.selectResource(componentId) $: builderStore.selectResource(componentId)

View File

@ -4,10 +4,9 @@
import ScreenRoleModal from "./ScreenRoleModal.svelte" import ScreenRoleModal from "./ScreenRoleModal.svelte"
import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl" import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
import { Modal, notifications } from "@budibase/bbui" import { Modal, notifications } from "@budibase/bbui"
import { screenStore, navigationStore } from "stores/builder" import { screenStore, navigationStore, tables } from "stores/builder"
import { get } from "svelte/store" import { get } from "svelte/store"
import getTemplates from "builder/store/screenTemplates" import getTemplates from "builder/store/screenTemplates"
import { tables } from "stores/builder"
import { Roles } from "constants/backend" import { Roles } from "constants/backend"
import { capitalise } from "helpers" import { capitalise } from "helpers"
import { goto } from "@roxi/routify" import { goto } from "@roxi/routify"

View File

@ -1,9 +1,8 @@
<script> <script>
import { Select, ModalContent } from "@budibase/bbui" import { Select, ModalContent } from "@budibase/bbui"
import { RoleUtils } from "@budibase/frontend-core" import { RoleUtils } from "@budibase/frontend-core"
import { roles } from "stores/builder" import { roles, screenStore } from "stores/builder"
import { get } from "svelte/store" import { get } from "svelte/store"
import { screenStore } from "stores/builder"
import { onMount } from "svelte" import { onMount } from "svelte"
export let onConfirm export let onConfirm

View File

@ -1,4 +1,4 @@
import { writable, get } from "svelte/store" import { get } from "svelte/store"
import { createBuilderWebsocket } from "./websocket.js" import { createBuilderWebsocket } from "./websocket.js"
import { BuilderSocketEvent } from "@budibase/shared-core" import { BuilderSocketEvent } from "@budibase/shared-core"
import BudiStore from "./BudiStore" import BudiStore from "./BudiStore"

View File

@ -23,6 +23,7 @@ import {
DB_TYPE_EXTERNAL, DB_TYPE_EXTERNAL,
} from "constants/backend" } from "constants/backend"
import BudiStore from "../BudiStore" import BudiStore from "../BudiStore"
import { Utils } from "@budibase/frontend-core"
export const INITIAL_COMPONENTS_STATE = { export const INITIAL_COMPONENTS_STATE = {
components: [], components: [],

View File

@ -6,8 +6,9 @@ import {
themeStore, themeStore,
navigationStore, navigationStore,
deploymentStore, deploymentStore,
datasources,
tables,
} from "stores/builder" } from "stores/builder"
import { datasources, tables } from "stores/builder"
import { get } from "svelte/store" import { get } from "svelte/store"
import { auth, apps } from "stores/portal" import { auth, apps } from "stores/portal"
import { screenStore } from "./screens" import { screenStore } from "./screens"