Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automation Branching UX #14783

Draft
wants to merge 100 commits into
base: v3-ui
Choose a base branch
from
Draft

Automation Branching UX #14783

Show file tree
Hide file tree
Changes from 69 commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
8837cb9
Merge commit
deanhannigan Sep 19, 2024
fa1a2b4
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Sep 19, 2024
eff76e1
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Sep 20, 2024
1ef2f8f
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Sep 23, 2024
a69a210
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Sep 24, 2024
18017c0
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Sep 25, 2024
62d2c34
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Sep 25, 2024
279d69e
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Sep 26, 2024
8de5a0d
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Sep 27, 2024
836b1fa
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Sep 27, 2024
3bd41db
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Sep 27, 2024
b99375c
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Sep 30, 2024
09cc253
Merge commit
deanhannigan Oct 1, 2024
47904a2
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 1, 2024
a9b747d
Replaced global selectedAutomation with memoised parameter
deanhannigan Oct 2, 2024
6d0d4a9
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 2, 2024
9835e95
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 2, 2024
abf4b60
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 2, 2024
f6b5b41
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 3, 2024
757ddc4
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 4, 2024
d326f6b
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 4, 2024
e9f8d1d
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 4, 2024
1ad566a
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 7, 2024
2c7950e
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 8, 2024
18f9b2a
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 8, 2024
2c31ddc
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 10, 2024
f23da77
Merge commit
deanhannigan Oct 10, 2024
ed0a9ce
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 10, 2024
185fd55
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 11, 2024
9382ca4
Branching UX updates, fix for looping results and general failure res…
deanhannigan Oct 11, 2024
61188fc
Fix for renaming steps. Removed unnecessary binding reprocessing
deanhannigan Oct 11, 2024
9cfc3d4
Refactored the selectedAutomation derived store to include tree metad…
deanhannigan Oct 13, 2024
b999c1a
Removed unused variable and fixes blockref references
deanhannigan Oct 13, 2024
4928c7f
Add a default branch id for server tests
deanhannigan Oct 14, 2024
3eb604f
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 14, 2024
b304d1d
changes to support automation conditions on both sides of evaluation
PClmnt Oct 14, 2024
030022a
lint
PClmnt Oct 14, 2024
20acd90
Merge pull request #14787 from Budibase/branching/branch-evaluation-b…
PClmnt Oct 14, 2024
bde3852
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 14, 2024
77a5b34
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 14, 2024
bfa3a66
null check on definition and selected automation
PClmnt Oct 16, 2024
092febb
update submodule
PClmnt Oct 16, 2024
d9deba6
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 16, 2024
77fefcd
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 18, 2024
f1217a6
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 21, 2024
843dd7e
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 21, 2024
7aa0ee7
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 21, 2024
1c41471
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 22, 2024
fb17881
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 23, 2024
071a5b1
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 23, 2024
cf7e00e
Fixes and refactoring for deleteBlock functionality. moveBlock added,…
deanhannigan Oct 24, 2024
1193efb
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 24, 2024
a816765
Added zoom text output and rounding to the closest 5. This was to acc…
deanhannigan Oct 24, 2024
f159a51
Remove unused
deanhannigan Oct 24, 2024
7f1184b
Lint
deanhannigan Oct 24, 2024
6a6ae2c
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 24, 2024
7dd245d
Allow editing bindings in filters inline as long as JS is not used
aptkingston Oct 25, 2024
a46acda
Update filter editor text to better support automation branching
aptkingston Oct 25, 2024
95069ef
Update style of branch text
aptkingston Oct 25, 2024
2b982ab
Removed zoom output, added focus element registration to allow center…
deanhannigan Oct 25, 2024
a60002d
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 25, 2024
acf743e
Lint
deanhannigan Oct 25, 2024
c3bf7ed
Allow 1.5x zoom. Used to top out at 1x
deanhannigan Oct 25, 2024
d1c21d7
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 28, 2024
0c587b3
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 28, 2024
11d24db
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 28, 2024
0c4df81
Bug fixes
deanhannigan Oct 28, 2024
4dd6deb
Merge branch 'v3-ui' of github.com:Budibase/budibase into feature/aut…
aptkingston Oct 28, 2024
392dc08
Merge branch 'v3-ui' into feature/automation-branching-ux
adrinr Oct 28, 2024
931ebde
Add settings and user bindings to drawer
PClmnt Oct 28, 2024
b999741
some lint
PClmnt Oct 28, 2024
3ad1cf5
Merge pull request #14892 from Budibase/feat/add-new-bindings-to-drawer
PClmnt Oct 29, 2024
8336f25
Merge branch 'v3-ui' into feature/automation-branching-ux
adrinr Oct 29, 2024
23c655e
Merge branch 'v3-ui' into feature/automation-branching-ux
adrinr Oct 29, 2024
1bfb4ee
Merge branch 'v3-ui' of github.com:budibase/budibase into feature/aut…
samwho Oct 29, 2024
a4aded3
Merge branch 'v3-ui' into feature/automation-branching-ux
adrinr Oct 29, 2024
3a8dc18
Minor fix for webhook modal to accomodate slower load times. selected…
deanhannigan Oct 29, 2024
bc406e1
Merge branch 'v3-ui' into feature/automation-branching-ux
aptkingston Oct 29, 2024
1c9f4be
Merge branch 'v3-ui' into feature/automation-branching-ux
adrinr Oct 30, 2024
d2da61e
Merge branch 'v3-ui' into feature/automation-branching-ux
adrinr Oct 30, 2024
7aad0d6
Type branch filters
adrinr Oct 30, 2024
b510d04
Simplify
adrinr Oct 30, 2024
3779c7f
Typing
adrinr Oct 30, 2024
d31275e
Merge branch 'v3-ui' of github.com:budibase/budibase into feature/aut…
samwho Oct 30, 2024
b1eaf8e
Merge branch 'v3-ui' into feature/automation-branching-ux
adrinr Oct 31, 2024
bddb6d4
Fix wrongly removing valueType=binding
adrinr Oct 31, 2024
987592d
Ignore scale factor when refreshing the step placeholder dimensions
deanhannigan Oct 31, 2024
acb5d27
Merge pull request #14927 from Budibase/budi-8810-automation-branches…
adrinr Oct 31, 2024
dd90571
Lint
deanhannigan Oct 31, 2024
d37c3ab
remove validation for empty conditions
PClmnt Oct 31, 2024
5a9c586
Ensure branch conditions are reinitialised on save. Improved error ca…
deanhannigan Oct 31, 2024
9023864
Revert "remove validation for empty conditions"
PClmnt Oct 31, 2024
4f93043
Added complete reference to branch config util function
deanhannigan Oct 31, 2024
86aabcc
Merge pull request #14922 from Budibase/chore/search-filter-typing
adrinr Oct 31, 2024
30a3013
Merge branch 'v3-ui' of github.com:budibase/budibase into feature/aut…
samwho Oct 31, 2024
79970ae
Fix to ensure events are ignored when the viewport isnt initialised. …
deanhannigan Oct 31, 2024
48752ce
Merge remote-tracking branch 'origin/v3-ui' into feature/automation-b…
deanhannigan Oct 31, 2024
96ca6e6
Use InfoDisplay instead of InlineAlert for row action triggers
aptkingston Oct 31, 2024
472830c
Merge branch 'feature/automation-branching-ux' of github.com:Budibase…
aptkingston Oct 31, 2024
81d01bc
Fix for robustness when navigating quickly through automations. dragO…
deanhannigan Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import Flowchart from "./FlowChart/FlowChart.svelte"
</script>

{#if $selectedAutomation}
{#key $selectedAutomation._id}
<Flowchart automation={$selectedAutomation} />
{#if $selectedAutomation?.data}
{#key $selectedAutomation.data._id}
<Flowchart automation={$selectedAutomation.data} />
{/key}
{/if}
Loading
Loading