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.

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

fix: Fixed rollup divider position #1125

Merged
merged 4 commits into from
Mar 9, 2023

Conversation

bmingles
Copy link
Contributor

@bmingles bmingles commented Mar 2, 2023

fixes #1062

@bmingles bmingles requested a review from mattrunyon March 2, 2023 21:48
@codecov
Copy link

codecov bot commented Mar 2, 2023

Codecov Report

Merging #1125 (0eb036b) into main (11f4518) will increase coverage by 0.01%.
The diff coverage is 25.00%.

@@            Coverage Diff             @@
##             main    #1125      +/-   ##
==========================================
+ Coverage   43.38%   43.40%   +0.01%     
==========================================
  Files         435      435              
  Lines       32692    32680      -12     
  Branches     8243     8240       -3     
==========================================
  Hits        14185    14185              
+ Misses      18458    18446      -12     
  Partials       49       49              
Flag Coverage Δ
unit 43.40% <25.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
packages/iris-grid/src/IrisGridRenderer.ts 24.46% <25.00%> (+0.09%) ⬆️
packages/code-studio/src/plugins/PluginUtils.tsx 3.22% <0.00%> (+0.78%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@bmingles bmingles force-pushed the 1062-rollup-divider branch from ecbc612 to fa74cdf Compare March 3, 2023 23:02
);
const columnX = allColumnXs.get(modelIndex);
const columnWidth = allColumnWidths.get(modelIndex);
const lastVisibleGroupColumnIndex = groupedColumns.length - 1;
Copy link
Collaborator

Choose a reason for hiding this comment

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

I would add a comment along the lines of "This assumes the engine puts the grouped columns at the start of the model, so model and visible index match for grouped columns. If we add freeze support for tree tables or allow moving the grouped columns, this may need to change to get the visible index from the model index" so anybody woh sees this code in the future knows we didn't get the visible from model on purpose

Copy link
Contributor

Choose a reason for hiding this comment

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

that sounds like its waiting to break @mofojed might have opinions.

Copy link
Collaborator

Choose a reason for hiding this comment

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

It was already broken before if we added support for either of the things I mentioned. allColumnXs is keyed on VisibleIndex and we were using ModelIndex

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mattrunyon I've added a comment. It also occurs to me if we do ever support group columns not being the furthest to the left, we'll have some other UI decisions to make since the single vertical line of separation would no longer convey what it does now.

Copy link
Contributor

Choose a reason for hiding this comment

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

Frozen columns get a double line and a background.

image

We should probably not crash the table when a frozen column and a rollup are combined, what behaviour happens though I am not sure yet.

Copy link
Contributor Author

@bmingles bmingles Mar 7, 2023

Choose a reason for hiding this comment

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

@dsmmcken There's definitely some issues with combining frozen + grouping. A couple of examples:

  • freeze column then group by another column. Frozen columns no longer highlighted and context menu says you can freeze it. If you remove the grouping, frozen column returns.
  • Freeze a grouped column causes an error

That said, I don't think these are caused by this PR and likely will require some more testing + requirement definition of how we want to handle various scenarios of grouping + freeze + unfreeze

Any objections to this PR getting merged and us creating a new issue for the above?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@dsmmcken @mattrunyon Can this PR be merged, or are you still expecting something to be revised?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm fine with it. I was waiting to see if @mofojed had anything to say in regards to this, but the existing behavior would break if either of those features were implemented anyway, so I think it's fine.

Just for future reference, we typically click the re-request review button next to the reviewers when we're ready for a re-review. That makes the PR show up as "awaiting your review" in VSCode or when filtering the PR list by PRs waiting on your review

@dsmmcken dsmmcken requested review from dsmmcken and removed request for dsmmcken March 6, 2023 21:34
@bmingles bmingles merged commit 859bfa2 into deephaven:main Mar 9, 2023
@bmingles bmingles deleted the 1062-rollup-divider branch March 9, 2023 17:54
@github-actions github-actions bot locked and limited conversation to collaborators Mar 9, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rollup divider is shown at the wrong column edge.
4 participants