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

some type fixes

This commit is contained in:
Peter Clement 2024-12-24 09:21:56 +00:00
parent a1569e1145
commit c3ef77b767
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/builder/src/stores/builder/automations.ts
View File

@ -91,7 +91,13 @@ const automationActions = (store: AutomationStore) => ({
* @param {Object} destPath the destinationPart * @param {Object} destPath the destinationPart
* @param {Object} automation the automaton to be mutated * @param {Object} automation the automaton to be mutated
*/ */
moveBlock: async (sourcePath: any, destPath: any, automation: Automation) => { moveBlock: async (
sourcePath: BranchPath[],
destPath: BranchPath[],
automation: Automation
) => {
console.log(sourcePath)
console.log(destPath)
// The last part of the source node address, containing the id. // The last part of the source node address, containing the id.
const pathSource = sourcePath.at(-1) const pathSource = sourcePath.at(-1)
@ -99,13 +105,13 @@ const automationActions = (store: AutomationStore) => ({
const pathEnd = destPath.at(-1) const pathEnd = destPath.at(-1)
// Check if dragging a step into its own drag zone // Check if dragging a step into its own drag zone
const isOwnDragzone = pathSource.id === pathEnd.id const isOwnDragzone = pathSource?.id === pathEnd?.id
// Check if dragging the first branch step into the branch node drag zone // Check if dragging the first branch step into the branch node drag zone
const isFirstBranchStep = const isFirstBranchStep =
pathEnd.branchStepId && pathEnd?.branchStepId &&
pathEnd.branchIdx === pathSource.branchIdx && pathEnd.branchIdx === pathSource?.branchIdx &&
pathSource.stepIdx === 0 pathSource?.stepIdx === 0
// If dragging into an area that will not affect the tree structure // If dragging into an area that will not affect the tree structure
// Ignore the drag and drop. // Ignore the drag and drop.
@ -128,13 +134,15 @@ const automationActions = (store: AutomationStore) => ({
let finalPath let finalPath
// If dropping in a branch-step dropzone you need to find // If dropping in a branch-step dropzone you need to find
// the updated parent step route then add the branch details again // the updated parent step route then add the branch details again
if (pathEnd.branchStepId) { if (pathEnd?.branchStepId) {
const branchStepRef = newRefs[pathEnd.branchStepId] const branchStepRef = newRefs[pathEnd.branchStepId]
finalPath = branchStepRef.pathTo finalPath = branchStepRef.pathTo
finalPath.push(pathEnd) finalPath.push(pathEnd)
} else { } else {
// Place the target 1 after the drop // Place the target 1 after the drop
finalPath = newRefs[pathEnd.id].pathTo if (pathEnd?.id) {
finalPath = newRefs[pathEnd.id].pathTo
}
finalPath.at(-1).stepIdx += 1 finalPath.at(-1).stepIdx += 1
} }
@ -742,7 +750,7 @@ const automationActions = (store: AutomationStore) => ({
data: Record<string, any> data: Record<string, any>
) => { ) => {
// Create new modified block // Create new modified block
let newBlock: any = { let newBlock: AutomationStep & { inputs: any } = {
...block, ...block,
inputs: { inputs: {
...block.inputs, ...block.inputs,

1
packages/types/src/ui/stores/automations.ts
View File

@ -2,6 +2,7 @@ export interface BranchPath {
stepIdx: number stepIdx: number
branchIdx: number branchIdx: number
branchStepId: string branchStepId: string
id: string
} }
export interface BlockDefinitions { export interface BlockDefinitions {