starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-09-21 16:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

right positioning when mixing R and W assets

Browse Source
This commit is contained in:
Diego Imbert
2025-07-02 14:01:59 +02:00
parent 977ee7f199
commit b91801c4ab
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/lib/components/flows/utils.ts
+2 -2
View File
@@ -197,6 +197,6 @@ export function checkIfParentLoop(
}
export const NODE_WITH_READ_ASSET_Y_OFFSET = 45
export const NODE_WITH_WRITE_ASSET_Y_OFFSET = 48
export const NODE_WITH_WRITE_ASSET_Y_OFFSET = 45
export const READ_ASSET_Y_OFFSET = -45
export const WRITE_ASSET_Y_OFFSET = 68
export const WRITE_ASSET_Y_OFFSET = 64
frontend/src/lib/components/graph/FlowGraphV2.svelte
+22 -20
View File
@@ -262,12 +262,8 @@
let assetAdditionalHeight = 0
if (assetsMap?.[id]?.some((a) => a.accessType === 'read'))
assetAdditionalHeight += NODE_WITH_READ_ASSET_Y_OFFSET
if (assetsMap?.[id]?.some((a) => a.accessType === 'write'))
assetAdditionalHeight += NODE_WITH_WRITE_ASSET_Y_OFFSET
console.log('assetAdditionalHeight', assetAdditionalHeight)
return [
(nodeWidths[id] ?? 1) * (NODE.width + NODE.gap.horizontal * 1),
NODE.height + NODE.gap.vertical + assetAdditionalHeight
@@ -320,22 +316,28 @@
for (const node of newNodes) {
const assets = assetsMap?.[node.id]
const assetNodes: (Node & AssetN)[] | undefined = assets?.map(
({ asset, accessType }, assetIdx) =>
({
id: `${node.id}-asset-${formatAsset(asset)}`,
type: 'asset',
data: { asset, accessType },
position: {
x:
(ASSET_WIDTH + ASSET_X_GAP) * (assetIdx - assets.length / 2) +
(NODE.width + ASSET_X_GAP) / 2,
y: accessType === 'read' ? READ_ASSET_Y_OFFSET : WRITE_ASSET_Y_OFFSET
},
parentId: node.id,
width: ASSET_WIDTH
}) satisfies Node & AssetN
)
let [readAssetIdx, writeAssetIdx] = [0, 0]
let [readAssetCount, writeAssetCount] = [
assets?.filter((a) => a.accessType === 'read').length ?? 0,
assets?.filter((a) => a.accessType === 'write').length ?? 0
]
const assetNodes: (Node & AssetN)[] | undefined = assets?.map(({ asset, accessType }) => {
const assetIdx = accessType === 'read' ? readAssetIdx++ : writeAssetIdx++
const accessTypeTotal = accessType === 'read' ? readAssetCount : writeAssetCount
return {
id: `${node.id}-asset-${formatAsset(asset)}`,
type: 'asset',
data: { asset, accessType },
position: {
x:
(ASSET_WIDTH + ASSET_X_GAP) * (assetIdx - accessTypeTotal / 2) +
(NODE.width + ASSET_X_GAP) / 2,
y: accessType === 'read' ? READ_ASSET_Y_OFFSET : WRITE_ASSET_Y_OFFSET
},
parentId: node.id,
width: ASSET_WIDTH
} satisfies Node & AssetN
})
if (assetNodes?.length) {
if (assetNodes.every((n) => n.data.accessType === 'read')) {