From 11f8fa94034832e1663cda3d9a19a36033320033 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 5 May 2025 15:56:20 +0200 Subject: [PATCH] Fiddle types --- .../builder/src/templates/BaseStructure.ts | 6 ++--- .../src/templates/screenTemplating/form.ts | 24 +++++++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/packages/builder/src/templates/BaseStructure.ts b/packages/builder/src/templates/BaseStructure.ts index 32f2457b99..99401dde1c 100644 --- a/packages/builder/src/templates/BaseStructure.ts +++ b/packages/builder/src/templates/BaseStructure.ts @@ -1,9 +1,9 @@ -import { Document } from "@budibase/types" +import { Document, Component } from "@budibase/types" import { cloneDeep } from "lodash/fp" export class BaseStructure { private _isScreen: boolean - private _children: BaseStructure[] + private _children: Component[] _json: T constructor(isScreen: boolean, initialDoc: T) { @@ -12,7 +12,7 @@ export class BaseStructure { this._json = initialDoc } - addChild(child: BaseStructure) { + addChild(child: Component) { this._children.push(child) return this } diff --git a/packages/builder/src/templates/screenTemplating/form.ts b/packages/builder/src/templates/screenTemplating/form.ts index 6eb36c8ef9..4053da1c6f 100644 --- a/packages/builder/src/templates/screenTemplating/form.ts +++ b/packages/builder/src/templates/screenTemplating/form.ts @@ -1,9 +1,11 @@ -import { Screen } from "./Screen" +import { componentStore } from "@/stores/builder" +import { getRowActionButtonTemplates } from "@/templates/rowActions" +import { Helpers } from "@budibase/bbui" +import { Screen as ScreenDoc } from "@budibase/types" import { Component } from "../Component" import getValidRoute from "./getValidRoute" -import { componentStore } from "@/stores/builder" -import { Helpers } from "@budibase/bbui" -import { getRowActionButtonTemplates } from "@/templates/rowActions" +import { Screen } from "./Screen" +import { utils } from "@budibase/shared-core" type FormType = "create" | "update" | "view" @@ -17,6 +19,8 @@ export const getTypeSpecificRoute = ( return `/${tableOrView.name}/edit/:id` } else if (type === "view") { return `/${tableOrView.name}/view/:id` + } else { + throw utils.unreachable(type) } } @@ -52,7 +56,17 @@ const getTitle = (type: FormType) => { return "Row details" } -const form = async ({ tableOrView, type, permissions, screens }) => { +const form = async ({ + tableOrView, + type, + permissions, + screens, +}: { + tableOrView: any + type: any + permissions: any + screens: ScreenDoc[] +}) => { const id = Helpers.uuid() const typeSpecificRoute = getTypeSpecificRoute(tableOrView, type) const role = getRole(permissions, type)