Combine the two toolbars#2542
Conversation
3d3bf40 to
fa7bf76
Compare
0e1326e to
0769b50
Compare
|
The merge of the two toolbar logics looks good to me. It looks to me like one of the 2 was never used but might be wrong about that. The backburger works I think. I'm not used to it but I think it's obvious what it means. Only thing is that the icon looks like a different font or font weight to the menu burger: <v-btn
icon
@click.stop="toggleDrawer"
id="toggle-drawer"
>
<v-icon
:style="drawer
? { stroke: 'currentColor', strokeWidth: 1.1 }
: {}"
>
{{ drawer ? icons.backBurger : icons.list }}
</v-icon>
</v-btn>The alternative would be to unify to this set of icons for both: Doing some digging, it looks like there is a further "toolbar" that needs merging (or just removing)! <v-alert
:icon="icons.mdiTable"
prominent
color="grey-lighten-3"
>
<h3 class="text-h5">{{ $t('Workflows.tableHeader') }}</h3>
</v-alert>Just removing that block fixes the duplicate headings / toolbar but does leave the formatting of the workflows table a little off. Also, some of the page headings on the new toolbar might need some formatting for users E.G.: Similarly the settings page uses an alert for its header, however the text is different so isn't as noticeable. 2 ways I can think to solve this are just to remove the alerts from the pages that use them, or to have the new toolbar display something generic while on these pages, maybe staying as 'dashboard' or maybe just 'cylc' or 'config' or similar. Not sure. Style wise, for some reason the blue headings doesn't feel quite right to me. It works for workflow headings: But im less of a fan on the workflows table and settings pages, especially after removing the additional heading: |
|
The mdi library does not have a ForwardBurger icon (which does seem like an oversight on their part) and importing extra icons seems a bit much. |
samuel-denton
left a comment
There was a problem hiding this comment.
Functionally I'm happy it works.
The settings page still has 2 toolbars/headings but they have different text so arguable if thats ok.
The icons aren't perfectly matched style wise but they work fine.
There are a few small style improvements that could be made but aren't critical, such as text colour on the toolbar on the workflows table page, or a margin being added back to the workflows table page so it matches other pages.
|
FYI, we're not actually restricted to MDI icons. If you can draw it (e.g, on paper) I can SVG'ize it for use in |
# Conflicts: # src/components/cylc/Toolbar.vue # src/components/cylc/workspace/Toolbar.vue
# Conflicts: # src/components/cylc/Toolbar.vue
703be40 to
da5a97d
Compare
| .get('#core-app-bar') | ||
| .should('exist') | ||
| }) | ||
| it('Is NOT displayed when looking at the dashboard', () => { | ||
| it('Is NOT displayed when using a standalone view', () => { | ||
| cy.visit('/#/') | ||
| cy | ||
| .get('#core-app-bar') | ||
| .should('not.exist') | ||
| }) |
There was a problem hiding this comment.
Testing it is not displayed when looking at the dashboard... immediately followed by testing it is displayed when looking at the dashboard (below).
(The reason this one is passing is probably the page has not fully loaded by the time this assertion is made - which is a gotcha with Cypress.)
Your new test below can replace both of these two above.
There was a problem hiding this comment.
I think we should still keep it for completeness sake.
But I have amended the test to actually test the thing it's supposed to test.
(Also, what is the proper way to get cypress to wait? The linter doesn't likecy.wait())
|
This composable is no longer applicable: Lines 39 to 43 in e8922ea |
Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>






This addresses the comments in (#2540) and closes #1455.
It combines both toolbars into one and implements the backburger icon.
Check List
CONTRIBUTING.mdand added my name as a Code Contributor.setup.cfg(andconda-environment.ymlif present).?.?.xbranch.