From 5f353a85f7f9668d59e6cd9fa1e01a0a8e7891ff Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 8 Jan 2025 10:55:11 +0000 Subject: [PATCH 01/17] permissions store --- .../builder/src/stores/builder/permissions.js | 27 ----------- .../builder/src/stores/builder/permissions.ts | 47 +++++++++++++++++++ 2 files changed, 47 insertions(+), 27 deletions(-) delete mode 100644 packages/builder/src/stores/builder/permissions.js create mode 100644 packages/builder/src/stores/builder/permissions.ts diff --git a/packages/builder/src/stores/builder/permissions.js b/packages/builder/src/stores/builder/permissions.js deleted file mode 100644 index a303cd713b..0000000000 --- a/packages/builder/src/stores/builder/permissions.js +++ /dev/null @@ -1,27 +0,0 @@ -import { writable } from "svelte/store" -import { API } from "@/api" - -export function createPermissionStore() { - const { subscribe } = writable([]) - - return { - subscribe, - save: async ({ level, role, resource }) => { - return await API.updatePermissionForResource(resource, role, level) - }, - remove: async ({ level, role, resource }) => { - return await API.removePermissionFromResource(resource, role, level) - }, - forResource: async resourceId => { - return (await API.getPermissionForResource(resourceId)).permissions - }, - forResourceDetailed: async resourceId => { - return await API.getPermissionForResource(resourceId) - }, - getDependantsInfo: async resourceId => { - return await API.getDependants(resourceId) - }, - } -} - -export const permissions = createPermissionStore() diff --git a/packages/builder/src/stores/builder/permissions.ts b/packages/builder/src/stores/builder/permissions.ts new file mode 100644 index 0000000000..002b73893e --- /dev/null +++ b/packages/builder/src/stores/builder/permissions.ts @@ -0,0 +1,47 @@ +import { BudiStore } from "../BudiStore" +import { API } from "@/api" +import { + PermissionLevel, + GetResourcePermsResponse, + GetDependantResourcesResponse, +} from "@budibase/types" + +interface Permission { + level: PermissionLevel + role: string + resource: string +} + +export class PermissionStore extends BudiStore { + constructor() { + super([]) + } + + save = async (permission: Permission) => { + const { level, role, resource } = permission + return await API.updatePermissionForResource(resource, role, level) + } + + remove = async (permission: Permission) => { + const { level, role, resource } = permission + return await API.removePermissionFromResource(resource, role, level) + } + + forResource = async (resourceId: string): Promise => { + return (await API.getPermissionForResource(resourceId)).permissions + } + + forResourceDetailed = async ( + resourceId: string + ): Promise => { + return await API.getPermissionForResource(resourceId) + } + + getDependantsInfo = async ( + resourceId: string + ): Promise => { + return await API.getDependants(resourceId) + } +} + +export const permissions = new PermissionStore() From a983292865fee9980342d23af16a8d9ed20c6a64 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 8 Jan 2025 11:14:56 +0000 Subject: [PATCH 02/17] fix return type --- packages/builder/src/stores/builder/permissions.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/stores/builder/permissions.ts b/packages/builder/src/stores/builder/permissions.ts index 002b73893e..6056449150 100644 --- a/packages/builder/src/stores/builder/permissions.ts +++ b/packages/builder/src/stores/builder/permissions.ts @@ -4,6 +4,7 @@ import { PermissionLevel, GetResourcePermsResponse, GetDependantResourcesResponse, + ResourcePermissionInfo, } from "@budibase/types" interface Permission { @@ -27,7 +28,9 @@ export class PermissionStore extends BudiStore { return await API.removePermissionFromResource(resource, role, level) } - forResource = async (resourceId: string): Promise => { + forResource = async ( + resourceId: string + ): Promise> => { return (await API.getPermissionForResource(resourceId)).permissions } From b6418c333cf422857f64db84f963f96e12a061d4 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 9 Jan 2025 09:20:16 +0000 Subject: [PATCH 03/17] views v1 --- packages/builder/src/stores/builder/views.js | 67 -------------- packages/builder/src/stores/builder/views.ts | 94 ++++++++++++++++++++ 2 files changed, 94 insertions(+), 67 deletions(-) delete mode 100644 packages/builder/src/stores/builder/views.js create mode 100644 packages/builder/src/stores/builder/views.ts diff --git a/packages/builder/src/stores/builder/views.js b/packages/builder/src/stores/builder/views.js deleted file mode 100644 index 07c356f56d..0000000000 --- a/packages/builder/src/stores/builder/views.js +++ /dev/null @@ -1,67 +0,0 @@ -import { writable, derived } from "svelte/store" -import { tables } from "./tables" -import { API } from "@/api" - -export function createViewsStore() { - const store = writable({ - selectedViewName: null, - }) - const derivedStore = derived([store, tables], ([$store, $tables]) => { - let list = [] - $tables.list?.forEach(table => { - const views = Object.values(table?.views || {}).filter(view => { - return view.version !== 2 - }) - list = list.concat(views) - }) - return { - ...$store, - list, - selected: list.find(view => view.name === $store.selectedViewName), - } - }) - - const select = name => { - store.update(state => ({ - ...state, - selectedViewName: name, - })) - } - - const deleteView = async view => { - await API.deleteView(view.name) - - // Update tables - tables.update(state => { - const table = state.list.find(table => table._id === view.tableId) - delete table.views[view.name] - return { ...state } - }) - } - - const save = async view => { - const savedView = await API.saveView(view) - select(view.name) - - // Update tables - tables.update(state => { - const table = state.list.find(table => table._id === view.tableId) - if (table) { - if (view.originalName) { - delete table.views[view.originalName] - } - table.views[view.name] = savedView - } - return { ...state } - }) - } - - return { - subscribe: derivedStore.subscribe, - select, - delete: deleteView, - save, - } -} - -export const views = createViewsStore() diff --git a/packages/builder/src/stores/builder/views.ts b/packages/builder/src/stores/builder/views.ts new file mode 100644 index 0000000000..4e309e180d --- /dev/null +++ b/packages/builder/src/stores/builder/views.ts @@ -0,0 +1,94 @@ +import { DerivedBudiStore } from "../BudiStore" +import { tables } from "./tables" +import { API } from "@/api" +import { View } from "@budibase/types" +import { helpers } from "@budibase/shared-core" +import { derived, Writable } from "svelte/store" + +interface BuilderViewStore { + selectedViewName: string | null +} + +interface DerivedViewStore extends BuilderViewStore { + list: View[] + selected?: View +} + +export class ViewsStore extends DerivedBudiStore< + BuilderViewStore, + DerivedViewStore +> { + constructor() { + const makeDerivedStore = (store: Writable) => { + return derived([store, tables], ([$store, $tables]): DerivedViewStore => { + let list: View[] = [] + $tables.list?.forEach(table => { + const views = Object.values(table?.views || {}).filter( + (view): view is View => !helpers.views.isV2(view) + ) + list = list.concat(views) + }) + return { + selectedViewName: $store.selectedViewName, + list, + selected: list.find(view => view.name === $store.selectedViewName), + } + }) + } + + super( + { + selectedViewName: null, + }, + makeDerivedStore + ) + + this.select = this.select.bind(this) + } + + select = (name: string) => { + this.store.update(state => ({ + ...state, + selectedViewName: name, + })) + } + + delete = async (view: View) => { + if (!view.name) { + return + } + await API.deleteView(view.name) + + // Update tables + tables.update(state => { + const table = state.list.find(table => table._id === view.tableId) + if (table?.views && view.name) { + delete table.views[view.name] + } + return { ...state } + }) + } + + save = async (view: View & { originalName?: string }) => { + if (!view.name) { + return + } + + const savedView = await API.saveView(view) + this.select(view.name) + + // Update tables + tables.update(state => { + const table = state.list.find(table => table._id === view.tableId) + if (table?.views && view.name) { + if (view.originalName) { + delete table.views[view.originalName] + } + table.views[view.name] = savedView + } + return { ...state } + }) + } +} + +export const views = new ViewsStore() From 0bc1e33ef3e79c3edc9485c0017674f87e2f6d16 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Mon, 13 Jan 2025 18:20:22 +0000 Subject: [PATCH 04/17] pr comments --- packages/builder/src/stores/builder/views.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/stores/builder/views.ts b/packages/builder/src/stores/builder/views.ts index 4e309e180d..81085fcb42 100644 --- a/packages/builder/src/stores/builder/views.ts +++ b/packages/builder/src/stores/builder/views.ts @@ -55,7 +55,7 @@ export class ViewsStore extends DerivedBudiStore< delete = async (view: View) => { if (!view.name) { - return + throw new Error("View name is required") } await API.deleteView(view.name) @@ -71,7 +71,7 @@ export class ViewsStore extends DerivedBudiStore< save = async (view: View & { originalName?: string }) => { if (!view.name) { - return + throw new Error("View name is required") } const savedView = await API.saveView(view) From a3bcaddabbca7d02f5ba306b9b98ebf34e61dfa9 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 14 Jan 2025 16:05:14 +0100 Subject: [PATCH 05/17] Re-add tests files in backend-core/dist --- packages/backend-core/package.json | 2 +- packages/backend-core/tsconfig.test.json | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 packages/backend-core/tsconfig.test.json diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 3e1b5f324b..1ab05cd14b 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -21,7 +21,7 @@ "scripts": { "prebuild": "rimraf dist/", "prepack": "cp package.json dist", - "build": "node ./scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly --paths null", + "build": "node ./scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly --paths null && tsc -p tsconfig.test.json --paths null", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "build:oss": "node ./scripts/build.js", "check:types": "tsc -p tsconfig.json --noEmit --paths null", diff --git a/packages/backend-core/tsconfig.test.json b/packages/backend-core/tsconfig.test.json new file mode 100644 index 0000000000..48322b7a94 --- /dev/null +++ b/packages/backend-core/tsconfig.test.json @@ -0,0 +1,8 @@ +{ + "extends": "../../tsconfig.build.json", + "compilerOptions": { + "outDir": "dist" + }, + "include": ["tests/**/*.js", "tests/**/*.ts"], + "exclude": ["node_modules", "dist"] +} From bc1e95b012aa357fa646ccecffd1bb65cc0624fb Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 14 Jan 2025 16:15:24 +0100 Subject: [PATCH 06/17] Add sourcemap --- packages/backend-core/tsconfig.test.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/backend-core/tsconfig.test.json b/packages/backend-core/tsconfig.test.json index 48322b7a94..0e3e7a79b2 100644 --- a/packages/backend-core/tsconfig.test.json +++ b/packages/backend-core/tsconfig.test.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { - "outDir": "dist" + "outDir": "dist", + "sourceMap": true }, "include": ["tests/**/*.js", "tests/**/*.ts"], "exclude": ["node_modules", "dist"] From 3715bd0bed58432a13657126e69b222df6762a86 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 14 Jan 2025 16:51:31 +0100 Subject: [PATCH 07/17] Update pro submodule --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 193476cdfa..19295c7e4d 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 193476cdfade6d3c613e6972f16ee0c527e01ff6 +Subproject commit 19295c7e4d223bec493a108a905c110d5f024258 From 2acbf29e625f60452adb3a8f2f696b05641f1939 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 14 Jan 2025 16:20:54 +0000 Subject: [PATCH 08/17] Bump version to 3.2.42 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index e8cd581c98..d0f0bd23c5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "3.2.41", + "version": "3.2.42", "npmClient": "yarn", "concurrency": 20, "command": { From ccf3e787011ff11838f48fa9b569d50345b2d5cf Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 14 Jan 2025 23:35:18 +0100 Subject: [PATCH 09/17] Update pro submodule --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 19295c7e4d..a4f63b2267 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 19295c7e4d223bec493a108a905c110d5f024258 +Subproject commit a4f63b22675e16dcdcaa4d9e83b298eee6466a07 From 4c1013e4d37c070eeb8ffb2b71fbd03f81b2c79d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 15 Jan 2025 09:04:44 +0000 Subject: [PATCH 10/17] Bump version to 3.2.43 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index d0f0bd23c5..1aa1705d19 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "3.2.42", + "version": "3.2.43", "npmClient": "yarn", "concurrency": 20, "command": { From 2b0f8091e774f4046dfaaf525698e3ad72e50331 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 15 Jan 2025 10:48:03 +0100 Subject: [PATCH 11/17] Add string logging --- scripts/build.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/build.js b/scripts/build.js index a745f49cfb..c18f637fab 100755 --- a/scripts/build.js +++ b/scripts/build.js @@ -47,6 +47,9 @@ let { argv } = require("yargs") async function runBuild(entry, outfile) { const isDev = process.env.NODE_ENV !== "production" + + console.log(`Building in mode ${process.env.NODE_ENV}`) + const tsconfig = argv["p"] || `tsconfig.build.json` const { data: tsconfigPathPluginContent } = loadTsConfig( From aa488ae8942197bbed46e723b5fc296e872f882b Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 15 Jan 2025 11:03:05 +0100 Subject: [PATCH 12/17] Fix is dev --- scripts/build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.js b/scripts/build.js index c18f637fab..a77329765f 100755 --- a/scripts/build.js +++ b/scripts/build.js @@ -46,9 +46,9 @@ const svelteCompilePlugin = { let { argv } = require("yargs") async function runBuild(entry, outfile) { - const isDev = process.env.NODE_ENV !== "production" + const isDev = !process.env.CI - console.log(`Building in mode ${process.env.NODE_ENV}`) + console.log(`Building in mode dev mode: ${isDev}`) const tsconfig = argv["p"] || `tsconfig.build.json` From f2fba9da0888aa88aa380e72ff1704b1e9603e45 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 15 Jan 2025 11:03:20 +0100 Subject: [PATCH 13/17] Sourcemap from tsconfig.json --- scripts/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.js b/scripts/build.js index a77329765f..e8e52d267c 100755 --- a/scripts/build.js +++ b/scripts/build.js @@ -61,7 +61,7 @@ async function runBuild(entry, outfile) { entryPoints: [entry], bundle: true, minify: !isDev, - sourcemap: isDev, + sourcemap: tsconfigPathPluginContent.compilerOptions.sourceMap, tsconfig, plugins: [ svelteCompilePlugin, From 3751886304020c20fc3862d04fa0316e94c1acdd Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 15 Jan 2025 11:03:27 +0100 Subject: [PATCH 14/17] Default on --- tsconfig.build.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tsconfig.build.json b/tsconfig.build.json index a05fa2c976..0e22ddf964 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -11,6 +11,7 @@ "declaration": true, "isolatedModules": true, "baseUrl": ".", + "sourceMap": true, "paths": { "@budibase/types": ["./packages/types/src"], "@budibase/backend-core": ["./packages/backend-core/src"], From 322d3cbacb8a35c5ee624ed971e0dc411458cec5 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 15 Jan 2025 11:03:48 +0100 Subject: [PATCH 15/17] Generate meta only if in dev --- scripts/build.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/build.js b/scripts/build.js index e8e52d267c..0106421fe7 100755 --- a/scripts/build.js +++ b/scripts/build.js @@ -128,10 +128,12 @@ async function runBuild(entry, outfile) { await Promise.all([hbsFiles, mainBuild, oldClientVersions]) - fs.writeFileSync( - `dist/${path.basename(outfile)}.meta.json`, - JSON.stringify((await mainBuild).metafile) - ) + if (isDev) { + fs.writeFileSync( + `dist/${path.basename(outfile)}.meta.json`, + JSON.stringify((await mainBuild).metafile) + ) + } console.log( "\x1b[32m%s\x1b[0m", From 1be1787bdc56655f92e79395abdecd481e6ae474 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 15 Jan 2025 11:04:15 +0100 Subject: [PATCH 16/17] Don't publish sourcemap for pro --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index a4f63b2267..43a5785ccb 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit a4f63b22675e16dcdcaa4d9e83b298eee6466a07 +Subproject commit 43a5785ccb4f83ce929b29f05ea0a62199fcdf23 From 29e9c9bb678c3a41d95bb5ac81107515c261422c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 15 Jan 2025 11:16:09 +0000 Subject: [PATCH 17/17] Bump version to 3.2.44 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 1aa1705d19..8d7179dbae 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "3.2.43", + "version": "3.2.44", "npmClient": "yarn", "concurrency": 20, "command": {