mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-02-24 12:21:22 -05:00
cc5701e870
A lot of pages in the admin app are now generated entirely from Redis, without touching the API. The one remaining API call that a lot of pages make, when the user is platform admin or a member of an organisation, is to get the name of the current service’s organisation. This commit adds some code to start caching that as well, which should speed up page load times for when we’re clicking around the admin app (it’s typically 100ms just to get the organisation, and more than that when the API is under load). This means changing the service model to get the organisation from the API by ID, not by service ID. Otherwise it would be very hard to clear the cache if the name of the organisation ever changed. We can’t cache the whole organisation because it has a `count_of_live_services` field which can change at any time, without an update being made.
47 lines
1.8 KiB
HTML
47 lines
1.8 KiB
HTML
{% extends "admin_template.html" %}
|
||
|
||
{% set mainClasses = "govuk-!-padding-top-0 govuk-!-padding-bottom-0" %}
|
||
|
||
{% block per_page_title %}
|
||
{% block service_page_title %}{% endblock %} – {{ current_service.name }}
|
||
{% endblock %}
|
||
|
||
{% block main %}
|
||
<div class="govuk-width-container">
|
||
<div class="navigation-service">
|
||
{% if current_service.organisation_id %}
|
||
{% if current_user.platform_admin or
|
||
(current_user.belongs_to_organisation(current_service.organisation_id) and current_service.live) %}
|
||
<a href="{{ url_for('.organisation_dashboard', org_id=current_service.organisation_id) }}" class="govuk-link govuk-link--no-visited-state navigation-organisation-link">{{ current_service.organisation_name }}</a>
|
||
{% endif %}
|
||
{% endif %}
|
||
<div class="navigation-service-name govuk-!-font-weight-bold">
|
||
{{ current_service.name }}
|
||
</div>
|
||
<a href="{{ url_for('main.choose_account') }}" class="govuk-link govuk-link--no-visited-state navigation-service-switch">Switch service</a>
|
||
</div>
|
||
<div class="govuk-grid-row govuk-!-padding-bottom-12">
|
||
{% if help %}
|
||
<div class="govuk-grid-column-one-third">
|
||
{% else %}
|
||
<div class="govuk-grid-column-one-quarter">
|
||
{% endif %}
|
||
{% include "main_nav.html" %}
|
||
</div>
|
||
{% if help %}
|
||
<div class="govuk-grid-column-two-thirds">
|
||
{% else %}
|
||
<div class="govuk-grid-column-three-quarters">
|
||
{% endif %}
|
||
{% block beforeContent %}{% endblock %}
|
||
<main class="govuk-main-wrapper column-main {{ mainClasses }}" id="main-content" role="main">
|
||
{% block content %}
|
||
{% include 'flash_messages.html' %}
|
||
{% block maincolumn_content %}{% endblock %}
|
||
{% endblock %}
|
||
</main>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
{% endblock %}
|