Isolated dashboard app JavaScript
#2155
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adamzap
commented
Aug 9, 2025
| {% block body_extra %}{% endblock body_extra %} | ||
| <script src="{% static "js/djangoproject.js" %}"></script> | ||
|
|
||
| {% block javascript %} |
There was a problem hiding this comment.
The addition of this block is probably the most controversial change in this PR.
marksweb
reviewed
Sep 1, 2025
| @@ -1,14 +1,19 @@ | |||
| {% extends "base_dashboard.html" %} | |||
| {% load i18n %} | |||
| {% load static %} | |||
There was a problem hiding this comment.
Why not load it alongside i18n?
There was a problem hiding this comment.
Sure, I can do that. Just a personal style thing.
Updated in 9e53eab.
| <script src="{% static "js/lib/jquery.flot.min.js" %}"></script> | ||
| <script src="{% static "js/dashboard/utils.js" %}"></script> | ||
|
|
||
| {% block dashboard_javascript %}{% endblock %} |
There was a problem hiding this comment.
It might be simpler to not have dashboard_javascript (and arguably it's already dashboard JS as we're in dashboard templates). Then when more JS is needed, use the super...
{% block javascript %}
{{ block.super }}
<script src="{% static "js/dashboard/index.js" %}"></script>
{% endblock %}
There was a problem hiding this comment.
Good thinking!
Updated in 7ac24bc.
This patch moves the `dashboard` app's JavaScript inclusion from the project's `require.js` structure to the app itself. This was achieved with a new block in the base template called `javascript`. The rest of the site gets the default JavaScript includes, and the `dashboard` app overrides the block to include the JavaScript specific to it. The `dashboard` app benefits by not knowing about JavaScript related to the rest of the site and vice versa. None of the actual `dashboard` JavaScript code was changed. It was only adapted to the new structure. - Added `javascript` block to base template - Added `dashboard_javascript` block to `dashboard` base template - Included `dashboard` JavaScript directly in `dashboard` templates - Removed `dashboard`-related entries in `main.js` - Remove references to `jquery.flot.min.js` from base template - This library is only used by the `dashboard` app - Removed `dashboard-*` CSS classes only used by `require.js` - Removed `require.js` structure in `dashboard` JavaScript files - Simplified structure of `utils.js`
adamzap
force-pushed
the
isolate-dashboard-javascript
branch
from
8d20764 to
7ac24bc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch moves the
dashboardapp's JavaScript inclusion from the project'srequire.jsstructure to the app itself.This was achieved with a new block in the base template called
javascript. The rest of the site gets the default JavaScript includes, and thedashboardapp overrides the block to include the JavaScript specific to it. Thedashboardapp benefits by not knowing about JavaScript related to the rest of the site and vice versa.None of the actual
dashboardJavaScript code was changed. It was only adapted to the new structure.javascriptblock to base templatedashboard_javascriptblock todashboardbase templatedashboardJavaScript directly indashboardtemplatesdashboard-related entries inmain.jsjquery.flot.min.jsfrom base templatedashboardappdashboard-*CSS classes only used byrequire.jsrequire.jsstructure indashboardJavaScript filesutils.js