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

Merge branch 'master' into fix/pc-fixes

This commit is contained in:
Peter Clement 2024-01-31 16:21:39 +00:00 committed by GitHub
parent cf6c9c16b8 c0823d7018
commit 1b023b849f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
21 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.eslintrc.json
View File

@ -45,6 +45,16 @@
"no-prototype-builtins": "off",
"local-rules/no-budibase-imports": "error"
}
},
{
"files": [
"packages/builder/**/*",
"packages/client/**/*",
"packages/frontend-core/**/*"
],
"rules": {
"no-console": ["error", { "allow": ["warn", "error", "debug"] } ]
}
}
],
"rules": {

2
lerna.json
View File

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

2
packages/backend-core/package.json
View File

@ -21,7 +21,7 @@
"test:watch": "jest --watchAll"
},
"dependencies": {
"@budibase/nano": "10.1.4",
"@budibase/nano": "10.1.5",
"@budibase/pouchdb-replication-stream": "1.2.10",
"@budibase/shared-core": "0.0.0",
"@budibase/types": "0.0.0",

1
packages/builder/src/builderStore/dataBinding.js
View File

@ -364,7 +364,6 @@ const getContextBindings = (asset, componentId) => {
* Generates a set of bindings for a given component context
*/
const generateComponentContextBindings = (asset, componentContext) => {
console.log("Hello ")
const { component, definition, contexts } = componentContext
if (!component || !definition || !contexts?.length) {
return []

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

@ -21,7 +21,7 @@ export const createBuilderWebsocket = appId => {
})
})
socket.on("connect_error", err => {
console.log("Failed to connect to builder websocket:", err.message)
console.error("Failed to connect to builder websocket:", err.message)
})
socket.on("disconnect", () => {
userStore.actions.reset()

2
packages/builder/src/components/common/CodeEditor/index.js
View File

@ -312,7 +312,7 @@ export const insertBinding = (view, from, to, text, mode) => {
} else if (mode.name == "handlebars") {
parsedInsert = hbInsert(view.state.doc?.toString(), from, to, text)
} else {
console.log("Unsupported")
console.warn("Unsupported")
return
}

2
packages/builder/src/components/portal/onboarding/TourPopover.svelte
View File

@ -67,7 +67,7 @@
}))
navigateStep(target)
} else {
console.log("Could not retrieve step")
console.warn("Could not retrieve step")
}
} else {
if (typeof tourStep.onComplete === "function") {

4
packages/builder/src/components/portal/onboarding/tourHandler.js
View File

@ -3,11 +3,11 @@ import { get } from "svelte/store"
const registerNode = async (node, tourStepKey) => {
if (!node) {
console.log("Tour Handler - an anchor node is required")
console.warn("Tour Handler - an anchor node is required")
}
if (!get(store).tourKey) {
console.log("Tour Handler - No active tour ", tourStepKey, node)
console.error("Tour Handler - No active tour ", tourStepKey, node)
return
}

2
packages/builder/src/components/portal/onboarding/tours.js
View File

@ -45,7 +45,7 @@ const endUserOnboarding = async ({ skipped = false } = {}) => {
onboarding: false,
}))
} catch (e) {
console.log("Onboarding failed", e)
console.error("Onboarding failed", e)
return false
}
return true

2
packages/builder/src/helpers/urlStateSync.js
View File

@ -52,7 +52,7 @@ export const syncURLToState = options => {
let cachedPage = get(routify.page)
let previousParamsHash = null
let debug = false
const log = (...params) => debug && console.log(`[${urlParam}]`, ...params)
const log = (...params) => debug && console.debug(`[${urlParam}]`, ...params)
// Navigate to a certain URL
const gotoUrl = (url, params) => {

2
packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
View File

@ -107,7 +107,7 @@
return
}
if (!prodAppId) {
console.log("Application id required")
console.error("Application id required")
return
}
await usersFetch.update({

2
packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
View File

@ -66,7 +66,7 @@
try {
await store.actions.screens.updateSetting(get(selectedScreen), key, value)
} catch (error) {
console.log(error)
console.error(error)
notifications.error("Error saving screen settings")
}
}

2
packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
View File

@ -71,7 +71,7 @@
$goto(`./${screenId}`)
store.actions.screens.select(screenId)
} catch (error) {
console.log(error)
console.error(error)
notifications.error("Error creating screens")
}
}

