Skip to content
Merged
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2c851e5
preliminary notes
Mathieu-Deharbe Apr 23, 2026
37304cb
use modifications_order for composites
Mathieu-Deharbe Apr 24, 2026
e6f5caa
keep order for composites saved to gridexplore
Mathieu-Deharbe Apr 24, 2026
135e1b1
correct drag to composites from root
Mathieu-Deharbe Apr 24, 2026
08894ee
autosort in many places
Mathieu-Deharbe Apr 24, 2026
35a6dca
cleans pom
Mathieu-Deharbe Apr 24, 2026
f1aa801
Merge branch 'main' into use-modifications_order-for-coposites
Mathieu-Deharbe Apr 24, 2026
7db3bb9
@OrderBy("modificationsOrder asc")
Mathieu-Deharbe Apr 27, 2026
db73cee
don't remove orphans because modification entity may be passed from c…
Mathieu-Deharbe Apr 27, 2026
135d7c1
migrationCompositesOrder.sql
Mathieu-Deharbe Apr 28, 2026
d8a1ad6
Merge branch 'main' into use-modifications_order-for-coposites
Mathieu-Deharbe Apr 28, 2026
172488c
rename comment
Mathieu-Deharbe Apr 28, 2026
4437ed0
Merge branch 'main' into use-modifications_order-for-coposites
Mathieu-Deharbe Apr 29, 2026
cbdbd5c
updates order when replacing a composite
Mathieu-Deharbe Apr 29, 2026
ddf31ce
Merge branch 'main' into use-modifications_order-for-coposites
Mathieu-Deharbe Apr 29, 2026
0b83cc2
remove primary key and prevent migration from running on h2 TUs
Mathieu-Deharbe Apr 29, 2026
4d7dae2
Guarantee findAllChildrenUuids results order
Apr 29, 2026
64ee136
Merge branch 'main' into use-modifications_order-for-coposites
Meklo Apr 30, 2026
4a98784
Merge remote-tracking branch 'origin/use-modifications_order-for-copo…
May 4, 2026
999cfd8
Fix regression
May 4, 2026
9a7db12
Simplify query
May 4, 2026
9d11392
COMPOSITE_MODIFICATION_SUB_MODIFICATIONSPK to composite_modification_…
Mathieu-Deharbe May 4, 2026
c009a47
Merge remote-tracking branch 'origin/use-modifications_order-for-copo…
May 4, 2026
5a6607f
replace PrimaryKey
Mathieu-Deharbe May 4, 2026
2d0cf95
Merge branch 'use-modifications_order-for-coposites' into marcellinh/…
Mathieu-Deharbe May 5, 2026
d85c88d
Merge branch 'main' into use-modifications_order-for-coposites
Meklo May 11, 2026
82f76da
Merge branch 'main' into use-modifications_order-for-coposites
Mathieu-Deharbe May 12, 2026
b8669b1
Merge remote-tracking branch 'origin/use-modifications_order-for-copo…
May 12, 2026
7e5e4d0
Merge main
May 12, 2026
fd55a13
PR suggestions
May 12, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,16 @@ WHERE sm.id IN (?1)
"WHERE m.id IN (SELECT mh.id FROM ModificationHierarchy mh)")
List<UUID> findOnlyCompositeChildrenUuids(UUID compositeUuid);

@NativeQuery("WITH RECURSIVE ModificationHierarchy (id) AS ( " +
" SELECT m0.id" +
" FROM composite_modification_sub_modifications m0 " +
" WHERE m0.id = :compositeUuid " +
" UNION ALL " +
" SELECT distinct m.modification_id" +
" FROM composite_modification_sub_modifications m " +
" INNER JOIN ModificationHierarchy mh ON m.id = mh.id " +
") " +
"SELECT distinct cast(m.id AS VARCHAR) FROM ModificationHierarchy m ")
// Returns the composite uuid and all its children uuid recursively
@NativeQuery("WITH RECURSIVE ModificationHierarchy (modification_id, path) AS ( " +
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would add a small comment like :
// returns the composite uuid and its children and subchildren's uuids
because the request is a bit complicated and it is not very logical that compositeUuid is returned given the function name (findAllChildrenUuids).

" SELECT cast(:compositeUuid AS VARCHAR), ARRAY[0] " +
" UNION ALL " +
" SELECT cast(sm.modification_id AS VARCHAR), mh.path || (m.modifications_order) " +
" FROM composite_modification_sub_modifications sm " +
" INNER JOIN modification m ON m.id = sm.modification_id " +
" INNER JOIN ModificationHierarchy mh ON cast(sm.id AS VARCHAR) = mh.modification_id " +
") " +
"SELECT modification_id FROM ModificationHierarchy ORDER BY path")
List<UUID> findAllChildrenUuids(UUID compositeUuid);

interface CompositeDepth {
Expand Down
Loading