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

eslint tidy up

This commit is contained in:
Martin McKeaveney 2020-02-25 15:21:23 +00:00
parent 2a06c70900
commit 0d0f635db4
119 changed files with 911 additions and 914 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.eslintrc.json
View File

@ -5,11 +5,13 @@
"jest": true,
"node": true
},
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 2019,
"sourceType": "module"
"sourceType": "module",
"allowImportExportEverywhere": true
},
"ignorePatterns": ["node_modules", "dist", "public"],
"ignorePatterns": ["node_modules", "dist", "public", "*.spec.js", "bundle.js"],
"plugins": ["prettier", "svelte3"],
"extends": ["eslint:recommended"],
"overrides": [

5
.prettierignore Normal file
View File

@ -0,0 +1,5 @@
packages/builder/src/userInterface/CurrentItemPreview.svelte
public
dist
packages/server/builder
**/*.spec.js

1
package.json
View File

@ -2,6 +2,7 @@
"name": "root",
"private": true,
"devDependencies": {
"babel-eslint": "^10.0.3",
"eslint": "^6.8.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-svelte3": "^2.7.3",

28
packages/builder/rollup.config.js
View File

@ -16,23 +16,17 @@ const _builderProxy = proxy("/_builder", {
pathRewrite: { "^/_builder": "" },
})
const apiProxy = proxy(
[
"/_builder/api/**",
"/_builder/**/componentlibrary"
],
{
target,
logLevel: "debug",
changeOrigin: true,
cookieDomainRewrite: true,
onProxyReq(proxyReq) {
if (proxyReq.getHeader("origin")) {
proxyReq.setHeader("origin", target)
}
},
}
)
const apiProxy = proxy(["/_builder/api/**", "/_builder/**/componentlibrary"], {
target,
logLevel: "debug",
changeOrigin: true,
cookieDomainRewrite: true,
onProxyReq(proxyReq) {
if (proxyReq.getHeader("origin")) {
proxyReq.setHeader("origin", target)
}
},
})
const production = !process.env.ROLLUP_WATCH

1
packages/builder/src/App.svelte
View File

@ -61,5 +61,4 @@
align-items: center;
justify-content: center;
}
</style>

7
packages/builder/src/accessLevels/AccessLevelsRoot.svelte
View File

