diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 88f7c7b542..f1e1642e22 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -66,11 +66,12 @@ "@spectrum-css/radio": "^3.0.2", "@spectrum-css/search": "^3.0.2", "@spectrum-css/sidenav": "^3.0.2", + "@spectrum-css/slider": "3.0.1", "@spectrum-css/statuslight": "^3.0.2", "@spectrum-css/stepper": "^3.0.3", "@spectrum-css/switch": "^1.0.2", "@spectrum-css/table": "^3.0.1", - "@spectrum-css/tabs": "^3.0.1", + "@spectrum-css/tabs": "^3.2.12", "@spectrum-css/tags": "^3.0.2", "@spectrum-css/textfield": "^3.0.1", "@spectrum-css/toast": "^3.0.1", diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte index 2d23120046..53ba6c7e51 100644 --- a/packages/bbui/src/ActionButton/ActionButton.svelte +++ b/packages/bbui/src/ActionButton/ActionButton.svelte @@ -82,6 +82,12 @@ .active svg { color: var(--spectrum-global-color-blue-600); } + :global([dir="ltr"] .spectrum-ActionButton .spectrum-Icon) { + margin-left: 0; + } + .is-selected:not(.spectrum-ActionButton--emphasized) { + background: var(--spectrum-global-color-gray-300); + } .noPadding { padding: 0; min-width: 0; diff --git a/packages/bbui/src/Banner/Banner.svelte b/packages/bbui/src/Banner/Banner.svelte index f41fb5f803..3810021a61 100644 --- a/packages/bbui/src/Banner/Banner.svelte +++ b/packages/bbui/src/Banner/Banner.svelte @@ -8,6 +8,7 @@ export let size = "S" export let extraButtonText export let extraButtonAction + export let showCloseButton = true let show = true @@ -39,22 +40,24 @@ {/if} -
- -
+ {#if showCloseButton} +
+ +
+ {/if} {/if} @@ -63,4 +66,7 @@ pointer-events: all; width: 100%; } + .spectrum-Button { + border: 1px solid rgba(255, 255, 255, 0.2); + } diff --git a/packages/bbui/src/Divider/Divider.svelte b/packages/bbui/src/Divider/Divider.svelte index 2b4de9cfb0..e4f0f2fb61 100644 --- a/packages/bbui/src/Divider/Divider.svelte +++ b/packages/bbui/src/Divider/Divider.svelte @@ -16,6 +16,9 @@ /> diff --git a/packages/bbui/src/Form/Core/index.js b/packages/bbui/src/Form/Core/index.js index 96d81855e4..7c81cfd70b 100644 --- a/packages/bbui/src/Form/Core/index.js +++ b/packages/bbui/src/Form/Core/index.js @@ -12,3 +12,4 @@ export { default as CoreDatePicker } from "./DatePicker.svelte" export { default as CoreDropzone } from "./Dropzone.svelte" export { default as CoreStepper } from "./Stepper.svelte" export { default as CoreRichTextField } from "./RichTextField.svelte" +export { default as CoreSlider } from "./Slider.svelte" diff --git a/packages/bbui/src/Form/Search.svelte b/packages/bbui/src/Form/Search.svelte index 25dd98306b..74ffeeb22a 100644 --- a/packages/bbui/src/Form/Search.svelte +++ b/packages/bbui/src/Form/Search.svelte @@ -10,6 +10,7 @@ export let disabled = false export let updateOnChange = true export let quiet = false + export let inputRef const dispatch = createEventDispatcher() const onChange = e => { @@ -25,6 +26,7 @@ {value} {placeholder} {quiet} + bind:inputRef on:change={onChange} on:click on:input diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte index 0df27e2ff0..1b68746c5e 100644 --- a/packages/bbui/src/Form/Select.svelte +++ b/packages/bbui/src/Form/Select.svelte @@ -14,6 +14,7 @@ export let getOptionLabel = option => extractProperty(option, "label") export let getOptionValue = option => extractProperty(option, "value") export let getOptionIcon = option => option?.icon + export let getOptionColour = option => option?.colour export let quiet = false export let autoWidth = false export let sort = false @@ -47,6 +48,7 @@ {getOptionLabel} {getOptionValue} {getOptionIcon} + {getOptionColour} on:change={onChange} on:click /> diff --git a/packages/bbui/src/Form/Slider.svelte b/packages/bbui/src/Form/Slider.svelte new file mode 100644 index 0000000000..34b2251b35 --- /dev/null +++ b/packages/bbui/src/Form/Slider.svelte @@ -0,0 +1,24 @@ + + + + + diff --git a/packages/bbui/src/Icon/Icon.svelte b/packages/bbui/src/Icon/Icon.svelte index eee1d7fbae..9c99178fdb 100644 --- a/packages/bbui/src/Icon/Icon.svelte +++ b/packages/bbui/src/Icon/Icon.svelte @@ -47,7 +47,7 @@ {#if tooltip && showTooltip}
- +
{/if} diff --git a/packages/bbui/src/IconSideNav/IconSideNav.svelte b/packages/bbui/src/IconSideNav/IconSideNav.svelte new file mode 100644 index 0000000000..e8144402e4 --- /dev/null +++ b/packages/bbui/src/IconSideNav/IconSideNav.svelte @@ -0,0 +1,14 @@ +
+ +
+ + diff --git a/packages/bbui/src/IconSideNav/IconSideNavItem.svelte b/packages/bbui/src/IconSideNav/IconSideNavItem.svelte new file mode 100644 index 0000000000..46625c9707 --- /dev/null +++ b/packages/bbui/src/IconSideNav/IconSideNavItem.svelte @@ -0,0 +1,56 @@ + + +
(showTooltip = true)} + on:focus={() => (showTooltip = true)} + on:mouseleave={() => (showTooltip = false)} + on:click +> + + {#if tooltip && showTooltip} +
+ +
+ {/if} +
+ + diff --git a/packages/bbui/src/Notification/NotificationDisplay.svelte b/packages/bbui/src/Notification/NotificationDisplay.svelte index 0b846f06ce..0f7e93eb23 100644 --- a/packages/bbui/src/Notification/NotificationDisplay.svelte +++ b/packages/bbui/src/Notification/NotificationDisplay.svelte @@ -9,7 +9,7 @@
{#each $notifications as { type, icon, message, id, dismissable, action, wide } (id)} -
+
.notifications { position: fixed; - top: 20px; + bottom: 40px; left: 0; right: 0; margin: 0 auto; diff --git a/packages/bbui/src/StatusLight/StatusLight.svelte b/packages/bbui/src/StatusLight/StatusLight.svelte index f56fee0c2a..a0c72443a6 100644 --- a/packages/bbui/src/StatusLight/StatusLight.svelte +++ b/packages/bbui/src/StatusLight/StatusLight.svelte @@ -17,10 +17,13 @@ export let negative = false export let disabled = false export let active = false + export let color = null
+ + diff --git a/packages/bbui/src/Tabs/Tab.svelte b/packages/bbui/src/Tabs/Tab.svelte index 04791619dc..c25be7dbc9 100644 --- a/packages/bbui/src/Tabs/Tab.svelte +++ b/packages/bbui/src/Tabs/Tab.svelte @@ -79,4 +79,10 @@ .emphasized { color: var(--spectrum-global-color-blue-600); } + .spectrum-Tabs-item { + color: var(--spectrum-global-color-gray-600); + } + .spectrum-Tabs-item.is-selected { + color: var(--spectrum-global-color-gray-900); + } diff --git a/packages/bbui/src/Tabs/Tabs.svelte b/packages/bbui/src/Tabs/Tabs.svelte index 579c61e28d..74edc9cd02 100644 --- a/packages/bbui/src/Tabs/Tabs.svelte +++ b/packages/bbui/src/Tabs/Tabs.svelte @@ -10,8 +10,7 @@ export let noHorizPadding = false export let quiet = false export let emphasized = false - // overlay content from the tab bar onto tabs e.g. for a dropdown - export let onTop = false + export let size = "M" let thisSelected = undefined @@ -74,20 +73,18 @@
{#if $tab.info}
{/if}
@@ -98,26 +95,26 @@ /> diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 2b16f32b84..7d5baad474 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -64,6 +64,9 @@ export { default as BannerDisplay } from "./Banner/BannerDisplay.svelte" export { default as MarkdownEditor } from "./Markdown/MarkdownEditor.svelte" export { default as MarkdownViewer } from "./Markdown/MarkdownViewer.svelte" export { default as RichTextField } from "./Form/RichTextField.svelte" +export { default as IconSideNav } from "./IconSideNav/IconSideNav.svelte" +export { default as IconSideNavItem } from "./IconSideNav/IconSideNavItem.svelte" +export { default as Slider } from "./Form/Slider.svelte" // Renderers export { default as BoldRenderer } from "./Table/BoldRenderer.svelte" diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock index 0bff3e86d9..d301afea53 100644 --- a/packages/bbui/yarn.lock +++ b/packages/bbui/yarn.lock @@ -206,6 +206,11 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.2.tgz#9d70f408d588ee79c69857751010333671f32713" integrity sha512-YpIdH/F0jEICYmoduGrnkTmxwJq1kfKxEp0wOs+ZkQOsvKMv1an7nyhsfOKCQqcGNfYzJ9mJAk7/u5+vsxHa8g== +"@spectrum-css/slider@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49" + integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q== + "@spectrum-css/statuslight@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5" @@ -226,10 +231,10 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.2.tgz#c666743d569fef81ddc8810fac8cda53b315f8d7" integrity sha512-nt/QNC7NmUank0wozd4FySEX1UIYXuvuOKDyN1II3sxfwFSpJfp/Df9KVMhrYs4EsmB4XMGcoxp8ND/CrvH3ow== -"@spectrum-css/tabs@^3.0.1": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.0.2.tgz#822316672e7b0dfba66faa988e638ddae18c700e" - integrity sha512-4RNcmwf0wxLpB7M54H02owlj0mKE8neL1+lytQpxOOhlwTO5zdsD82zjvx9tIc8tRnRKuhCCCwTuBxHYstnBmw== +"@spectrum-css/tabs@^3.2.12": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff" + integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA== "@spectrum-css/tags@^3.0.2": version "3.0.2" diff --git a/packages/builder/package.json b/packages/builder/package.json index 5b0e934d6c..8d505ff159 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -95,7 +95,7 @@ "@babel/preset-env": "^7.13.12", "@babel/runtime": "^7.13.10", "@rollup/plugin-replace": "^2.4.2", - "@roxi/routify": "2.18.0", + "@roxi/routify": "2.18.5", "@sveltejs/vite-plugin-svelte": "1.0.0-next.19", "@testing-library/jest-dom": "^5.11.10", "@testing-library/svelte": "^3.0.0", @@ -113,7 +113,7 @@ "rollup": "^2.44.0", "rollup-plugin-copy": "^3.4.0", "start-server-and-test": "^1.12.1", - "svelte": "^3.38.2", + "svelte": "^3.48.0", "svelte-jester": "^1.3.2", "ts-node": "^10.4.0", "tsconfig-paths": "4.0.0", diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index 234f83d7cc..bebd06c6d7 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -20,7 +20,7 @@ import { } from "@budibase/string-templates" import { TableNames } from "../constants" import { JSONUtils } from "@budibase/frontend-core" -import ActionDefinitions from "components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/manifest.json" +import ActionDefinitions from "components/design/settings/controls/ButtonActionEditor/manifest.json" // Regex to match all instances of template strings const CAPTURE_VAR_INSIDE_TEMPLATE = /{{([^}]+)}}/g @@ -478,11 +478,17 @@ const getUrlBindings = asset => { } }) const safeURL = makePropSafe("url") - return params.map(param => ({ + const urlParamBindings = params.map(param => ({ type: "context", runtimeBinding: `${safeURL}.${makePropSafe(param)}`, readableBinding: `URL.${param}`, })) + const queryParamsBinding = { + type: "context", + runtimeBinding: makePropSafe("query"), + readableBinding: "Query params", + } + return urlParamBindings.concat([queryParamsBinding]) } const getRoleBindings = () => { @@ -782,6 +788,13 @@ export const getAllStateVariables = () => { }) }) + // Add on load settings from screens + get(store).screens.forEach(screen => { + if (screen.onLoad) { + eventSettings.push(screen.onLoad) + } + }) + // Extract all state keys from any "update state" actions in each setting let bindingSet = new Set() eventSettings.forEach(setting => { diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js index 619bdd94a1..28ef1f4376 100644 --- a/packages/builder/src/builderStore/index.js +++ b/packages/builder/src/builderStore/index.js @@ -1,65 +1,77 @@ import { getFrontendStore } from "./store/frontend" import { getAutomationStore } from "./store/automation" import { getThemeStore } from "./store/theme" -import { derived, writable } from "svelte/store" -import { FrontendTypes, LAYOUT_NAMES } from "../constants" +import { derived } from "svelte/store" +import { LAYOUT_NAMES } from "../constants" import { findComponent, findComponentPath } from "./componentUtils" +import { RoleUtils } from "@budibase/frontend-core" export const store = getFrontendStore() export const automationStore = getAutomationStore() export const themeStore = getThemeStore() -export const currentAsset = derived(store, $store => { - const type = $store.currentFrontEndType - if (type === FrontendTypes.SCREEN) { - return $store.screens.find(screen => screen._id === $store.selectedScreenId) - } else if (type === FrontendTypes.LAYOUT) { - return $store.layouts.find(layout => layout._id === $store.selectedLayoutId) - } - return null +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, currentAsset], - ([$store, $currentAsset]) => { - if (!$currentAsset || !$store.selectedComponentId) { + [store, selectedScreen], + ([$store, $selectedScreen]) => { + if (!$selectedScreen || !$store.selectedComponentId) { return null } - return findComponent($currentAsset?.props, $store.selectedComponentId) + return findComponent($selectedScreen?.props, $store.selectedComponentId) } ) +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, currentAsset], - ([$store, $currentAsset]) => { + [store, selectedScreen], + ([$store, $selectedScreen]) => { return findComponentPath( - $currentAsset?.props, + $selectedScreen?.props, $store.selectedComponentId ).map(component => component._id) } ) -export const currentAssetId = derived(store, $store => { - return $store.currentFrontEndType === FrontendTypes.SCREEN - ? $store.selectedScreenId - : $store.selectedLayoutId -}) - -export const currentAssetName = derived(currentAsset, $currentAsset => { - return $currentAsset?.name -}) - -// leave this as before for consistency -export const allScreens = derived(store, $store => { - return $store.screens -}) - export const mainLayout = derived(store, $store => { return $store.layouts?.find( layout => layout._id === LAYOUT_NAMES.MASTER.PRIVATE ) }) -export const selectedAccessRole = writable("BASIC") - -export const screenSearchString = writable(null) +// For compatibility +export const currentAsset = selectedScreen diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index ec810e5c31..16ae5ce215 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -1,12 +1,6 @@ import { get, writable } from "svelte/store" import { cloneDeep } from "lodash/fp" -import { - allScreens, - currentAsset, - mainLayout, - selectedComponent, - selectedAccessRole, -} from "builderStore" +import { currentAsset, mainLayout, selectedComponent } from "builderStore" import { datasources, integrations, @@ -15,7 +9,6 @@ import { tables, } from "stores/backend" import { API } from "api" -import { FrontendTypes } from "constants" import analytics, { Events } from "analytics" import { findComponentType, @@ -27,6 +20,7 @@ import { makeComponentUnique, } from "../componentUtils" import { Helpers } from "@budibase/bbui" +import { DefaultAppTheme, LAYOUT_NAMES } from "../../constants" const INITIAL_FRONTEND_STATE = { apps: [], @@ -47,10 +41,6 @@ const INITIAL_FRONTEND_STATE = { messagePassing: false, continueIfAction: false, }, - currentFrontEndType: "none", - selectedScreenId: "", - selectedLayoutId: "", - selectedComponentId: "", errors: [], hasAppPackage: false, libraries: null, @@ -61,6 +51,11 @@ const INITIAL_FRONTEND_STATE = { customTheme: {}, previewDevice: "desktop", highlightedSettingKey: null, + + // URL params + selectedScreenId: null, + selectedComponentId: null, + selectedLayoutId: null, } export const getFrontendStore = () => { @@ -100,6 +95,7 @@ export const getFrontendStore = () => { previousTopNavPath: {}, version: application.version, revertableVersion: application.revertableVersion, + navigation: application.navigation || {}, })) // Initialise backend stores @@ -108,6 +104,35 @@ export const getFrontendStore = () => { await integrations.init() await queries.init() await tables.init() + + // Add navigation settings to old apps + if (!application.navigation) { + const layout = layouts.find(x => x._id === LAYOUT_NAMES.MASTER.PRIVATE) + const customTheme = application.customTheme + let navigationSettings = { + navigation: "Top", + title: application.name, + navWidth: "Large", + navBackground: + customTheme?.navBackground || DefaultAppTheme.navBackground, + navTextColor: + customTheme?.navTextColor || DefaultAppTheme.navTextColor, + } + if (layout) { + navigationSettings.hideLogo = layout.props.hideLogo + navigationSettings.hideTitle = layout.props.hideTitle + navigationSettings.title = layout.props.title || application.name + navigationSettings.logoUrl = layout.props.logoUrl + navigationSettings.links = layout.props.links + navigationSettings.navigation = layout.props.navigation || "Top" + navigationSettings.sticky = layout.props.sticky + navigationSettings.navWidth = layout.props.width || "Large" + if (navigationSettings.navigation === "None") { + navigationSettings.navigation = "Top" + } + } + await store.actions.navigation.save(navigationSettings) + } }, theme: { save: async theme => { @@ -135,6 +160,19 @@ export const getFrontendStore = () => { }) }, }, + navigation: { + save: async navigation => { + const appId = get(store).appId + await API.saveAppMetadata({ + appId, + metadata: { navigation }, + }) + store.update(state => { + state.navigation = navigation + return state + }) + }, + }, routing: { fetch: async () => { const response = await API.fetchAppRoutes() @@ -147,18 +185,12 @@ export const getFrontendStore = () => { screens: { select: screenId => { store.update(state => { - let screens = get(allScreens) + let screens = state.screens let screen = screens.find(screen => screen._id === screenId) || screens[0] if (!screen) return state - // Update role to the screen's role setting so that it will always - // be visible - selectedAccessRole.set(screen.routing.roleId) - - state.currentFrontEndType = FrontendTypes.SCREEN state.selectedScreenId = screen._id - state.currentView = "detail" state.selectedComponentId = screen.props?._id return state }) @@ -221,16 +253,44 @@ export const getFrontendStore = () => { // Refresh routes await store.actions.routing.fetch() }, + updateHomeScreen: async (screen, makeHomeScreen = true) => { + let promises = [] + + // Find any existing home screen for this role so we can remove it, + // if we are setting this to be the new home screen + if (makeHomeScreen) { + const roleId = screen.routing.roleId + let existingHomeScreen = get(store).screens.find(s => { + return ( + s.routing.roleId === roleId && + s.routing.homeScreen && + s._id !== screen._id + ) + }) + if (existingHomeScreen) { + existingHomeScreen.routing.homeScreen = false + promises.push(store.actions.screens.save(existingHomeScreen)) + } + } + + // Update the passed in screen + screen.routing.homeScreen = makeHomeScreen + promises.push(store.actions.screens.save(screen)) + return await Promise.all(promises) + }, + removeCustomLayout: async screen => { + // Pull relevant settings from old layout, if required + const layout = get(store).layouts.find(x => x._id === screen.layoutId) + screen.layoutId = null + screen.showNavigation = layout?.props.navigation !== "None" + screen.width = layout?.props.width || "Large" + await store.actions.screens.save(screen) + }, }, preview: { saveSelected: async () => { - const state = get(store) const selectedAsset = get(currentAsset) - if (state.currentFrontEndType !== FrontendTypes.LAYOUT) { - return await store.actions.screens.save(selectedAsset) - } else { - return await store.actions.layouts.save(selectedAsset) - } + return await store.actions.screens.save(selectedAsset) }, setDevice: device => { store.update(state => { @@ -245,8 +305,6 @@ export const getFrontendStore = () => { const layout = store.actions.layouts.find(layoutId) || get(store).layouts[0] if (!layout) return - state.currentFrontEndType = FrontendTypes.LAYOUT - state.currentView = "detail" state.selectedLayoutId = layout._id state.selectedComponentId = layout.props?._id return state @@ -297,32 +355,6 @@ export const getFrontendStore = () => { }, }, components: { - select: component => { - const asset = get(currentAsset) - if (!asset || !component) { - return - } - - // If this is the root component, select the asset instead - const parent = findComponentParent(asset.props, component._id) - if (parent == null) { - const state = get(store) - const isLayout = state.currentFrontEndType === FrontendTypes.LAYOUT - if (isLayout) { - store.actions.layouts.select(asset._id) - } else { - store.actions.screens.select(asset._id) - } - return - } - - // Otherwise select the component - store.update(state => { - state.selectedComponentId = component._id - state.currentView = "component" - return state - }) - }, getDefinition: componentName => { if (!componentName) { return null @@ -418,7 +450,6 @@ export const getFrontendStore = () => { // Save components and update UI await store.actions.preview.saveSelected() store.update(state => { - state.currentView = "component" state.selectedComponentId = componentInstance._id return state }) @@ -461,11 +492,14 @@ export const getFrontendStore = () => { parent._children = parent._children.filter( child => child._id !== component._id ) - store.actions.components.select(parent) + store.update(state => { + state.selectedComponentId = parent._id + return state + }) } await store.actions.preview.saveSelected() }, - copy: (component, cut = false) => { + copy: (component, cut = false, selectParent = true) => { const selectedAsset = get(currentAsset) if (!selectedAsset) { return null @@ -485,7 +519,12 @@ export const getFrontendStore = () => { parent._children = parent._children.filter( child => child._id !== component._id ) - store.actions.components.select(parent) + if (selectParent) { + store.update(state => { + state.selectedComponentId = parent._id + return state + }) + } } } }, @@ -536,7 +575,7 @@ export const getFrontendStore = () => { // Save and select the new component promises.push(store.actions.preview.saveSelected()) - store.actions.components.select(componentToPaste) + state.selectedComponentId = componentToPaste._id return state }) await Promise.all(promises) @@ -578,35 +617,38 @@ export const getFrontendStore = () => { }, links: { save: async (url, title) => { - const layout = get(mainLayout) - if (!layout) { + const navigation = get(store).navigation + let links = [...navigation?.links] + + // Skip if we have an identical link + if (links.find(link => link.url === url && link.text === title)) { return } - // Add link setting to main layout - if (!layout.props.links) { - layout.props.links = [] - } - layout.props.links.push({ + links.push({ text: title, url, }) - - await store.actions.layouts.save(layout) + await store.actions.navigation.save({ + ...navigation, + links: [...links], + }) }, delete: async urls => { - const layout = get(mainLayout) - if (!layout?.props.links?.length) { + const navigation = get(store).navigation + let links = navigation?.links + if (!links?.length) { return } // Filter out the URLs to delete urls = Array.isArray(urls) ? urls : [urls] - layout.props.links = layout.props.links.filter( - link => !urls.includes(link.url) - ) + links = links.filter(link => !urls.includes(link.url)) - await store.actions.layouts.save(layout) + await store.actions.navigation.save({ + ...navigation, + links, + }) }, }, settings: { diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js b/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js index 272f627163..6fc79e53b0 100644 --- a/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js +++ b/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js @@ -5,7 +5,8 @@ export class Screen extends BaseStructure { constructor() { super(true) this._json = { - layoutId: "layout_private_master", + showNavigation: true, + width: "Large", props: { _id: Helpers.uuid(), _component: "@budibase/standard-components/container", @@ -26,6 +27,7 @@ export class Screen extends BaseStructure { routing: { route: "", roleId: "BASIC", + homeScreen: false, }, name: "screen-id", } diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 7b189ad109..c149b6a00e 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -26,7 +26,7 @@ import CronBuilder from "./CronBuilder.svelte" import Editor from "components/integration/QueryEditor.svelte" import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte" - import FilterDrawer from "components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte" + import FilterDrawer from "components/design/settings/controls/FilterEditor/FilterDrawer.svelte" import { LuceneUtils } from "@budibase/frontend-core" import { getSchemaForTable } from "builderStore/dataBinding" import { Utils } from "@budibase/frontend-core" diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte index cf9e4b1358..633c7e1ad1 100644 --- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte +++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte @@ -1,7 +1,7 @@ + + + + + Beta Builder + + Your account has been given access to the budibase beta program. We + would love to hear what you think and get your feedback and suggestions + on the new Design UI. + + + + + + + + diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte index 364ae50f64..4cb67dc9c4 100644 --- a/packages/builder/src/components/common/NavItem.svelte +++ b/packages/builder/src/components/common/NavItem.svelte @@ -1,5 +1,5 @@ - + - + - import { notifications, Select } from "@budibase/bbui" - import { store } from "builderStore" - import { get } from "svelte/store" - - const themeOptions = [ - { - label: "Lightest", - value: "spectrum--lightest", - }, - { - label: "Light", - value: "spectrum--light", - }, - { - label: "Dark", - value: "spectrum--dark", - }, - { - label: "Darkest", - value: "spectrum--darkest", - }, - ] - - const onChangeTheme = async theme => { - try { - await store.actions.theme.save(theme) - await store.actions.customTheme.save({ - ...get(store).customTheme, - navBackground: - theme === "spectrum--light" - ? "var(--spectrum-global-color-gray-50)" - : "var(--spectrum-global-color-gray-100)", - }) - } catch (error) { - notifications.error("Error updating theme") - } - } - - -
- -
-
-
- - -
-
- - -
-
- - -
-
- - -
- -
- -
- - - - diff --git a/packages/builder/src/components/design/AppPreview/index.js b/packages/builder/src/components/design/AppPreview/index.js deleted file mode 100644 index 61030700ec..0000000000 --- a/packages/builder/src/components/design/AppPreview/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from "./CurrentItemPreview.svelte" diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte deleted file mode 100644 index 6b78bc40c1..0000000000 --- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte +++ /dev/null @@ -1,157 +0,0 @@ - - -
    - {#each components || [] as component, index (component._id)} -
  • selectComponent(component)}> - {#if $dragDropStore?.targetComponent === component && $dragDropStore.dropPosition === DropPosition.ABOVE} -
    - {/if} - - toggleNodeOpen(component._id)} - on:drop={onDrop} - text={getComponentText(component)} - withArrow - indentLevel={level + 1} - selected={$store.selectedComponentId === component._id} - opened={isOpen(component, $selectedComponentPath, closedNodes)} - > - - - - {#if isOpen(component, $selectedComponentPath, closedNodes)} - - {/if} - - {#if $dragDropStore?.targetComponent === component && ($dragDropStore.dropPosition === DropPosition.INSIDE || $dragDropStore.dropPosition === DropPosition.BELOW)} -
    - {/if} -
    • - {/each} -
- - diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/LayoutDropdownMenu.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/LayoutDropdownMenu.svelte deleted file mode 100644 index e54beb9e41..0000000000 --- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/LayoutDropdownMenu.svelte +++ /dev/null @@ -1,74 +0,0 @@ - - - -
- -
- Edit - Delete - - - - - - - - - - - diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathDropdownMenu.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathDropdownMenu.svelte deleted file mode 100644 index 6de656b6b5..0000000000 --- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathDropdownMenu.svelte +++ /dev/null @@ -1,82 +0,0 @@ - - - -
- -
- - Delete all screens - - - - - -
- Are you sure you want to delete all screens under the {path} route? -
-
The following screens will be deleted:
-
- {#each screens as screen} -
{screen.route}
- {/each} -
- - - - diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte deleted file mode 100644 index 3d6984cf14..0000000000 --- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte +++ /dev/null @@ -1,106 +0,0 @@ - - -{#if !noSearchMatch} - - - - - {#if routeOpened} - {#each filteredScreens as screen (screen.id)} - changeScreen(screen.id)} - > - - - {#if selectedScreen?._id === screen.id} - - {/if} - {/each} - {/if} -{/if} diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/dragDropStore.js b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/dragDropStore.js deleted file mode 100644 index d965a2456d..0000000000 --- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/dragDropStore.js +++ /dev/null @@ -1,104 +0,0 @@ -import { writable, get } from "svelte/store" -import { store as frontendStore } from "builderStore" -import { findComponentPath } from "builderStore/componentUtils" - -export const DropEffect = { - MOVE: "move", - COPY: "copy", -} - -export const DropPosition = { - ABOVE: "above", - BELOW: "below", - INSIDE: "inside", -} - -export default function () { - const store = writable({}) - - store.actions = { - dragstart: component => { - store.update(state => { - state.dragged = component - return state - }) - }, - dragover: ({ - component, - index, - canHaveChildrenButIsEmpty, - mousePosition, - }) => { - store.update(state => { - state.targetComponent = component - // only allow dropping inside when container is empty - // if container has children, drag over them - - if (canHaveChildrenButIsEmpty && index === 0) { - // hovered above center of target - if (mousePosition < 0.4) { - state.dropPosition = DropPosition.ABOVE - } - - // hovered around bottom of target - if (mousePosition > 0.8) { - state.dropPosition = DropPosition.BELOW - } - - // hovered in center of target - if (mousePosition > 0.4 && mousePosition < 0.8) { - state.dropPosition = DropPosition.INSIDE - } - return state - } - - // bottom half - if (mousePosition > 0.5) { - state.dropPosition = DropPosition.BELOW - } else { - state.dropPosition = canHaveChildrenButIsEmpty - ? DropPosition.INSIDE - : DropPosition.ABOVE - } - - return state - }) - }, - reset: () => { - store.update(state => { - state.dropPosition = "" - state.targetComponent = null - state.dragged = null - return state - }) - }, - drop: async () => { - const state = get(store) - - // Stop if the target and source are the same - if (state.targetComponent === state.dragged) { - return - } - // Stop if the target or source are null - if (!state.targetComponent || !state.dragged) { - return - } - // Stop if the target is a child of source - const path = findComponentPath(state.dragged, state.targetComponent._id) - const ids = path.map(component => component._id) - if (ids.includes(state.targetComponent._id)) { - return - } - - // Cut and paste the component - frontendStore.actions.components.copy(state.dragged, true) - await frontendStore.actions.components.paste( - state.targetComponent, - state.dropPosition - ) - store.actions.reset() - }, - } - - return store -} diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte deleted file mode 100644 index ed064f8307..0000000000 --- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte +++ /dev/null @@ -1,83 +0,0 @@ - - -
- {#each paths as path, idx (path)} - 0} {path} route={routes[path]} /> - {/each} - {#if !paths.length} -
- There aren't any screens configured with this access role. -
- {/if} -
- - diff --git a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte deleted file mode 100644 index 0611d4fc71..0000000000 --- a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte +++ /dev/null @@ -1,229 +0,0 @@ - - -
- - -
- - - diff --git a/packages/builder/src/components/design/Panel.svelte b/packages/builder/src/components/design/Panel.svelte new file mode 100644 index 0000000000..c1eab881d5 --- /dev/null +++ b/packages/builder/src/components/design/Panel.svelte @@ -0,0 +1,112 @@ + + +
+
+ {#if showBackButton} + + {/if} + {#if icon} + + {/if} +
+ {title || ""} +
+ {#if showExpandIcon} + (wide = !wide)} + /> + {/if} + {#if showAddButton} +
+ +
+ {/if} +
+
+ +
+
+ + diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertiesPanel.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertiesPanel.svelte deleted file mode 100644 index df91a87456..0000000000 --- a/packages/builder/src/components/design/PropertiesPanel/PropertiesPanel.svelte +++ /dev/null @@ -1,63 +0,0 @@ - - - - -
- {#key componentInstance?._id} - - - - - - {/key} -
- - - - diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/NavigationEditor/NavigationEditor.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/NavigationEditor/NavigationEditor.svelte deleted file mode 100644 index 33a82d1886..0000000000 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/NavigationEditor/NavigationEditor.svelte +++ /dev/null @@ -1,25 +0,0 @@ - - -Configure links - - - Configure the links in your navigation bar. - - - - diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js deleted file mode 100644 index 23a0a312bc..0000000000 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js +++ /dev/null @@ -1,68 +0,0 @@ -import { Checkbox, Select, Stepper } from "@budibase/bbui" -import DataSourceSelect from "./DataSourceSelect.svelte" -import S3DataSourceSelect from "./S3DataSourceSelect.svelte" -import DataProviderSelect from "./DataProviderSelect.svelte" -import ButtonActionEditor from "./ButtonActionEditor/ButtonActionEditor.svelte" -import TableSelect from "./TableSelect.svelte" -import ColorPicker from "./ColorPicker.svelte" -import { IconSelect } from "./IconSelect" -import FieldSelect from "./FieldSelect.svelte" -import MultiFieldSelect from "./MultiFieldSelect.svelte" -import SearchFieldSelect from "./SearchFieldSelect.svelte" -import SchemaSelect from "./SchemaSelect.svelte" -import SectionSelect from "./SectionSelect.svelte" -import NavigationEditor from "./NavigationEditor/NavigationEditor.svelte" -import FilterEditor from "./FilterEditor/FilterEditor.svelte" -import URLSelect from "./URLSelect.svelte" -import OptionsEditor from "./OptionsEditor/OptionsEditor.svelte" -import FormFieldSelect from "./FormFieldSelect.svelte" -import ValidationEditor from "./ValidationEditor/ValidationEditor.svelte" -import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte" -import ColumnEditor from "./ColumnEditor/ColumnEditor.svelte" - -const componentMap = { - text: DrawerBindableCombobox, - select: Select, - dataSource: DataSourceSelect, - "dataSource/s3": S3DataSourceSelect, - dataProvider: DataProviderSelect, - boolean: Checkbox, - number: Stepper, - event: ButtonActionEditor, - table: TableSelect, - color: ColorPicker, - icon: IconSelect, - field: FieldSelect, - multifield: MultiFieldSelect, - searchfield: SearchFieldSelect, - options: OptionsEditor, - schema: SchemaSelect, - section: SectionSelect, - navigation: NavigationEditor, - filter: FilterEditor, - url: URLSelect, - columns: ColumnEditor, - "field/string": FormFieldSelect, - "field/number": FormFieldSelect, - "field/options": FormFieldSelect, - "field/boolean": FormFieldSelect, - "field/longform": FormFieldSelect, - "field/datetime": FormFieldSelect, - "field/attachment": FormFieldSelect, - "field/link": FormFieldSelect, - "field/array": FormFieldSelect, - "field/json": FormFieldSelect, - // Some validation types are the same as others, so not all types are - // explicitly listed here. e.g. options uses string validation - "validation/string": ValidationEditor, - "validation/array": ValidationEditor, - "validation/number": ValidationEditor, - "validation/boolean": ValidationEditor, - "validation/datetime": ValidationEditor, - "validation/attachment": ValidationEditor, - "validation/link": ValidationEditor, -} - -export const getComponentForSettingType = type => { - return componentMap[type] -} diff --git a/packages/builder/src/components/design/PropertiesPanel/ScreenSettingsSection.svelte b/packages/builder/src/components/design/PropertiesPanel/ScreenSettingsSection.svelte deleted file mode 100644 index e0b46d8ed7..0000000000 --- a/packages/builder/src/components/design/PropertiesPanel/ScreenSettingsSection.svelte +++ /dev/null @@ -1,125 +0,0 @@ - - -{#if $store.currentView !== "component" && $currentAsset && $store.currentFrontEndType === FrontendTypes.SCREEN} - - {#each screenSettings as def (`${componentInstance._id}-${def.key}`)} - setAssetProps(def.key, val, def.parser, def.validate)} - {bindings} - props={{ error: errors[def.key] }} - /> - {/each} - -{/if} diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js new file mode 100644 index 0000000000..56ae3de490 --- /dev/null +++ b/packages/builder/src/components/design/settings/componentSettings.js @@ -0,0 +1,77 @@ +import { Checkbox, Select, Stepper } from "@budibase/bbui" +import DataSourceSelect from "./controls/DataSourceSelect.svelte" +import S3DataSourceSelect from "./controls/S3DataSourceSelect.svelte" +import DataProviderSelect from "./controls/DataProviderSelect.svelte" +import ButtonActionEditor from "./controls/ButtonActionEditor/ButtonActionEditor.svelte" +import TableSelect from "./controls/TableSelect.svelte" +import ColorPicker from "./controls/ColorPicker.svelte" +import { IconSelect } from "./controls/IconSelect" +import FieldSelect from "./controls/FieldSelect.svelte" +import MultiFieldSelect from "./controls/MultiFieldSelect.svelte" +import SearchFieldSelect from "./controls/SearchFieldSelect.svelte" +import SchemaSelect from "./controls/SchemaSelect.svelte" +import SectionSelect from "./controls/SectionSelect.svelte" +import FilterEditor from "./controls/FilterEditor/FilterEditor.svelte" +import URLSelect from "./controls/URLSelect.svelte" +import OptionsEditor from "./controls/OptionsEditor/OptionsEditor.svelte" +import FormFieldSelect from "./controls/FormFieldSelect.svelte" +import ValidationEditor from "./controls/ValidationEditor/ValidationEditor.svelte" +import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte" +import ColumnEditor from "./controls/ColumnEditor/ColumnEditor.svelte" +import BarButtonList from "./controls/BarButtonList.svelte" + +const componentMap = { + text: DrawerBindableCombobox, + select: Select, + dataSource: DataSourceSelect, + "dataSource/s3": S3DataSourceSelect, + dataProvider: DataProviderSelect, + boolean: Checkbox, + number: Stepper, + event: ButtonActionEditor, + table: TableSelect, + color: ColorPicker, + icon: IconSelect, + field: FieldSelect, + multifield: MultiFieldSelect, + searchfield: SearchFieldSelect, + options: OptionsEditor, + schema: SchemaSelect, + section: SectionSelect, + filter: FilterEditor, + url: URLSelect, + columns: ColumnEditor, + "field/string": FormFieldSelect, + "field/number": FormFieldSelect, + "field/options": FormFieldSelect, + "field/boolean": FormFieldSelect, + "field/longform": FormFieldSelect, + "field/datetime": FormFieldSelect, + "field/attachment": FormFieldSelect, + "field/link": FormFieldSelect, + "field/array": FormFieldSelect, + "field/json": FormFieldSelect, + // Some validation types are the same as others, so not all types are + // explicitly listed here. e.g. options uses string validation + "validation/string": ValidationEditor, + "validation/array": ValidationEditor, + "validation/number": ValidationEditor, + "validation/boolean": ValidationEditor, + "validation/datetime": ValidationEditor, + "validation/attachment": ValidationEditor, + "validation/link": ValidationEditor, +} + +export const getComponentForSetting = setting => { + const { type, showInBar, barStyle } = setting || {} + if (!type) { + return null + } + + // We can show a clone of the bar settings for certain select settings + if (showInBar && type === "select" && barStyle === "buttons") { + return BarButtonList + } + + return componentMap[type] +} diff --git a/packages/builder/src/components/design/settings/controls/BarButtonList.svelte b/packages/builder/src/components/design/settings/controls/BarButtonList.svelte new file mode 100644 index 0000000000..339edb1f74 --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/BarButtonList.svelte @@ -0,0 +1,18 @@ + + + + {#each options as option} + onChange(option.value)} + selected={option.value === value} + /> + {/each} + diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/ButtonActionDrawer.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/ButtonActionDrawer.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/ButtonActionEditor.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/ButtonActionEditor.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ChangeFormStep.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ChangeFormStep.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ClearForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ClearForm.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/CloseScreenModal.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/CloseScreenModal.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ContinueIf.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ContinueIf.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/DeleteRow.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/DuplicateRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/DuplicateRow.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExecuteQuery.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExportData.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExportData.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/LogOut.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/LogOut.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/LogOut.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/LogOut.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/NavigateTo.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/NavigateTo.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/RefreshDataProvider.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/RefreshDataProvider.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/S3Upload.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/S3Upload.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/SaveFields.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveFields.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/SaveFields.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveFields.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/SaveRow.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/TriggerAutomation.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/UpdateFieldValue.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/UpdateFieldValue.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/UpdateState.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/UpdateState.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ValidateForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ValidateForm.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/index.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/index.js rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/index.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/index.js rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/manifest.json b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/manifest.json rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte b/packages/builder/src/components/design/settings/controls/ColorPicker.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte rename to packages/builder/src/components/design/settings/controls/ColorPicker.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/CellDrawer.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/CellDrawer.svelte rename to packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/CellEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellEditor.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/CellEditor.svelte rename to packages/builder/src/components/design/settings/controls/ColumnEditor/CellEditor.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte rename to packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnEditor.svelte rename to packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataProviderSelect.svelte b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataProviderSelect.svelte rename to packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte rename to packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FieldSelect.svelte rename to packages/builder/src/components/design/settings/controls/FieldSelect.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte rename to packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterEditor.svelte rename to packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/FlatButton.svelte b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/FlatButton.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/FlatButton.svelte rename to packages/builder/src/components/design/settings/controls/FlatButtonGroup/FlatButton.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/FlatButtonGroup.svelte b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/FlatButtonGroup.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/FlatButtonGroup.svelte rename to packages/builder/src/components/design/settings/controls/FlatButtonGroup/FlatButtonGroup.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/index.js b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/index.js rename to packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte rename to packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/IconSelect.svelte b/packages/builder/src/components/design/settings/controls/IconSelect/IconSelect.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/IconSelect.svelte rename to packages/builder/src/components/design/settings/controls/IconSelect/IconSelect.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/icons.js b/packages/builder/src/components/design/settings/controls/IconSelect/icons.js similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/icons.js rename to packages/builder/src/components/design/settings/controls/IconSelect/icons.js diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/index.js b/packages/builder/src/components/design/settings/controls/IconSelect/index.js similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/index.js rename to packages/builder/src/components/design/settings/controls/IconSelect/index.js diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/LayoutSelect.svelte b/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/LayoutSelect.svelte rename to packages/builder/src/components/design/settings/controls/LayoutSelect.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiFieldSelect.svelte rename to packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte b/packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsDrawer.svelte similarity index 80% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte rename to packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsDrawer.svelte index 340c1eb107..ba8e297189 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsDrawer.svelte @@ -6,6 +6,7 @@ DrawerContent, Layout, Body, + Label, } from "@budibase/bbui" import { generate } from "shortid" @@ -35,19 +36,12 @@ {/if} {#if options?.length}
+ + +
{#each options as option (option.id)} - - + + import { Select } from "@budibase/bbui" import { roles } from "stores/backend" + import { RoleUtils } from "@budibase/frontend-core" export let value export let error + export let placeholder = null x.routing.route} + getOptionValue={x => x._id} + getOptionIcon={x => (x.routing.homeScreen ? "Home" : "WebPage")} + getOptionColour={x => RoleUtils.getRoleColour(x.routing.roleId)} + bind:value={$store.selectedScreenId} + /> +
+
+ {#if $store.clientFeatures.devicePreview} + + {/if} + +
+
+
+ {#key $store.version} + + {/key} +
+
+ + diff --git a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte similarity index 87% rename from packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte index 706550cca7..e332f8e896 100644 --- a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte @@ -1,10 +1,13 @@
diff --git a/packages/builder/src/components/design/AppPreview/DevicePreviewSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte similarity index 100% rename from packages/builder/src/components/design/AppPreview/DevicePreviewSelect.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte diff --git a/packages/builder/src/components/design/AppPreview/iframeTemplate.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/iframeTemplate.js similarity index 97% rename from packages/builder/src/components/design/AppPreview/iframeTemplate.js rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/iframeTemplate.js index c265a64d53..def32dd45f 100644 --- a/packages/builder/src/components/design/AppPreview/iframeTemplate.js +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/iframeTemplate.js @@ -61,11 +61,11 @@ export default ` selectedComponentId, layout, screen, - previewType, appId, theme, customTheme, previewDevice, + navigation } = parsed // Set some flags so the app knows we're in the builder @@ -75,10 +75,10 @@ export default ` window["##BUDIBASE_PREVIEW_SCREEN##"] = screen window["##BUDIBASE_SELECTED_COMPONENT_ID##"] = selectedComponentId window["##BUDIBASE_PREVIEW_ID##"] = Math.random() - window["##BUDIBASE_PREVIEW_TYPE##"] = previewType window["##BUDIBASE_PREVIEW_THEME##"] = theme window["##BUDIBASE_PREVIEW_CUSTOM_THEME##"] = customTheme window["##BUDIBASE_PREVIEW_DEVICE##"] = previewDevice + window["##BUDIBASE_PREVIEW_NAVIGATION##"] = navigation // Initialise app try { diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_fallback.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_fallback.svelte new file mode 100644 index 0000000000..00165e4ee9 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_fallback.svelte @@ -0,0 +1,5 @@ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte new file mode 100644 index 0000000000..d0eb93466d --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte @@ -0,0 +1,102 @@ + + +
+
+ + $goto("./screens")} + /> + $goto("./components")} + /> + $goto("./theme")} + /> + $goto("./navigation")} + /> + {#if $store.layouts?.length} + $goto("./layouts")} + /> + {/if} + +
+ +
+ {#if $selectedScreen} + + + {/if} +
+
+ + diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte similarity index 100% rename from packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentDropdownMenu.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte new file mode 100644 index 0000000000..5b86d4da29 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte @@ -0,0 +1,129 @@ + + + $goto("../new")} + showExpandIcon + borderRight +> +
+
    +
  • { + $store.selectedComponentId = $selectedScreen?.props._id + }} + id={`component-${$selectedScreen?.props._id}`} + > + + + + + + + {#if $dndStore.dragging && $dndStore.valid} + + {#if $dndStore.dropPosition !== DropPosition.INSIDE} + + {/if} + {/if} +
    • +
+
+ + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte new file mode 100644 index 0000000000..cc7f70f2c5 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentTree.svelte @@ -0,0 +1,148 @@ + + +
    + {#each components || [] as component, index (component._id)} + {@const opened = isOpen(component, $selectedComponentPath, closedNodes)} +
  • { + $store.selectedComponentId = component._id + }} + id={`component-${component._id}`} + > + dndStore.actions.dragstart(component)} + on:dragover={dragover(component, index)} + on:iconClick={() => toggleNodeOpen(component._id)} + on:drop={onDrop} + text={getComponentText(component)} + icon={getComponentIcon(component)} + withArrow={componentHasChildren(component)} + indentLevel={level + 1} + selected={$store.selectedComponentId === component._id} + {opened} + highlighted={isChildOfSelectedComponent(component)} + > + + + {#if opened} + + {/if} +
    • + {/each} +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte new file mode 100644 index 0000000000..c01bcaf36f --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/DNDPositionIndicator.svelte @@ -0,0 +1,67 @@ + + +{#if component && position} +
+{/if} + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ScreenslotDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ScreenslotDropdownMenu.svelte new file mode 100644 index 0000000000..7ec7b0821c --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ScreenslotDropdownMenu.svelte @@ -0,0 +1,52 @@ + + +{#if showMenu} + +
+ +
+ storeComponentForCopy(false)}> + Copy + + pasteComponent("inside")} + disabled={noPaste} + > + Paste inside + + +{/if} + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dndStore.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dndStore.js new file mode 100644 index 0000000000..8a9e7ed915 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/dndStore.js @@ -0,0 +1,129 @@ +import { writable, get } from "svelte/store" +import { store as frontendStore, selectedScreen } from "builderStore" +import { + findComponentParent, + findComponentPath, +} from "builderStore/componentUtils" + +export const DropPosition = { + ABOVE: "above", + BELOW: "below", + INSIDE: "inside", +} + +const initialState = { + source: null, + target: null, + targetParent: null, + dropPosition: null, + dragging: false, + valid: false, +} + +const createDNDStore = () => { + const store = writable(initialState) + const actions = { + dragstart: component => { + if (!component) { + return + } + store.set({ + source: component, + target: null, + dropPosition: null, + dragging: true, + valid: false, + }) + }, + dragover: ({ component, mousePosition }) => { + const definition = frontendStore.actions.components.getDefinition( + component._component + ) + const canHaveChildren = definition?.hasChildren + const hasChildren = component._children?.length > 0 + + let dropPosition + let target + let targetParent + + // If it can have children then it can be any position + if (canHaveChildren) { + if (mousePosition <= 0.33) { + dropPosition = DropPosition.ABOVE + } else if (mousePosition >= 0.66) { + dropPosition = DropPosition.BELOW + } else { + dropPosition = DropPosition.INSIDE + } + } + + // Otherwise drop either above or below + else { + dropPosition = + mousePosition > 0.5 ? DropPosition.BELOW : DropPosition.ABOVE + } + + // If hovering over a component with children and attempting to drop + // below, we need to change this to be above the first child instead + if (dropPosition === DropPosition.BELOW && hasChildren) { + target = component._children[0] + dropPosition = DropPosition.ABOVE + } else { + target = component + } + + // If drop position and target are the same then we can skip this update + const state = get(store) + if ( + dropPosition === state.dropPosition && + target?._id === state.target?._id + ) { + return + } + + // Find the parent of the target component + if (target) { + targetParent = findComponentParent( + get(selectedScreen).props, + target._id + ) + } + + store.update(state => { + return { + ...state, + dropPosition, + target, + targetParent, + + /// Mark as invalid if the target is a child of the source + valid: findComponentPath(state.source, target._id)?.length === 0, + } + }) + }, + reset: () => { + store.set(initialState) + }, + drop: async () => { + const state = get(store) + if (!state.valid || !state.source || !state.target) { + return + } + actions.reset() + + // Cut and paste the component + frontendStore.actions.components.copy(state.source, true, false) + await frontendStore.actions.components.paste( + state.target, + state.dropPosition + ) + }, + } + + return { + subscribe: store.subscribe, + actions, + } +} + +export const dndStore = createDNDStore() diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte new file mode 100644 index 0000000000..ff0c53e7ab --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte @@ -0,0 +1,46 @@ + + +{#if $selectedComponent} + + + + + + +{/if} diff --git a/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte similarity index 86% rename from packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte index 14e4f74bcb..ba16c705f6 100644 --- a/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte @@ -2,15 +2,16 @@ import { isEmpty } from "lodash/fp" import { Input, DetailSummary, notifications } from "@budibase/bbui" import { store } from "builderStore" - import PropertyControl from "./PropertyControls/PropertyControl.svelte" - import ResetFieldsButton from "./PropertyControls/ResetFieldsButton.svelte" - import { getComponentForSettingType } from "./PropertyControls/componentSettings" + import PropertyControl from "components/design/settings/controls/PropertyControl.svelte" + import ResetFieldsButton from "components/design/settings/controls/ResetFieldsButton.svelte" + import { getComponentForSetting } from "components/design/settings/componentSettings" import { Utils } from "@budibase/frontend-core" export let componentDefinition export let componentInstance export let bindings export let componentBindings + export let isScreen = false $: sections = getSections(componentDefinition) @@ -20,7 +21,7 @@ const customSections = settings.filter(setting => setting.section) return [ { - name: componentDefinition?.name || "General", + name: "General", info: componentDefinition?.info, settings: generalSettings, }, @@ -37,7 +38,7 @@ }) const canRenderControl = setting => { - const control = getComponentForSettingType(setting?.type) + const control = getComponentForSetting(setting) if (!control) { return false } @@ -77,7 +78,7 @@ {#each sections as section, idx (section.name)} - {#if idx === 0 && !componentInstance._component.endsWith("/layout")} + {#if idx === 0 && !componentInstance._component.endsWith("/layout") && !isScreen} updateProp(setting.key, val)} highlighted={$store.highlightedSettingKey === setting.key} props={{ - options: setting.options || [], + // Generic settings placeholder: setting.placeholder || null, + + // Select settings + options: setting.options || [], + + // Number fields min: setting.min || null, max: setting.max || null, }} diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte similarity index 91% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte index 11d19edf7c..b40b33744f 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte @@ -14,8 +14,8 @@ import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte" import { LuceneUtils, Constants } from "@budibase/frontend-core" import { selectedComponent } from "builderStore" - import { getComponentForSettingType } from "./componentSettings" - import PropertyControl from "./PropertyControl.svelte" + import { getComponentForSetting } from "components/design/settings/componentSettings" + import PropertyControl from "components/design/settings/controls/PropertyControl.svelte" import { getComponentSettings } from "builderStore/componentUtils" export let conditions = [] @@ -71,11 +71,6 @@ return settings.find(setting => setting.key === key) } - const getComponentForSetting = key => { - const settingDefinition = getSettingDefinition(key) - return getComponentForSettingType(settingDefinition?.type || "text") - } - const addCondition = () => { conditions = [ ...conditions, @@ -154,6 +149,7 @@ on:consider={updateConditions} > {#each conditions as condition (condition.id)} + {@const definition = getSettingDefinition(condition.setting)}
TO
- {#if getSettingDefinition(condition.setting)} + {#if definition} (condition.settingValue = val)} props={{ - options: getSettingDefinition(condition.setting).options, - placeholder: getSettingDefinition(condition.setting) - .placeholder, + options: definition.options, + placeholder: definition.placeholder, }} {bindings} /> diff --git a/packages/builder/src/components/design/PropertiesPanel/ConditionalUISection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUISection.svelte similarity index 93% rename from packages/builder/src/components/design/PropertiesPanel/ConditionalUISection.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUISection.svelte index b0863dce83..ba84b67622 100644 --- a/packages/builder/src/components/design/PropertiesPanel/ConditionalUISection.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUISection.svelte @@ -7,7 +7,7 @@ notifications, } from "@budibase/bbui" import { store } from "builderStore" - import ConditionalUIDrawer from "./PropertyControls/ConditionalUIDrawer.svelte" + import ConditionalUIDrawer from "./ConditionalUIDrawer.svelte" export let componentInstance export let bindings diff --git a/packages/builder/src/components/design/PropertiesPanel/CustomStylesSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/CustomStylesSection.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/CustomStylesSection.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/CustomStylesSection.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/DesignSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/DesignSection.svelte similarity index 100% rename from packages/builder/src/components/design/PropertiesPanel/DesignSection.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/DesignSection.svelte diff --git a/packages/builder/src/components/design/PropertiesPanel/StyleSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/StyleSection.svelte similarity index 94% rename from packages/builder/src/components/design/PropertiesPanel/StyleSection.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/StyleSection.svelte index aa5147fa62..e34ea1019a 100644 --- a/packages/builder/src/components/design/PropertiesPanel/StyleSection.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/StyleSection.svelte @@ -1,5 +1,5 @@ + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/index.svelte new file mode 100644 index 0000000000..a8e1e3e630 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/index.svelte @@ -0,0 +1,7 @@ + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/index.svelte new file mode 100644 index 0000000000..f8c4cc0868 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/index.svelte @@ -0,0 +1,18 @@ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/NewComponentPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/NewComponentPanel.svelte new file mode 100644 index 0000000000..7f841e09ea --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/NewComponentPanel.svelte @@ -0,0 +1,263 @@ + + + $goto("../slot")} + borderRight +> + + (searchString = e.detail)} + bind:inputRef={searchRef} + /> + {#if !searchString} + + (section = "components")}>Components + (section = "blocks")}>Blocks + + {/if} + +
+ +
+ {#if searchString || section === "components"} + {#each filteredStructure as category} + +
+ {#each category.children as component} +
15} + class:selected={selectedIndex === orderMap[component.component]} + on:click={() => addComponent(component.component)} + on:mouseover={() => (selectedIndex = null)} + > + + {component.name} +
+ {/each} +
+ + {/each} + {:else} + + Blocks are collections of pre-built components + + {#each blocks as block} +
addComponent(block.component)} + > + + {block.name} +
+ {/each} + + + {/if} + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/NewComponentTargetPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/NewComponentTargetPanel.svelte new file mode 100644 index 0000000000..af44934526 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/NewComponentTargetPanel.svelte @@ -0,0 +1,21 @@ + + + + + + Components that you add will be placed {position} + {title} + + + diff --git a/packages/builder/src/components/design/AppPreview/componentStructure.json b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/componentStructure.json similarity index 89% rename from packages/builder/src/components/design/AppPreview/componentStructure.json rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/componentStructure.json index 6873ae547d..acd28c6a41 100644 --- a/packages/builder/src/components/design/AppPreview/componentStructure.json +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/_components/componentStructure.json @@ -26,6 +26,26 @@ "dynamicfilter" ] }, + { + "name": "Basic", + "icon": "TextParagraph", + "children": [ + "heading", + "text", + "button", + "tag", + "spectrumcard", + "cardstat", + "divider", + "image", + "link", + "icon", + "embed", + "markdownviewer", + "backgroundimage", + "embeddedmap" + ] + }, { "name": "Form", "icon": "Form", @@ -39,23 +59,15 @@ "optionsfield", "booleanfield", "longformfield", - "datetimefield", "attachmentfield", - "relationshipfield", "daterangepicker", - "multifieldselect", "jsonfield", + "relationshipfield", + "datetimefield", + "multifieldselect", "s3upload" ] }, - { - "name": "Card", - "icon": "Card", - "children": [ - "spectrumcard", - "cardstat" - ] - }, { "name": "Chart", "icon": "GraphBarVertical", @@ -63,27 +75,9 @@ "bar", "line", "area", + "candlestick", "pie", - "donut", - "candlestick" - ] - }, - { - "name": "Elements", - "icon": "TextParagraph", - "children": [ - "heading", - "text", - "button", - "tag", - "divider", - "image", - "backgroundimage", - "link", - "icon", - "embed", - "markdownviewer", - "embeddedmap" + "donut" ] } ] diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/index.svelte new file mode 100644 index 0000000000..8f2042671b --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/new/index.svelte @@ -0,0 +1,26 @@ + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte new file mode 100644 index 0000000000..f5e3806bd6 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte @@ -0,0 +1,5 @@ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutDropdownMenu.svelte new file mode 100644 index 0000000000..cba68f899d --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutDropdownMenu.svelte @@ -0,0 +1,41 @@ + + + +
+ +
+ Delete + + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte new file mode 100644 index 0000000000..fd38f08ceb --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte @@ -0,0 +1,29 @@ + + + +
+ {#each $store.layouts as layout (layout._id)} + ($store.selectedLayoutId = layout._id)} + > + + + {/each} +
+ + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte new file mode 100644 index 0000000000..8e6ac603e7 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte @@ -0,0 +1,53 @@ + + + + + + Custom layouts are being deprecated. They will be removed in a future + release. + + + You can save the content of this layout by pressing the button below. + + + This will copy all components inside your layout, which you can then paste + into a screen. + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_layout.svelte new file mode 100644 index 0000000000..c82fefab3e --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_layout.svelte @@ -0,0 +1,20 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/index.svelte new file mode 100644 index 0000000000..4d39403bc3 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/index.svelte @@ -0,0 +1,7 @@ + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/_layout.svelte new file mode 100644 index 0000000000..1333c6afe3 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/_layout.svelte @@ -0,0 +1,12 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte new file mode 100644 index 0000000000..09d45f8fde --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte @@ -0,0 +1,12 @@ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte new file mode 100644 index 0000000000..dbd23c462f --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte @@ -0,0 +1,33 @@ + + + + + {#if $selectedScreen.layoutId} + + You can't preview your navigation settings using this screen as it uses + a custom layout, which is deprecated + + {/if} + + Your navigation is configured for all the screens within your app. + + + You can hide and show your navigation for each screen in the screen + settings. + + + diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/NavigationEditor/NavigationDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationLinksDrawer.svelte similarity index 94% rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/NavigationEditor/NavigationDrawer.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationLinksDrawer.svelte index 4d1823108c..5ffccc5800 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/NavigationEditor/NavigationDrawer.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationLinksDrawer.svelte @@ -11,6 +11,7 @@ import { dndzone } from "svelte-dnd-action" import { generate } from "shortid" import { store } from "builderStore" + import RoleSelect from "components/design/settings/controls/RoleSelect.svelte" export let links = [] @@ -75,6 +76,7 @@ placeholder="URL" options={urlOptions} /> + .container { width: 100%; - max-width: 600px; + max-width: 800px; margin: 0 auto; } .links { diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationLinksEditor.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationLinksEditor.svelte new file mode 100644 index 0000000000..895c82495d --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationLinksEditor.svelte @@ -0,0 +1,34 @@ + + + + + + Configure the links in your navigation bar. + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationSettingsPanel.svelte new file mode 100644 index 0000000000..c6d43984b2 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationSettingsPanel.svelte @@ -0,0 +1,110 @@ + + + + + + + + + update("navigation", "Top")} + /> + update("navigation", "Left")} + /> + + + {#if $store.navigation.navigation === "Top"} + update("sticky", e.detail)} + /> + update("logoUrl", e.detail)} + placeholder="Add logo URL" + updateOnChange={false} + /> + {/if} + + + update("hideTitle", !e.detail)} + /> + {#if !$store.navigation.hideTitle} + update("title", e.detail)} + placeholder="Add title" + updateOnChange={false} + /> + {/if} + + + + update("navBackground", e.detail)} + /> + + + + update("navTextColor", e.detail)} + /> + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte new file mode 100644 index 0000000000..fc2e03d8e8 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte @@ -0,0 +1,7 @@ + + + + diff --git a/packages/builder/src/components/design/NavigationPanel/DatasourceModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte similarity index 90% rename from packages/builder/src/components/design/NavigationPanel/DatasourceModal.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte index bd9b6a1741..523e3d9da9 100644 --- a/packages/builder/src/components/design/NavigationPanel/DatasourceModal.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/DatasourceModal.svelte @@ -1,9 +1,15 @@
- Duplicate pasteComponent("inside")} - disabled={!$store.componentToPaste} + disabled={noPaste} > Paste inside + Duplicate Delete @@ -90,8 +90,8 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte new file mode 100644 index 0000000000..40d9ab273d --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte @@ -0,0 +1,78 @@ + + + + + (searchString = e.detail)} + /> + role.name} + getOptionValue={role => role._id} + getOptionColour={role => RoleUtils.getRoleColour(role._id)} + options={$roles} + placeholder={null} + /> + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte new file mode 100644 index 0000000000..0d861d1cd8 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte @@ -0,0 +1,197 @@ + + + + + {#if $selectedScreen.layoutId} + + This screen uses a custom layout, which is deprecated + + {/if} + {#each screenSettings as setting (setting.key)} + setScreenSetting(setting, val)} + props={{ ...setting.props, error: errors[setting.key] }} + {bindings} + /> + {/each} + + + diff --git a/packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenWizard.svelte similarity index 81% rename from packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenWizard.svelte index 5f36034b93..6485e7a13f 100644 --- a/packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenWizard.svelte @@ -1,13 +1,16 @@ + + +{#key $selectedScreen?._id} + +{/key} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/AppThemeSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/AppThemeSelect.svelte new file mode 100644 index 0000000000..accd156c29 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/AppThemeSelect.svelte @@ -0,0 +1,47 @@ + + +
+ + + +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte new file mode 100644 index 0000000000..9593f0bff5 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte @@ -0,0 +1,12 @@ + + + + + + Your theme is set across all the screens within your app. + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte new file mode 100644 index 0000000000..4bad3b7bc4 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte @@ -0,0 +1,116 @@ + + + + + + + + + + +
+ {#each ButtonBorderRadiusOptions as option} +
+ +
+ {/each} +
+ + + + update("primaryColor", e.detail)} + /> + + + + update("primaryColorHover", e.detail)} + /> + + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte new file mode 100644 index 0000000000..013257d8e1 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte @@ -0,0 +1,7 @@ + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte index d41fc0ee34..ec21d909aa 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte @@ -1,2 +1,2 @@ - + diff --git a/packages/builder/src/pages/builder/app/[application]/design/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/index.svelte index 1a454df4db..6490000b35 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/index.svelte @@ -1,8 +1,67 @@ - +{#if loaded} +
+ + logo +
+ LET’S BRING THIS APP TO LIFE +
+ + +
+{/if} + + diff --git a/packages/builder/src/pages/builder/app/[application]/index.svelte b/packages/builder/src/pages/builder/app/[application]/index.svelte index d3321037d5..0143f38324 100644 --- a/packages/builder/src/pages/builder/app/[application]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/index.svelte @@ -1,6 +1,4 @@ - - diff --git a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte deleted file mode 100644 index eff7c155d3..0000000000 --- a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/packages/builder/src/pages/builder/app/[application]/settings/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/index.svelte deleted file mode 100644 index 163d304af4..0000000000 --- a/packages/builder/src/pages/builder/app/[application]/settings/index.svelte +++ /dev/null @@ -1 +0,0 @@ -Settings diff --git a/packages/builder/src/pages/builder/app/index.svelte b/packages/builder/src/pages/builder/app/index.svelte index 110b5e83d9..05a71911d2 100644 --- a/packages/builder/src/pages/builder/app/index.svelte +++ b/packages/builder/src/pages/builder/app/index.svelte @@ -1,4 +1,4 @@ diff --git a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte index 83d5b35af2..d0176aa5e0 100644 --- a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte @@ -27,6 +27,7 @@ import AppLockModal from "components/common/AppLockModal.svelte" import EditableIcon from "components/common/EditableIcon.svelte" import ConfirmDialog from "components/common/ConfirmDialog.svelte" + import BetaTab from "components/beta/BetaTab.svelte" import HistoryTab from "components/portal/overview/automation/HistoryTab.svelte" import { checkIncomingDeploymentStatus } from "components/deploy/utils" import { onDestroy, onMount } from "svelte" @@ -317,6 +318,9 @@ + + +
{ const roles = await API.getRoles() - set(roles) + set( + roles.sort((a, b) => { + const priorityA = RoleUtils.getRolePriority(a._id) + const priorityB = RoleUtils.getRolePriority(b._id) + return priorityA > priorityB ? -1 : 1 + }) + ) }, delete: async role => { await API.deleteRole({ diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index 929aa29f2a..32f8767c03 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -1223,10 +1223,10 @@ estree-walker "^2.0.1" picomatch "^2.2.2" -"@roxi/routify@2.18.0": - version "2.18.0" - resolved "https://registry.yarnpkg.com/@roxi/routify/-/routify-2.18.0.tgz#8f88bedd936312d0dbe44cbc11ab179b1f938ec2" - integrity sha512-MVB50HN+VQWLzfjLplcBjsSBvwOiExKOmht2DuWR3WQ60JxQi9pSejkB06tFVkFKNXz2X5iYtKDqKBTdae/gRg== +"@roxi/routify@2.18.5": + version "2.18.5" + resolved "https://registry.yarnpkg.com/@roxi/routify/-/routify-2.18.5.tgz#abd2b7cadeed008ab20d40a68323719d9c254552" + integrity sha512-xNG84JOSUtCyOV0WeQwPcj+HbA4nxtXCqvt9JXQZm13pdJZqY18WV2C7ayReKGtRAa3ogQyDo8k/C8f1MixA1w== dependencies: "@roxi/ssr" "^0.2.1" "@types/node" ">=4.2.0 < 13" @@ -5732,10 +5732,10 @@ svelte-portal@0.1.0: resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-0.1.0.tgz#cc2821cc84b05ed5814e0218dcdfcbebc53c1742" integrity sha512-kef+ksXVKun224mRxat+DdO4C+cGHla+fEcZfnBAvoZocwiaceOfhf5azHYOPXSSB1igWVFTEOF3CDENPnuWxg== -svelte@^3.38.2: - version "3.44.1" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.44.1.tgz#5cc772a8340f4519a4ecd1ac1a842325466b1a63" - integrity sha512-4DrCEJoBvdR689efHNSxIQn2pnFwB7E7j2yLEJtHE/P8hxwZWIphCtJ8are7bjl/iVMlcEf5uh5pJ68IwR09vQ== +svelte@^3.48.0: + version "3.48.0" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.48.0.tgz#f98c866d45e155bad8e1e88f15f9c03cd28753d3" + integrity sha512-fN2YRm/bGumvjUpu6yI3BpvZnpIm9I6A7HR4oUNYd7ggYyIwSA/BX7DJ+UXXffLp6XNcUijyLvttbPVCYa/3xQ== symbol-tree@^3.2.4: version "3.2.4" diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 6f0a55e5a9..fdb5700a5c 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -81,7 +81,7 @@ "container": { "name": "Container", "description": "This component contains things within itself", - "icon": "Sandbox", + "icon": "Selection", "hasChildren": true, "showSettingsBar": true, "styles": [ @@ -393,7 +393,7 @@ "repeater": { "name": "Repeater", "description": "A configurable data list that attaches to your backend tables.", - "icon": "ViewList", + "icon": "JourneyData", "illegalChildren": [ "section" ], @@ -894,7 +894,7 @@ }, "tag": { "name": "Tag", - "icon": "TextParagraph", + "icon": "Label", "showSettingsBar": true, "settings": [ { @@ -1028,7 +1028,7 @@ "icon": { "name": "Icon", "description": "A basic component for displaying icons", - "icon": "Bell", + "icon": "Shapes", "illegalChildren": [ "section" ], @@ -2358,7 +2358,7 @@ }, "optionsfield": { "name": "Options Picker", - "icon": "ViewList", + "icon": "Menu", "styles": [ "size" ], @@ -2686,7 +2686,7 @@ }, "booleanfield": { "name": "Checkbox", - "icon": "Checkmark", + "icon": "SelectBox", "editable": true, "illegalChildren": [ "section" @@ -2763,7 +2763,7 @@ }, "longformfield": { "name": "Long Form Field", - "icon": "TextParagraph", + "icon": "AlignLeft", "styles": [ "size" ], @@ -2838,7 +2838,7 @@ }, "datetimefield": { "name": "Date Picker", - "icon": "DateInput", + "icon": "Date", "styles": [ "size" ], @@ -3430,7 +3430,7 @@ }, "daterangepicker": { "name": "Date Range", - "icon": "Date", + "icon": "Calendar", "styles": [ "size" ], @@ -3467,7 +3467,7 @@ }, "spectrumcard": { "name": "Card", - "icon": "Card", + "icon": "PersonalizationField", "styles": [ "size" ], @@ -3526,7 +3526,7 @@ }, "dynamicfilter": { "name": "Dynamic Filter", - "icon": "FilterEdit", + "icon": "Filter", "showSettingsBar": true, "settings": [ { @@ -4122,7 +4122,7 @@ }, "markdownviewer": { "name": "Markdown Viewer", - "icon": "TaskList", + "icon": "Preview", "styles": [ "size" ], diff --git a/packages/client/src/api/api.js b/packages/client/src/api/api.js index c3cc679220..b96ad9c9e7 100644 --- a/packages/client/src/api/api.js +++ b/packages/client/src/api/api.js @@ -23,9 +23,9 @@ export const API = createAPIClient({ } // Add role header - const role = get(devToolsStore).role - if (role) { - headers["x-budibase-role"] = role + const devToolsState = get(devToolsStore) + if (devToolsState.enabled && devToolsState.role) { + headers["x-budibase-role"] = devToolsState.role } }, @@ -34,7 +34,11 @@ export const API = createAPIClient({ // Or we could check error.status and redirect to login on a 403 etc. onError: error => { const { status, method, url, message, handled } = error || {} - const ignoreErrorUrls = ["bbtel", "/api/global/self"] + const ignoreErrorUrls = [ + "bbtel", + "/api/global/self", + "/api/tables/ta_users", + ] // Log any errors that we haven't manually handled if (!handled) { diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index aab1f78a86..dcf4f54557 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -24,6 +24,7 @@ import DeviceBindingsProvider from "components/context/DeviceBindingsProvider.svelte" import StateBindingsProvider from "components/context/StateBindingsProvider.svelte" import RowSelectionProvider from "components/context/RowSelectionProvider.svelte" + import QueryParamsProvider from "components/context/QueryParamsProvider.svelte" import SettingsBar from "components/preview/SettingsBar.svelte" import SelectionIndicator from "components/preview/SelectionIndicator.svelte" import HoverIndicator from "components/preview/HoverIndicator.svelte" @@ -41,6 +42,40 @@ let dataLoaded = false let permissionError = false + // Determine if we should show devtools or not + $: showDevTools = + !$builderStore.inBuilder && + $devToolsStore.enabled && + !$routeStore.queryParams?.peek + + // Handle no matching route + $: { + if (dataLoaded && $routeStore.routerLoaded && !$routeStore.activeRoute) { + if ($screenStore.screens.length) { + // If we have some available screens, use the first screen which + // represents the best route based on rank + const route = $screenStore.screens[0].routing?.route + if (!route) { + permissionError = true + console.error("No route found but screens exist") + } else { + permissionError = false + routeStore.actions.navigate(route) + } + } else if ($authStore) { + // If the user is logged in but has no screens, they don't have + // permission to use the app + permissionError = true + } else { + // If they have no screens and are not logged in, it probably means + // they should log in to gain access + const returnUrl = `${window.location.pathname}${window.location.hash}` + CookieUtils.setCookie(Constants.Cookies.ReturnUrl, returnUrl) + window.location = "/builder/auth/login" + } + } + } + // Load app config onMount(async () => { await initialise() @@ -50,44 +85,6 @@ builderStore.actions.notifyLoaded() } }) - - // Handle no matching route - this is likely a permission error - $: { - if (dataLoaded && $routeStore.routerLoaded && !$routeStore.activeRoute) { - if ($authStore) { - // There is a logged in user, so handle them - if ($screenStore.screens.length) { - let firstRoute - - // If using devtools, find the first screen matching our role - if ($devToolsStore.role) { - const roleRoutes = $screenStore.screens.filter( - screen => screen.routing?.roleId === $devToolsStore.role - ) - firstRoute = roleRoutes[0]?.routing?.route || "/" - } - - // Otherwise just use the first route - else { - firstRoute = $screenStore.screens[0]?.routing?.route ?? "/" - } - - // Screens exist so navigate back to the home screen - routeStore.actions.navigate(firstRoute) - } else { - // No screens likely means the user has no permissions to view this app - permissionError = true - } - } else { - // The user is not logged in, redirect them to login - const returnUrl = `${window.location.pathname}${window.location.hash}` - CookieUtils.setCookie(Constants.Cookies.ReturnUrl, returnUrl) - window.location = "/builder/auth/login" - } - } - } - - $: isDevPreview = $appStore.isDevApp && !$builderStore.inBuilder {#if dataLoaded} @@ -97,19 +94,11 @@ dir="ltr" class="spectrum spectrum--medium {$themeStore.theme}" > - {#if permissionError} -
- - {@html ErrorSVG} - You don't have permission to use this app - Ask your administrator to grant you access - -
- {:else if $screenStore.activeLayout} + - - - + + + {#key $builderStore.selectedComponentId} @@ -127,36 +116,62 @@ >
- {#if isDevPreview} + {#if showDevTools} {/if}
- - {#key `${$screenStore.activeLayout._id}-${$builderStore.previewType}`} - - {/key} + {#if permissionError} +
+ + {@html ErrorSVG} + + You don't have permission to use this app + + + Ask your administrator to grant you access + + +
+ {:else if !$screenStore.activeLayout} +
+ + {@html ErrorSVG} + + Something went wrong rendering your app + + + Get in touch with support if this issue persists + + +
+ {:else} + + {#key $screenStore.activeLayout._id} + + {/key} - -
+ +
- -
+ +
- - - - - + + + + + + {/if} - {#if $appStore.isDevApp && !$builderStore.inBuilder} + {#if showDevTools} {/if}
@@ -173,11 +188,11 @@ {/if}
- - - + + + - {/if} +
{/if} @@ -226,7 +241,6 @@ } .error { - position: absolute; width: 100%; height: 100%; display: grid; @@ -235,23 +249,19 @@ text-align: center; padding: 20px; } - .error :global(svg) { fill: var(--spectrum-global-color-gray-500); width: 80px; height: 80px; } - .error :global(h1), .error :global(p) { color: var(--spectrum-global-color-gray-800); } - .error :global(p) { font-style: italic; margin-top: -0.5em; } - .error :global(h1) { font-weight: 400; } @@ -261,12 +271,10 @@ #clip-root.preview { padding: 2px; } - #clip-root.tablet-preview { width: calc(1024px + 6px); height: calc(768px + 6px); } - #clip-root.mobile-preview { width: calc(390px + 6px); height: calc(844px + 6px); diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte index c196e2ff64..808bfdae07 100644 --- a/packages/client/src/components/Component.svelte +++ b/packages/client/src/components/Component.svelte @@ -20,9 +20,9 @@ } from "utils/componentProps" import { builderStore, devToolsStore, componentStore, appStore } from "stores" import { Helpers } from "@budibase/bbui" - import Manifest from "manifest.json" import { getActiveConditions, reduceConditionActions } from "utils/conditions" import Placeholder from "components/app/Placeholder.svelte" + import ScreenPlaceholder from "components/app/ScreenPlaceholder.svelte" import ComponentPlaceholder from "components/app/ComponentPlaceholder.svelte" export let instance = {} @@ -90,7 +90,8 @@ // Extract component instance info $: children = instance._children || [] $: id = instance._id - $: name = instance._instanceName + $: name = isScreen ? "Screen" : instance._instanceName + $: icon = definition?.icon // Determine if the component is selected or is part of the critical path // leading to the selected component @@ -109,9 +110,7 @@ // Interactive components can be selected, dragged and highlighted inside // the builder preview $: builderInteractive = - $builderStore.inBuilder && - ($builderStore.previewType === "layout" || insideScreenslot) && - !isBlock + $builderStore.inBuilder && insideScreenslot && !isBlock $: devToolsInteractive = $devToolsStore.allowSelection && !isBlock $: interactive = builderInteractive || devToolsInteractive $: editing = editable && selected && $builderStore.editMode @@ -141,6 +140,9 @@ // Determine and apply settings to the component $: applySettings(staticSettings, enrichedSettings, conditionalSettings) + // Scroll the selected element into view + $: selected && scrollIntoView() + // Update component context $: store.set({ id, @@ -175,8 +177,9 @@ } // Pull definition and constructor - constructor = getComponentConstructor(instance._component) - definition = getComponentDefinition(instance._component) + const component = instance._component + constructor = getComponentConstructor(component) + definition = componentStore.actions.getComponentDefinition(component) if (!definition) { return } @@ -236,19 +239,12 @@ const getComponentConstructor = component => { const split = component?.split("/") const name = split?.[split.length - 1] - if (name === "screenslot" && $builderStore.previewType !== "layout") { + if (name === "screenslot" && !insideScreenslot) { return Router } return AppComponents[name] } - // Gets this component's definition from the manifest - const getComponentDefinition = component => { - const prefix = "@budibase/standard-components/" - const type = component?.replace(prefix, "") - return type ? Manifest[type] : null - } - const getSettingsDefinitionMap = settingsDefinition => { let map = {} settingsDefinition?.forEach(setting => { @@ -402,6 +398,19 @@ } } + const scrollIntoView = () => { + const node = document.getElementsByClassName(id)?.[0]?.childNodes[0] + if (!node) { + return + } + node.style.scrollMargin = "100px" + node.scrollIntoView({ + behavior: "smooth", + block: "start", + inline: "start", + }) + } + onMount(() => { if ( $appStore.isDevApp && @@ -438,22 +447,25 @@ class:block={isBlock} data-id={id} data-name={name} + data-icon={icon} > - {#if hasMissingRequiredSettings} - - {:else} - - {#if children.length} - {#each children as child (child._id)} - - {/each} - {:else if emptyState} + + {#if hasMissingRequiredSettings} + + {:else if children.length} + {#each children as child (child._id)} + + {/each} + {:else if emptyState} + {#if isScreen} + + {:else} - {:else if isBlock} - {/if} - - {/if} + {:else if isBlock} + + {/if} +
{/if} diff --git a/packages/client/src/components/CustomThemeWrapper.svelte b/packages/client/src/components/CustomThemeWrapper.svelte index c656b09306..919aa13926 100644 --- a/packages/client/src/components/CustomThemeWrapper.svelte +++ b/packages/client/src/components/CustomThemeWrapper.svelte @@ -16,6 +16,7 @@ /* Buttons */ --spectrum-semantic-cta-color-background-default: var(--primaryColor); --spectrum-semantic-cta-color-background-hover: var(--primaryColorHover); + --spectrum-semantic-cta-color-background-down: var(--primaryColorHover); --spectrum-button-primary-s-border-radius: var(--buttonBorderRadius); --spectrum-button-primary-m-border-radius: var(--buttonBorderRadius); --spectrum-button-primary-l-border-radius: var(--buttonBorderRadius); diff --git a/packages/client/src/components/Screen.svelte b/packages/client/src/components/Screen.svelte index 17f068e04f..3ec8d1ea52 100644 --- a/packages/client/src/components/Screen.svelte +++ b/packages/client/src/components/Screen.svelte @@ -1,21 +1,36 @@ diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte index 4df9087904..58b2797162 100644 --- a/packages/client/src/components/app/Layout.svelte +++ b/packages/client/src/components/app/Layout.svelte @@ -2,13 +2,16 @@ import { getContext, setContext } from "svelte" import { writable } from "svelte/store" import { Heading, Icon } from "@budibase/bbui" - import { FieldTypes } from "../../constants" + import { FieldTypes } from "constants" import active from "svelte-spa-router/active" + import { RoleUtils } from "@budibase/frontend-core" - const { routeStore, styleable, linkable, builderStore } = getContext("sdk") + const sdk = getContext("sdk") + const { routeStore, styleable, linkable, builderStore, currentRole } = sdk const component = getContext("component") const context = getContext("context") + // Legacy props which must remain unchanged for backwards compatibility export let title export let hideTitle = false export let logoUrl @@ -18,18 +21,27 @@ export let links export let width = "Large" - const navigationClasses = { + // New props from new design UI + export let navBackground + export let navTextColor + export let navWidth + export let pageWidth + + const NavigationClasses = { Top: "top", Left: "left", None: "none", } - const widthClasses = { + const WidthClasses = { Max: "max", Large: "l", Medium: "m", Small: "s", + "Extra small": "xs", } + let mobileOpen = false + // Set some layout context. This isn't used in bindings but can be used // determine things about the current app layout. $: mobile = $context.device.mobile @@ -40,18 +52,45 @@ }) setContext("layout", store) - // Permanently go into peek mode if we ever get the peek flag - let isPeeking = false + $: validLinks = getValidLinks(links, $currentRole) + $: typeClass = NavigationClasses[navigation] || NavigationClasses.None + $: navWidthClass = WidthClasses[navWidth || width] || WidthClasses.Large + $: pageWidthClass = WidthClasses[pageWidth || width] || WidthClasses.Large + $: navStyle = getNavStyle( + navBackground, + navTextColor, + $context.device.width, + $context.device.height + ) + + // Scroll navigation into view if selected $: { - if ($routeStore.queryParams?.peek) { - isPeeking = true + if ( + $builderStore.inBuilder && + $builderStore.selectedComponentId === "navigation" + ) { + const node = document.getElementsByClassName("nav-wrapper")?.[0] + if (node) { + node.style.scrollMargin = "100px" + node.scrollIntoView({ + behavior: "smooth", + block: "start", + inline: "start", + }) + } } } - $: validLinks = links?.filter(link => link.text && link.url) || [] - $: typeClass = navigationClasses[navigation] || "none" - $: widthClass = widthClasses[width] || "l" - let mobileOpen = false + const getValidLinks = (allLinks, role) => { + // Strip links missing required info + let validLinks = (allLinks || []).filter(link => link.text && link.url) + + // Filter to only links allowed by the current role + const priority = RoleUtils.getRolePriority(role) + return validLinks.filter(link => { + return !link.roleId || RoleUtils.getRolePriority(link.roleId) <= priority + }) + } const isInternal = url => { return url.startsWith("/") @@ -83,6 +122,17 @@ return navigation === "Top" ? "137px" : "0px" } } + + const getNavStyle = (backgroundColor, textColor, width, height) => { + let style = `--width:${width}px; --height:${height}px;` + if (backgroundColor) { + style += `--navBackground:${backgroundColor};` + } + if (textColor) { + style += `--navTextColor:${textColor};` + } + return style + }
{#if typeClass !== "none"}
-
-
+
+
+
+ {#if validLinks?.length} +
+ (mobileOpen = !mobileOpen)} + /> +
+ {/if} + +
+ +
+
+
(mobileOpen = false)} + /> {#if validLinks?.length} -
- (mobileOpen = !mobileOpen)} - /> +
+ {#each validLinks as { text, url }} + {#if isInternal(url)} + + {text} + + {:else} + + {text} + + {/if} + {/each} +
+ (mobileOpen = false)} + /> +
{/if} - -
- -
-
(mobileOpen = false)} - /> - {#if validLinks?.length} -
- {#each validLinks as { text, url }} - {#if isInternal(url)} - - {text} - - {:else} - - {text} - - {/if} - {/each} -
- (mobileOpen = false)} - /> -
-
- {/if}
{/if}
-
+
@@ -173,6 +234,9 @@ diff --git a/packages/client/src/components/context/DeviceBindingsProvider.svelte b/packages/client/src/components/context/DeviceBindingsProvider.svelte index cdc19c74c2..ba2d9c2dc9 100644 --- a/packages/client/src/components/context/DeviceBindingsProvider.svelte +++ b/packages/client/src/components/context/DeviceBindingsProvider.svelte @@ -21,11 +21,11 @@ } onMount(() => { - resizeObserver.observe(document.getElementById("app-root")) + resizeObserver.observe(document.getElementById("clip-root")) }) onDestroy(() => { - resizeObserver.unobserve(document.getElementById("app-root")) + resizeObserver.unobserve(document.getElementById("clip-root")) }) diff --git a/packages/client/src/components/context/QueryParamsProvider.svelte b/packages/client/src/components/context/QueryParamsProvider.svelte new file mode 100644 index 0000000000..7f111a7043 --- /dev/null +++ b/packages/client/src/components/context/QueryParamsProvider.svelte @@ -0,0 +1,8 @@ + + + + + diff --git a/packages/client/src/components/context/UserBindingsProvider.svelte b/packages/client/src/components/context/UserBindingsProvider.svelte index f7605122ae..98769cf76a 100644 --- a/packages/client/src/components/context/UserBindingsProvider.svelte +++ b/packages/client/src/components/context/UserBindingsProvider.svelte @@ -1,6 +1,6 @@ - + diff --git a/packages/client/src/components/devtools/DevToolsStatsTab.svelte b/packages/client/src/components/devtools/DevToolsStatsTab.svelte index ab029db815..b20b9fafa0 100644 --- a/packages/client/src/components/devtools/DevToolsStatsTab.svelte +++ b/packages/client/src/components/devtools/DevToolsStatsTab.svelte @@ -14,8 +14,6 @@ value={`${$appStore.clientLoadTime} ms`} /> {/if} - - { @@ -54,6 +55,7 @@ width={dimensions.width} height={dimensions.height} {text} + {icon} {zIndex} {color} {transition} diff --git a/packages/client/src/components/preview/Indicator.svelte b/packages/client/src/components/preview/Indicator.svelte index ee969e3395..1cb669bdc4 100644 --- a/packages/client/src/components/preview/Indicator.svelte +++ b/packages/client/src/components/preview/Indicator.svelte @@ -1,18 +1,20 @@
- {#if text} -
- {text} + {#if text || icon} +
+ {#if icon} + + {/if} + {#if text} +
+ {text} +
+ {/if}
{/if}
diff --git a/packages/client/src/components/preview/IndicatorSet.svelte b/packages/client/src/components/preview/IndicatorSet.svelte index 6fcf552d21..b9113f9532 100644 --- a/packages/client/src/components/preview/IndicatorSet.svelte +++ b/packages/client/src/components/preview/IndicatorSet.svelte @@ -13,6 +13,8 @@ let indicators = [] let interval let text + let icon + $: visibleIndicators = indicators.filter(x => x.visible) $: offset = $builderStore.inBuilder ? 0 : 2 @@ -57,6 +59,9 @@ if (prefix) { text = `${prefix} ${text}` } + if (parents[0].dataset.icon) { + icon = parents[0].dataset.icon + } } // Batch reads to minimize reflow @@ -121,6 +126,7 @@ width={indicator.width} height={indicator.height} text={idx === 0 ? text : null} + icon={idx === 0 ? icon : null} {transition} {zIndex} {color} diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte index 154a115c98..bc227c87d9 100644 --- a/packages/client/src/components/preview/SettingsBar.svelte +++ b/packages/client/src/components/preview/SettingsBar.svelte @@ -6,7 +6,7 @@ import { builderStore, componentStore } from "stores" import { domDebounce } from "utils/domDebounce" - const verticalOffset = 28 + const verticalOffset = 36 const horizontalOffset = 2 let top = 0 diff --git a/packages/client/src/index.js b/packages/client/src/index.js index 1acf25f21d..d00277c157 100644 --- a/packages/client/src/index.js +++ b/packages/client/src/index.js @@ -1,6 +1,7 @@ import ClientApp from "./components/ClientApp.svelte" -import { builderStore, appStore } from "./stores" +import { builderStore, appStore, devToolsStore } from "./stores" import loadSpectrumIcons from "@budibase/bbui/spectrum-icons-rollup.js" +import { get } from "svelte/store" // Initialise spectrum icons loadSpectrumIcons() @@ -15,15 +16,20 @@ const loadBudibase = () => { screen: window["##BUDIBASE_PREVIEW_SCREEN##"], selectedComponentId: window["##BUDIBASE_SELECTED_COMPONENT_ID##"], previewId: window["##BUDIBASE_PREVIEW_ID##"], - previewType: window["##BUDIBASE_PREVIEW_TYPE##"], theme: window["##BUDIBASE_PREVIEW_THEME##"], customTheme: window["##BUDIBASE_PREVIEW_CUSTOM_THEME##"], previewDevice: window["##BUDIBASE_PREVIEW_DEVICE##"], + navigation: window["##BUDIBASE_PREVIEW_NAVIGATION##"], }) // Set app ID - this window flag is set by both the preview and the real // server rendered app HTML - appStore.actions.setAppID(window["##BUDIBASE_APP_ID##"]) + appStore.actions.setAppId(window["##BUDIBASE_APP_ID##"]) + + // Enable dev tools or not. We need to be using a dev app and not inside + // the builder preview to enable them. + const enableDevTools = !get(builderStore).inBuilder && get(appStore).isDevApp + devToolsStore.actions.setEnabled(enableDevTools) // Create app if one hasn't been created yet if (!app) { diff --git a/packages/client/src/sdk.js b/packages/client/src/sdk.js index db31da7164..13190e0a4f 100644 --- a/packages/client/src/sdk.js +++ b/packages/client/src/sdk.js @@ -8,6 +8,7 @@ import { uploadStore, rowSelectionStore, componentStore, + currentRole, } from "stores" import { styleable } from "utils/styleable" import { linkable } from "utils/linkable" @@ -26,6 +27,7 @@ export default { builderStore, uploadStore, componentStore, + currentRole, styleable, linkable, getAction, diff --git a/packages/client/src/stores/app.js b/packages/client/src/stores/app.js index 2c2ead66c4..f3fd271639 100644 --- a/packages/client/src/stores/app.js +++ b/packages/client/src/stores/app.js @@ -1,5 +1,5 @@ import { API } from "api" -import { get, writable } from "svelte/store" +import { get, writable, derived } from "svelte/store" const initialState = { appId: null, @@ -9,6 +9,12 @@ const initialState = { const createAppStore = () => { const store = writable(initialState) + const derivedStore = derived(store, $store => { + return { + ...$store, + isDevApp: $store.appId?.startsWith("app_dev"), + } + }) // Fetches the app definition including screens, layouts and theme const fetchAppDefinition = async () => { @@ -22,7 +28,6 @@ const createAppStore = () => { ...initialState, ...appDefinition, appId: appDefinition?.application?.appId, - isDevApp: appId.startsWith("app_dev"), }) } catch (error) { store.set(initialState) @@ -30,7 +35,7 @@ const createAppStore = () => { } // Sets the initial app ID - const setAppID = id => { + const setAppId = id => { store.update(state => { if (state) { state.appId = id @@ -42,8 +47,8 @@ const createAppStore = () => { } return { - subscribe: store.subscribe, - actions: { setAppID, fetchAppDefinition }, + subscribe: derivedStore.subscribe, + actions: { setAppId, fetchAppDefinition }, } } diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js index f641bb56e6..94436b53b7 100644 --- a/packages/client/src/stores/builder.js +++ b/packages/client/src/stores/builder.js @@ -8,17 +8,18 @@ const dispatchEvent = (type, data = {}) => { const createBuilderStore = () => { const initialState = { inBuilder: false, - layout: null, screen: null, selectedComponentId: null, editMode: false, previewId: null, - previewType: null, - selectedPath: [], theme: null, customTheme: null, previewDevice: "desktop", isDragging: false, + navigation: null, + + // Legacy - allow the builder to specify a layout + layout: null, } const store = writable(initialState) const actions = { @@ -46,9 +47,6 @@ const createBuilderStore = () => { notifyLoaded: () => { dispatchEvent("preview-loaded") }, - setSelectedPath: path => { - store.update(state => ({ ...state, selectedPath: path })) - }, moveComponent: (componentId, destinationComponentId, mode) => { dispatchEvent("move-component", { componentId, @@ -68,6 +66,12 @@ const createBuilderStore = () => { } store.update(state => ({ ...state, editMode: enabled })) }, + clickNav: () => { + dispatchEvent("click-nav") + }, + requestAddComponent: () => { + dispatchEvent("request-add-component") + }, highlightSetting: setting => { dispatchEvent("highlight-setting", { setting }) }, diff --git a/packages/client/src/stores/components.js b/packages/client/src/stores/components.js index 4f972b23c7..a7426113e2 100644 --- a/packages/client/src/stores/components.js +++ b/packages/client/src/stores/components.js @@ -18,9 +18,9 @@ const createComponentStore = () => { // Derive the selected component instance and definition let asset - const { layout, screen, previewType, selectedComponentId } = $builderState + const { screen, selectedComponentId } = $builderState if ($builderState.inBuilder) { - asset = previewType === "layout" ? layout : screen + asset = screen } else { asset = $screenState.activeScreen } @@ -67,6 +67,12 @@ const createComponentStore = () => { return findComponentById(asset?.props, id) } + const getComponentDefinition = type => { + const prefix = "@budibase/standard-components/" + type = type?.replace(prefix, "") + return type ? Manifest[type] : null + } + return { ...derivedStore, actions: { @@ -74,6 +80,7 @@ const createComponentStore = () => { unregisterInstance, isComponentRegistered, getComponentById, + getComponentDefinition, }, } } diff --git a/packages/client/src/stores/devTools.js b/packages/client/src/stores/devTools.js index 6d631080ab..4abfe33b7b 100644 --- a/packages/client/src/stores/devTools.js +++ b/packages/client/src/stores/devTools.js @@ -1,23 +1,29 @@ -import { get } from "svelte/store" import { createLocalStorageStore } from "@budibase/frontend-core" -import { appStore } from "./app" import { initialise } from "./initialise" import { authStore } from "./auth" +import { API } from "../api" const initialState = { + enabled: false, visible: false, allowSelection: false, role: null, } const createDevToolStore = () => { - const localStorageKey = `${get(appStore).appId}.devTools` - const store = createLocalStorageStore(localStorageKey, initialState) + const store = createLocalStorageStore("bb-devtools", initialState) + + const setEnabled = enabled => { + store.update(state => ({ + ...state, + enabled, + })) + } const setVisible = visible => { store.update(state => ({ ...state, - visible: visible, + visible, })) } @@ -33,14 +39,14 @@ const createDevToolStore = () => { ...state, role: role === "self" ? null : role, })) - // location.reload() + API.invalidateCache() await authStore.actions.fetchUser() await initialise() } return { subscribe: store.subscribe, - actions: { setVisible, setAllowSelection, changeRole }, + actions: { setEnabled, setVisible, setAllowSelection, changeRole }, } } diff --git a/packages/client/src/stores/index.js b/packages/client/src/stores/index.js index 280a32e069..e28fbaee42 100644 --- a/packages/client/src/stores/index.js +++ b/packages/client/src/stores/index.js @@ -1,3 +1,7 @@ +import { derived } from "svelte/store" +import { devToolsStore } from "./devTools.js" +import { authStore } from "./auth.js" + export { authStore } from "./auth" export { appStore } from "./app" export { notificationStore } from "./notification" @@ -13,8 +17,17 @@ export { devToolsStore } from "./devTools" export { componentStore } from "./components" export { uploadStore } from "./uploads.js" export { rowSelectionStore } from "./rowSelection.js" + // Context stores are layered and duplicated, so it is not a singleton export { createContextStore } from "./context" // Initialises an app by loading screens and routes export { initialise } from "./initialise" + +// Derive the current role of the logged-in user +export const currentRole = derived( + [devToolsStore, authStore], + ([$devToolsStore, $authStore]) => { + return ($devToolsStore.enabled && $devToolsStore.role) || $authStore?.roleId + } +) diff --git a/packages/client/src/stores/screens.js b/packages/client/src/stores/screens.js index 9635f2b5a0..84cd4000c1 100644 --- a/packages/client/src/stores/screens.js +++ b/packages/client/src/stores/screens.js @@ -1,78 +1,118 @@ -import { derived, get } from "svelte/store" +import { derived } from "svelte/store" import { routeStore } from "./routes" import { builderStore } from "./builder" import { appStore } from "./app" -import { - findComponentPathById, - findChildrenByType, - findComponentById, -} from "../utils/components" +import { RoleUtils } from "@budibase/frontend-core" const createScreenStore = () => { const store = derived( [appStore, routeStore, builderStore], ([$appStore, $routeStore, $builderStore]) => { let activeLayout, activeScreen - let layouts, screens + let screens + if ($builderStore.inBuilder) { // Use builder defined definitions if inside the builder preview - activeLayout = $builderStore.layout activeScreen = $builderStore.screen - layouts = [activeLayout] screens = [activeScreen] - } else { - activeLayout = { props: { _component: "screenslot" } } + // Legacy - allow the builder to specify a layout + if ($builderStore.layout) { + activeLayout = $builderStore.layout + } + } else { // Find the correct screen by matching the current route - screens = $appStore.screens - layouts = $appStore.layouts + screens = $appStore.screens || [] if ($routeStore.activeRoute) { activeScreen = screens.find( screen => screen._id === $routeStore.activeRoute.screenId ) } + + // Legacy - find the custom layout for the selected screen if (activeScreen) { - activeLayout = layouts.find( + const screenLayout = $appStore.layouts?.find( layout => layout._id === activeScreen.layoutId ) + if (screenLayout) { + activeLayout = screenLayout + } } } - return { layouts, screens, activeLayout, activeScreen } + + // Assign ranks to screens, preferring higher roles and home screens + screens.forEach(screen => { + const roleId = screen.routing.roleId + let rank = RoleUtils.getRolePriority(roleId) + if (screen.routing.homeScreen) { + rank += 100 + } + screen.rank = rank + }) + + // Sort screens so the best route is first + screens = screens.sort((a, b) => { + // First sort by rank + if (a.rank !== b.rank) { + return a.rank > b.rank ? -1 : 1 + } + // Then sort alphabetically + return a.routing.route < b.routing.route ? -1 : 1 + }) + + // If we don't have a legacy custom layout, build a layout structure + // from the screen navigation settings + if (!activeLayout) { + let navigationSettings = { + navigation: "None", + pageWidth: activeScreen?.width || "Large", + } + if (activeScreen?.showNavigation) { + navigationSettings = { + ...navigationSettings, + ...($builderStore.navigation || $appStore.application?.navigation), + } + + // Default navigation to top + if (!navigationSettings.navigation) { + navigationSettings.navigation = "Top" + } + + // Default title to app name + if (!navigationSettings.title && !navigationSettings.hideTitle) { + navigationSettings.title = $appStore.application?.name + } + } + activeLayout = { + _id: "layout", + props: { + _component: "@budibase/standard-components/layout", + _children: [ + { + _component: "screenslot", + _id: "screenslot", + _styles: { + normal: { + flex: "1 1 auto", + display: "flex", + "flex-direction": "column", + "justify-content": "flex-start", + "align-items": "stretch", + }, + }, + }, + ], + ...navigationSettings, + }, + } + } + + return { screens, activeLayout, activeScreen } } ) - // Utils to parse component definitions - const actions = { - findComponentById: componentId => { - const { activeScreen, activeLayout } = get(store) - let result = findComponentById(activeScreen?.props, componentId) - if (result) { - return result - } - return findComponentById(activeLayout?.props) - }, - findComponentPathById: componentId => { - const { activeScreen, activeLayout } = get(store) - let result = findComponentPathById(activeScreen?.props, componentId) - if (result) { - return result - } - return findComponentPathById(activeLayout?.props) - }, - findChildrenByType: (componentId, type) => { - const component = actions.findComponentById(componentId) - if (!component || !component._children) { - return null - } - let children = [] - findChildrenByType(component, type, children) - return children - }, - } - return { subscribe: store.subscribe, - actions, } } diff --git a/packages/frontend-core/src/api/attachments.js b/packages/frontend-core/src/api/attachments.js index e2eb348f9d..e3b1b74e5b 100644 --- a/packages/frontend-core/src/api/attachments.js +++ b/packages/frontend-core/src/api/attachments.js @@ -48,7 +48,6 @@ export const buildAttachmentEndpoints = API => { * @param data the file to upload */ externalUpload: async ({ datasourceId, bucket, key, data }) => { - console.log(API) const { signedUrl, publicUrl } = await getSignedDatasourceURL({ datasourceId, bucket, diff --git a/packages/frontend-core/src/api/index.js b/packages/frontend-core/src/api/index.js index 164f51aae5..fddbffde4a 100644 --- a/packages/frontend-core/src/api/index.js +++ b/packages/frontend-core/src/api/index.js @@ -57,6 +57,7 @@ export const createAPIClient = config => { ...defaultAPIClientConfig, ...config, } + let cache = {} // Generates an error object from an API response const makeErrorFromResponse = async (response, method) => { @@ -139,6 +140,7 @@ export const createAPIClient = config => { credentials: "same-origin", }) } catch (error) { + delete cache[url] throw makeError("Failed to send request", { url, method }) } @@ -151,9 +153,11 @@ export const createAPIClient = config => { return await response.json() } } catch (error) { + delete cache[url] return null } } else { + delete cache[url] throw await makeErrorFromResponse(response, method) } } @@ -161,7 +165,6 @@ export const createAPIClient = config => { // Performs an API call to the server and caches the response. // Future invocation for this URL will return the cached result instead of // hitting the server again. - let cache = {} const makeCachedApiCall = async params => { const identifier = params.url if (!identifier) { @@ -206,6 +209,9 @@ export const createAPIClient = config => { error: message => { throw makeError(message) }, + invalidateCache: () => { + cache = {} + }, } // Attach all endpoints diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index f69590f720..00af4127e4 100644 --- a/packages/frontend-core/src/constants.js +++ b/packages/frontend-core/src/constants.js @@ -68,6 +68,15 @@ export const TableNames = { */ export const ApiVersion = "1" +// Role IDs +export const Roles = { + ADMIN: "ADMIN", + POWER: "POWER", + BASIC: "BASIC", + PUBLIC: "PUBLIC", + BUILDER: "BUILDER", +} + /** * Maximum minimum range for SQL number values */ diff --git a/packages/frontend-core/src/utils/index.js b/packages/frontend-core/src/utils/index.js index 6755940289..3ba3bf0fd4 100644 --- a/packages/frontend-core/src/utils/index.js +++ b/packages/frontend-core/src/utils/index.js @@ -1,4 +1,5 @@ export * as LuceneUtils from "./lucene" export * as JSONUtils from "./json" export * as CookieUtils from "./cookies" +export * as RoleUtils from "./roles" export * as Utils from "./utils" diff --git a/packages/frontend-core/src/utils/roles.js b/packages/frontend-core/src/utils/roles.js new file mode 100644 index 0000000000..5c4aff2cf5 --- /dev/null +++ b/packages/frontend-core/src/utils/roles.js @@ -0,0 +1,22 @@ +import { Roles } from "../constants" + +const RolePriorities = { + [Roles.ADMIN]: 4, + [Roles.POWER]: 3, + [Roles.BASIC]: 2, + [Roles.PUBLIC]: 1, +} +const RoleColours = { + [Roles.ADMIN]: "var(--spectrum-global-color-static-seafoam-400)", + [Roles.POWER]: "var(--spectrum-global-color-static-purple-400)", + [Roles.BASIC]: "var(--spectrum-global-color-static-magenta-400)", + [Roles.PUBLIC]: "var(--spectrum-global-color-static-yellow-400)", +} + +export const getRolePriority = roleId => { + return RolePriorities[roleId] ?? 0 +} + +export const getRoleColour = roleId => { + return RoleColours[roleId] ?? "rgb(20, 115, 230)" +} diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index df461f40f8..cdde8542fd 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -276,16 +276,26 @@ const performAppCreate = async (ctx: any) => { updatedAt: new Date().toISOString(), createdAt: new Date().toISOString(), status: AppStatus.DEV, + navigation: { + navigation: "Top", + title: name, + navWidth: "Large", + navBackground: "var(--spectrum-global-color-gray-100)", + links: [ + { + url: "/home", + text: "Home", + }, + ], + }, + theme: "spectrum--light", + customTheme: { + buttonBorderRadius: "16px", + }, } const response = await db.put(newApplication, { force: true }) newApplication._rev = response.rev - // Only create the default home screens and layout if we aren't importing - // an app - if (useTemplate !== "true") { - await createEmptyAppPackage(ctx, newApplication) - } - /* istanbul ignore next */ if (!env.isTest()) { await createApp(appId) @@ -565,15 +575,3 @@ const updateAppPackage = async (appPackage: any, appId: any) => { return newAppPackage }) } - -const createEmptyAppPackage = async (ctx: any, app: any) => { - const db = getAppDB() - - let screensAndLayouts = [] - for (let layout of BASE_LAYOUTS) { - const cloned = cloneDeep(layout) - screensAndLayouts.push(await processObject(cloned, app)) - } - - await db.bulkDocs(screensAndLayouts) -} diff --git a/packages/server/src/api/controllers/layout.js b/packages/server/src/api/controllers/layout.js index c7d3216cfc..f3f52d4ef0 100644 --- a/packages/server/src/api/controllers/layout.js +++ b/packages/server/src/api/controllers/layout.js @@ -1,7 +1,4 @@ -const { - EMPTY_LAYOUT, - BASE_LAYOUT_PROP_IDS, -} = require("../../constants/layouts") +const { EMPTY_LAYOUT } = require("../../constants/layouts") const { generateLayoutID, getScreenParams } = require("../../db/utils") const { getAppDB } = require("@budibase/backend-core/context") const { events } = require("@budibase/backend-core") @@ -32,19 +29,15 @@ exports.destroy = async function (ctx) { const layoutId = ctx.params.layoutId, layoutRev = ctx.params.layoutRev - if (Object.values(BASE_LAYOUT_PROP_IDS).includes(layoutId)) { - ctx.throw(400, "Cannot delete a built-in layout") - } else { - const layoutsUsedByScreens = ( - await db.allDocs( - getScreenParams(null, { - include_docs: true, - }) - ) - ).rows.map(element => element.doc.layoutId) - if (layoutsUsedByScreens.includes(layoutId)) { - ctx.throw(400, "Cannot delete a layout that's being used by a screen") - } + const layoutsUsedByScreens = ( + await db.allDocs( + getScreenParams(null, { + include_docs: true, + }) + ) + ).rows.map(element => element.doc.layoutId) + if (layoutsUsedByScreens.includes(layoutId)) { + ctx.throw(400, "Cannot delete a layout that's being used by a screen") } await db.remove(layoutId, layoutRev) diff --git a/packages/server/src/api/routes/tests/application.spec.js b/packages/server/src/api/routes/tests/application.spec.js index b80e874d39..2620547298 100644 --- a/packages/server/src/api/routes/tests/application.spec.js +++ b/packages/server/src/api/routes/tests/application.spec.js @@ -59,14 +59,13 @@ describe("/applications", () => { expect(events.app.templateImported).toBeCalledTimes(1) }) - it("creates app from file", async () => { const res = await request .post("/api/applications") .field("name", "My App") .field("useTemplate", "true") .set(config.defaultHeaders()) - .attach('templateFile', 'src/api/routes/tests/data/export.txt') + .attach("templateFile", "src/api/routes/tests/data/export.txt") .expect("Content-Type", /json/) .expect(200) expect(res.body._id).toBeDefined() @@ -107,8 +106,7 @@ describe("/applications", () => { .set(config.defaultHeaders()) .expect("Content-Type", /json/) .expect(200) - // should have empty packages - expect(res.body.layouts.length).toEqual(2) + expect(res.body.libraries.length).toEqual(1) }) }) @@ -120,7 +118,7 @@ describe("/applications", () => { .expect("Content-Type", /json/) .expect(200) expect(res.body.application).toBeDefined() - expect(res.body.layouts.length).toEqual(2) + expect(res.body.application.appId).toEqual(config.getAppId()) }) }) @@ -171,7 +169,7 @@ describe("/applications", () => { .set(config.defaultHeaders()) .expect("Content-Type", /json/) .expect(200) - expect(events.app.versionUpdated).toBeCalledTimes(1) + expect(events.app.versionUpdated).toBeCalledTimes(1) }) it("should be able to revert the app client library version", async () => { // We need to first update the version so that we can then revert @@ -185,7 +183,7 @@ describe("/applications", () => { .set(config.defaultHeaders()) .expect("Content-Type", /json/) .expect(200) - expect(events.app.versionReverted).toBeCalledTimes(1) + expect(events.app.versionReverted).toBeCalledTimes(1) }) }) diff --git a/packages/server/src/api/routes/utils/validators.js b/packages/server/src/api/routes/utils/validators.js index 9567db1ce2..1a094e380b 100644 --- a/packages/server/src/api/routes/utils/validators.js +++ b/packages/server/src/api/routes/utils/validators.js @@ -9,6 +9,7 @@ const Joi = require("joi") const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("") const OPTIONAL_NUMBER = Joi.number().optional().allow(null) +const OPTIONAL_BOOLEAN = Joi.boolean().optional().allow(null) exports.tableValidator = () => { // prettier-ignore @@ -160,9 +161,12 @@ exports.screenValidator = () => { // prettier-ignore return joiValidator.body(Joi.object({ name: Joi.string().required(), + showNavigation: OPTIONAL_BOOLEAN, + width: OPTIONAL_STRING, routing: Joi.object({ route: Joi.string().required(), roleId: Joi.string().required().allow(""), + homeScreen: OPTIONAL_BOOLEAN, }).required().unknown(true), props: Joi.object({ _id: Joi.string().required(), diff --git a/packages/server/src/middleware/currentapp.js b/packages/server/src/middleware/currentapp.js index 8ddf608572..61be834d45 100644 --- a/packages/server/src/middleware/currentapp.js +++ b/packages/server/src/middleware/currentapp.js @@ -74,6 +74,10 @@ module.exports = async (ctx, next) => { try { await getRole(roleHeader) roleId = roleHeader + + // Delete admin and builder flags so that the specified role is honoured + delete ctx.user.builder + delete ctx.user.admin } catch (error) { // Swallow error and do nothing } diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 7c7a225e02..5174aa346f 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1080,11 +1080,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.219": - version "1.0.219" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.219.tgz#430d23f25c9c6b275d3448f6d88a26a8c6196e3e" - integrity sha512-nU1nAkW7Pi8LLx9UfTff+kgDUV/IC64+iurVoQ7WKPI580M5RDCdHjig8R03OStRSCdcP1xRdUb1Ge2IpByfMg== +"@budibase/backend-core@1.0.220-alpha.0": + version "1.0.220-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.220-alpha.0.tgz#cbeb9f54fb0b702c45585b27d5f0f74c4c19bbc9" + integrity sha512-UnMZUpkp3OQloFP1muxnY2OZZMqJJszt9/u36omtqnBbZV6UzBi0w3g02aW4V9jGiLzALo5p6+gBl9UO7gKWpQ== dependencies: + "@budibase/types" "^1.0.220-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1100,6 +1101,7 @@ passport-google-oauth "2.0.0" passport-jwt "4.0.0" passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" posthog-node "1.3.0" pouchdb "7.3.0" pouchdb-find "7.2.2" @@ -1160,12 +1162,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.0.219": - version "1.0.219" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.219.tgz#a8406aaf7137db43c290f0a3eb005650330ca6fb" - integrity sha512-BH7sBHuGEz9UP6bCt/a22pZskvvyk/lqMdLYSKGAEcoj7AnJB6MW2QKSIXPmLpT1OmdrYGM+49X0wtm9qWx/Lg== +"@budibase/pro@1.0.220-alpha.0": + version "1.0.220-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.220-alpha.0.tgz#93302a1e8de63e8fcd379cfab2ac8626fa4f1509" + integrity sha512-4GqR5hIhnGOEZm2dKE6N3/I3wd/bA8GlBTTvdw+F6FmgGk8wkL4QFtenJ2Qo23MVyYeBvUSt+98X+/OGtT8llQ== dependencies: - "@budibase/backend-core" "1.0.219" + "@budibase/backend-core" "1.0.220-alpha.0" + "@budibase/types" "1.0.220-alpha.0" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": @@ -1186,6 +1189,11 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" +"@budibase/types@1.0.220-alpha.0", "@budibase/types@^1.0.220-alpha.0": + version "1.0.220-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.220-alpha.0.tgz#63a928d4d1cf0465b341db1a534a5afe8e2a624f" + integrity sha512-Iad5pkO3a3wzjF3JZROBVLI9BqdoT30cPOz19wlbyOkdDxxTnSucZgfN/MHhyY67YfNEYkWmbYXJQh89FK5koA== + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -2458,24 +2466,24 @@ integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== "@tsconfig/node10@^1.0.7": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9" - integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg== + version "1.0.9" + resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" + integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA== "@tsconfig/node12@^1.0.7": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c" - integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw== + version "1.0.11" + resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" + integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== "@tsconfig/node14@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2" - integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" + integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== "@tsconfig/node16@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" - integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" + integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== "@types/accepts@*": version "1.3.5" @@ -2604,9 +2612,9 @@ integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== "@types/express-serve-static-core@^4.17.18": - version "4.17.28" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" - integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig== + version "4.17.29" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz#2a1795ea8e9e9c91b4a4bbe475034b20c1ec711c" + integrity sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q== dependencies: "@types/node" "*" "@types/qs" "*" @@ -2759,7 +2767,7 @@ "@types/bson" "*" "@types/node" "*" -"@types/node-fetch@2.6.1", "@types/node-fetch@^2.5.0": +"@types/node-fetch@2.6.1": version "2.6.1" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975" integrity sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA== @@ -2767,6 +2775,14 @@ "@types/node" "*" form-data "^3.0.0" +"@types/node-fetch@^2.5.0": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da" + integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A== + dependencies: + "@types/node" "*" + form-data "^3.0.0" + "@types/node@*", "@types/node@>=13.13.4": version "17.0.18" resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.18.tgz#3b4fed5cfb58010e3a2be4b6e74615e4847f1074" @@ -3076,22 +3092,22 @@ "@webassemblyjs/ast" "1.11.1" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356" - integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg== +"@webpack-cli/configtest@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" + integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== -"@webpack-cli/info@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea" - integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA== +"@webpack-cli/info@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" + integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe" - integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw== +"@webpack-cli/serve@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" + integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== "@xmldom/xmldom@^0.7.0": version "0.7.5" @@ -6011,9 +6027,9 @@ fast-safe-stringify@^2.0.7, fast-safe-stringify@^2.0.8: integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz#ec02ac8e01ab8a319af182dae2681213cfe9ce53" - integrity sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig== + version "1.0.4" + resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.4.tgz#bf1898ad800282a4e53c0ea9690704dd26e4298e" + integrity sha512-x6lDDm/tBAzX9kmsPcZsNbvDs3Zey3+scsxaZElS8xWLgUMAg/oFLeewfUz0mu1CblHhhsu15jGkraldkFh8KQ== fast-url-parser@^1.1.3: version "1.1.3" @@ -7338,10 +7354,10 @@ is-class-hotfix@~0.0.6: resolved "https://registry.yarnpkg.com/is-class-hotfix/-/is-class-hotfix-0.0.6.tgz#a527d31fb23279281dde5f385c77b5de70a72435" integrity sha512-0n+pzCC6ICtVr/WXnN2f03TK/3BfXY7me4cjCAqT8TYXEl0+JBRoqBo94JJHXcyDSLUeWbNX8Fvy5g5RJdAstQ== -is-core-module@^2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" - integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== +is-core-module@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" + integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== dependencies: has "^1.0.3" @@ -9751,9 +9767,9 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass@^3.0.0: - version "3.1.6" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" - integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ== + version "3.3.3" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.3.tgz#fd1f0e6c06449c10dadda72618b59c00f3d6378d" + integrity sha512-N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA== dependencies: yallist "^4.0.0" @@ -10564,6 +10580,11 @@ passport-oauth1@1.x.x: passport-strategy "1.x.x" utils-merge "1.x.x" +passport-oauth2-refresh@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4" + integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A== + passport-oauth2@1.x.x: version "1.6.1" resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b" @@ -11363,7 +11384,7 @@ raw-body@^2.2.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.8: +rc@1.2.8, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -11593,11 +11614,11 @@ regexpu-core@^5.0.1: unicode-match-property-value-ecmascript "^2.0.0" registry-auth-token@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" - integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== + version "4.2.2" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" + integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg== dependencies: - rc "^1.2.8" + rc "1.2.8" registry-url@^5.0.0: version "5.1.0" @@ -11762,11 +11783,11 @@ resolve@1.1.7: integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.9.0: - version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== dependencies: - is-core-module "^2.8.1" + is-core-module "^2.9.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -12114,7 +12135,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: simple-lru-cache@^0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz#d59cc3a193c1a5d0320f84ee732f6e4713e511dd" - integrity sha1-1ZzDoZPBpdAyD4Tucy9uRxPlEd0= + integrity sha512-uEv/AFO0ADI7d99OHDmh1QfYzQk/izT1vCmu/riQfh7qjBVUUgRT87E5s5h7CxWCA/+YoZerykpEthzVrW3LIw== simple-swizzle@^0.2.2: version "0.2.2" @@ -12745,14 +12766,14 @@ svg.draggable.js@^2.2.2: svg.easing.js@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/svg.easing.js/-/svg.easing.js-2.0.0.tgz#8aa9946b0a8e27857a5c40a10eba4091e5691f12" - integrity sha1-iqmUawqOJ4V6XEChDrpAkeVpHxI= + integrity sha512-//ctPdJMGy22YoYGV+3HEfHbm6/69LJUTAqI2/5qBvaNHZ9uUFVC82B0Pl299HzgH13rKrBgi4+XyXXyVWWthA== dependencies: svg.js ">=2.3.x" svg.filter.js@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/svg.filter.js/-/svg.filter.js-2.0.2.tgz#91008e151389dd9230779fcbe6e2c9a362d1c203" - integrity sha1-kQCOFROJ3ZIwd5/L5uLJo2LRwgM= + integrity sha512-xkGBwU+dKBzqg5PtilaTb0EYPqPfJ9Q6saVldX+5vCRy31P6TlRCP3U9NxH3HEufkKkpNgdTLBJnmhDHeTqAkw== dependencies: svg.js "^2.2.5" @@ -12969,12 +12990,12 @@ text-hex@1.0.x: text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== thenify-all@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" - integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= + integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA== dependencies: thenify ">= 3.1.0 < 4" @@ -12988,7 +13009,7 @@ thenify-all@^1.0.0: throat@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" - integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= + integrity sha512-wCVxLDcFxw7ujDxaeJC6nfl2XfHJNYs8yUYJnvMgtPEFlttP9tHSfRUv2vBe6C4hkVFPWoP1P6ZccbYjmSEkKA== throat@^6.0.1: version "6.0.1" @@ -13006,7 +13027,7 @@ through2@3.0.2: through2@^0.6.2, through2@^0.6.5: version "0.6.5" resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= + integrity sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg== dependencies: readable-stream ">=1.0.33-1 <1.1.0-0" xtend ">=4.0.0 <4.1.0-0" @@ -13022,7 +13043,7 @@ through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3: through@^2.3.6, through@^2.3.8, through@~2.3.4: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== tildify@2.0.0: version "2.0.0" @@ -13032,7 +13053,7 @@ tildify@2.0.0: timed-out@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" - integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= + integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA== timekeeper@2.2.0: version "2.2.0" @@ -13055,7 +13076,7 @@ tiny-glob@^0.2.9: tiny-queue@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz#25a67f2c6e253b2ca941977b5ef7442ef97a6046" - integrity sha1-JaZ/LG4lOyypQZd7XvdELvl6YEY= + integrity sha512-EijGsv7kzd9I9g0ByCl6h42BWNGUZrlCSejfrb3AKeHC33SGbASu1VDf5O3rRiiUOhAC9CHdZxFPbZu0HmR70A== tinycolor2@^1.4.1: version "1.4.2" @@ -13089,7 +13110,7 @@ to-buffer@^1.1.1: to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== to-json-schema@0.2.5: version "0.2.5" @@ -13106,7 +13127,7 @@ to-json-schema@0.2.5: to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= + integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg== dependencies: kind-of "^3.0.2" @@ -13118,7 +13139,7 @@ to-readable-stream@^1.0.0: to-regex-range@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= + integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg== dependencies: is-number "^3.0.0" repeat-string "^1.6.1" @@ -13181,7 +13202,7 @@ tough-cookie@^3.0.1: tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" - integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= + integrity sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA== dependencies: punycode "^2.1.0" @@ -13195,12 +13216,12 @@ tr46@^2.1.0: tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== trim-repeated@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21" - integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE= + integrity sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg== dependencies: escape-string-regexp "^1.0.2" @@ -13276,7 +13297,7 @@ tsutils@^3.21.0: tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== dependencies: safe-buffer "^5.0.1" @@ -13288,12 +13309,12 @@ tunnel@0.0.6, tunnel@^0.0.6: tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== dependencies: prelude-ls "~1.1.2" @@ -13340,7 +13361,7 @@ typedarray-to-buffer@^3.1.5: typeof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/typeof/-/typeof-1.0.0.tgz#9c84403f2323ae5399167275497638ea1d2f2440" - integrity sha1-nIRAPyMjrlOZFnJ1SXY46h0vJEA= + integrity sha512-Pze0mIxYXhaJdpw1ayMzOA7rtGr1OmsTY/Z+FWtRKIqXFz6aoDLjqdbWE/tcIBSC8nhnVXiRrEXujodR/xiFAA== typescript@4.6.2: version "4.6.2" @@ -13448,12 +13469,12 @@ universalify@^2.0.0: unpipe@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== unreachable-branch-transform@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/unreachable-branch-transform/-/unreachable-branch-transform-0.3.0.tgz#d99cc4c6e746d264928845b611db54b0f3474caa" - integrity sha1-2ZzExudG0mSSiEW2EdtUsPNHTKo= + integrity sha512-vza0JqnYAxuiynTpibnaaJsQ/FOKo7oJSXnWT96gIGsvQOfv0QHil8dRcRqONFnYK3YXaqVdbGz36bgCAm0qVg== dependencies: esmangle-evaluator "^1.0.0" recast "^0.10.1" @@ -13462,7 +13483,7 @@ unreachable-branch-transform@^0.3.0: unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= + integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ== dependencies: has-value "^0.3.1" isobject "^3.0.0" @@ -13512,12 +13533,12 @@ urijs@^1.19.0: urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= + integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg== url-parse-lax@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ== dependencies: prepend-http "^2.0.0" @@ -13532,12 +13553,12 @@ url-parse@^1.5.3: url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" - integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= + integrity sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A== url@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" - integrity sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ= + integrity sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ== dependencies: punycode "1.3.2" querystring "0.2.0" @@ -13557,7 +13578,7 @@ utif@^2.0.1: util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== util.promisify@^1.0.0, util.promisify@^1.0.1: version "1.1.1" @@ -13573,7 +13594,7 @@ util.promisify@^1.0.0, util.promisify@^1.0.1: utils-merge@1.x.x: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== uuid@3.3.2, uuid@^3.1.0, uuid@^3.3.2: version "3.3.2" @@ -13635,12 +13656,12 @@ validator@^13.6.0, validator@^13.7.0: vary@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== verror@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw== dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" @@ -13657,7 +13678,7 @@ vm2@3.9.6: vuvuzela@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" - integrity sha1-O+FF5YJxxzylUnndhR8SpoIRSws= + integrity sha512-Tm7jR1xTzBbPW+6y1tknKiEhz04Wf/1iZkcTJjSFcpNko43+dFW6+OOeQe9taJIug3NdfUAjFKgUSyQrIKaDvQ== w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2: version "1.0.2" @@ -13691,7 +13712,7 @@ watchpack@^2.3.1: webfinger@^0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/webfinger/-/webfinger-0.4.2.tgz#3477a6d97799461896039fcffc650b73468ee76d" - integrity sha1-NHem2XeZRhiWA5/P/GULc0aO520= + integrity sha512-PvvQ/k74HkC3q5G7bGu4VYeKDt3ePZMzT5qFPtEnOL8eyIU1/06OtDn9X5vlkQ23BlegA3eN89rDLiYUife3xQ== dependencies: step "0.0.x" xml2js "0.1.x" @@ -13699,7 +13720,7 @@ webfinger@^0.4.2: webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== webidl-conversions@^4.0.2: version "4.0.2" @@ -13717,17 +13738,17 @@ webidl-conversions@^6.1.0: integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== webpack-cli@^4.9.1: - version "4.9.2" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d" - integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ== + version "4.10.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" + integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.1.1" - "@webpack-cli/info" "^1.4.1" - "@webpack-cli/serve" "^1.6.1" + "@webpack-cli/configtest" "^1.2.0" + "@webpack-cli/info" "^1.5.0" + "@webpack-cli/serve" "^1.7.0" colorette "^2.0.14" commander "^7.0.0" - execa "^5.0.0" + cross-spawn "^7.0.3" fastest-levenshtein "^1.0.12" import-local "^3.0.2" interpret "^2.2.0" @@ -13800,7 +13821,7 @@ whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== dependencies: tr46 "~0.0.3" webidl-conversions "^3.0.0" @@ -13846,7 +13867,7 @@ which-boxed-primitive@^1.0.2: which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== which@^1.2.9: version "1.3.1" @@ -13930,7 +13951,7 @@ word-wrap@~1.2.3: wordwrap@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= + integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== worker-farm@1.7.0: version "1.7.0" @@ -13960,7 +13981,7 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== write-file-atomic@2.4.1: version "2.4.1" @@ -13984,7 +14005,7 @@ write-file-atomic@^3.0.0: write-stream@~0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/write-stream/-/write-stream-0.4.3.tgz#83cc8c0347d0af6057a93862b4e3ae01de5c81c1" - integrity sha1-g8yMA0fQr2BXqThitOOuAd5cgcE= + integrity sha512-IJrvkhbAnj89W/GAVdVgbnPiVw5Ntg/B4tc/MUCIEwj/g6JIww1DWJyB/yBMT3yw2/TkT6IUZ0+IYef3flEw8A== dependencies: readable-stream "~0.0.2" @@ -14035,12 +14056,12 @@ xml-name-validator@^3.0.0: xml-parse-from-string@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz#a9029e929d3dbcded169f3c6e28238d95a5d5a28" - integrity sha1-qQKekp09vN7RafPG4oI42VpdWig= + integrity sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g== xml2js@0.1.x: version "0.1.14" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.1.14.tgz#5274e67f5a64c5f92974cd85139e0332adc6b90c" - integrity sha1-UnTmf1pkxfkpdM2FE54DMq3GuQw= + integrity sha512-pbdws4PPPNc1HPluSUKamY4GWMk592K7qwcj6BExbVOhhubub8+pMda/ql68b6L3luZs/OGjGSB5goV7SnmgnA== dependencies: sax ">=0.1.1" @@ -14068,7 +14089,7 @@ xmlbuilder@~11.0.0: xmlbuilder@~9.0.1: version "9.0.7" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ== xmlchars@^2.2.0: version "2.2.0" @@ -14103,7 +14124,7 @@ yallist@4.0.0, yallist@^4.0.0: yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= + integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== yaml@2.0.0-1: version "2.0.0-1" @@ -14190,7 +14211,7 @@ yargs@^16.1.0, yargs@^16.2.0: yauzl@^2.4.2: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== dependencies: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" diff --git a/packages/types/src/documents/app/app.ts b/packages/types/src/documents/app/app.ts index 1e9bffb867..1def994697 100644 --- a/packages/types/src/documents/app/app.ts +++ b/packages/types/src/documents/app/app.ts @@ -13,10 +13,37 @@ export interface App extends Document { instance: AppInstance tenantId: string status: string + theme?: string + customTheme?: { + buttonBorderRadius?: string + primaryColor?: string + primaryColorHover?: string + } revertableVersion?: string + navigation?: AppNavigation automationErrors?: AppMetadataErrors } export interface AppInstance { _id: string } + +export interface AppNavigation { + navigation: string + title: string + navWidth: string + sticky?: boolean + hideLogo?: boolean + logoUrl?: string + hideTitle?: boolean + navBackground?: string + navTextColor?: string + links?: AppNavigationLink[] +} + +export interface AppNavigationLink { + text: string + url: string + id?: string + roleId?: string +} diff --git a/packages/types/src/documents/app/screen.ts b/packages/types/src/documents/app/screen.ts index 311c023011..1eead16aa0 100644 --- a/packages/types/src/documents/app/screen.ts +++ b/packages/types/src/documents/app/screen.ts @@ -2,8 +2,11 @@ import { Document } from "../document" export interface Screen extends Document { layoutId: string + showNavigation?: boolean + width?: string routing: { route: string roleId: string + homeScreen?: boolean } } diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index e17e01b30e..0b18f53ec4 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -293,11 +293,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.219": - version "1.0.219" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.219.tgz#430d23f25c9c6b275d3448f6d88a26a8c6196e3e" - integrity sha512-nU1nAkW7Pi8LLx9UfTff+kgDUV/IC64+iurVoQ7WKPI580M5RDCdHjig8R03OStRSCdcP1xRdUb1Ge2IpByfMg== +"@budibase/backend-core@1.0.220-alpha.0": + version "1.0.220-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.220-alpha.0.tgz#cbeb9f54fb0b702c45585b27d5f0f74c4c19bbc9" + integrity sha512-UnMZUpkp3OQloFP1muxnY2OZZMqJJszt9/u36omtqnBbZV6UzBi0w3g02aW4V9jGiLzALo5p6+gBl9UO7gKWpQ== dependencies: + "@budibase/types" "^1.0.220-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -313,6 +314,7 @@ passport-google-oauth "2.0.0" passport-jwt "4.0.0" passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" posthog-node "1.3.0" pouchdb "7.3.0" pouchdb-find "7.2.2" @@ -324,14 +326,20 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.0.219": - version "1.0.219" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.219.tgz#a8406aaf7137db43c290f0a3eb005650330ca6fb" - integrity sha512-BH7sBHuGEz9UP6bCt/a22pZskvvyk/lqMdLYSKGAEcoj7AnJB6MW2QKSIXPmLpT1OmdrYGM+49X0wtm9qWx/Lg== +"@budibase/pro@1.0.220-alpha.0": + version "1.0.220-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.220-alpha.0.tgz#93302a1e8de63e8fcd379cfab2ac8626fa4f1509" + integrity sha512-4GqR5hIhnGOEZm2dKE6N3/I3wd/bA8GlBTTvdw+F6FmgGk8wkL4QFtenJ2Qo23MVyYeBvUSt+98X+/OGtT8llQ== dependencies: - "@budibase/backend-core" "1.0.219" + "@budibase/backend-core" "1.0.220-alpha.0" + "@budibase/types" "1.0.220-alpha.0" node-fetch "^2.6.1" +"@budibase/types@1.0.220-alpha.0", "@budibase/types@^1.0.220-alpha.0": + version "1.0.220-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.220-alpha.0.tgz#63a928d4d1cf0465b341db1a534a5afe8e2a624f" + integrity sha512-Iad5pkO3a3wzjF3JZROBVLI9BqdoT30cPOz19wlbyOkdDxxTnSucZgfN/MHhyY67YfNEYkWmbYXJQh89FK5koA== + "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b" @@ -745,24 +753,24 @@ integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== "@tsconfig/node10@^1.0.7": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9" - integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg== + version "1.0.9" + resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" + integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA== "@tsconfig/node12@^1.0.7": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c" - integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw== + version "1.0.11" + resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" + integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== "@tsconfig/node14@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2" - integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" + integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== "@tsconfig/node16@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" - integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" + integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== "@types/accepts@*": version "1.3.5" @@ -845,9 +853,9 @@ "@types/node" "*" "@types/express-serve-static-core@^4.17.18": - version "4.17.28" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" - integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig== + version "4.17.29" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz#2a1795ea8e9e9c91b4a4bbe475034b20c1ec711c" + integrity sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q== dependencies: "@types/node" "*" "@types/qs" "*" @@ -3338,10 +3346,10 @@ is-class-hotfix@~0.0.6: resolved "https://registry.yarnpkg.com/is-class-hotfix/-/is-class-hotfix-0.0.6.tgz#a527d31fb23279281dde5f385c77b5de70a72435" integrity sha512-0n+pzCC6ICtVr/WXnN2f03TK/3BfXY7me4cjCAqT8TYXEl0+JBRoqBo94JJHXcyDSLUeWbNX8Fvy5g5RJdAstQ== -is-core-module@^2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" - integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== +is-core-module@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" + integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== dependencies: has "^1.0.3" @@ -4589,9 +4597,9 @@ minimist@^1.2.6: integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass@^3.0.0: - version "3.1.6" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" - integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ== + version "3.3.3" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.3.tgz#fd1f0e6c06449c10dadda72618b59c00f3d6378d" + integrity sha512-N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA== dependencies: yallist "^4.0.0" @@ -4975,6 +4983,11 @@ passport-oauth1@1.x.x: passport-strategy "1.x.x" utils-merge "1.x.x" +passport-oauth2-refresh@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4" + integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A== + passport-oauth2@1.x.x: version "1.6.1" resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b" @@ -5509,7 +5522,7 @@ raw-body@^2.2.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.8: +rc@1.2.8, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -5623,11 +5636,11 @@ regexpp@^2.0.1: integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== registry-auth-token@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" - integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== + version "4.2.2" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" + integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg== dependencies: - rc "^1.2.8" + rc "1.2.8" registry-url@^5.0.0: version "5.1.0" @@ -5708,11 +5721,11 @@ resolve.exports@^1.1.0: integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== resolve@^1.20.0: - version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== dependencies: - is-core-module "^2.8.1" + is-core-module "^2.9.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -6300,7 +6313,7 @@ test-exclude@^6.0.0: text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== throat@^6.0.1: version "6.0.1" @@ -6326,7 +6339,7 @@ through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3: through@^2.3.6, through@~2.3.4: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== timekeeper@2.2.0: version "2.2.0" @@ -6336,7 +6349,7 @@ timekeeper@2.2.0: tiny-queue@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz#25a67f2c6e253b2ca941977b5ef7442ef97a6046" - integrity sha1-JaZ/LG4lOyypQZd7XvdELvl6YEY= + integrity sha512-EijGsv7kzd9I9g0ByCl6h42BWNGUZrlCSejfrb3AKeHC33SGbASu1VDf5O3rRiiUOhAC9CHdZxFPbZu0HmR70A== tmp@^0.0.33: version "0.0.33" @@ -6353,7 +6366,7 @@ tmpl@1.0.5: to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== to-readable-stream@^1.0.0: version "1.0.0" @@ -6406,7 +6419,7 @@ tr46@^2.1.0: tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== ts-jest@27.1.3: version "27.1.3" @@ -6469,19 +6482,19 @@ tsutils@^3.21.0: tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== dependencies: safe-buffer "^5.0.1" tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== dependencies: prelude-ls "~1.1.2" @@ -6555,7 +6568,7 @@ universalify@^0.1.2: unpipe@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== untildify@^4.0.0: version "4.0.0" @@ -6602,14 +6615,14 @@ urijs@^1.19.2: url-parse-lax@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ== dependencies: prepend-http "^2.0.0" url@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" - integrity sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ= + integrity sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ== dependencies: punycode "1.3.2" querystring "0.2.0" @@ -6617,12 +6630,12 @@ url@0.10.3: util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== utils-merge@1.x.x: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== uuid@3.3.2: version "3.3.2" @@ -6661,12 +6674,12 @@ v8-to-istanbul@^8.1.0: vary@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== verror@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw== dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" @@ -6675,7 +6688,7 @@ verror@1.10.0: vuvuzela@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" - integrity sha1-O+FF5YJxxzylUnndhR8SpoIRSws= + integrity sha512-Tm7jR1xTzBbPW+6y1tknKiEhz04Wf/1iZkcTJjSFcpNko43+dFW6+OOeQe9taJIug3NdfUAjFKgUSyQrIKaDvQ== w3c-hr-time@^1.0.2: version "1.0.2" @@ -6701,7 +6714,7 @@ walker@^1.0.7: webfinger@^0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/webfinger/-/webfinger-0.4.2.tgz#3477a6d97799461896039fcffc650b73468ee76d" - integrity sha1-NHem2XeZRhiWA5/P/GULc0aO520= + integrity sha512-PvvQ/k74HkC3q5G7bGu4VYeKDt3ePZMzT5qFPtEnOL8eyIU1/06OtDn9X5vlkQ23BlegA3eN89rDLiYUife3xQ== dependencies: step "0.0.x" xml2js "0.1.x" @@ -6709,7 +6722,7 @@ webfinger@^0.4.2: webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== webidl-conversions@^5.0.0: version "5.0.0" @@ -6736,7 +6749,7 @@ whatwg-mimetype@^2.3.0: whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== dependencies: tr46 "~0.0.3" webidl-conversions "^3.0.0" @@ -6795,7 +6808,7 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== write-file-atomic@^3.0.0: version "3.0.3" @@ -6810,7 +6823,7 @@ write-file-atomic@^3.0.0: write-stream@~0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/write-stream/-/write-stream-0.4.3.tgz#83cc8c0347d0af6057a93862b4e3ae01de5c81c1" - integrity sha1-g8yMA0fQr2BXqThitOOuAd5cgcE= + integrity sha512-IJrvkhbAnj89W/GAVdVgbnPiVw5Ntg/B4tc/MUCIEwj/g6JIww1DWJyB/yBMT3yw2/TkT6IUZ0+IYef3flEw8A== dependencies: readable-stream "~0.0.2" @@ -6839,7 +6852,7 @@ xml-name-validator@^3.0.0: xml2js@0.1.x: version "0.1.14" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.1.14.tgz#5274e67f5a64c5f92974cd85139e0332adc6b90c" - integrity sha1-UnTmf1pkxfkpdM2FE54DMq3GuQw= + integrity sha512-pbdws4PPPNc1HPluSUKamY4GWMk592K7qwcj6BExbVOhhubub8+pMda/ql68b6L3luZs/OGjGSB5goV7SnmgnA== dependencies: sax ">=0.1.1" @@ -6854,7 +6867,7 @@ xml2js@0.4.19: xmlbuilder@~9.0.1: version "9.0.7" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ== xmlchars@^2.2.0: version "2.2.0"