Admin missing translations and tiny improvements. #2023

amazingphilippe · 2024-12-20T19:04:05Z

Summary | Résumé

This addresses cds-snc/notification-planning#998

Adds or calls translation keys where missing
Adds translations where missing
Some style tweaks on the live service table to improve readability.

Test instructions | Instructions pour tester la modification

Sequential steps (1., 2., 3., ...) that describe how to test this change. This
will help a developer test things out without too much detective work. Also,
include any environmental setup steps that aren't in the normal README steps
and/or any time-based elements that this requires.

Étapes consécutives (1., 2., 3., …) qui décrivent la façon de tester la
modification. Elles aideront les développeurs à faire des tests sans avoir à
jouer au détective. Veuillez aussi inclure toutes les étapes de configuration
de l’environnement qui ne font pas partie des étapes normales dans le fichier
README et tout élément temporel requis.

github-actions · 2024-12-20T19:10:34Z

🧪 Review environment

https://cqf2wmzgzrikyse3gcfucku2mq0fjvmr.lambda-url.ca-central-1.on.aws/

amazingphilippe · 2024-12-20T19:29:44Z

app/templates/components/empty-list.html

-      <p class="mb-0 text-base text-gray-800">{{ message }}</p>
+{% macro empty_list(heading, message=None, img="emptyFlower", link=None, linkText="", attributes="") %}
+<div
+  class="flex items-center border-dashed border-1 border-gray-400 p-8 sm:bg-{{img}} sm:bg-right bg-empty-state min-h-emptyState"


I've only added a min-height. The rest is auto formatting.

amazingphilippe · 2024-12-20T19:30:04Z

app/templates/components/table.html

-        <td class="table-empty-message p-6" colspan="10">
-          {{ empty_message }}
+        <td class="table-empty-message h-10" colspan="10">
+          {{ empty_list(heading=empty_message) }}


Why not use the empty component!

Could you move this change into its own PR? Along with the change to the empty_list component.

amazingphilippe · 2024-12-20T19:30:53Z

app/templates/components/table.html

-{% macro row_heading(cell_width=None) -%}
-  <th class="table-field {{ cell_width if cell_width}}" scope="row">
+{% macro row_heading(cell_width=None, rowspan="1") -%}
+<th class="table-field {{ cell_width if cell_width}}" scope="row" rowspan="{{ rowspan }}">


This lets us create <th> that span many rows, like we have on the admin panel for each service usage. Defaults to 1

amazingphilippe · 2024-12-20T19:32:21Z

app/templates/org_template.html

+            <li>
+              <a href="{{ url_for('.organisation_dashboard', org_id=current_org.id) }}" {{ org_navigation.is_selected('dashboard')
+                }}>
+                {{ _("Usage") }}


This looks worse than it is, I simply added the _() calls and reformated the html.

amazingphilippe · 2024-12-20T19:33:16Z

app/templates/partials/nav/gc_header_nav.html

@@ -103,7 +103,7 @@
              {{ nav_menu_item(url=url_for('main.contact', service_id=current_service.id),localised_txt=_('Contact us'), is_active=header_navigation.is_selected('contact')) }}
            {% endif %}
          {% else %} {# current_user.platform_admin #}
-            {% if not platform_admin_view_ind %}
+


This fixes the empty main navigation in platform admin. ✨ No more layout shift ✨ 🎉

Could you move this change into its own PR? So we can make this PR just translation changes?

amazingphilippe · 2024-12-20T19:33:50Z

app/templates/partials/nav/gc_header_nav.html

@@ -113,9 +113,10 @@
                {{ nav_menu_item(url=url_for('main.service_settings', service_id=current_service.id),localised_txt=_('Settings'), is_active=header_navigation.is_selected('settings')) }}
              {% else %} {# not current_user.has_permissions, i.e. services not in context #}
                {{ nav_menu_item(url=url_for('main.choose_account'),localised_txt=_('Your services'),css_classes='pl-0',id_key='choose_account', is_active=header_navigation.is_selected('choose_account')) }}
-                {{ nav_menu_item(url=url_for('main.live_services', service_id=current_service.id),localised_txt=_('Admin panel')) }}
+                {{ nav_menu_item(url=url_for('main.live_services', service_id=current_service.id),localised_txt=_('Admin panel'),
+                is_active=header_navigation) }}


Just adding the aria-current

When I log in, I now see the blue underline under 2 menu items which seems wrong:

Could you move this change out of this PR so we can make this one just translations?

amazingphilippe · 2025-01-02T15:43:27Z

app/templates/views/organisations/organisation/index.html

  </h1>
  <ul>
  {% for service in current_org.live_services %}
    <li class="browse-list-item">
-      <a href="{{ url_for('main.usage', service_id=service.id) }}" class="browse-list-link">{{ service['name'] }}</a>
+      <a href="{{ url_for('main.service_dashboard', service_id=service.id) }}" class="browse-list-link">{{ service['name']


Found out that there is not sid/usage page. Staging and prod fall back to dashboard somehow, so I've changed it to actually be the dashboard. (And fixed the tests)

makes sense to me!

… use

smcmurtry

I haven't noticed any issues with the translations you've added - they look great!

Could you split this PR into a few different ones so that we can merge it in piece by piece?

smcmurtry · 2025-01-08T20:14:12Z

app/templates/partials/nav/gc_header_nav.html

@@ -103,7 +103,7 @@
              {{ nav_menu_item(url=url_for('main.contact', service_id=current_service.id),localised_txt=_('Contact us'), is_active=header_navigation.is_selected('contact')) }}
            {% endif %}
          {% else %} {# current_user.platform_admin #}
-            {% if not platform_admin_view_ind %}
+


Could you move this change into its own PR? So we can make this PR just translation changes?

smcmurtry · 2025-01-08T20:15:35Z

app/templates/components/table.html

-        <td class="table-empty-message p-6" colspan="10">
-          {{ empty_message }}
+        <td class="table-empty-message h-10" colspan="10">
+          {{ empty_list(heading=empty_message) }}


Could you move this change into its own PR? Along with the change to the empty_list component.

smcmurtry · 2025-01-08T20:21:15Z

app/templates/partials/nav/gc_header_nav.html

@@ -113,9 +113,10 @@
                {{ nav_menu_item(url=url_for('main.service_settings', service_id=current_service.id),localised_txt=_('Settings'), is_active=header_navigation.is_selected('settings')) }}
              {% else %} {# not current_user.has_permissions, i.e. services not in context #}
                {{ nav_menu_item(url=url_for('main.choose_account'),localised_txt=_('Your services'),css_classes='pl-0',id_key='choose_account', is_active=header_navigation.is_selected('choose_account')) }}
-                {{ nav_menu_item(url=url_for('main.live_services', service_id=current_service.id),localised_txt=_('Admin panel')) }}
+                {{ nav_menu_item(url=url_for('main.live_services', service_id=current_service.id),localised_txt=_('Admin panel'),
+                is_active=header_navigation) }}


When I log in, I now see the blue underline under 2 menu items which seems wrong:

Could you move this change out of this PR so we can make this one just translations?

smcmurtry

Looks great @amazingphilippe! I think I looked at all the pages you touched and they all look good. I noticed a couple minor things that were missing translations but let's deal with those in a different PR.

smcmurtry · 2025-01-09T18:24:52Z

app/templates/views/organisations/organisation/index.html

  </h1>
  <ul>
  {% for service in current_org.live_services %}
    <li class="browse-list-item">
-      <a href="{{ url_for('main.usage', service_id=service.id) }}" class="browse-list-link">{{ service['name'] }}</a>
+      <a href="{{ url_for('main.service_dashboard', service_id=service.id) }}" class="browse-list-link">{{ service['name']


makes sense to me!

smcmurtry · 2025-01-09T18:33:28Z

app/assets/stylesheets/index.css

why did this file change? was this left over form the other changes that you removed from this PR? if so lets revert changes to this file

Probably due to the rebuild after I reverted the changes.

amazingphilippe added 2 commits December 19, 2024 15:58

add translation keys + format

c9f31d1

add translation keys + format

eceb2cb

fix test on service table

e18169f

amazingphilippe commented Dec 20, 2024

View reviewed changes

amazingphilippe added 3 commits December 20, 2024 19:43

caught some missing _s and fix tests

82c8ef5

remove whitespace

a9f3428

fix tests

32b995e

amazingphilippe commented Jan 2, 2025

View reviewed changes

amazingphilippe added 2 commits January 2, 2025 15:43

fix url test from admin to dashboard

6ec9364

some manual html formatting and removing some tailwind that I did not…

f9a71a1

… use

smcmurtry requested changes Jan 8, 2025

View reviewed changes

amazingphilippe added 4 commits January 8, 2025 20:56

Merge branch 'main' into debt/admin-org-missing-translations

5309569

Merge branch 'main' into debt/admin-org-missing-translations

ad1895e

cherry picked only translation changes

5dea1b5

remove some more stuff and build css

1116a22

amazingphilippe requested a review from smcmurtry January 9, 2025 16:57

actually, I needed that test for dashboard url

ae7eda5

smcmurtry approved these changes Jan 9, 2025

View reviewed changes

smcmurtry and others added 3 commits January 9, 2025 13:35

Merge branch 'main' into debt/admin-org-missing-translations

a133fbf

actually revert the compiled css

2b41ddd

Merge branch 'main' into debt/admin-org-missing-translations

469da5d

amazingphilippe merged commit 87fe6e0 into main Jan 9, 2025
11 checks passed

amazingphilippe deleted the debt/admin-org-missing-translations branch January 9, 2025 20:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Admin missing translations and tiny improvements. #2023

Admin missing translations and tiny improvements. #2023

amazingphilippe commented Dec 20, 2024

github-actions bot commented Dec 20, 2024

amazingphilippe Dec 20, 2024

amazingphilippe Dec 20, 2024

smcmurtry Jan 8, 2025

amazingphilippe Dec 20, 2024 •

edited

Loading

amazingphilippe Dec 20, 2024

amazingphilippe Dec 20, 2024

smcmurtry Jan 8, 2025

amazingphilippe Dec 20, 2024

smcmurtry Jan 8, 2025

amazingphilippe Jan 2, 2025

smcmurtry Jan 9, 2025

smcmurtry left a comment

smcmurtry Jan 8, 2025

smcmurtry Jan 8, 2025

smcmurtry Jan 8, 2025

smcmurtry left a comment

smcmurtry Jan 9, 2025

smcmurtry Jan 9, 2025

amazingphilippe Jan 9, 2025

Admin missing translations and tiny improvements. #2023

Admin missing translations and tiny improvements. #2023

Conversation

amazingphilippe commented Dec 20, 2024

Summary | Résumé

Test instructions | Instructions pour tester la modification

github-actions bot commented Dec 20, 2024

🧪 Review environment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amazingphilippe Dec 20, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smcmurtry left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smcmurtry left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amazingphilippe Dec 20, 2024 •

edited

Loading