Skip to content

Remove unused javascript from toolshed test makos #21387

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.

Sign up for GitHub

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

Open
guerler wants to merge 22 commits into
base: dev
Choose a base branch
from
Open

Remove unused javascript from toolshed test makos #21387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1779087
Remove refresh frames mako
guerler Dec 4, 2025
1128fcf
Remove unused styles
guerler Dec 5, 2025
3ac4d51
Remove libs bundle
guerler Dec 5, 2025
a31c3d4
Strip galaxy client usage
guerler Dec 5, 2025
2bc78b6
Remove base style
guerler Dec 5, 2025
ed00389
Remove legacy toolshed bundle
guerler Dec 5, 2025
bcfd996
Remove initialization methods
guerler Dec 5, 2025
2c0dd0a
Remove addInitialization handler
guerler Dec 5, 2025
21f237e
Remove remaining addInitialization calls
guerler Dec 5, 2025
c947c83
Remove last addInitialization call
guerler Dec 6, 2025
c03c830
Remove unused client helper
guerler Dec 6, 2025
d686a3b
Remove unused sections of galaxy client mako
guerler Dec 8, 2025
0f677af
Strip masthead from test makos
guerler Dec 8, 2025
e01ae8e
Move grid from legacy, all makos are legacy
guerler Dec 8, 2025
2fe119b
Remove base panel layer
guerler Dec 8, 2025
48bd455
Fix grid base mako path
guerler Dec 9, 2025
6fc9279
Remove left panel from test makos
guerler Dec 9, 2025
4d7d1f5
Remove panels from message mako
guerler Dec 9, 2025
e10fbde
Remove panels from groups mako
guerler Dec 9, 2025
4fc5b3e
Remove base panels entirely
guerler Dec 9, 2025
57ea097
Remove galaxy client mako, and js app reference
guerler Dec 9, 2025
949c977
Remove unused base mako content
guerler Dec 9, 2025
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
4 changes: 2 additions & 2 deletions lib/tool_shed/grids/framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,8 @@ class Grid:
title = ""
model_class: Optional[type] = None
show_item_checkboxes = False
template = "legacy/grid_base.mako"
async_template = "legacy/grid_base_async.mako"
template = "grid_base.mako"
async_template = "grid_base_async.mako"
use_async = False
use_hide_message = True
global_actions: list[GridAction] = []
Expand Down
83 changes: 1 addition & 82 deletions lib/tool_shed/webapp/templates/base.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,87 +1,6 @@
<%namespace name="galaxy_client" file="/galaxy_client_app.mako" />
<% self.js_app = None %>

<% _=n_ %>
<!DOCTYPE HTML>
<html>
<!--base.mako-->
${self.init()}
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>
Galaxy
%if app.config.brand:
| ${app.config.brand}
%endif
| ${self.title()}
</title>

## relative href for site root
## TODO: try <base> tag?
<link rel="index" href="${ h.url_for( '/' ) }"/>

${self.metas()}
${self.stylesheets()}
${self.javascripts()}
${self.javascript_app()}
</head>
<body class="inbound">
<body>
${next.body()}
</body>
</html>

## Default title
<%def name="title()"></%def>

## Default init
<%def name="init()"></%def>

## Default stylesheets
<%def name="stylesheets()">
${h.dist_css('base')}
</%def>

## Default javascripts
<%def name="javascripts()">
## TODO: remove when all libs are required directly in modules
${h.dist_js(
'libs.bundled',
)}
${self.javascript_entry()}
</%def>

<%def name="javascript_entry()">
${h.dist_js('toolshed.bundled')}
</%def>

<%def name="javascript_app()">

${ galaxy_client.load( app=self.js_app ) }
${ galaxy_client.config_sentry( app=self.js_app ) }
%if self.js_app and self.js_app.config and self.js_app.config.ga_code:
${ galaxy_client.config_google_analytics(self.js_app.config.ga_code) }
%endif
%if self.js_app and self.js_app.config and self.js_app.config.plausible_server and self.js_app.config.plausible_domain:
${ galaxy_client.config_plausible_analytics(self.js_app.config.plausible_server, self.js_app.config.plausible_domain) }
%endif
%if self.js_app and self.js_app.config and self.js_app.config.matomo_server and self.js_app.config.matomo_site_id:
${ galaxy_client.config_matomo_analytics(self.js_app.config.matomo_server, self.js_app.config.matomo_site_id) }
%endif

%if not form_input_auto_focus is UNDEFINED and form_input_auto_focus:
<script type="text/javascript">
// Auto Focus on first item on form
config.addInitialization(function() {
console.log("base.mako", "auto focus on first item on form");
if ( $("*:focus").html() == null ) {
$(":input:not([type=hidden]):visible:enabled:first").focus();
}
});
</script>
%endif

</%def>

## Additional metas can be defined by templates inheriting from this one.
<%def name="metas()"></%def>
191 changes: 0 additions & 191 deletions lib/tool_shed/webapp/templates/base/base_panels.mako
View file
Open in desktop

This file was deleted.

Loading
Loading