2
packages/builder/src/pages/builder/auth/login.svelte
View File

@ -31,7 +31,7 @@
async function login() {
form.validate()
if (Object.keys(errors).length > 0) {
console.log("errors", errors)
console.error("errors", errors)
return
}
try {

2
packages/client/src/components/app/embedded-map/EmbeddedMap.svelte
View File

@ -307,7 +307,7 @@
// Reset view
resetView()
} catch (e) {
console.log("There was a problem with the map", e)
console.error("There was a problem with the map", e)
}
}

2
packages/client/src/components/app/forms/CodeScanner.svelte
View File

@ -61,7 +61,7 @@
resolve({ initialised: true })
})
.catch(err => {
console.log("There was a problem scanning the image", err)
console.error("There was a problem scanning the image", err)
resolve({ initialised: false })
})
})

3
packages/client/src/sdk.js
View File

@ -28,6 +28,7 @@ import { fetchDatasourceSchema } from "./utils/schema.js"
import { getAPIKey } from "./utils/api.js"
import { enrichButtonActions } from "./utils/buttonActions.js"
import { processStringSync, makePropSafe } from "@budibase/string-templates"
import { fetchData, LuceneUtils } from "@budibase/frontend-core"
export default {
API,
@ -54,6 +55,8 @@ export default {
linkable,
getAction,
fetchDatasourceSchema,
fetchData,
LuceneUtils,
ContextScopes,
getAPIKey,
enrichButtonActions,

2
packages/client/src/stores/org.js
View File

@ -14,7 +14,7 @@ const createOrgStore = () => {
const settingsConfigDoc = await API.getTenantConfig(tenantId)
set({ logoUrl: settingsConfigDoc.config.logoUrl })
} catch (e) {
console.log("Could not init org ", e)
console.error("Could not init org ", e)
}
}

2
packages/frontend-core/src/components/grid/lib/websocket.js
View File

@ -29,7 +29,7 @@ export const createGridWebsocket = context => {
connectToDatasource(get(datasource))
})
socket.on("connect_error", err => {
console.log("Failed to connect to grid websocket:", err.message)
console.error("Failed to connect to grid websocket:", err.message)
})
// User events

2
packages/types/package.json
View File

@ -15,7 +15,7 @@
},
"jest": {},
"devDependencies": {
"@budibase/nano": "10.1.4",
"@budibase/nano": "10.1.5",
"@types/koa": "2.13.4",
"@types/pouchdb": "6.4.0",
"@types/redlock": "4.0.3",

8
yarn.lock
View File

@ -2050,10 +2050,10 @@
to-gfm-code-block "^0.1.1"
uuid "^9.0.1"
"@budibase/nano@10.1.4":
version "10.1.4"
resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.4.tgz#5c2670d0b4c12d736ddd6581c57d47c0aa45efad"
integrity sha512-J+IVaAljGideDvJss/AUxXA1599HEIUJo5c0LLlmc1KMA3GZWZjyX+w2fxAw3qF7hqFvX+qAStQgdcD3+/GPMA==
"@budibase/nano@10.1.5":
version "10.1.5"
resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.5.tgz#eeaded7bfc707ecabf8fde604425b865a90c06ec"
integrity sha512-q1eKIsYKo+iK17zsJYd3VBl+5ufQMPpHYLec0wVsid8wnJVrTQk7RNpBlBUn/EDgXM7t8XNNHlERqHu+CxJu8Q==
dependencies:
"@types/tough-cookie" "^4.0.2"
axios "^1.1.3"