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

Merge pull request #515 from Budibase/path-bug 

fix path bug
This commit is contained in:
Martin McKeaveney 2020-07-27 16:20:50 +01:00 committed by GitHub
parent d86bbf8b98 9e978019aa
commit 1e014af785
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
View File

@ -16,15 +16,12 @@
const joinPath = join("/") const joinPath = join("/")
const normalizedName = name => const normalizedName = name =>
pipe( pipe(name, [
name, trimCharsStart("./"),
[ trimCharsStart("~/"),
trimCharsStart("./"), trimCharsStart("../"),
trimCharsStart("~/"), trimChars(" "),
trimCharsStart("../"), ])
trimChars(" "),
]
)
const changeScreen = screen => { const changeScreen = screen => {
store.setCurrentScreen(screen.props._instanceName) store.setCurrentScreen(screen.props._instanceName)

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

@ -19,11 +19,7 @@
const capitalise = s => s.substring(0, 1).toUpperCase() + s.substring(1) const capitalise = s => s.substring(0, 1).toUpperCase() + s.substring(1)
const get_name = s => (!s ? "" : last(s.split("/"))) const get_name = s => (!s ? "" : last(s.split("/")))
const get_capitalised_name = name => const get_capitalised_name = name => pipe(name, [get_name, capitalise])
pipe(
name,
[get_name, capitalise]
)
const isScreenslot = name => name === "##builtin/screenslot" const isScreenslot = name => name === "##builtin/screenslot"
const selectComponent = component => { const selectComponent = component => {

1
packages/server/src/api/controllers/component.js
View File

@ -27,6 +27,7 @@ exports.fetchAppComponentDefinitions = async function(ctx) {
const componentJson = require(join( const componentJson = require(join(
appDirectory, appDirectory,
componentLibrary, componentLibrary,
ctx.isDev ? "" : "packages",
"components.json" "components.json"
)) ))