@ -82,11 +82,10 @@
</table>
{:else}(no actions added){/if}
<Modal
onClosed={() => isEditing = false}
<Modal
onClosed={() => (isEditing = false)}
bind:isOpen={isEditing}
title={isEditing ? "Edit Access Level" : "Create Access Level"}
>
title={isEditing ? 'Edit Access Level' : 'Create Access Level'}>
{#if isEditing}
<AccessLevelView
level={editingLevel}

23
packages/builder/src/actionsAndTriggers/ActionView.svelte
View File

@ -16,10 +16,10 @@
let optValue = ""
let clonedAction = cloneDeep(action)
let initialOptions = pipe(
action.initialOptions,
[keys, map(k => ({ key: k, value: action.initialOptions[k] }))]
)
let initialOptions = pipe(action.initialOptions, [
keys,
map(k => ({ key: k, value: action.initialOptions[k] })),
])
let errors = []
const addNewOption = () => {
@ -44,26 +44,17 @@
const removeOption = opt => {
if (opt) {
delete clonedAction.initialOptions[opt.key]
initialOptions = pipe(
initialOptions,
[filter(o => o.key !== opt.key)]
)
initialOptions = pipe(initialOptions, [filter(o => o.key !== opt.key)])
}
}
const save = () => {
const newActionsList = [
...pipe(
allActions,
[filter(a => a !== action)]
),
...pipe(allActions, [filter(a => a !== action)]),
clonedAction,
]
errors = pipe(
newActionsList,
[validateActions, map(e => e.error)]
)
errors = pipe(newActionsList, [validateActions, map(e => e.error)])
if (errors.length === 0) onFinished(clonedAction)
}

28
packages/builder/src/actionsAndTriggers/Actions.svelte
View File

@ -19,26 +19,20 @@
let actionsArray = []
store.subscribe(s => {
actionsArray = pipe(
s.actions,
[keys, map(k => s.actions[k])]
)
actionsArray = pipe(s.actions, [keys, map(k => s.actions[k])])
})
let getDefaultOptionsHtml = defaultOptions =>
pipe(
defaultOptions,
[
keys,
map(
k =>
`<span style="color:var(--slate)">${k}: </span>${JSON.stringify(
defaultOptions[k]
)}`
),
join("<br>"),
]
)
pipe(defaultOptions, [
keys,
map(
k =>
`<span style="color:var(--slate)">${k}: </span>${JSON.stringify(
defaultOptions[k]
)}`
),
join("<br>"),
])
let actionEditingFinished = action => {
if (action) {

5
packages/builder/src/actionsAndTriggers/TriggerView.svelte
View File

@ -22,10 +22,7 @@
let cancel = () => onFinished()
let save = () => {
const newTriggersList = [
...pipe(
allTriggers,
[filter(t => t !== trigger)]
),
...pipe(allTriggers, [filter(t => t !== trigger)]),
clonedTrigger,
]

41
packages/builder/src/builderStore/buildStateOrigins.js
View File

@ -1,27 +1,28 @@
/**
* buildStateOrigins
*
* Builds an object that details all the bound state in the application, and what updates it.
*
* @param screenDefinition - the screen definition metadata.
* @returns {Object} an object with the client state values and how they are managed.
*/
export const buildStateOrigins = screenDefinition => {
const origins = {};
/**
* buildStateOrigins
*
* Builds an object that details all the bound state in the application, and what updates it.
*
* @param screenDefinition - the screen definition metadata.
* @returns {Object} an object with the client state values and how they are managed.
*/
export const buildStateOrigins = screenDefinition => {
const origins = {}
function traverse(propValue) {
for (let key in propValue) {
if (!Array.isArray(propValue[key])) continue;
function traverse(propValue) {
for (let key in propValue) {
if (!Array.isArray(propValue[key])) continue
if (key === "_children") propValue[key].forEach(traverse);
if (key === "_children") propValue[key].forEach(traverse)
for (let element of propValue[key]) {
if (element["##eventHandlerType"] === "Set State") origins[element.parameters.path] = element;
}
for (let element of propValue[key]) {
if (element["##eventHandlerType"] === "Set State")
origins[element.parameters.path] = element
}
}
}
traverse(screenDefinition.props);
traverse(screenDefinition.props)
return origins;
};
return origins
}

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

@ -1,10 +1,7 @@
import { createPackage } from "./createPackage"
import getStore from "./store"
export const store = getStore()
export const createNewPackage = () => createPackage(packageInfo, store)
export const initialise = async () => {
try {
setupRouter(store)
@ -17,8 +14,7 @@ export const initialise = async () => {
const setupRouter = writable => {
const pushState = history.pushState
history.pushState = () => {
pushState.apply(history, arguments)
//fireEvents('pushState', arguments);
pushState.apply(history, [writable])
writable.initialise()
}
window.addEventListener("hashchange", () => {

10
packages/builder/src/builderStore/loadComponentLibraries.js
View File

@ -5,7 +5,6 @@ export const loadLibs = async (appName, appPackage) => {
const allLibraries = {}
for (let lib of libsFromPages(appPackage.pages)) {
const libModule = await import(makeLibraryUrl(appName, lib))
allLibraries[lib] = libModule
}
@ -31,10 +30,5 @@ export const loadLib = async (appName, lib, allLibs) => {
export const makeLibraryUrl = (appName, lib) =>
`/_builder/${appName}/componentlibrary?lib=${encodeURI(lib)}`
export const libsFromPages = pages => pipe(pages, [
values,
map(p => p.componentLibraries),
flatten,
uniq
])
export const libsFromPages = pages =>
pipe(pages, [values, map(p => p.componentLibraries), flatten, uniq])

2
packages/builder/src/builderStore/store.js
View File

@ -763,7 +763,7 @@ const addChildComponent = store => (componentToAdd, presetName) => {
state.currentFrontEndType === "page"
? _savePage(state)
: _saveScreenApi(state.currentPreviewItem, state)
state.currentComponentInfo = newComponent.props
return state

2
packages/builder/src/common/Dropdown.svelte
View File

@ -1,6 +1,6 @@
<script>
import { createEventDispatcher } from "svelte"
import Select from "../common/Select.svelte";
import Select from "../common/Select.svelte"
export let selected
export let label

4
packages/builder/src/common/DropdownButton.svelte
View File

@ -17,7 +17,9 @@
class="dropdown-content"
style="display: {isDroppedDown ? 'inline-block' : 'none'}">
{#each actions as action}
<div class="budibase__nav-item" on:click={action.onclick}>{action.label}</div>
<div class="budibase__nav-item" on:click={action.onclick}>
{action.label}
</div>
{/each}
</div>

4
packages/builder/src/common/PlusButton.svelte
View File

@ -1,7 +1,5 @@
<button on:click>
<slot>
+
</slot>
<slot>+</slot>
</button>
<style>

2
packages/builder/src/common/core.js
View File

@ -4,7 +4,7 @@ import {
getTemplateApi,
getAuthApi,
} from "../../../core/src"
import { find, filter, includes, keyBy, some, flatten, map } from "lodash/fp"
import { find, filter, keyBy, flatten, map } from "lodash/fp"
import { generateSchema } from "../../../core/src/indexing/indexSchemaCreator"

4
packages/builder/src/database/ActionsHeader.svelte
View File

@ -39,9 +39,7 @@
{/if}
<Modal onClosed={() => (confirmDelete = false)} bind:isOpen={confirmDelete}>
<span>
Are you sure you want to delete {$store.currentNode.name}?
</span>
<span>Are you sure you want to delete {$store.currentNode.name}?</span>
<div class="uk-modal-footer uk-text-right">
<ButtonGroup>
<ActionButton alert on:click={deleteCurrentNode}>Yes</ActionButton>

2
packages/builder/src/database/FieldView.svelte
View File

@ -152,4 +152,4 @@
</ActionButton>
</ButtonGroup>
</div>
</div>
</div>

21
packages/builder/src/database/IndexView.svelte
View File

@ -14,18 +14,15 @@
store.subscribe($store => {
index = $store.currentNode
indexableRecords = pipe(
$store.hierarchy,
[
hierarchyFunctions.getFlattenedHierarchy,
filter(hierarchyFunctions.isDecendant(index.parent())),
filter(hierarchyFunctions.isRecord),
map(n => ({
node: n,
isallowed: some(id => n.nodeId === id)(index.allowedRecordNodeIds),
})),
]
)
indexableRecords = pipe($store.hierarchy, [
hierarchyFunctions.getFlattenedHierarchy,
filter(hierarchyFunctions.isDecendant(index.parent())),
filter(hierarchyFunctions.isRecord),
map(n => ({
node: n,
isallowed: some(id => n.nodeId === id)(index.allowedRecordNodeIds),
})),
])
})
const toggleAllowedRecord = record => {

4
packages/builder/src/database/RecordView.svelte
View File

@ -99,7 +99,9 @@
<Textbox label="Name:" bind:text={record.name} on:change={nameChanged} />
{#if !record.isSingle}
<Textbox label="Collection Name:" bind:text={record.collectionName} />
<Textbox label="Estimated Record Count:" bind:text={record.estimatedRecordCount} />
<Textbox
label="Estimated Record Count:"
bind:text={record.estimatedRecordCount} />
{/if}
<div class="recordkey">{record.nodeKey()}</div>

1
packages/builder/src/main.js
View File

@ -13,6 +13,7 @@ import "uikit/dist/js/uikit.min.js"
import "codemirror/lib/codemirror.css"
import "codemirror/theme/monokai.css"
/* eslint-disable */
const app = new App({
target: document.getElementById("app"),
})

9
packages/builder/src/nav/NavItem.svelte
View File

@ -14,10 +14,15 @@
const setActive = () => store.setActiveNav(name)
</script>
<div class="budibase__nav-item backend-nav-item" class:selected={navActive} on:click={setActive}>{label}</div>
<div
class="budibase__nav-item backend-nav-item"
class:selected={navActive}
on:click={setActive}>
{label}
</div>
<style>
.backend-nav-item {
padding-left: 25px;
}
</style>
</style>

59
packages/builder/src/userInterface/ComponentSelectionList.svelte
View File

@ -1,13 +1,26 @@
<script>
import { splitName } from "./pagesParsing/splitRootComponentName.js"
import { store } from "../builderStore"
import { find, sortBy, groupBy, values, filter, map, uniqBy, flatten } from "lodash/fp"
import {
find,
sortBy,
groupBy,
values,
filter,
map,
uniqBy,
flatten,
} from "lodash/fp"
import { ImageIcon, InputIcon, LayoutIcon } from "../common/Icons/"
import Select from "../common/Select.svelte"
import Button from "../common/PlusButton.svelte"
import ConfirmDialog from "../common/ConfirmDialog.svelte"
import { getRecordNodes, getIndexNodes, getIndexSchema, pipe } from "../common/core"
import {
getRecordNodes,
getIndexNodes,
getIndexSchema,
pipe,
} from "../common/core"
export let toggleTab
@ -27,7 +40,7 @@
flatten,
filter(t => !$store.components.some(c => c.name === t.component)),
map(t => ({ name: splitName(t.component).componentName, template: t })),
uniqBy(t => t.name)
uniqBy(t => t.name),
])
const addRootComponent = (component, allComponents) => {
@ -62,18 +75,20 @@
records: getRecordNodes(hierarchy),
indexes: getIndexNodes(hierarchy),
helpers: {
indexSchema: getIndexSchema(hierarchy)
}
indexSchema: getIndexSchema(hierarchy),
},
}
templateInstances = libraryModules[libName][componentName](templateOptions)
if(!templateInstances || templateInstances.length === 0) return
if (!templateInstances || templateInstances.length === 0) return
selectedTemplateInstance = templateInstances[0].name
selectTemplateDialog.show()
}
const onTemplateInstanceChosen = () => {
selectedComponent = null
const instance = templateInstances.find(i => i.name === selectedTemplateInstance)
const instance = templateInstances.find(
i => i.name === selectedTemplateInstance
)
store.addTemplatedComponent(instance.props)
toggleTab()
}
@ -81,7 +96,8 @@
function generate_components_list(components) {
return ($store.currentFrontEndType === "page"
? $store.builtins.concat(components)
: components).concat(standaloneTemplates)
: components
).concat(standaloneTemplates)
}
$: {
@ -96,15 +112,12 @@
}
$: componentLibrary = componentLibraries.find(l => l.libName === selectedLib)
</script>
<div class="root">
<Select on:change={e => selectedLib = e.target.value}>
<Select on:change={e => (selectedLib = e.target.value)}>
{#each componentLibraries as lib}
<option value={lib.libName}>
{lib.libName}
</option>
<option value={lib.libName}>{lib.libName}</option>
{/each}
</Select>
@ -136,9 +149,7 @@
{#if componentLibrary}
{#each generate_components_list(componentLibrary.components) as component}
<div class="component-container">
<div
class="component"
on:click={() => onComponentChosen(component)}>
<div class="component" on:click={() => onComponentChosen(component)}>
<div class="name">{splitName(component.name).componentName}</div>
{#if (component.presets || templatesByComponent[component.name]) && component.name === selectedComponent}
<ul class="preset-menu">
@ -152,7 +163,9 @@
{/each}
{/if}
{#if templatesByComponent[component.name]}
<span>{splitName(component.name).componentName} Templates</span>
<span>
{splitName(component.name).componentName} Templates
</span>
{#each templatesByComponent[component.name] as template}
<li
on:click|stopPropagation={() => onTemplateChosen(template)}>
@ -180,18 +193,21 @@
{/if}
</div>
</div>
<ConfirmDialog
bind:this={selectTemplateDialog}
title="Choose Template"
onCancel={() => selectedComponent = null}
onCancel={() => (selectedComponent = null)}
onOk={onTemplateInstanceChosen}>
{#each templateInstances.map(i => i.name) as instance}
<div class="uk-margin uk-grid-small uk-child-width-auto uk-grid">
<label>
<input class="uk-radio" type="radio" bind:group={selectedTemplateInstance} value={instance}>
<input
class="uk-radio"
type="radio"
bind:group={selectedTemplateInstance}
value={instance} />
<span class="template-instance-label">{instance}</span>
</label>
</div>
@ -307,5 +323,4 @@
.template-instance-label {
margin-left: 20px;
}
</style>

24
packages/builder/src/userInterface/ComponentsHierarchy.svelte
View File

@ -15,15 +15,12 @@
const joinPath = join("/")
const normalizedName = name =>
pipe(
name,
[
trimCharsStart("./"),
trimCharsStart("~/"),
trimCharsStart("../"),
trimChars(" "),
]
)
pipe(name, [
trimCharsStart("./"),
trimCharsStart("~/"),
trimCharsStart("../"),
trimChars(" "),
])
const lastPartOfName = c => {
if (!c) return ""
@ -31,15 +28,14 @@
return last(name.split("/"))
}
const isComponentSelected = (current, comp) => current === comp
const isFolderSelected = (current, folder) => isInSubfolder(current, folder)
$: _screens = pipe(
screens,
[map(c => ({ component: c, title: lastPartOfName(c) })), sortBy("title")]
)
$: _screens = pipe(screens, [
map(c => ({ component: c, title: lastPartOfName(c) })),
sortBy("title"),
])
const isScreenSelected = component =>
component.component &&

6
packages/builder/src/userInterface/ComponentsHierarchyChildren.svelte
View File

@ -20,11 +20,7 @@
const capitalise = s => s.substring(0, 1).toUpperCase() + s.substring(1)
const get_name = s => (!s ? "" : last(s.split("/")))
const get_capitalised_name = name =>
pipe(
name,
[get_name, capitalise]
)
const get_capitalised_name = name => pipe(name, [get_name, capitalise])
const moveDownComponent = component => {
const c = component

10
packages/builder/src/userInterface/ComponentsPaneSwitcher.svelte
View File

@ -3,16 +3,18 @@
import ComponentPropertiesPanel from "./ComponentPropertiesPanel.svelte"
import ComponentSelectionList from "./ComponentSelectionList.svelte"
const PROPERTIES_TAB = "properties";
const COMPONENT_SELECTION_TAB = "components";
const PROPERTIES_TAB = "properties"
const COMPONENT_SELECTION_TAB = "components"
let selected = PROPERTIES_TAB
let selected = PROPERTIES_TAB
const isSelected = tab => selected === tab
const selectTab = tab => (selected = tab)
const toggleTab = () => selected = selected === PROPERTIES_TAB ? COMPONENT_SELECTION_TAB : PROPERTIES_TAB;
const toggleTab = () =>
(selected =
selected === PROPERTIES_TAB ? COMPONENT_SELECTION_TAB : PROPERTIES_TAB)
</script>
<div class="root">

4
packages/builder/src/userInterface/EventsEditor/EventEditorModal.svelte
View File

@ -20,8 +20,8 @@
let draftEventHandler = { parameters: [] }
$: eventData = event || { handlers: [] }
$: if (!eventOptions.includes(eventType) && eventOptions.length > 0)
eventType = eventOptions[0].name
$: if (!eventOptions.includes(eventType) && eventOptions.length > 0)
eventType = eventOptions[0].name
const closeModal = () => {
onClose()

2
packages/builder/src/userInterface/EventsEditor/StateBindingCascader.svelte
View File

@ -61,7 +61,7 @@
display: flex;
flex-direction: column;
}
.handler-input {
position: relative;
display: flex;

20
packages/builder/src/userInterface/MasterLayout.svelte
View File

@ -16,15 +16,12 @@
const joinPath = join("/")
const normalizedName = name =>
pipe(
name,
[
trimCharsStart("./"),
trimCharsStart("~/"),
trimCharsStart("../"),
trimChars(" "),
]
)
pipe(name, [
trimCharsStart("./"),
trimCharsStart("~/"),
trimCharsStart("../"),
trimChars(" "),
])
const lastPartOfName = c =>
c && last(c.name ? c.name.split("/") : c._component.split("/"))
@ -33,10 +30,7 @@
const isFolderSelected = (current, folder) => isInSubfolder(current, folder)
$: _layout = pipe(
layout,
[c => ({ component: c, title: lastPartOfName(c) })]
)
$: _layout = pipe(layout, [c => ({ component: c, title: lastPartOfName(c) })])
const isScreenSelected = component =>
component.component &&

29
packages/builder/src/userInterface/NewScreen.svelte
View File

@ -21,20 +21,17 @@
let layoutComponent
let screens
let name = ""
let saveAttempted = false
$: layoutComponents = pipe(
$store.components,
[
filter(c => c.container),
map(c => ({ name: c.name, ...splitName(c.name) })),
]
)
$: layoutComponents = pipe($store.components, [
filter(c => c.container),
map(c => ({ name: c.name, ...splitName(c.name) })),
])
$: layoutComponent = layoutComponent
? find(c => c.name === layoutComponent.name)(layoutComponents)
: layoutComponents[0]
? find(c => c.name === layoutComponent.name)(layoutComponents)
: layoutComponents[0]
$: screens = $store.screens
$: route = !route && screens.length === 0 ? "*" : route
@ -43,9 +40,11 @@
saveAttempted = true
const isValid =
name.length > 0 && !screenNameExists(name)
&& route.length > 0 && !routeNameExists(route)
&& layoutComponent
name.length > 0 &&
!screenNameExists(name) &&
route.length > 0 &&
!routeNameExists(route) &&
layoutComponent
if (!isValid) return
@ -101,8 +100,8 @@
<input
class="uk-input uk-form-small"
class:uk-form-danger={saveAttempted && (route.length === 0 || routeNameExists(route))}
bind:value={route}
on:change={routeChanged}/>
bind:value={route}
on:change={routeChanged} />
</div>
</div>

14
packages/builder/src/userInterface/PropertyCascader/PropertyCascader.svelte
View File

@ -3,7 +3,7 @@
import { store } from "../../builderStore"
import { buildStateOrigins } from "../../builderStore/buildStateOrigins"
import { isBinding, getBinding, setBinding } from "../../common/binding"
import StateBindingOptions from "./StateBindingOptions.svelte";
import StateBindingOptions from "./StateBindingOptions.svelte"
export let onChanged = () => {}
export let value = ""
@ -28,7 +28,8 @@
const setBindingPath = value =>
bindValueToSource(value, bindingFallbackValue, bindingSource)
const setBindingFallback = value => bindValueToSource(bindingPath, value, bindingSource)
const setBindingFallback = value =>
bindValueToSource(bindingPath, value, bindingSource)
const setBindingSource = source =>
bindValueToSource(bindingPath, bindingFallbackValue, source)
@ -69,10 +70,11 @@
</button>
</div>
{#if isOpen}
<StateBindingOptions onSelect={option => {
onChanged(option);
isOpen = false;
}} />
<StateBindingOptions
onSelect={option => {
onChanged(option)
isOpen = false
}} />
{/if}
</div>

2
packages/builder/src/userInterface/PropertyCascader/index.js
View File

@ -1 +1 @@
export { default } from "./PropertyCascader.svelte"
export { default } from "./PropertyCascader.svelte"

32
packages/builder/src/userInterface/PropsView.svelte
View File

@ -11,36 +11,34 @@
let errors = []
const props_to_ignore = ["_component", "_children", "_styles", "_code", "_id"]
$: componentDef =
component && components &&
components.find(({ name }) => name === component._component)
$: componentDef =
component &&
components &&
components.find(({ name }) => name === component._component)
let setProp = (name, value) => {
onPropChanged(name, value)
}
</script>
<div class="root">
<form class="uk-form-stacked form-root">
{#if componentDef}
{#each Object.entries(componentDef.props) as [prop_name, prop_def], index}
<div class="prop-container">
{#each Object.entries(componentDef.props) as [prop_name, prop_def], index}
<div class="prop-container">
<PropControl
{setProp}
{prop_name}
prop_value={component[prop_name]}
prop_definition={prop_def}
{index}
disabled={false} />
<PropControl
{setProp}
{prop_name}
prop_value={component[prop_name]}
prop_definition={prop_def}
{index}
disabled={false} />
</div>
{/each}
</div>
{/each}
{/if}
</form>

2
packages/builder/src/userInterface/StateBindingControl.svelte
View File

@ -23,7 +23,7 @@
class="uk-select uk-form-small"
{value}
on:change={ev => onChanged(ev.target.value)}>
{#each (options || []) as option}
{#each options || [] as option}
<option value={option}>{option}</option>
{/each}
</select>

2
packages/builder/src/userInterface/pagesParsing/findDependencies.js
View File

@ -5,7 +5,7 @@ import { isRootComponent } from "./searchComponents"
export const libraryDependencies = (components, lib) => {
const componentDependsOnLibrary = comp => {
if (isRootComponent(comp)) {
const { libName } = splitName(component.name)
const { libName } = splitName(comp.name)
return libName === lib
}
return componentDependsOnLibrary(

2
packages/builder/src/userInterface/pagesParsing/searchComponents.js
View File

@ -1,6 +1,6 @@
import { pipe } from "../../common/core"
import { find, isUndefined, filter, some, includes, has } from "lodash/fp"
import { find, isUndefined, filter, some, includes } from "lodash/fp"
const normalString = s => (s || "").trim().toLowerCase()

3
packages/builder/src/userInterface/pagesParsing/types.js
View File

@ -3,10 +3,8 @@ import {
isBoolean,
isNumber,
isArray,
isObjectLike,
isPlainObject,
every,
isUndefined,
} from "lodash/fp"
import { EVENT_TYPE_MEMBER_NAME } from "../../common/eventHandlers"
@ -61,7 +59,6 @@ export const expandComponentDefinition = componentDefinition => {
return expandedComponent
}
const isComponent = isObjectLike
const isEvent = e =>
isPlainObject(e) &&
isString(e[EVENT_TYPE_MEMBER_NAME]) &&

2
packages/builder/src/userInterface/pagesParsing/validatePages.js
View File

@ -2,7 +2,7 @@ import { isString, keys, flatten, isArray, map, filter } from "lodash/fp"
import { common } from "../../../../core/src"
const pipe = common.$
export const validatePage = (page, getComponent) => {
export const validatePage = page => {
const errors = []
const error = message => errors.push(message)

56
packages/builder/tests/buildStateOrigins.spec.js
View File

@ -1,30 +1,32 @@
import { buildStateOrigins } from "../src/builderStore/buildStateOrigins";
import { buildStateOrigins } from "../src/builderStore/buildStateOrigins"
it("builds the correct stateOrigins object from a screen definition with handlers", () => {
expect(buildStateOrigins({
"name": "screen1",
"description": "",
"props": {
"_component": "@budibase/standard-components/container",
"className": "",
"type": "div",
"onClick": [
{
"##eventHandlerType": "Set State",
"parameters": {
"path": "testKey",
"value": "value"
}
}
]
}
})).toEqual({
"testKey": {
expect(
buildStateOrigins({
name: "screen1",
description: "",
props: {
_component: "@budibase/standard-components/container",
className: "",
type: "div",
onClick: [
{
"##eventHandlerType": "Set State",
parameters: {
path: "testKey",
value: "value",
},
},
],
},
})
).toEqual({
testKey: {
"##eventHandlerType": "Set State",
"parameters": {
"path": "testKey",
"value": "value"
}
}
});
});
parameters: {
path: "testKey",
value: "value",
},
},
})
})

2
packages/builder/tests/createProps.spec.js
View File

@ -206,7 +206,7 @@ describe("createDefaultProps", () => {
expect(props.fieldName).toBe("surname")
expect(props.fieldLength).toBe(500)
})
it("should create standard props", () => {
const comp = getcomponent()
comp.props.fieldName = { type: "string", default: 1 }

2
packages/cli/src/commands/new/appPackageTemplate/plugins.js
View File

@ -1 +1 @@
module.exports = config => ({})
module.exports = () => ({})

2
packages/cli/src/common.js
View File

@ -1,4 +1,4 @@
const { resolve, join } = require("path")
const { resolve } = require("path")
const { cwd } = require("process")
const buildAppContext = require("@budibase/server/initialise/buildAppContext")

1
packages/client/rollup.config.js
View File

@ -2,7 +2,6 @@ import resolve from "rollup-plugin-node-resolve"
import commonjs from "rollup-plugin-commonjs"
import builtins from "rollup-plugin-node-builtins"
import nodeglobals from "rollup-plugin-node-globals"
import { terser } from "rollup-plugin-terser"
const lodash_fp_exports = [
"find",

2
packages/client/scripts/publishDev.js
View File

@ -19,8 +19,6 @@ const appPackages = join(
const publicMain = appName => join(appPackages, appName, "public", "main")
const publicUnauth = appName =>
join(appPackages, appName, "public", "unauthenticated")
const nodeModules = appName =>
join(appPackages, appName, "node_modules", "@budibase", "client", "dist")
;(async () => {
const apps = await readdir(appPackages)

29
packages/client/src/index.js
View File

@ -6,16 +6,15 @@ import { builtins, builtinLibName } from "./render/builtinComponents"
* create a web application from static budibase definition files.
* @param {object} opts - configuration options for budibase client libary
*/
export const loadBudibase = async (opts) => {
export const loadBudibase = async opts => {
let componentLibraries = opts && opts.componentLibraries
const _window = (opts && opts.window) || window
const _localStorage = (opts && opts.localStorage) || localStorage
const _localStorage = (opts && opts.localStorage) || localStorage
const backendDefinition = _window["##BUDIBASE_BACKEND_DEFINITION##"]
const frontendDefinition = _window["##BUDIBASE_FRONTEND_DEFINITION##"]
const uiFunctions = _window["##BUDIBASE_FRONTEND_FUNCTIONS##"]
const userFromStorage = _localStorage.getItem("budibase:user")
const user = userFromStorage
@ -33,8 +32,8 @@ export const loadBudibase = async (opts) => {
: "/" + trimSlash(frontendDefinition.appRootPath)
if (!componentLibraries) {
const componentLibraryUrl = lib => frontendDefinition.appRootPath + "/" + trimSlash(lib)
const componentLibraryUrl = lib =>
frontendDefinition.appRootPath + "/" + trimSlash(lib)
componentLibraries = {}
for (let lib of frontendDefinition.componentLibraries) {
@ -46,25 +45,29 @@ export const loadBudibase = async (opts) => {
componentLibraries[builtinLibName] = builtins(_window)
const { initialisePage, screenStore, pageStore, routeTo, rootNode } = createApp(
const { initialisePage, screenStore, pageStore, routeTo } = createApp(
componentLibraries,
frontendDefinition,
backendDefinition,
user,
uiFunctions || {},
_window
_window,
rootNode
)
const route = _window.location
? _window.location.pathname.replace(frontendDefinition.appRootPath, "")
: "";
const route = _window.location
? _window.location.pathname.replace(frontendDefinition.appRootPath, "")
: ""
return {
rootNode: initialisePage(frontendDefinition.page, _window.document.body, route),
rootNode: initialisePage(
frontendDefinition.page,
_window.document.body,
route
),
screenStore,
pageStore,
routeTo,
rootNode
}
}

2
packages/client/src/render/attachChildren.js
View File

@ -47,7 +47,7 @@ export const attachChildren = initialiseOpts => (htmlElement, options) => {
uiFunctions,
htmlElement,
anchor,
getCurrentState
getCurrentState,
})
for (let childNode of childNodesThisIteration) {

13
packages/client/src/state/parseBinding.js
View File

@ -5,9 +5,9 @@ export const BB_STATE_FALLBACK = "##bbstatefallback"
export const isBound = prop => !!parseBinding(prop)
/**
*
*
* @param {object|string|number} prop - component property to parse for a dynamic state binding
* @returns {object|boolean}
* @returns {object|boolean}
*/
export const parseBinding = prop => {
if (!prop) return false
@ -34,7 +34,8 @@ export const parseBinding = prop => {
}
export const isStoreBinding = binding => binding && binding.source === "store"
export const isContextBinding = binding => binding && binding.source === "context"
export const isContextBinding = binding =>
binding && binding.source === "context"
export const isEventBinding = binding => binding && binding.source === "event"
const hasBindingObject = prop =>
@ -50,8 +51,8 @@ const isBindingExpression = prop =>
prop.startsWith("route."))
const parseBindingExpression = prop => {
let [source, ...rest] = prop.split(".");
let path = rest.join(".")
let [source, ...rest] = prop.split(".")
let path = rest.join(".")
if (source === "route") {
source = "state"
@ -59,7 +60,7 @@ const parseBindingExpression = prop => {
}
return {
fallback: "", // TODO: provide fallback support
fallback: "", // TODO: provide fallback support
source,
path,
}

81
packages/client/src/state/stateManager/index.js
View File

@ -160,41 +160,46 @@ const setNodeState = (storeState, node) => {
* Bind a components event handler parameters to state, context or the event itself.
* @param {Array} eventHandlerProp - event handler array from component definition
*/
function bindComponentEventHandlers(eventHandlerProp) {
const boundEventHandlers = []
for (let event of eventHandlerProp) {
const boundEventHandler = {
handlerType: event[EVENT_TYPE_MEMBER_NAME],
parameters: event.parameters,
function bindComponentEventHandlers(
eventHandlerProp,
context,
getCurrentState
) {
const boundEventHandlers = []
for (let event of eventHandlerProp) {
const boundEventHandler = {
handlerType: event[EVENT_TYPE_MEMBER_NAME],
parameters: event.parameters,
}
const boundParameters = {}
for (let paramName in boundEventHandler.parameters) {
const paramValue = boundEventHandler.parameters[paramName]
const paramBinding = parseBinding(paramValue)
if (!paramBinding) {
boundParameters[paramName] = () => paramValue
continue
}
const boundParameters = {}
for (let paramName in boundEventHandler.parameters) {
const paramValue = boundEventHandler.parameters[paramName]
const paramBinding = parseBinding(paramValue)
if (!paramBinding) {
boundParameters[paramName] = () => paramValue
continue
}
let paramValueSource
let paramValueSource;
if (paramBinding.source === "context") paramValueSource = context
if (paramBinding.source === "state") paramValueSource = getCurrentState()
if (paramBinding.source === "context") paramValueSource = context;
if (paramBinding.source === "state") paramValueSource = getCurrentState();
// The new dynamic event parameter bound to the relevant source
boundParameters[paramName] = eventContext => getState(
// The new dynamic event parameter bound to the relevant source
boundParameters[paramName] = eventContext =>
getState(
paramBinding.source === "event" ? eventContext : paramValueSource,
paramBinding.path,
paramBinding.fallback
);
}
boundEventHandler.parameters = boundParameters
boundEventHandlers.push(boundEventHandlers)
return boundEventHandlers;
)
}
boundEventHandler.parameters = boundParameters
boundEventHandlers.push(boundEventHandlers)
return boundEventHandlers
}
}
const _setup = (
@ -230,22 +235,26 @@ const _setup = (
binding.fallback,
binding.source
)
}
}
if (isBound && binding.source === "context") {
initialProps[propName] = !context
? propValue
: getState(context, binding.path, binding.fallback, binding.source)
}
if (isEventType(propValue)) {
const boundEventHandlers = bindComponentEventHandlers(propValue);
}
if (boundEventHandlers.length === 0) {
if (isEventType(propValue)) {
const boundEventHandlers = bindComponentEventHandlers(
propValue,
context,
getCurrentState
)
if (boundEventHandlers.length === 0) {
initialProps[propName] = doNothing
} else {
initialProps[propName] = async context => {
for (let handlerInfo of handlersInfos) {
for (let handlerInfo of boundEventHandlers) {
const handler = makeHandler(handlerTypes, handlerInfo)
await handler(context)
}
@ -271,4 +280,4 @@ const makeHandler = (handlerTypes, handlerInfo) => {
}
handlerType.execute(parameters)
}
}
}

2
packages/core/src/indexing/allIds.js
View File

@ -1,5 +1,5 @@
import { flatten, orderBy, filter, isUndefined } from "lodash/fp"
import hierarchy, {
import {
getFlattenedHierarchy,
getCollectionNodeByKeyOrNodeKey,
isCollectionRecord,

1
packages/core/src/indexing/sharding.js
View File

@ -5,7 +5,6 @@ import {
isGlobalIndex,
getParentKey,
isShardedIndex,
getExactNodeForKey,
} from "../templateApi/hierarchy"
import { joinKey, isNonEmptyString, splitKey, $ } from "../common"

2
packages/core/src/recordApi/load.js
View File

@ -1,5 +1,5 @@
import { keyBy, mapValues, filter, map, includes, last } from "lodash/fp"
import { getExactNodeForKey, getNode } from "../templateApi/hierarchy"
import { getNode } from "../templateApi/hierarchy"
import { safeParseField } from "../types"
import {
$,

2
packages/core/src/recordApi/recordInfo.js
View File

@ -5,7 +5,7 @@ import {
isSingleRecord,
getNodeForCollectionPath,
} from "../templateApi/hierarchy"
import { reduce, find, filter, take } from "lodash/fp"
import { reduce, find, filter } from "lodash/fp"
import { $, getFileFromKey, joinKey, safeKey, keySep } from "../common"
import { folderStructureArray, allIdChars } from "../indexing/allIds"

4
packages/core/src/recordApi/uploadFile.js
View File

@ -73,9 +73,7 @@ const _uploadFile = async (
)
if (!isExpectedFileSize) {
throw new BadRequestError(
`Fields for ${relativeFilePath} do not have expected size: ${join(
","
)(incorrectFields)}`
`Fields for ${relativeFilePath} do not have expected size.`
)
}
})

2
packages/core/src/templateApi/deleteNodes.js
View File

@ -1,6 +1,6 @@
import {} from "../templateApi/heirarchy"
export const canDelete = (app, node) => {
export const canDelete = () => {
/*
it must not exist on any index.allowedRecordNodeIds
it must not exist on and reference type fields

6
packages/core/test/apiWrapper.spec.js
View File

@ -1,6 +1,6 @@
import { apiWrapper, apiWrapperSync } from "../src/common/apiWrapper"
import { filter } from "lodash/fp"
import { event, onComplete, onBegin, onError, events } from "../src/common"
import { events } from "../src/common"
const getApp = () => {
var events = []
@ -26,7 +26,7 @@ describe("apiWrapper", () => {
const getErrorEvents = app => app.getEvents(testNamespace.onError)
const runThrowEx = (arg1, arg2) => {
const throwEx = (x, y) => {
const throwEx = () => {
throw new Error("test error")
}
const app = getApp()
@ -47,7 +47,7 @@ describe("apiWrapper", () => {
}
const runThrowExAsync = async (arg1, arg2) => {
const throwEx = async (x, y) => {
const throwEx = async () => {
throw new Error("test error")
}
const app = getApp()

2
packages/core/test/authApi.authenticate.spec.js
View File

@ -33,7 +33,7 @@ describe("authApi > authenticate", () => {
})
it("should return null when non existing user", async () => {
const { authApi, app } = await setupApphierarchy(
const { authApi } = await setupApphierarchy(
basicAppHierarchyCreator_WithFields
)
const result = await authApi.authenticate("nobody", "password")

8
packages/core/test/recordApi.files.spec.js
View File

@ -31,7 +31,7 @@ describe("recordApi > files", () => {
const { recordApi } = await setupApphierarchy(
basicAppHierarchyCreator_WithFields
)
const { file, stream, content } = getFile()
const { file, stream } = getFile()
file.size = file.size - 1
const record = recordApi.getNew("/customers", "customer")
record.surname = "Ledog"
@ -46,7 +46,7 @@ describe("recordApi > files", () => {
const { recordApi } = await setupApphierarchy(
basicAppHierarchyCreator_WithFields
)
const { file, stream, content } = getFile()
const { file, stream } = getFile()
const record = recordApi.getNew("/customers", "customer")
record.surname = "Ledog"
record.profilepic = file
@ -80,7 +80,7 @@ describe("recordApi > files", () => {
const { recordApi } = await setupApphierarchy(
basicAppHierarchyCreator_WithFields
)
const { file, stream, content } = getFile()
const { file, stream } = getFile()
const record = recordApi.getNew("/customers", "customer")
record.surname = "Ledog"
record.profilepic = file
@ -98,7 +98,7 @@ describe("recordApi > files", () => {
const { recordApi } = await setupApphierarchy(
basicAppHierarchyCreator_WithFields
)
const { file, stream, content } = getFile()
const { file, stream } = getFile()
const record = recordApi.getNew("/customers", "customer")
record.surname = "Ledog"
record.profilepic = file

1
packages/datastores/config.js
View File

@ -4,7 +4,6 @@ import { promisify } from "es6-promisify"
import _rimraf from "rimraf"
const mkdir = promisify(fs.mkdir)
const rmdir = promisify(fs.rmdir)
const rimraf = promisify(_rimraf)
const getConfig = async () => {

11
packages/datastores/config.template.js
View File

@ -1,9 +1,8 @@
import fs from "fs"
import { mkdir } from "fs"
import { join } from "path"
import { promisify } from "es6-promisify"
mkdirp = promisify(mkdir)
const mkdirp = promisify(mkdir)
const getConfig = async () => {
const config = {
@ -13,15 +12,13 @@ const getConfig = async () => {
memory: {},
}
try {
await mkdir("./output")
} catch (e) {}
await mkdirp("./output")
for (let type in config) {
await mkdir(join("output", type))
await mkdirp(join("output", type))
}
await mkdir("./output/local/files")
await mkdirp("./output/local/files")
return config
}

11
packages/datastores/datastores/azure-blob.js
View File

@ -9,7 +9,7 @@ import {
} from "@azure/storage-blob"
export const createFile = ({ containerUrl }) => async (key, content) => {
const blobURL = BlobURL.fromContainerURL(containerURL, key)
const blobURL = BlobURL.fromContainerURL(containerUrl, key)
const blockBlobURL = BlockBlobURL.fromBlobURL(blobURL)
await blockBlobURL.upload(Aborter.none, content, content.length)
}
@ -17,7 +17,7 @@ export const createFile = ({ containerUrl }) => async (key, content) => {
export const updateFile = opts => async (path, content) =>
createFile(opts)(path, content)
export const loadFile = ({ containerUrl }) => async key => {
export const loadFile = ({ containerUrl }) => async (key, content) => {
const blobURL = BlobURL.fromContainerURL(containerUrl, key)
const downloadBlockBlobResponse = await blobURL.download(Aborter.none, 0)
@ -27,8 +27,8 @@ export const loadFile = ({ containerUrl }) => async key => {
.toString()
}
export const exists = ({ containerURL }) => async key => {
const blobURL = BlobURL.fromContainerURL(containerURL, key)
export const exists = ({ containerUrl }) => async key => {
const blobURL = BlobURL.fromContainerURL(containerUrl, key)
const getPropsResponse = await blobURL.getProperties()
return getPropsResponse._response.StatusCode === 200
}
@ -53,7 +53,7 @@ const initialise = opts => {
const pipeline = StorageURL.newPipeline(sharedKeyCredential)
const serviceURL = new ServiceURL(
`https://${account}.blob.core.windows.net`,
`https://${opts.account}.blob.core.windows.net`,
pipeline
)
@ -77,6 +77,5 @@ export default opts => {
datastoreType: "azure-blob-storage",
datastoreDescription: "",
data,
}
}

2
packages/datastores/index.js
View File

@ -24,5 +24,5 @@ initialise()
.then(init => {
return tests(init.datastore, init.config)
})
.then(_ => console.log("done"))
.then(() => console.log("done"))
.catch(e => console.log(e))

6
packages/datastores/tests/diagnosticPlugin.js
View File

@ -1,14 +1,8 @@
import { eventsList } from "@budibase/core"
import { filter, union, has, map } from "lodash/fp"
import records from "./records"
const allEventsOfType = type => filter(e => e.endsWith(`:${type}`))(eventsList)
const getEventNamespace = ev => {
const parts = ev.split(":")
return `${parts[0]}:${parts[1]}`
}
const hasRecord = has("record")
export const register = (app, logTimeElapsed, eventNamespaces = []) => {

1
packages/datastores/tests/index.js
View File

@ -16,7 +16,6 @@ const iterateActions = async (apis, getIterator) => {
limit(() => result.action.run(i))
)
let n = 1
await Promise.all(runPromises)
result = iterator()
} catch (e) {

31
packages/datastores/tests/records.js
View File

@ -1,5 +1,5 @@
import { action, iterateActionTimes, iterateCollection } from "./helpers"
import { isUndefined, union, takeRight } from "lodash"
import { action, iterateActionTimes } from "./helpers"
import { isUndefined, union } from "lodash"
const createClient = (apis, getState) => async i => {
const client = apis.recordApi.getNew("/clients", "client")
@ -20,16 +20,6 @@ const createClient = (apis, getState) => async i => {
return client.key()
}
const getClient = (apis, getState) => async k => {
const state = getState()
if (isUndefined(state.clients)) state.clients = []
const client = await apis.recordApi.load(k)
state.clients.push(client)
return `key: ${k} , add1: ${client.Address1} , count: ${state.clients.length}`
}
const listClients = (apis, getState) => async () => {
const clients = await apis.viewApi.listItems("/clients/default")
const state = getState()
@ -43,12 +33,6 @@ const listClients = (apis, getState) => async () => {
}
}
const deleteClient = (apis, getState) => async k => {
await apis.recordApi.delete(k)
const state = getState()
state.clientKeys = state.clientKeys.filter(key => key !== k)
}
export default apis => {
const state = {}
const getState = () => state
@ -64,9 +48,6 @@ export default apis => {
iterateActionTimes(recordsPerIteration)
),
/*action("Get client", getClient(apis, getState),
iterateCollection(() => takeRight(getState().clientKeys, recordsPerIteration))),*/
action("List Clients", listClients(apis, getState)),
]
@ -75,14 +56,6 @@ export default apis => {
actions = union(actions, actionsInOneIteration())
}
/*
for (let index = 0; index < noOfIterations; index++) {
actions.push(
action("Delete Clients", deleteClient(apis, getState),
iterateCollection(() => takeRight(getState().clientKeys, recordsPerIteration))),
action("List Clients", listClients(apis, getState))
);
}*/
let actionIndex = 0
return () => {

1
packages/datastores/tests/setup.js
View File

@ -1,5 +1,4 @@
import { getAppApis, getTemplateApi, setupDatastore } from "@budibase/core"
import { action } from "./helpers"
const addField = templateApi => type => (record, name) => {
const field = templateApi.getNewField(type)

1
packages/materialdesign-components/rollup.config.js
View File

@ -1,7 +1,6 @@
import svelte from "rollup-plugin-svelte"
import postcss from "rollup-plugin-postcss"
import resolve from "rollup-plugin-node-resolve"
import path from "path"
const postcssOptions = () => ({
extensions: [".scss", ".sass"],

2
packages/materialdesign-components/rollup.testconfig.js
View File

@ -5,7 +5,7 @@ import livereload from "rollup-plugin-livereload"
import { terser } from "rollup-plugin-terser"
import json from "rollup-plugin-json"
import alias from "rollup-plugin-alias"
import postcss from "rollup-plugin-postcss";
import postcss from "rollup-plugin-postcss"
import path from "path"
const aliases = {

66
packages/materialdesign-components/src/Checkbox/CheckboxGroup.svelte
View File

@ -1,28 +1,48 @@
<script>
import Checkbox from "./Checkbox.svelte";
import Label from "../Common/Label.svelte";
import Checkbox from "./Checkbox.svelte"
import Label from "../Common/Label.svelte"
export let label = "";
export let orientation = "row";
export let fullwidth = false;
export let onChange = selectedItems => {};
export let label = ""
export let orientation = "row"
export let fullwidth = false
export let onChange = selectedItems => {}
export let items = [];
export let items = []
export let disabled = false;
export let alignEnd = false;
let selectedItems = [];
export let disabled = false
export let alignEnd = false
let selectedItems = []
function handleonChange(item) {
if (!!item.checked) {
item.checked = !item.checked;
item.checked = !item.checked
} else {
item.checked = true;
item.checked = true
}
onChange(items.filter(i => i.checked));
onChange(items.filter(i => i.checked))
}
</script>
<div class="checkbox-group">
<div class="checkbox-group__label">
<Label text={label} bold />
</div>
<div class={`checkbox-group__boxes ${orientation}`}>
{#each items as item, i}
<div class:fullwidth>
<Checkbox
id={`${item.label}-${i}`}
{disabled}
{alignEnd}
indeterminate={item.indeterminate || false}
label={item.label}
checked={item.checked || false}
onClick={() => handleonChange(item)} />
</div>
{/each}
</div>
</div>
<style>
.checkbox-group {
display: flex;
@ -55,23 +75,3 @@
text-align: left;
}
</style>
<div class="checkbox-group">
<div class="checkbox-group__label">
<Label text={label} bold />
</div>
<div class={`checkbox-group__boxes ${orientation}`}>
{#each items as item, i}
<div class:fullwidth>
<Checkbox
id={`${item.label}-${i}`}
{disabled}
{alignEnd}
indeterminate={item.indeterminate || false}
label={item.label}
checked={item.checked || false}
onClick={() => handleonChange(item)} />
</div>
{/each}
</div>
</div>

7
packages/materialdesign-components/src/Checkbox/index.js
View File

@ -1,4 +1,3 @@
import "./_style.scss";
export { default as Checkbox } from "./Checkbox.svelte";
export { default as Checkboxgroup } from "./CheckboxGroup.svelte";
import "./_style.scss"
export { default as Checkbox } from "./Checkbox.svelte"
export { default as Checkboxgroup } from "./CheckboxGroup.svelte"

44
packages/materialdesign-components/src/ClassBuilder.js
View File

@ -1,7 +1,7 @@
export default class ClassBuilder {
constructor(block, defaultIgnoreList) {
this.block = `mdc-${block}`;
this.defaultIgnoreList = defaultIgnoreList; //will be ignored when building custom classes
this.block = `mdc-${block}`
this.defaultIgnoreList = defaultIgnoreList //will be ignored when building custom classes
}
/*
@ -10,32 +10,32 @@ export default class ClassBuilder {
All are optional
*/
build(params) {
if (!params) return this.block; //return block if nothing passed
const { props, elementName } = params;
let base = !!elementName ? `${this.block}__${elementName}` : this.block;
if (!props) return base;
return this._handleProps(base, props);
if (!params) return this.block //return block if nothing passed
const { props, elementName } = params
let base = elementName ? `${this.block}__${elementName}` : this.block
if (!props) return base
return this._handleProps(base, props)
}
//Easily grab a simple element class
elem(elementName) {
return this.build({ elementName });
return this.build({ elementName })
}
//use if a different base is needed than whats defined by this.block
debase(base, elementProps) {
if (!elementProps) return base;
return this._handleProps(base, elementProps);
if (!elementProps) return base
return this._handleProps(base, elementProps)
}
//proxies bindProps and checks for which elementProps exist before binding
_handleProps(base, elementProps) {
let cls = base;
const { modifiers, customs, extras } = elementProps;
if (!!modifiers) cls += this._bindProps(modifiers, base);
if (!!customs) cls += this._bindProps(customs, base, true);
if (!!extras) cls += ` ${extras.join(" ")}`;
return cls.trim();
let cls = base
const { modifiers, customs, extras } = elementProps
if (modifiers) cls += this._bindProps(modifiers, base)
if (customs) cls += this._bindProps(customs, base, true)
if (extras) cls += ` ${extras.join(" ")}`
return cls.trim()
}
/*
@ -53,22 +53,22 @@ export default class ClassBuilder {
!!value &&
(!this.defaultIgnoreList || !this.defaultIgnoreList.includes(value))
) {
let classBase = isCustom ? `bbmd-${base}` : `${base}`;
let valueType = typeof value;
let classBase = isCustom ? `bbmd-${base}` : `${base}`
let valueType = typeof value
if (valueType == "string" || valueType == "number") {
return isCustom
? ` ${classBase}--${this._convertCamel(property)}-${value}`
: ` ${classBase}--${value}`;
: ` ${classBase}--${value}`
} else if (valueType == "boolean") {
return ` ${classBase}--${this._convertCamel(property)}`;
return ` ${classBase}--${this._convertCamel(property)}`
}
}
})
.join("");
.join("")
}
_convertCamel(str) {
return str.replace(/[A-Z]/g, match => `-${match.toLowerCase()}`);
return str.replace(/[A-Z]/g, match => `-${match.toLowerCase()}`)
}
}

38
packages/materialdesign-components/src/Common/Formfield.svelte
View File

@ -1,32 +1,32 @@
<script>
import "@material/form-field/mdc-form-field.scss";
import ClassBuilder from "../ClassBuilder.js";
import { fieldStore } from "./FormfieldStore.js";
import { MDCFormField } from "@material/form-field";
import { onMount, onDestroy, setContext } from "svelte";
import "@material/form-field/mdc-form-field.scss"
import ClassBuilder from "../ClassBuilder.js"
import { fieldStore } from "./FormfieldStore.js"
import { MDCFormField } from "@material/form-field"
import { onMount, onDestroy, setContext } from "svelte"
const cb = new ClassBuilder("form-field");
const cb = new ClassBuilder("form-field")
let store;
const unsubscribe = fieldStore.subscribe(s => (store = s));
let store
const unsubscribe = fieldStore.subscribe(s => (store = s))
export let id = "";
export let label = "";
export let alignEnd = false;
export let id = ""
export let label = ""
export let alignEnd = false
let formField = null;
let formField = null
let modifiers = { alignEnd };
let props = { modifiers };
let modifiers = { alignEnd }
let props = { modifiers }
let blockClasses = cb.build({ props });
let blockClasses = cb.build({ props })
onMount(() => {
if (!!formField) fieldStore.set(new MDCFormField(formField));
setContext("BBMD:field-element", fieldStore);
});
if (!!formField) fieldStore.set(new MDCFormField(formField))
setContext("BBMD:field-element", fieldStore)
})
onDestroy(unsubscribe);
onDestroy(unsubscribe)
</script>
<div bind:this={formField} class={blockClasses}>

14
packages/materialdesign-components/src/Common/FormfieldStore.js
View File

@ -1,19 +1,19 @@
import { writable } from "svelte/store";
import { writable } from "svelte/store"
function store() {
const { set, update, subscribe } = writable({});
const { set, update, subscribe } = writable({})
function setInput(inp) {
update(n => {
n.input = inp;
});
n.input = inp
})
}
return {
subscribe,
set,
setInput
};
setInput,
}
}
export const fieldStore = store();
export const fieldStore = store()

8
packages/materialdesign-components/src/Common/Icon.svelte
View File

@ -1,12 +1,12 @@
<script>
import { getContext } from "svelte";
import { getContext } from "svelte"
export let icon = "";
export let icon = ""
let iconContext = getContext("BBMD:icon:context");
let iconContext = getContext("BBMD:icon:context")
let cls = iconContext
? `material-icons mdc-${iconContext}__icon`
: "material-icons";
: "material-icons"
</script>
<i class={cls}>{icon}</i>

8
packages/materialdesign-components/src/Common/Label.svelte
View File

@ -1,12 +1,12 @@
<script>
export let bold = false;
export let text = "";
export let bold = false
export let text = ""
</script>
<span class="mdc-typography" class:bold>{text}</span>
<style>
.bold {
font-weight: 500;
}
</style>
<span class="mdc-typography" class:bold>{text}</span>

15
packages/materialdesign-components/src/Datatable/Datatable.svelte
View File

@ -17,12 +17,10 @@
let tableElement
let initialied = false
$: {
if(tableElement && datatable && !initialied) {
if (tableElement && datatable && !initialied) {
const children = _bb.attachChildren(tableElement)
if(children.length > 0) {
if (children.length > 0) {
instance = new MDCDataTable(datatable)
initialied = true
}
@ -34,7 +32,7 @@
return () => {
try {
!!instance && instance.destroy()
} catch(e) {
} catch (e) {
console.log(e)
}
instance = null
@ -43,7 +41,8 @@
</script>
<div bind:this={datatable} class={cb.build()}>
<table class={cb.elem`table`} aria-label="Material Design Datatable" bind:this={tableElement}>
</table>
<table
class={cb.elem`table`}
aria-label="Material Design Datatable"
bind:this={tableElement} />
</div>

13
packages/materialdesign-components/src/Datatable/DatatableBody.svelte
View File

@ -1,14 +1,13 @@
<script>
import { getContext } from "svelte"
import { getContext } from "svelte"
export let _bb
export let _bb
const cb = _bb.getContext("BBMD:data-table:cb")
const cb = _bb.getContext("BBMD:data-table:cb")
let tbody
$: tbody && _bb.attachChildren(tbody)
let tbody
$: tbody && _bb.attachChildren(tbody)
</script>
<tbody bind:this={tbody} class={cb.elem`content`}></tbody>
<tbody bind:this={tbody} class={cb.elem`content`} />

3
packages/materialdesign-components/src/Datatable/DatatableCell.svelte
View File

@ -5,7 +5,7 @@
export let numeric = false
export let _bb
const cb = _bb.getContext("BBMD:data-table:cb")
const cb = _bb.getContext("BBMD:data-table:cb")
let elementName = isHeader ? "header-cell" : "cell"
let modifiers = { numeric }
@ -14,7 +14,6 @@
let element
$: element && _bb.attachChildren(element)
</script>
{#if isHeader}

12
packages/materialdesign-components/src/Datatable/DatatableHead.svelte
View File

@ -1,13 +1,11 @@
<script>
export let _bb
export let _bb
const cb = _bb.getContext("BBMD:data-table:cb")
const cb = _bb.getContext("BBMD:data-table:cb")
let thead
$: thead && _bb.attachChildren(thead)
let thead
$: thead && _bb.attachChildren(thead)
</script>
<thead bind:this={thead} class=className></thead>
<thead bind:this={thead} class="className" />

28
packages/materialdesign-components/src/Datatable/DatatableRow.svelte
View File

@ -1,27 +1,27 @@
<script>
import { getContext } from "svelte";
import { getContext } from "svelte"
export let onSelect = () => {};
export let isHeader = false;
export let onSelect = () => {}
export let isHeader = false
export let _bb
let row = null;
let selected = false;
let row = null
let selected = false
const cb = _bb.getContext("BBMD:data-table:cb")
const cb = _bb.getContext("BBMD:data-table:cb")
let elementName = isHeader ? "header-row" : "row";
let modifiers = {};
let elementName = isHeader ? "header-row" : "row"
let modifiers = {}
$: modifiers = { selected };
$: props = { modifiers };
$: rowClass = cb.build({ elementName, props });
$: modifiers = { selected }
$: props = { modifiers }
$: rowClass = cb.build({ elementName, props })
$: row && _bb.attachChildren(row)
function rowSelected() {
selected = !selected;
onSelect();
selected = !selected
onSelect()
}
</script>

38
packages/materialdesign-components/src/Menu/Menu.svelte
View File

@ -1,32 +1,32 @@
<script>
import { List } from "../List";
import { MDCMenu } from "@material/menu";
import { onMount, setContext } from "svelte";
export let items = [];
export let singleSelection = true;
export let width = "400px";
export let open = true;
export let useFixedPosition = false;
export let useAbsolutePosition = false;
import { List } from "../List"
import { MDCMenu } from "@material/menu"
import { onMount, setContext } from "svelte"
export let items = []
export let singleSelection = true
export let width = "400px"
export let open = true
export let useFixedPosition = false
export let useAbsolutePosition = false
//{x: number, y: number}
export let absolutePositionCoords = null;
export let absolutePositionCoords = null
let menu = null;
let instance = null;
let menu = null
let instance = null
onMount(() => {
if (!!menu) {
instance = new MDCMenu(menu);
instance.open = open;
instance = new MDCMenu(menu)
instance.open = open
if (useFixedPosition) {
instance.setFixedPosition(true);
instance.setFixedPosition(true)
} else if (useAbsolutePosition) {
let { x, y } = absolutePositionCoords;
instance.setAbsolutePosition(x | 0, y | 0);
let { x, y } = absolutePositionCoords
instance.setAbsolutePosition(x | 0, y | 0)
}
}
setContext("BBMD:list:context", "menu");
});
setContext("BBMD:list:context", "menu")
})
</script>
{#if useFixedPosition || useAbsolutePosition}

4
packages/materialdesign-components/src/Menu/index.js
View File

@ -1,2 +1,2 @@
import "./_styles.scss";
export { default as Menu } from "./Menu.svelte";
import "./_styles.scss"
export { default as Menu } from "./Menu.svelte"

6
packages/materialdesign-components/src/Radiobutton/index.js
View File

@ -1,3 +1,3 @@
import "./_style.scss";
export { default as Radiobutton } from "./Radiobutton.svelte";
export { default as Radiobuttongroup } from "./RadiobuttonGroup.svelte";
import "./_style.scss"
export { default as Radiobutton } from "./Radiobutton.svelte"
export { default as Radiobuttongroup } from "./RadiobuttonGroup.svelte"

2
packages/materialdesign-components/src/Test/createApp.js
View File

@ -4,7 +4,7 @@ import packageJson from "../../package.json"
import { rootComponent } from "./rootComponent"
import * as standardcomponents from "@budibase/standard-components/src/index"
export default async props => {
export default async () => {
delete components._lib
const componentLibraries = {}
componentLibraries[packageJson.name] = components

6
packages/materialdesign-components/src/Textfield/Textfield.svelte
View File

@ -68,7 +68,7 @@
}
let useLabel = !!label && (!fullwidth || (fullwidth && textarea))
let useIcon = !!icon && (!textarea && !fullwidth)
let useIcon = !!icon && !textarea && !fullwidth
if (useIcon) {
setContext("BBMD:icon:context", "text-field")
@ -120,7 +120,7 @@ TODO:Needs error handling - this will depend on how Budibase handles errors
{placeholder}
{minLength}
maxLength={safeMaxLength}
value={value}
{value}
on:change={changed} />
{:else}
{#if renderLeadingIcon}
@ -135,7 +135,7 @@ TODO:Needs error handling - this will depend on how Budibase handles errors
placeholder={!!label && fullwidth ? label : placeholder}
{minLength}
maxLength={safeMaxLength}
value={value}
{value}
aria-label={`Textfield ${variant}`}
on:focus={focus}
on:input={changed} />

2
packages/materialdesign-components/src/Textfield/index.js
View File

@ -1,2 +1,2 @@
import "./_index.scss"
export { default as Textfield } from "./Textfield.svelte"
export { default as Textfield } from "./Textfield.svelte"

26
packages/materialdesign-components/src/Typography/index.js
View File

@ -1,13 +1,13 @@
import "./_style.scss";
export { default as Body1 } from "./Body1.svelte";
export { default as Body2 } from "./Body2.svelte";
export { default as Caption } from "./Caption.svelte";
export { default as H1 } from "./H1.svelte";
export { default as H2 } from "./H2.svelte";
export { default as H3 } from "./H3.svelte";
export { default as H4 } from "./H4.svelte";
export { default as H5 } from "./H5.svelte";
export { default as H6 } from "./H6.svelte";
export { default as Overline } from "./Overline.svelte";
export { default as Sub1 } from "./Sub1.svelte";
export { default as Sub2 } from "./Sub2.svelte";
import "./_style.scss"
export { default as Body1 } from "./Body1.svelte"
export { default as Body2 } from "./Body2.svelte"
export { default as Caption } from "./Caption.svelte"
export { default as H1 } from "./H1.svelte"
export { default as H2 } from "./H2.svelte"
export { default as H3 } from "./H3.svelte"
export { default as H4 } from "./H4.svelte"
export { default as H5 } from "./H5.svelte"
export { default as H6 } from "./H6.svelte"
export { default as Overline } from "./Overline.svelte"
export { default as Sub1 } from "./Sub1.svelte"
export { default as Sub2 } from "./Sub2.svelte"

2
packages/server/appPackages/testApp/plugins.js
View File

@ -1,6 +1,6 @@
const fs = require("fs")
module.exports = config => ({
module.exports = () => ({
main: {
outputToFile: async ({ filename, content }) => {
await new Promise((resolve, reject) => {

2
packages/server/appPackages/testApp2/plugins.js
View File

@ -1 +1 @@
module.exports = config => ({})
module.exports = () => ({})

50
packages/server/initialise/createInstanceDb.js
View File

@ -4,38 +4,34 @@ const { applictionVersionPackage } = require("../utilities/createAppPackage")
const { determineVersionId } = require("../utilities/runtimePackages")
module.exports = async (context, datastoreModule, app, instance) => {
try {
const databaseManager = getDatabaseManager(
datastoreModule,
context.config.datastoreConfig
)
const databaseManager = getDatabaseManager(
datastoreModule,
context.config.datastoreConfig
)
await databaseManager.createEmptyInstanceDb(app.id, instance.id)
await databaseManager.createEmptyInstanceDb(app.id, instance.id)
const dbConfig = databaseManager.getInstanceDatastoreConfig(
app.id,
instance.id
)
const dbConfig = databaseManager.getInstanceDatastoreConfig(
app.id,
instance.id
)
const datastore = setupDatastore(datastoreModule.getDatastore(dbConfig))
const datastore = setupDatastore(datastoreModule.getDatastore(dbConfig))
const versionId = determineVersionId(instance.version)
const versionId = determineVersionId(instance.version)
const appPackage = await applictionVersionPackage(
context,
app.name,
versionId,
instance.key
)
const appPackage = await applictionVersionPackage(
context,
app.name,
versionId,
instance.key
)
await initialiseData(
datastore,
appPackage.appDefinition,
appPackage.accessLevels
)
await initialiseData(
datastore,
appPackage.appDefinition,
appPackage.accessLevels
)
return dbConfig
} catch (e) {
throw e
}
return dbConfig
}

40
packages/server/initialise/createMasterDb.js
View File

@ -10,31 +10,25 @@ const masterDbAccessLevels = require("../appPackages/_master/access_levels.json"
const { masterAppPackage } = require("../utilities/createAppPackage")
module.exports = async (context, datastoreModule, username, password) => {
try {
const { config } = context
const databaseManager = getDatabaseManager(
datastoreModule,
config.datastoreConfig
)
const { config } = context
const databaseManager = getDatabaseManager(
datastoreModule,
config.datastoreConfig
)
await databaseManager.createEmptyMasterDb()
const masterDbConfig = databaseManager.masterDatastoreConfig
const datastore = setupDatastore(
datastoreModule.getDatastore(masterDbConfig)
)
await databaseManager.createEmptyMasterDb()
const masterDbConfig = databaseManager.masterDatastoreConfig
const datastore = setupDatastore(datastoreModule.getDatastore(masterDbConfig))
await initialiseData(datastore, constructHierarchy(masterDbAppDefinition))
await initialiseData(datastore, constructHierarchy(masterDbAppDefinition))
const masterPackage = masterAppPackage(context)
const bbMaster = await getApisWithFullAccess(datastore, masterPackage)
await bbMaster.authApi.saveAccessLevels(masterDbAccessLevels)
const user = bbMaster.authApi.getNewUser()
user.name = username
user.accessLevels = ["owner"]
await bbMaster.authApi.createUser(user, password)
const masterPackage = masterAppPackage(context)
const bbMaster = await getApisWithFullAccess(datastore, masterPackage)
await bbMaster.authApi.saveAccessLevels(masterDbAccessLevels)
const user = bbMaster.authApi.getNewUser()
user.name = username
user.accessLevels = ["owner"]
await bbMaster.authApi.createUser(user, password)
return await getApisForUser(datastore, masterPackage, username, password)
} catch (e) {
throw e
}
return await getApisForUser(datastore, masterPackage, username, password)
}

14
packages/server/initialise/initialiseRuntimePackages.js
View File

@ -13,7 +13,9 @@ const copyfolder = (source, destination) =>
})
})
module.exports = async (context, bbMaster, latestAppsFolder) => {
exports.copyfolder = copyfolder
module.exports = async context => {
// create runtime folder
// copy master into /master/latest
if (await pathExists(runtimePackagesDirectory)) {
@ -26,16 +28,6 @@ module.exports = async (context, bbMaster, latestAppsFolder) => {
await mkdir(runtimePackagesDirectory)
/*
const allApps = await bbMaster
.indexApi
.listItems("/all_applications");
for(let app of allApps) {
app.
}
*/
const apps = {
_master: masterAppPackage(context),
}

6
packages/server/middleware/routers.js
View File

@ -141,7 +141,11 @@ module.exports = (config, app) => {
})
.get("/_builder/api/:appname/components", async ctx => {
try {
ctx.body = getComponentDefinitions(config, ctx.params.appname, ctx.query.lib)
ctx.body = getComponentDefinitions(
config,
ctx.params.appname,
ctx.query.lib
)
ctx.response.status = StatusCodes.OK
} catch (e) {
if (e.status) {

6
packages/server/middleware/session.js
View File

@ -14,9 +14,9 @@ module.exports = (config, app) => {
rolling: false /** (boolean) Force a session identifier cookie to be set on every response. The expiration is reset to the original maxAge, resetting the expiration countdown. (default is false) */,
renew: false /** (boolean) renew session when session is nearly expired, so we can always keep user logged in. (default is false)*/,
store: {
get: async (key, maxAge, { rolling }) => ({ key }),
set: async (key, sess, maxAge, { rolling, changed }) => ({ key }),
destroy: async key => ({}),
get: async key => ({ key }),
set: async key => ({ key }),
destroy: async () => ({}),
},
}

7
packages/server/tests/createNewApp.js
View File

@ -1,14 +1,9 @@
const statusCodes = require("../utilities/statusCodes")
const constructHierarchy = require("../utilities/constructHierarchy")
const { readFile } = require("fs-extra")
const { hierarchy } = require("@budibase/core")
const { take } = require("lodash/fp")
const masterAppDefinition = constructHierarchy(
require("../appPackages/_master/appDefinition.json")
)
constructHierarchy(require("../appPackages/_master/appDefinition.json"))
const { getApisWithFullAccess } = require("../utilities/budibaseApi")
const { createTarGzPackage } = require("../utilities/targzAppPackage")
const { timeout } = require("./helpers")
module.exports = app => {
let _master

6
packages/server/tests/helpers.js
View File

@ -1,6 +1,8 @@
module.exports.timeout = ms => new Promise(resolve => setTimeout(resolve, ms))
const timeout = ms => new Promise(resolve => setTimeout(resolve, ms))
module.exports.sleep = async (ms, fn) => {
exports.timeout = timeout
module.exports.sleep = async (ms, fn, ...args) => {
await timeout(ms)
return await fn(...args)
}

7
packages/server/tests/multipleInstances.js
View File

@ -1,13 +1,8 @@
const statusCodes = require("../utilities/statusCodes")
const constructHierarchy = require("../utilities/constructHierarchy")
const { readFile } = require("fs-extra")
const { getRecordApi, getAuthApi } = require("@budibase/core")
const masterAppDefinition = constructHierarchy(
require("../appPackages/_master/appDefinition.json")
)
constructHierarchy(require("../appPackages/_master/appDefinition.json"))
const { getApisWithFullAccess } = require("../utilities/budibaseApi")
const { createTarGzPackage } = require("../utilities/targzAppPackage")
const { timeout } = require("./helpers")
module.exports = app => {
let _master

4
packages/server/tests/testApp.js
View File

@ -141,9 +141,7 @@ const getRequest = (server, url) =>
.set("Accept", "application/json")
const reInitialize = async () => {
try {
await remove(config.datastoreConfig.rootPath)
} catch (_) {}
await remove(config.datastoreConfig.rootPath)
await mkdir(config.datastoreConfig.rootPath)

4
packages/server/utilities/builder/componentLibraryInfo.js
View File

@ -4,7 +4,7 @@ const { resolve, join, dirname } = require("path")
/**
* @param {string} appPath - budibase application name
* @param {string} libname - component library name
* @returns {string} directory name of component definitions for a specific budibase application.
* @returns {string} directory name of component definitions for a specific budibase application.
*/
const getLibDir = (appPath, libname) => {
try {
@ -25,7 +25,7 @@ module.exports.componentsFilepath = (appPath, libname) =>
/**
* @param {string} appPath - the path to a budibase application
* @param {string} libname - the name of the component libary to use for namespacing
* @returns {object} tree of components namespaced by their component library name.
* @returns {object} tree of components namespaced by their component library name.
*/
module.exports.componentLibraryInfo = async (appPath, libname) => {
const libDir = getLibDir(appPath, libname)

8
packages/server/utilities/builder/index.js
View File

@ -112,14 +112,18 @@ module.exports.savePage = async (config, appname, pagename, page) => {
await buildPage(config, appname, appDefinition, pagename, page)
}
module.exports.componentLibraryInfo = async (config, appname, componentLibrary) => {
module.exports.componentLibraryInfo = async (
config,
appname,
componentLibrary
) => {
const appPath = appPackageFolder(config, appname)
return await componentLibraryInfo(appPath, componentLibrary)
}
/**
* @param {string} appPath - path to a budibase application
* @param {Array} pages - a list of budibase application pages
* @param {Array} pages - a list of budibase application pages
* @param {string} componentLibrary - component library to fetch components for
* @returns {object} - an object containing component definitions namespaced by their component library
*/

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