Add visibility management for spreadsheet columns #55
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: achour94 <[email protected]>
…olumn-visibility # Conflicts: # src/main/resources/db/changelog/db.changelog-master.yaml # src/test/java/org/gridsuite/studyconfig/server/DtoConverterTest.java
Signed-off-by: achour94 <[email protected]>
Tristan-WorkGH
requested changes
Jun 10, 2025
|
|
||
| @Column(name = "visible", nullable = false) | ||
| @Builder.Default | ||
| private Boolean visible = true; |
There was a problem hiding this comment.
If nullable = false, then use primitive type instead of nullable Object.
Suggested change
| private Boolean visible = true; | |
| private boolean visible = true; |
You can also set the default value at SQL level:
@ColumnDefault(false)| Double filterTolerance | ||
| Double filterTolerance, | ||
|
|
||
| @Schema(description = "Column visibility", defaultValue = "true") |
There was a problem hiding this comment.
defaultValue without nullable=true?
Suggested change
| @Schema(description = "Column visibility", defaultValue = "true") | |
| @Schema(description = "Column visibility", nullable=true, defaultValue = "true") |
| Double filterTolerance, | ||
|
|
||
| @Schema(description = "Column visibility", defaultValue = "true") | ||
| Boolean visible |
There was a problem hiding this comment.
why not using the primitive type if null isn't a value we support?
Suggested change
| Boolean visible | |
| boolean visible |
Comment on lines
+384
to
+388
| List<UUID> orderedColumnIds = columnStates.stream() | ||
| .sorted(Comparator.comparingInt(ColumnStateUpdateInfos::order)) | ||
| .map(ColumnStateUpdateInfos::columnId) | ||
| .toList(); | ||
| reorderColumns(orderedColumnIds, columns); |
There was a problem hiding this comment.
Instead of creating an intermediate list, you can order directly in one step.
Comment on lines
3
to
17
| <changeSet author="berrahmaach (generated)" id="1749213150568-4"> | ||
| <addColumn tableName="spreadsheet_column"> | ||
| <column name="visible" type="boolean" defaultValueBoolean="true"> | ||
| <constraints nullable="false"/> | ||
| </column> | ||
| </addColumn> | ||
| </changeSet> | ||
|
|
||
| <!-- Set default value for existing rows --> | ||
| <changeSet author="berrahmaach" id="1749213150568-5"> | ||
| <update tableName="spreadsheet_column"> | ||
| <column name="visible" valueBoolean="true"/> | ||
| <where>visible IS NULL</where> | ||
| </update> | ||
| </changeSet> |
There was a problem hiding this comment.
You can simplify it:
Suggested change
| <changeSet author="berrahmaach (generated)" id="1749213150568-4"> | |
| <addColumn tableName="spreadsheet_column"> | |
| <column name="visible" type="boolean" defaultValueBoolean="true"> | |
| <constraints nullable="false"/> | |
| </column> | |
| </addColumn> | |
| </changeSet> | |
| <!-- Set default value for existing rows --> | |
| <changeSet author="berrahmaach" id="1749213150568-5"> | |
| <update tableName="spreadsheet_column"> | |
| <column name="visible" valueBoolean="true"/> | |
| <where>visible IS NULL</where> | |
| </update> | |
| </changeSet> | |
| <changeSet author="berrahmaach (generated)" id="1749213150568-4"> | |
| <addColumn tableName="spreadsheet_column"> | |
| <column name="visible" type="boolean" defaultValueBoolean="true" valueBoolean="true" remarks="Is the column visible in the table?"> | |
| <constraints nullable="false"/> | |
| </column> | |
| </addColumn> | |
| </changeSet> |
Signed-off-by: achour94 <[email protected]>
…olumn-visibility # Conflicts: # src/main/resources/db/changelog/db.changelog-master.yaml
Tristan-WorkGH
approved these changes
Jun 13, 2025
|
|
||
| @Schema(description = "Column visibility", defaultValue = "true") | ||
| Boolean visible | ||
| boolean visible |
There was a problem hiding this comment.
Attention: if you do that, you must also set the default value in Java because primitive types have 0/false as implicit value when their container object is initialized!
Suggested change
| boolean visible | |
| boolean visible = true |
There was a problem hiding this comment.
you cannot assign default values directly in record parameter declarations
Comment on lines
384
to
390
| columns.sort(Comparator.comparing(column -> | ||
| columnStates.stream() | ||
| .filter(state -> state.columnId().equals(column.getUuid())) | ||
| .findFirst() | ||
| .map(ColumnStateUpdateInfos::order) | ||
| .orElse(Integer.MAX_VALUE) | ||
| )); |
There was a problem hiding this comment.
My previous review was wrong, I was thinking you could reuse the columnMap, but that isn't the case. You're previous version was good.
Comment on lines
359
to
365
| private static void reorderColumns(List<UUID> columnOrder, List<ColumnEntity> columns) { | ||
| columns.sort((c1, c2) -> { | ||
| int idx1 = columnOrder.indexOf(c1.getUuid()); | ||
| int idx2 = columnOrder.indexOf(c2.getUuid()); | ||
| return Integer.compare(idx1, idx2); | ||
| }); | ||
| } |
There was a problem hiding this comment.
IntelliJ simplify as
Suggested change
| private static void reorderColumns(List<UUID> columnOrder, List<ColumnEntity> columns) { | |
| columns.sort((c1, c2) -> { | |
| int idx1 = columnOrder.indexOf(c1.getUuid()); | |
| int idx2 = columnOrder.indexOf(c2.getUuid()); | |
| return Integer.compare(idx1, idx2); | |
| }); | |
| } | |
| private static void reorderColumns(List<UUID> columnOrder, List<ColumnEntity> columns) { | |
| columns.sort(Comparator.comparingInt(c -> columnOrder.indexOf(c.getUuid()))); | |
| } |
…olumn sorting logic Signed-off-by: achour94 <[email protected]>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.