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

Masthead Revision #17927

Merged
merged 60 commits into from
Jun 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
46c247d
Remove masthead icons
guerler Apr 7, 2024
9cbb318
Adjust masthead size
guerler Apr 7, 2024
97cc442
Remove masthead dropdown handler, only allow regular tabs
guerler May 20, 2024
43c1226
Remove unused imports from masthead item component
guerler May 20, 2024
832d62e
Start splitting object property into individual attributes in masthead
guerler May 20, 2024
bb46203
Remove interactive tools from masthead, since already available in th…
guerler May 20, 2024
d11ab54
Remove pseudo class handling, will use id instead
guerler May 20, 2024
5d5301f
Move away from json blob configuration for masthead options
guerler May 20, 2024
0eb2203
Decouple menu.js configuration module
guerler May 20, 2024
723f92d
Delete menu.js
guerler May 20, 2024
2e49d3f
Fix icon handling
guerler May 20, 2024
9827dcb
Remove unused props from masthead
guerler May 20, 2024
080a72a
Fix window manager handling in masthead
guerler May 20, 2024
6dcc6f8
Reorder masthead tabs
guerler May 21, 2024
e245919
Fix icon handling, avoid reload when returning to home
guerler May 21, 2024
06709ff
Fix toggle state, adjust icon styles
guerler May 21, 2024
e978ee0
Add configuration conditions
guerler May 21, 2024
636f6f4
Show navbar while loading config, reduce margin
guerler May 21, 2024
18caa0e
Move quota margin to navbar, adjust alignment
guerler May 21, 2024
b78612b
Fix tooltips in masthead
guerler May 21, 2024
3abbe62
Adjust jest tests
guerler May 23, 2024
f5b1e96
Preliminary adjustment of workflow run selenium test
guerler May 27, 2024
b6d8ab8
Remove additional login confirmation tests for now
guerler May 27, 2024
f212d04
More selenium adjustments, using the activity bar to navigate instead…
guerler May 27, 2024
bf132e1
Fix tool exection in selenium tests
guerler May 27, 2024
11428d0
Fix client formatting
guerler May 27, 2024
38ef60c
Extend list of visible activity items to anon user
guerler May 27, 2024
5755aa4
Fix workflow bookmarking test
guerler May 28, 2024
8952b28
Fix workflow invocations selenium test
guerler May 28, 2024
c0237f4
Fix tour test
guerler May 28, 2024
e590a89
Remove legacy navigation selectors
guerler May 28, 2024
63e2a81
Add help and community links to about page
guerler May 28, 2024
3d07d2a
Adjust library identifier to align with selenium tests
guerler May 28, 2024
4b90ffe
Fix visualization activity, adjust tour
guerler May 29, 2024
f1e1317
Add dropdown for user tab in masthead
guerler May 29, 2024
e0b4820
Remove unused popover plugin from masthead components
guerler May 29, 2024
5a54090
Move activity toggle icon to the left, treat like favorites selection
guerler May 29, 2024
83d484e
Reframe activity settings as list of all activities
guerler May 29, 2024
b3f4bb2
Only display optional activities when user clicks on more
guerler May 29, 2024
20d77f1
Fix regular icon state in activity list
guerler May 29, 2024
4d2fe61
Adjust selenium tests with regard to updated user dropdown
guerler May 30, 2024
3eeb107
Adjust jest test with regard to changes in activity panel
guerler May 30, 2024
ca11e91
Add username to user tab in masthead
guerler May 30, 2024
0f5b261
Adjust quota meter, consistently show progress bar, adjust tooltip
guerler May 30, 2024
fc3dd1e
Add loading spinner to masthead
guerler May 30, 2024
c0de496
Adjust quota meter test case
guerler May 30, 2024
aa4a8b8
Adjust tool running selenium test case in the context of object store
guerler May 31, 2024
765bab3
Convert quota meter to composition api and typescript
guerler May 31, 2024
5cdd404
Adjust quota meter jest test
guerler May 31, 2024
4430b42
Add total quota to quota meter
guerler May 31, 2024
af8350a
Fix typescript error in jest test
guerler May 31, 2024
136e8a6
Add prop for library metadata, possible reactivity issue?
guerler Jun 1, 2024
f170db9
Make masthead tooltips noninteractive
guerler Jun 1, 2024
f5b73ab
Remove redundant home icon from masthead
guerler Jun 28, 2024
b29c828
Adjust masthead test case
guerler Jun 28, 2024
360b147
Disable storage dashboard for anon users
guerler Jun 28, 2024
04c68ea
Link to login instead of disabling storage tab
guerler Jun 28, 2024
8d20256
Add prevent directive to masthead item click handler
guerler Jun 28, 2024
9766387
Limit username text length in masthead
guerler Jun 28, 2024
3255601
Improve brand alignment padding
guerler Jun 28, 2024
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
Prev Previous commit
Next Next commit
Fix tool exection in selenium tests
guerler committed Jun 1, 2024
commit bf132e181f7bd9eb0c39bba67eca256bc203a85e
4 changes: 4 additions & 0 deletions client/src/utils/navigation/navigation.yml
Original file line number Diff line number Diff line change
@@ -906,6 +906,10 @@ tour:
next: '${_} .tour-next'
end: '${_} .tour-end'

