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

Fix anys and undefineds

This commit is contained in:
Adria Navarro 2025-01-29 11:03:38 +01:00
parent 12ab5637c1
commit e34812719b
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/builder/src/stores/builder/components.ts
View File

@ -30,9 +30,18 @@ import {
} from "@/constants/backend" } from "@/constants/backend"
import { BudiStore } from "../BudiStore" import { BudiStore } from "../BudiStore"
import { Utils } from "@budibase/frontend-core" import { Utils } from "@budibase/frontend-core"
import { Component, FieldType, Screen, Table } from "@budibase/types" import {
Component as ComponentType,
FieldType,
Screen,
Table,
} from "@budibase/types"
import { utils } from "@budibase/shared-core" import { utils } from "@budibase/shared-core"
interface Component extends ComponentType {
_id: string
}
export interface ComponentState { export interface ComponentState {
components: Record<string, ComponentDefinition> components: Record<string, ComponentDefinition>
customComponents: string[] customComponents: string[]
@ -442,7 +451,11 @@ export class ComponentStore extends BudiStore<ComponentState> {
* @param {object} parent * @param {object} parent
* @returns * @returns
*/ */
createInstance(componentName: string, presetProps: any, parent: any) { createInstance(
componentName: string,
presetProps: any,
parent: any
): Component | null {
const screen = get(selectedScreen) const screen = get(selectedScreen)
if (!screen) { if (!screen) {
throw "A valid screen must be selected" throw "A valid screen must be selected"
@ -454,7 +467,7 @@ export class ComponentStore extends BudiStore<ComponentState> {
} }
// Generate basic component structure // Generate basic component structure
let instance = { let instance: Component = {
_id: Helpers.uuid(), _id: Helpers.uuid(),
_component: definition.component, _component: definition.component,
_styles: { _styles: {
@ -481,7 +494,7 @@ export class ComponentStore extends BudiStore<ComponentState> {
} }
// Custom post processing for creation only // Custom post processing for creation only
let extras: any = {} let extras: Partial<Component> = {}
if (definition.hasChildren) { if (definition.hasChildren) {
extras._children = [] extras._children = []
} }
@ -490,7 +503,7 @@ export class ComponentStore extends BudiStore<ComponentState> {
if (componentName.endsWith("/formstep")) { if (componentName.endsWith("/formstep")) {
const parentForm = findClosestMatchingComponent( const parentForm = findClosestMatchingComponent(
screen.props, screen.props,
get(selectedComponent)._id, get(selectedComponent)?._id,
(component: Component) => component._component.endsWith("/form") (component: Component) => component._component.endsWith("/form")
) )
const formSteps = findAllMatchingComponents( const formSteps = findAllMatchingComponents(
@ -775,7 +788,7 @@ export class ComponentStore extends BudiStore<ComponentState> {
if (!cut) { if (!cut) {
componentToPaste = makeComponentUnique(componentToPaste) componentToPaste = makeComponentUnique(componentToPaste)
} }
newComponentId = componentToPaste._id! newComponentId = componentToPaste._id
// Strip grid position metadata if pasting into a new screen, but keep // Strip grid position metadata if pasting into a new screen, but keep
// alignment metadata // alignment metadata
@ -918,7 +931,7 @@ export class ComponentStore extends BudiStore<ComponentState> {
// If we have children, select first child, and the node is not collapsed // If we have children, select first child, and the node is not collapsed
if ( if (
component._children?.length && component?._children?.length &&
(state.selectedComponentId === navComponentId || (state.selectedComponentId === navComponentId ||
componentTreeNodesStore.isNodeExpanded(component._id)) componentTreeNodesStore.isNodeExpanded(component._id))
) { ) {
@ -1347,7 +1360,10 @@ export const selectedComponent = derived(
$selectedScreen && $selectedScreen &&
$store.selectedComponentId?.startsWith(`${$selectedScreen._id}-`) $store.selectedComponentId?.startsWith(`${$selectedScreen._id}-`)
) { ) {
return $selectedScreen?.props return {
...$selectedScreen.props,
_id: $selectedScreen.props._id!,
}
} }
if (!$selectedScreen || !$store.selectedComponentId) { if (!$selectedScreen || !$store.selectedComponentId) {
return null return null