-
+
{{ _('Yes, add recipients') }}
{{ _('No, send yourself this message') }}
diff --git a/app/translations/csv/fr.csv b/app/translations/csv/fr.csv
index fa46627958..de78b23f8e 100644
--- a/app/translations/csv/fr.csv
+++ b/app/translations/csv/fr.csv
@@ -1986,4 +1986,8 @@
"The service {} responded in {} seconds.","Le service {} a répondu en {} secondes."
"Are you sure you want to delete this callback configuration?","Voulez-vous vraiment supprimer cette configuration de rappel?"
"Your Callback configuration has been deleted.","Votre configuration de rappel a été supprimée."
-"The service {} took longer than 1 second to respond.","Le service {} a mis plus d’une seconde à répondre."
\ No newline at end of file
+"The service {} took longer than 1 second to respond.","Le service {} a mis plus d’une seconde à répondre."
+"Display","Afficher"
+"email content","le message du courriel"
+"Email content","Message du courriel"
+"right to left","de droite Ă gauche"
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 2ee74543c2..a82ff52527 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -65,6 +65,7 @@ const javascripts = () => {
paths.src + "javascripts/notificationsReports.js",
paths.src + "javascripts/main.js",
paths.src + "javascripts/templateCategories.js",
+ paths.src + "javascripts/templateContent.js",
])
.pipe(plugins.prettyerror())
.pipe(
diff --git a/poetry.lock b/poetry.lock
index c29a65bfdb..9aae375237 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1538,7 +1538,7 @@ requests = ">=2.0.0"
[[package]]
name = "notifications-utils"
-version = "52.3.3"
+version = "52.3.5"
description = "Shared python code for Notification - Provides logging utils etc."
optional = false
python-versions = "~3.10.9"
@@ -1574,8 +1574,8 @@ werkzeug = "3.0.4"
[package.source]
type = "git"
url = "https://github.com/cds-snc/notifier-utils.git"
-reference = "52.3.3"
-resolved_reference = "e8721832bc75903769c6b1b71112fb5eabb5f1ac"
+reference = "52.3.5"
+resolved_reference = "953ee170b4c47465bef047f1060d17a7702edeeb"
[[package]]
name = "openpyxl"
@@ -2744,4 +2744,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"]
[metadata]
lock-version = "2.0"
python-versions = "~3.10.9"
-content-hash = "35b779d96b5f35042b21fbc7f2b691d8bc8ac8535c76c9a8ddbdee31fdf0b948"
+content-hash = "2a255ecaba02c0b01b8a429b847ce67f15aa0f0b5e2f9fd9c262f2e2a3154ad2"
diff --git a/pyproject.toml b/pyproject.toml
index ee4cdef26a..e4fa18b8a3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,7 +49,8 @@ unidecode = "^1.3.8"
# PaaS
awscli-cwlogs = "^1.4.6"
-notifications-utils = { git = "https://github.com/cds-snc/notifier-utils.git", tag = "52.3.3" }
+notifications-utils = { git = "https://github.com/cds-snc/notifier-utils.git", tag = "52.3.5" }
+
# Pinned dependencies
certifi = "^2024.0.0" # Pinned for security reasons: https://github.com/cds-snc/notification-admin/security/dependabot/169
diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py
index cbd36c275d..b48234af1f 100644
--- a/tests/app/main/views/test_templates.py
+++ b/tests/app/main/views/test_templates.py
@@ -168,19 +168,13 @@ def test_edit_email_template_cat_other_to_freshdesk(
"template_category_other": "hello",
"reply_to_text": "reply@go.com",
"process_type": None,
+ "text_direction_rtl": None,
},
_follow_redirects=True,
)
mock_update_service_template.assert_called_with(
- fake_uuid,
- name,
- "sms",
- content,
- SERVICE_ONE_ID,
- None,
- None,
- DEFAULT_TEMPLATE_CATEGORY_LOW,
+ fake_uuid, name, "sms", content, SERVICE_ONE_ID, None, None, DEFAULT_TEMPLATE_CATEGORY_LOW, False
)
assert mock_send_other_category_to_freshdesk.called is True
mock_send_other_category_to_freshdesk.assert_called_once_with(
@@ -1369,14 +1363,7 @@ def test_should_redirect_when_saving_a_template(
assert flash_banner == f"'{name}' template saved"
# self, id_, name, type_, content, service_id, subject=None, process_type=None, template_category_id=None
mock_update_service_template.assert_called_with(
- fake_uuid,
- name,
- "sms",
- content,
- SERVICE_ONE_ID,
- None,
- None,
- DEFAULT_TEMPLATE_CATEGORY_LOW,
+ fake_uuid, name, "sms", content, SERVICE_ONE_ID, None, None, DEFAULT_TEMPLATE_CATEGORY_LOW, False
)
@@ -1416,6 +1403,7 @@ def test_should_edit_content_when_process_type_is_set_not_platform_admin(
None,
process_type,
TESTING_TEMPLATE_CATEGORY,
+ False,
)
@@ -1773,6 +1761,7 @@ def test_should_redirect_when_saving_a_template_email(
subject,
DEFAULT_PROCESS_TYPE,
DEFAULT_TEMPLATE_CATEGORY_LOW,
+ False,
)
@@ -1965,6 +1954,7 @@ def test_preview_should_update_and_redirect_on_save(client_request, mock_update_
"process_type": DEFAULT_PROCESS_TYPE,
"id": fake_uuid,
"template_category_id": DEFAULT_TEMPLATE_CATEGORY_LOW,
+ "text_direction_rtl": False,
}
mocker.patch(
"app.main.views.templates.get_preview_data",
@@ -1994,6 +1984,7 @@ def test_preview_should_update_and_redirect_on_save(client_request, mock_update_
"test subject",
DEFAULT_PROCESS_TYPE,
DEFAULT_TEMPLATE_CATEGORY_LOW,
+ False,
)
diff --git a/tests/conftest.py b/tests/conftest.py
index 529587d870..062729c462 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -990,6 +990,7 @@ def _update(
process_type=None,
postage=None,
template_category_id=None,
+ text_direction_rtl=False,
):
template = template_json(service, id_, name, type_, content, subject, process_type, postage, template_category_id)
return {"data": template}
@@ -1024,6 +1025,8 @@ def _create(
subject=None,
process_type=None,
postage=None,
+ template_category_id=None,
+ text_direction_rtl=False,
):
json_mock = Mock(
return_value={
@@ -1068,6 +1071,8 @@ def _update(
subject=None,
process_type=None,
postage=None,
+ template_category_id=None,
+ text_direction_rtl=False,
):
json_mock = Mock(
return_value={
diff --git a/tests_cypress/cypress/Notify/Admin/Pages/TemplatesPage.js b/tests_cypress/cypress/Notify/Admin/Pages/TemplatesPage.js
index 2f3d0bb36b..6f1307aa82 100644
--- a/tests_cypress/cypress/Notify/Admin/Pages/TemplatesPage.js
+++ b/tests_cypress/cypress/Notify/Admin/Pages/TemplatesPage.js
@@ -28,6 +28,9 @@ let Components = {
TCExpandBytton: () => cy.getByTestId('tc_expand_button'),
TemplatePriority: () => cy.getByTestId('process_type'),
DeleteTemplateButton: () => cy.contains('a', 'Delete this template'),
+ TextDirectionCheckbox: () => cy.getByTestId('template-rtl'),
+ AddRecipientsButton: () => cy.getByTestId('add-recipients'),
+ OneRecipientRadio: () => cy.getByTestId('one-recipient'),
};
// Actions users can take on the page
@@ -115,6 +118,20 @@ let Actions = {
cy.get('.banner-dangerous').contains('Are you sure').should('be.visible');
cy.get('button[name="delete"]').click();
cy.url().should('contain', '/templates');
+ },
+ SetTextDirection: (rtl) => {
+ if (rtl) {
+ Components.TextDirectionCheckbox().check();
+ } else {
+ Components.TextDirectionCheckbox().uncheck();
+ }
+ },
+ AddRecipients: (email_address) => {
+ Components.AddRecipientsButton().click();
+ cy.contains('h1', 'Add recipients').should('be.visible');
+ Components.OneRecipientRadio().click();
+ Components.OneRecipientRadio().nextAll('input').first().type(email_address);
+ Components.ContinueButton().click();
}
}
diff --git a/tests_cypress/cypress/e2e/admin/ci.cy.js b/tests_cypress/cypress/e2e/admin/ci.cy.js
index 4b92eae122..37423cfea7 100644
--- a/tests_cypress/cypress/e2e/admin/ci.cy.js
+++ b/tests_cypress/cypress/e2e/admin/ci.cy.js
@@ -8,3 +8,4 @@ import "./template-filters.cy";
import "./template-categories.cy";
import "./template/create-template.cy";
import "./template/edit-template.cy";
+import "./template/text-direction.cy";
diff --git a/tests_cypress/cypress/e2e/admin/template/text-direction.cy.js b/tests_cypress/cypress/e2e/admin/template/text-direction.cy.js
new file mode 100644
index 0000000000..85ffecd49b
--- /dev/null
+++ b/tests_cypress/cypress/e2e/admin/template/text-direction.cy.js
@@ -0,0 +1,49 @@
+import config from "../../../../config";
+import { TemplatesPage as Page } from "../../../Notify/Admin/Pages/all";
+
+// TODO: dont hardcode these
+const templates = {
+ smoke_test_email: {
+ name: "SMOKE_TEST_EMAIL",
+ id: "5e26fae6-3565-44d5-bfed-b18680b6bd39",
+ },
+ smoke_test_email_attach: {
+ name: "SMOKE_TEST_EMAIL_ATTACH",
+ id: "bf85def8-01b4-4c72-98a8-86f2bc10f2a4",
+ },
+};
+
+describe("Template text direction", () => {
+ beforeEach(() => {
+ cy.login(Cypress.env("NOTIFY_USER"), Cypress.env("NOTIFY_PASSWORD"));
+ cy.visit(`/services/${config.Services.Cypress}/templates`);
+ });
+
+ it("Should align content to the right when clicked", () => {
+ Page.SelectTemplate(templates.smoke_test_email.name);
+ Page.EditCurrentTemplate();
+
+ // ensure content doesnt have dir attribute
+ Page.Components.TemplateContent().should("not.have.attr", "dir");
+
+ Page.SetTextDirection(true);
+ Page.Components.TemplateContent().should("have.attr", "dir", "rtl");
+ });
+
+ it("Should align to the right when previewed", () => {
+ Page.SelectTemplate(templates.smoke_test_email.name);
+ Page.EditCurrentTemplate();
+ Page.SetTextDirection(true);
+ Page.PreviewTemplate();
+
+ // ensure there is a dir=rtl attribute somewhere in the page
+ cy.get('[dir="rtl"]').should("exist");
+
+ cy.go("back");
+ Page.SetTextDirection(false);
+ Page.PreviewTemplate();
+
+ // ensure there is a dir=rtl attribute somewhere in the page
+ cy.get('[dir="rtl"]').should("not.exist");
+ });
+});