tools:
selectors:
activity: "#activity-tools"

admin:
allowlist:
selectors:
4 changes: 4 additions & 0 deletions lib/galaxy/selenium/navigates_galaxy.py
Original file line number Diff line number Diff line change
@@ -1268,6 +1268,10 @@ def navigate_to_published_histories(self):
self.components.histories.activity.wait_for_and_click()
self.components.published_histories.tab.wait_for_and_click()

def navigate_to_tools(self):
self.home()
self.components.tools.activity.wait_for_and_click()

def admin_open(self):
self.components.admin.activity.wait_for_and_click()

6 changes: 2 additions & 4 deletions lib/galaxy_test/selenium/test_change_password.py
Original file line number Diff line number Diff line change
@@ -10,8 +10,7 @@ def test_change_password(self):
self.home()
email = self._get_random_email()
self.register(email)
self.click_masthead_user()
self.components.masthead.preferences.wait_for_and_click()
self.navigate_to_user_preferences()
self.components.preferences.change_password.wait_for_and_click()
new_password = self._get_random_password()
self.fill_input_fields(self.default_password, new_password, new_password)
@@ -57,8 +56,7 @@ def test_new_password_same_password(self):
def register_and_change_password(self):
self.home()
self.register()
self.click_masthead_user()
self.components.masthead.preferences.wait_for_and_click()
self.navigate_to_user_preferences()
self.components.preferences.change_password.wait_for_and_click()

def fill_input_fields(self, current, password, confirm):
3 changes: 1 addition & 2 deletions lib/galaxy_test/selenium/test_sign_out.py
Original file line number Diff line number Diff line change
@@ -11,8 +11,7 @@ class TestSignOut(SeleniumTestCase):
def test_sign_out(self):
email = self._get_random_email()
self.register(email)
self.click_masthead_user()
self.components.masthead.preferences.wait_for_and_click()
self.navigate_to_user_preferences()
self.components.preferences.sign_out.wait_for_and_click()
self.components.sign_out.cancel_button.wait_for_and_click()
assert self.is_logged_in()
3 changes: 2 additions & 1 deletion test/integration_selenium/test_objectstore_selection.py
Original file line number Diff line number Diff line change
@@ -118,6 +118,7 @@ def test_2_user_override(self):
preferences = self.components.preferences
preferences.preferred_storage.wait_for_and_click()
self.select_storage("second")
self.navigate_to_tools()
self.run_environment_test_tool()
self.wait_for_hid_ok_and_open_details(1)
details = self.components.object_store_details
@@ -136,7 +137,7 @@ def test_3_user_un_override(self):
preferences = self.components.preferences
preferences.preferred_storage.wait_for_and_click()
self.select_storage("__null__")

self.navigate_to_tools()
self.run_environment_test_tool()
self.wait_for_hid_ok_and_open_details(1)
details = self.components.object_store_details
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ class TestUserFileSourceAwsPublicSeleniumIntegration(BaseUserObjectStoreSelenium
@managed_history
@selenium_test
def test_create_and_use(self):
self.navigate_to_user_preferences()
random_name = self._get_random_name(prefix="Encyclopedia of DNA Elements ENCODE")
instance = FileSourceInstance(
template_id="aws_public",