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

Improve AppBar #2190

Merged
merged 11 commits into from
May 24, 2023
Merged

Improve AppBar #2190

merged 11 commits into from
May 24, 2023

Conversation

imnasnainaec
Copy link
Collaborator

@imnasnainaec imnasnainaec commented May 23, 2023

Remove hard-coded grid size specifications to allow buttons to shift and fit more dynamically.
Restore small Combine icon for narrow windows, as it's the only way to get back to the ProjectScreen without logging out and back in again.
Fix max height of app-bar to prevent vertical stretching when "DATA ENTRY" or "DATA CLEANUP" overflow to third line in localization.
To save space on narrow windows, move Statistics button from large "DATA STATISTICS" nav button to small stats-icon button next to project settings.

With these changes:
Admins and project-owners have no AppBar overflow with window width at least 347 pixels;
Non-admin, non-project-owner users have no AppBar overflow with window width at least 302 pixels.


This change is Reviewable

@imnasnainaec imnasnainaec self-assigned this May 23, 2023
@codecov-commenter
Copy link

codecov-commenter commented May 23, 2023

Codecov Report

Patch coverage: 66.66% and project coverage change: -0.14 ⚠️

Comparison is base (73b92db) 57.99% compared to head (e68061b) 57.86%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2190      +/-   ##
==========================================
- Coverage   57.99%   57.86%   -0.14%     
==========================================
  Files         242      242              
  Lines        7745     7746       +1     
  Branches      497      498       +1     
==========================================
- Hits         4492     4482      -10     
- Misses       2884     2893       +9     
- Partials      369      371       +2     
Flag Coverage Δ
backend 73.04% <ø> (-0.34%) ⬇️
frontend 42.38% <66.66%> (+0.06%) ⬆️

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

Impacted Files Coverage Δ
src/components/AppBar/NavigationButtons.tsx 50.00% <0.00%> (-11.12%) ⬇️
src/components/AppBar/UserMenu.tsx 53.57% <ø> (ø)
src/components/DataEntry/DataEntryComponent.tsx 44.11% <0.00%> (-1.34%) ⬇️
.../MergeDupStep/DragDropComponents/MergeDragDrop.tsx 0.00% <ø> (ø)
...al/MergeDupStep/DragDropComponents/SidebarDrop.tsx 0.00% <ø> (ø)
src/components/AppBar/ProjectButtons.tsx 73.68% <73.68%> (ø)
src/components/AppBar/AppBarComponent.tsx 100.00% <100.00%> (ø)
src/components/AppBar/Logo.tsx 100.00% <100.00%> (+100.00%) ⬆️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@imnasnainaec imnasnainaec enabled auto-merge (squash) May 23, 2023 16:10
Copy link
Contributor

@jasonleenaylor jasonleenaylor left a comment

Choose a reason for hiding this comment

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

Reviewed 8 of 10 files at r1, 1 of 2 files at r2, all commit messages.
Reviewable status: 9 of 10 files reviewed, 2 unresolved discussions (waiting on @imnasnainaec)


src/components/AppBar/ProjectNameButton.tsx line 35 at r2 (raw file):

/** A button that redirects to the project settings */
export default function ProjectNameButton(

Insert appropriate new name here. My namer is malfunctioning, so I can't help right now.

Code quote:

ProjectNameButton

src/components/DataEntry/DataEntryComponent.tsx line 106 at r2 (raw file):

  componentDidMount(): void {
    this.props.openTree();

? Did we break this earlier?

Copy link
Collaborator Author

@imnasnainaec imnasnainaec left a comment

Choose a reason for hiding this comment

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

Reviewable status: 7 of 11 files reviewed, 1 unresolved discussion (waiting on @imnasnainaec and @jasonleenaylor)


src/components/DataEntry/DataEntryComponent.tsx line 106 at r2 (raw file):

Previously, jasonleenaylor (Jason Naylor) wrote…

? Did we break this earlier?

No, I added it here to remove the dispatch in AppBar/NavigationButtons.

Copy link
Contributor

@jasonleenaylor jasonleenaylor left a comment

Choose a reason for hiding this comment

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

Reviewed 3 of 4 files at r3, 4 of 4 files at r4, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @imnasnainaec)

@imnasnainaec imnasnainaec merged commit 3178d80 into master May 24, 2023
@imnasnainaec imnasnainaec deleted the appbar branch May 24, 2023 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants