Merge remote-tracking branch 'origin/design/ui-scaling' into design/u…

…i-scaling

.env.example

@@ -16,7 +16,5 @@ AWS_SECRET_ACCESS_KEY=
 
 REDIS_ENABLED=False
 
-MIXPANEL_PROJECT_TOKEN=<project_token>
-
 ALLOW_DEBUG_ROUTE=False
 DEBUG_KEY=

.github/workflows/export_github_data.yml

@@ -14,7 +14,7 @@ jobs:
           DNS_PROXY_FORWARDTOSENTINEL: "true"
           DNS_PROXY_LOGANALYTICSWORKSPACEID: ${{ secrets.LOG_ANALYTICS_WORKSPACE_ID }}
           DNS_PROXY_LOGANALYTICSSHAREDKEY: ${{ secrets.LOG_ANALYTICS_WORKSPACE_KEY }}
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Export Data
         uses: cds-snc/github-repository-metadata-exporter@main
         with:

.github/workflows/ossf-scorecard.yml

@@ -20,12 +20,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@72803a12483ed6f4f7c34f804818169f50162e37
+        uses: ossf/scorecard-action@e48dbb732fab761267783321dfa71e2a5c6e263d
         with:
           results_file: ossf-results.json
           results_format: json

.github/workflows/s3-backup.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         fetch-depth: 0 # retrieve all history
 

.github/workflows/test.yaml

@@ -38,7 +38,6 @@ jobs:
     - run: /bin/bash -c "scripts/bootstrap.sh && poetry run make test"
       env:
         A11Y_TRACKER_KEY: ${{ secrets.A11Y_TRACKER_KEY }}
-        MIXPANEL_PROJECT_TOKEN: <project_token>
     - name: Notify Slack channel if this job failed in default branch
       if: ${{ failure() && github.ref == 'refs/heads/main' }}
       run: |

.github/workflows/test_prod_config.yaml

@@ -41,7 +41,6 @@ jobs:
     - run: /bin/bash -c "scripts/bootstrap.sh && poetry run make test"
       env:
         A11Y_TRACKER_KEY: ${{ secrets.A11Y_TRACKER_KEY }}
-        MIXPANEL_PROJECT_TOKEN: <project_token>
     - name: Notify Slack channel if this job failed in default branch
       if: ${{ failure() && github.ref == 'refs/heads/main' }}
       run: |

app/main/validators.py

@@ -175,7 +175,7 @@ def validate_callback_url(service_callback_url, bearer_token):
         response = requests.post(
             url=service_callback_url,
             allow_redirects=True,
-            data={"health_check": "true"},
+            json={"health_check": True},
             headers={"Content-Type": "application/json", "Authorization": f"Bearer {bearer_token}"},
             timeout=2,
         )

app/main/views/api_keys.py

@@ -192,7 +192,7 @@ def delete_delivery_status_callback(service_id):
 
     form = ServiceDeliveryStatusCallbackForm(
         url=delivery_status_callback.get("url") if delivery_status_callback else "",
-        bearer_token=dummy_bearer_token if delivery_status_callback else "",
+        bearer_token=delivery_status_callback.get("bearer") if delivery_status_callback else "",
     )
 
     return render_template(
@@ -216,7 +216,7 @@ def delivery_status_callback(service_id):
 
     form = ServiceDeliveryStatusCallbackForm(
         url=delivery_status_callback.get("url") if delivery_status_callback else "",
-        bearer_token=dummy_bearer_token if delivery_status_callback else "",
+        bearer_token=delivery_status_callback.get("bearer") if delivery_status_callback else "",
     )
 
     if form.validate_on_submit():

app/main/views/authenticator.py

@@ -1,13 +1,11 @@
 from flask import session
 
 from app.models.user import User
-from config.mixpanel import NotifyMixpanel
 
 
 class Authenticator:
     def __init__(self, user_id):
         self.user = User.from_id(user_id)
-        self.mixpanel = NotifyMixpanel()
 
     def __enter__(self) -> User:
         # the user will have a new current_session_id set by the API - store it in the cookie for future requests
@@ -23,9 +21,6 @@ def __enter__(self) -> User:
         return self.user
 
     def __exit__(self, _exec_type, _exec_value, _traceback) -> None:
-        self.mixpanel.track_user_profile(self.user)
-        self.mixpanel.track_event(self.user, "Notify: Logged in")
-
         # get rid of anything in the session that we don't expect to have been set during register/sign in flow
         session.pop("user_details", None)
         session.pop("file_uploads", None)

app/templates/partials/jobs/status.html

@@ -1,34 +1,52 @@
+{% from "components/table.html" import mapping_table, row, row_heading, text_field, link_field, with context %}
+
 <div class="ajax-block-container"> 
-  <p class='mb-12 clear-both contain-floats'>
-
-      <div data-test-id="dr_header">
-        <div class="pb-4">
-          {{ _('Sent by:') }}
-          {% if job.api_key %}
-            {{ _("API key '<a href='{}'>{}</a>'").format(url_for('.api_keys', service_id=current_service.id), job.api_key.name) }}
-          {% else %}
-            {{ job.created_by.name }}
-          {% endif %}
-        </div>
-        <div class="pb-4">
-          {{ _('Started:') }}
-          <time class="local-datetime-short">{{ job.created_at }}</time>
-        </div>
-        <div class="pb-4">
-          {% if job.api_key %}
-            {{ _('API request name:')}} 
-          {% else %}
-            {{ _('Spreadsheet:') }}
-          {% endif %}
-          {{ job.original_file_name }}
-        </div>
-      </div>        
-
-
-      {% if template_type == "letter" %}
-        <p id="printing-info">
-          {{ letter_print_day }}
-        </p>
+  <div class="flex flex-wrap mb-8">
+    {% set caption = _("Scheduled messages") %}
+
+    {% call mapping_table(
+      caption=caption,
+      field_headings_visible=False,
+      caption_visible=False,
+      font_size='table-font-small',
+    ) %}
+
+    {% call row() %}
+      {% call row_heading(cell_width="sm:w-1/3") %}
+        {{ _('Sent by') }}
+      {% endcall %}
+      {% if job.api_key %}
+          {{ text_field(_("API key '<a href='{}'>{}</a>'").format(url_for('.api_keys', service_id=current_service.id), job.api_key.name)) }}
+      {% else %}
+        {{ text_field(job.created_by.name) }}
       {% endif %}
-  </p>
+    {% endcall %}
+
+    {% call row() %}
+      {% call row_heading(cell_width="sm:w-1/3") %}
+        {{ _('Started') }}
+      {% endcall %}
+      {{ text_field(text=job.created_at, date_format="local-datetime-short") }}
+    {% endcall %}
+
+    {% call row() %}
+      {% call row_heading(cell_width="sm:w-1/3") %}
+        {% if job.api_key %}
+          {{ _('API request name')}} 
+        {% else %}
+          {{ _('Spreadsheet') }}
+        {% endif %}
+      {% endcall %}
+      {{ text_field(job.original_file_name) }}
+    {% endcall %}
+
+    {% call row() %}
+      {% call row_heading(cell_width="sm:w-1/3") %}
+        {{ _('Template') }} 
+      {% endcall %}
+      {{ link_field(template.name, url_for('.view_template', service_id=job.service, template_id=template.id)) }}
+    {% endcall %}
+    {% endcall %}
+
+  </div>
 </div>

app/translations/csv/fr.csv

@@ -1823,6 +1823,7 @@
 "Try creating {} in a different application","Essayez de créer {} dans une application différente."
 "Sent by:","Envoyé par :"
 "Started:","Début :"
+"Started","Début"
 "Spreadsheet:","Feuille de calcul :"
 "API request name:","Nom de la requête API :"
 "GC Notify disposed of the information in this report on <time class='local-datetime-short'>{}</time>","Notification GC a supprimé les renseignements de ce rapport le <time class='local-datetime-short'>{}</time>"

ci/cloudbuild-test.yaml

@@ -4,6 +4,5 @@ steps:
   args: ["-c", "/workspace/scripts/bootstrap.sh && make test"]
   env:
     - 'CHROMEDRIVER_PATH=/usr/bin/chromedriver'
-    - 'MIXPANEL_PROJECT_TOKEN=<project_token>'
 options:
  machineType: 'N1_HIGHCPU_32'

pyproject.toml

@@ -44,7 +44,6 @@ WTForms = "3.1.2"
 email-validator = "1.3.1"
 Werkzeug = "3.0.4"
 greenlet = "3.1.1"
-mixpanel = "4.10.1"
 unidecode = "^1.3.8"
 
 # PaaS

tests/app/main/views/test_jobs.py

@@ -186,7 +186,10 @@ def test_should_show_page_for_one_job(
     )
 
     assert page.h1.text.strip() == "Delivery report"
-    assert " ".join(page.find("tbody").find("tr").text.split()) == ("6502532222 template content No Delivered 11:10:00.061258")
+    dashboard_table = page.find_all("table")[1]
+    assert " ".join(dashboard_table.find("tbody").find("tr").text.split()) == (
+        "6502532222 template content No Delivered 11:10:00.061258"
+    )
     assert page.find("div", {"data-key": "notifications"})["data-resource"] == url_for(
         "main.view_job_updates",
         service_id=SERVICE_ONE_ID,
@@ -204,10 +207,10 @@ def test_should_show_page_for_one_job(
     assert csv_link.text == "Download this report"
     assert page.find("time", {"id": "time-left"}).text.split(" ")[0] == "2016-01-09"
 
-    assert normalize_spaces(page.select_one("tbody tr").text) == normalize_spaces(
+    assert normalize_spaces(dashboard_table.select_one("tbody tr").text) == normalize_spaces(
         "6502532222 " "template content " "No " "Delivered 11:10:00.061258"
     )
-    assert page.select_one("tbody tr a")["href"] == url_for(
+    assert dashboard_table.select_one("tbody tr a")["href"] == url_for(
         "main.view_notification",
         service_id=SERVICE_ONE_ID,
         notification_id=sample_uuid(),
@@ -434,15 +437,13 @@ def test_should_show_job_from_api(
         service_id=SERVICE_ONE_ID,
         job_id=fake_uuid,
     )
+    job_info_table = page.find_all("table")[0]
 
-    assert (
-        normalize_spaces(page.select("div[data-test-id='dr_header'] >div:nth-child(1)")[0].text)
-        == f"Sent by: API key '{JOB_API_KEY_NAME}'"
-    )
-    assert (
-        normalize_spaces(page.select("div[data-test-id='dr_header'] >div:nth-child(2)")[0].text)
-        == "Started: 2016-01-01T00:00:00.061258+0000"
-    )
+    assert normalize_spaces(job_info_table.select("th")[0].text) == "Sent by"
+    assert normalize_spaces(job_info_table.select("td")[0].text) == f"API key '{JOB_API_KEY_NAME}'"
+
+    assert normalize_spaces(job_info_table.select("th")[1].text) == "Started"
+    assert normalize_spaces(job_info_table.select("td")[1].text) == "2016-01-01T00:00:00.061258+0000"
 
 
 # TODO: This test could be migrated to Cypress instead
@@ -579,6 +580,7 @@ def test_should_not_show_cancel_link_for_letter_job_if_too_late(
 
 
 @freeze_time("2019-06-20 15:32:00.000001")
+@pytest.mark.skip(reason="feature not in use")
 @pytest.mark.parametrize(" job_status", ["finished", "in progress"])
 def test_should_show_cancel_link_for_letter_job(
     client_request,

tests/app/main/views/test_new_password.py

@@ -1,5 +1,4 @@
 import json
-import os
 from datetime import datetime
 from unittest import mock
 
@@ -11,17 +10,6 @@
 from tests.conftest import url_for_endpoint_with_token
 
 
-@pytest.fixture(autouse=True)
-def stub_mixpanel(mocker):
-    environment_vars = os.environ.copy()
-    os.environ["MIXPANEL_PROJECT_TOKEN"] = "project_token_from_mixpanel"
-    mocker.patch("mixpanel.Mixpanel")
-
-    yield
-
-    os.environ = environment_vars
-
-
 def test_should_render_new_password_template(
     app_,
     client,

tests/app/main/views/test_two_factor.py

@@ -1,23 +1,10 @@
-import os
-
 import pytest
 from bs4 import BeautifulSoup
 from flask import url_for
 
 from tests.conftest import SERVICE_ONE_ID, captured_templates
 
 
-@pytest.fixture(autouse=True)
-def stub_mixpanel(mocker):
-    environment_vars = os.environ.copy()
-    os.environ["MIXPANEL_PROJECT_TOKEN"] = "project_token_from_mixpanel"
-    mocker.patch("mixpanel.Mixpanel")
-
-    yield
-
-    os.environ = environment_vars
-
-
 def test_should_render_sms_two_factor_page(
     client,
     api_user_active,