🔖(patch) release 1.2.1

Changed: - ♻️ Change ordering docs datagrid - 🔥(helm) use scaleway email
🧑‍💻(makefile) bump-packages-version
2024-08-23 16:27:52 +02:00 · 2024-08-23 16:27:52 +02:00 · 2024-08-23 15:37:01 +02:00 · 2024-08-23 15:37:01 +02:00 · 2024-08-23 14:29:52 +02:00 · 2024-08-23 14:29:52 +02:00
23 changed files with 254 additions and 240 deletions
@@ -8,7 +8,16 @@ and this project adheres to

 ## [Unreleased]

-## [1.2.0] - 2024-08-06
+
+## [1.2.1] - 2024-08-23
+
+## Changed
+
+- ♻️ Change ordering docs datagrid #195
+- 🔥(helm) use scaleway email #194
+
+
+## [1.2.0] - 2024-08-22

 ## Added

@@ -97,7 +106,8 @@ and this project adheres to
 - 🚀 Impress, project to manage your documents easily and collaboratively.


-[unreleased]: https://github.com/numerique-gouv/impress/compare/v1.2.0...main
+[unreleased]: https://github.com/numerique-gouv/impress/compare/v1.2.1...main
+[1.2.1]: https://github.com/numerique-gouv/impress/releases/v1.2.1
 [1.2.0]: https://github.com/numerique-gouv/impress/releases/v1.2.0
 [1.1.0]: https://github.com/numerique-gouv/impress/releases/v1.1.0
 [1.0.0]: https://github.com/numerique-gouv/impress/releases/v1.0.0
@@ -313,3 +313,13 @@ start-tilt: ## start the kubernetes cluster using kind
 	tilt up -f ./bin/Tiltfile
 .PHONY: build-k8s-cluster

+VERSION_TYPE ?= minor
+bump-packages-version: ## bump the version of the project - VERSION_TYPE can be "major", "minor", "patch"
+	cd ./src/mail && yarn version --no-git-tag-version --$(VERSION_TYPE)
+	cd ./src/frontend/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
+	cd ./src/frontend/apps/e2e/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
+	cd ./src/frontend/apps/impress/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
+	cd ./src/frontend/apps/y-webrtc-signaling/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
+	cd ./src/frontend/packages/eslint-config-impress/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
+	cd ./src/frontend/packages/i18n/ && yarn version --no-git-tag-version --$(VERSION_TYPE)
+.PHONY: bump-packages-version
@@ -310,6 +310,7 @@ class DocumentViewSet(
    access_model_class = models.DocumentAccess
    resource_field_name = "document"
    queryset = models.Document.objects.all()
+    ordering = ["-updated_at"]

    def perform_create(self, serializer):
        """
@@ -169,87 +169,26 @@ def test_api_documents_list_authenticated_distinct():
    assert content["results"][0]["id"] == str(document.id)


-def test_api_documents_order_created_at_desc():
+def test_api_documents_order_updated_at_desc_default():
    """
-    Test that the endpoint GET documents is sorted in 'created_at' descending order by default.
-    """
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    documents_created = [
-        document.created_at.isoformat().replace("+00:00", "Z")
-        for document in factories.DocumentFactory.create_batch(5, is_public=True)
-    ]
-
-    documents_created.sort(reverse=True)
-
-    response = client.get(
-        "/api/v1.0/documents/",
-    )
-
-    assert response.status_code == 200
-
-    response_data = response.json()
-    response_document_created = [
-        document["created_at"] for document in response_data["results"]
-    ]
-
-    assert (
-        response_document_created == documents_created
-    ), "created_at values are not sorted from newest to oldest"
-
-
-def test_api_documents_order_created_at_asc():
-    """
-    Test that the 'created_at' field is sorted in ascending order
-    when the 'ordering' query parameter is set.
-    """
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    documents_created = [
-        document.created_at.isoformat().replace("+00:00", "Z")
-        for document in factories.DocumentFactory.create_batch(5, is_public=True)
-    ]
-
-    documents_created.sort()
-
-    response = client.get(
-        "/api/v1.0/documents/?ordering=created_at",
-    )
-
-    assert response.status_code == 200
-
-    response_data = response.json()
-    response_document_created = [
-        document["created_at"] for document in response_data["results"]
-    ]
-
-    assert (
-        response_document_created == documents_created
-    ), "created_at values are not sorted from oldest to newest"
-
-
-def test_api_documents_order_updated_at_desc():
-    """
-    Test that the 'updated_at' field is sorted in descending order
-    when the 'ordering' query parameter is set.
+    Test that the endpoint GET documents is sorted in 'updated_at' descending order by default.
    """
    user = factories.UserFactory()
    client = APIClient()
    client.force_login(user)

+    # Updated at next year to ensure the order is correct
    documents_updated = [
        document.updated_at.isoformat().replace("+00:00", "Z")
-        for document in factories.DocumentFactory.create_batch(5, is_public=True)
+        for document in factories.DocumentFactory.create_batch(
+            5, is_public=True, updated_at=fake.date_time_this_year(before_now=False)
+        )
    ]

    documents_updated.sort(reverse=True)

    response = APIClient().get(
-        "/api/v1.0/documents/?ordering=-updated_at",
+        "/api/v1.0/documents/",
    )
    assert response.status_code == 200

@@ -264,97 +203,99 @@ def test_api_documents_order_updated_at_desc():
    ), "updated_at values are not sorted from newest to oldest"


-def test_api_documents_order_updated_at_asc():
+@pytest.mark.parametrize(
+    "ordering_field, factory_field",
+    [
+        ("-created_at", "created_at"),
+        ("-updated_at", "updated_at"),
+        ("-title", "title"),
+    ],
+)
+def test_api_documents_ordering_desc(ordering_field, factory_field):
    """
-    Test that the 'updated_at' field is sorted in ascending order
+    Test that the specified field is sorted in descending order
    when the 'ordering' query parameter is set.
    """
    user = factories.UserFactory()
    client = APIClient()
    client.force_login(user)

-    documents_updated = [
-        document.updated_at.isoformat().replace("+00:00", "Z")
-        for document in factories.DocumentFactory.create_batch(5, is_public=True)
-    ]
+    if factory_field == "title":
+        documents_field_values = [
+            factories.DocumentFactory(
+                is_public=True, title=fake.sentence(nb_words=4)
+            ).title
+            for _ in range(5)
+        ]
+    else:
+        documents_field_values = [
+            getattr(document, factory_field).isoformat().replace("+00:00", "Z")
+            for document in factories.DocumentFactory.create_batch(5, is_public=True)
+        ]

-    documents_updated.sort()
+    documents_field_values.sort(reverse=True)

-    response = APIClient().get(
-        "/api/v1.0/documents/?ordering=updated_at",
+    response = client.get(
+        f"/api/v1.0/documents/?ordering={ordering_field}"
+        if ordering_field != "-created_at"
+        else "/api/v1.0/documents/",
    )
    assert response.status_code == 200

    response_data = response.json()

-    response_document_updated = [
-        document["updated_at"] for document in response_data["results"]
+    response_documents_field_values = [
+        document[factory_field] for document in response_data["results"]
    ]

    assert (
-        response_document_updated == documents_updated
-    ), "updated_at values are not sorted from oldest to newest"
+        response_documents_field_values == documents_field_values
+    ), f"{factory_field} values are not sorted as expected"


-def test_api_documents_order_title_desc():
+@pytest.mark.parametrize(
+    "field",
+    [
+        ("updated_at"),
+        ("title"),
+        ("created_at"),
+    ],
+)
+def test_api_documents_ordering_asc(field):
    """
-    Test that the 'title' field is sorted in descending order
+    Test that the specified field is sorted in ascending order
    when the 'ordering' query parameter is set.
    """
    user = factories.UserFactory()
    client = APIClient()
    client.force_login(user)

-    documents_title = [
-        factories.DocumentFactory(is_public=True, title=fake.sentence(nb_words=4)).title
-        for _ in range(5)
-    ]
+    if field == "title":
+        documents_field_values = [
+            factories.DocumentFactory(
+                is_public=True, title=fake.sentence(nb_words=4)
+            ).title
+            for _ in range(5)
+        ]
+    else:
+        documents_field_values = [
+            getattr(document, field).isoformat().replace("+00:00", "Z")
+            for document in factories.DocumentFactory.create_batch(5, is_public=True)
+        ]

-    documents_title.sort(reverse=True)
+    documents_field_values.sort()

-    response = APIClient().get(
-        "/api/v1.0/documents/?ordering=-title",
+    response = client.get(
+        f"/api/v1.0/documents/?ordering={field}",
    )
    assert response.status_code == 200

    response_data = response.json()

-    response_documents_title = [
-        document["title"] for document in response_data["results"]
+    response_documents_field_values = [
+        document[field] for document in response_data["results"]
    ]

    assert (
-        response_documents_title == documents_title
-    ), "title values are not sorted descending"
-
-
-def test_api_documents_order_title_asc():
-    """
-    Test that the 'title' field is sorted in ascending order
-    when the 'ordering' query parameter is set.
-    """
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    documents_title = [
-        factories.DocumentFactory(is_public=True, title=fake.sentence(nb_words=4)).title
-        for _ in range(5)
-    ]
-
-    documents_title.sort()
-
-    response = APIClient().get(
-        "/api/v1.0/documents/?ordering=title",
-    )
-    assert response.status_code == 200
-
-    response_data = response.json()
-
-    response_documents_title = [
-        document["title"] for document in response_data["results"]
-    ]
-
-    assert (
-        response_documents_title == documents_title
-    ), "title values are not sorted ascending"
+        response_documents_field_values == documents_field_values
+    ), f"{field} values are not sorted as expected"
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "impress"
-version = "1.2.0"
+version = "1.2.1"
 authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }]
 classifiers = [
    "Development Status :: 5 - Production/Stable",
@@ -49,111 +49,130 @@ test.describe('Documents Grid', () => {
      nameColumn: 'Document name',
      ordering: 'title',
      cellNumber: 1,
+      orderDefault: '',
+      orderDesc: '&ordering=-title',
+      orderAsc: '&ordering=title',
    },
    {
      nameColumn: 'Created at',
      ordering: 'created_at',
      cellNumber: 2,
+      orderDefault: '',
+      orderDesc: '&ordering=-created_at',
+      orderAsc: '&ordering=created_at',
    },
    {
      nameColumn: 'Updated at',
      ordering: 'updated_at',
      cellNumber: 3,
+      orderDefault: '&ordering=-updated_at',
+      orderDesc: '&ordering=updated_at',
+      orderAsc: '',
    },
-  ].forEach(({ nameColumn, ordering, cellNumber }) => {
-    test(`checks datagrid ordering ${ordering}`, async ({ page }) => {
-      const responsePromise = page.waitForResponse(
-        (response) =>
-          response.url().includes(`/documents/?page=1`) &&
-          response.status() === 200,
-      );
+  ].forEach(
+    ({
+      nameColumn,
+      ordering,
+      cellNumber,
+      orderDefault,
+      orderDesc,
+      orderAsc,
+    }) => {
+      test(`checks datagrid ordering ${ordering}`, async ({ page }) => {
+        const responsePromise = page.waitForResponse(
+          (response) =>
+            response.url().includes(`/documents/?page=1${orderDefault}`) &&
+            response.status() === 200,
+        );

-      const responsePromiseOrderingDesc = page.waitForResponse(
-        (response) =>
-          response.url().includes(`/documents/?page=1&ordering=-${ordering}`) &&
-          response.status() === 200,
-      );
+        const responsePromiseOrderingDesc = page.waitForResponse(
+          (response) =>
+            response.url().includes(`/documents/?page=1${orderDesc}`) &&
+            response.status() === 200,
+        );

-      const responsePromiseOrderingAsc = page.waitForResponse(
-        (response) =>
-          response.url().includes(`/documents/?page=1&ordering=${ordering}`) &&
-          response.status() === 200,
-      );
+        const responsePromiseOrderingAsc = page.waitForResponse(
+          (response) =>
+            response.url().includes(`/documents/?page=1${orderAsc}`) &&
+            response.status() === 200,
+        );

-      const datagrid = page
-        .getByLabel('Datagrid of the documents page 1')
-        .getByRole('table');
-      const thead = datagrid.locator('thead');
+        // Checks the initial state
+        const datagrid = page
+          .getByLabel('Datagrid of the documents page 1')
+          .getByRole('table');
+        const thead = datagrid.locator('thead');

-      const response = await responsePromise;
-      expect(response.ok()).toBeTruthy();
+        const response = await responsePromise;
+        expect(response.ok()).toBeTruthy();

-      const docNameRow1 = datagrid
-        .getByRole('row')
-        .nth(1)
-        .getByRole('cell')
-        .nth(cellNumber);
-      const docNameRow2 = datagrid
-        .getByRole('row')
-        .nth(2)
-        .getByRole('cell')
-        .nth(cellNumber);
+        const docNameRow1 = datagrid
+          .getByRole('row')
+          .nth(1)
+          .getByRole('cell')
+          .nth(cellNumber);
+        const docNameRow2 = datagrid
+          .getByRole('row')
+          .nth(2)
+          .getByRole('cell')
+          .nth(cellNumber);

-      await expect(datagrid.getByLabel('Loading data')).toBeHidden();
+        await expect(datagrid.getByLabel('Loading data')).toBeHidden();

-      // Initial state
-      await expect(docNameRow1).toHaveText(/.*/);
-      await expect(docNameRow2).toHaveText(/.*/);
-      const initialDocNameRow1 = await docNameRow1.textContent();
-      const initialDocNameRow2 = await docNameRow2.textContent();
+        // Initial state
+        await expect(docNameRow1).toHaveText(/.*/);
+        await expect(docNameRow2).toHaveText(/.*/);
+        const initialDocNameRow1 = await docNameRow1.textContent();
+        const initialDocNameRow2 = await docNameRow2.textContent();

-      expect(initialDocNameRow1).toBeDefined();
-      expect(initialDocNameRow2).toBeDefined();
+        expect(initialDocNameRow1).toBeDefined();
+        expect(initialDocNameRow2).toBeDefined();

-      // Ordering ASC
-      await thead.getByText(nameColumn).click();
+        // Ordering ASC
+        await thead.getByText(nameColumn).click();

-      const responseOrderingAsc = await responsePromiseOrderingAsc;
-      expect(responseOrderingAsc.ok()).toBeTruthy();
+        const responseOrderingAsc = await responsePromiseOrderingAsc;
+        expect(responseOrderingAsc.ok()).toBeTruthy();

-      await expect(datagrid.getByLabel('Loading data')).toBeHidden();
+        await expect(datagrid.getByLabel('Loading data')).toBeHidden();

-      await expect(docNameRow1).toHaveText(/.*/);
-      await expect(docNameRow2).toHaveText(/.*/);
-      const textDocNameRow1Asc = await docNameRow1.textContent();
-      const textDocNameRow2Asc = await docNameRow2.textContent();
-      expect(
-        textDocNameRow1Asc &&
-          textDocNameRow2Asc &&
-          textDocNameRow1Asc.localeCompare(textDocNameRow2Asc, 'en', {
-            caseFirst: 'false',
-            ignorePunctuation: true,
-          }) <= 0,
-      ).toBeTruthy();
+        await expect(docNameRow1).toHaveText(/.*/);
+        await expect(docNameRow2).toHaveText(/.*/);
+        const textDocNameRow1Asc = await docNameRow1.textContent();
+        const textDocNameRow2Asc = await docNameRow2.textContent();
+        expect(
+          textDocNameRow1Asc &&
+            textDocNameRow2Asc &&
+            textDocNameRow1Asc.localeCompare(textDocNameRow2Asc, 'en', {
+              caseFirst: 'false',
+              ignorePunctuation: true,
+            }) <= 0,
+        ).toBeTruthy();

-      // Ordering Desc
-      await thead.getByText(nameColumn).click();
+        // Ordering Desc
+        await thead.getByText(nameColumn).click();

-      const responseOrderingDesc = await responsePromiseOrderingDesc;
-      expect(responseOrderingDesc.ok()).toBeTruthy();
+        const responseOrderingDesc = await responsePromiseOrderingDesc;
+        expect(responseOrderingDesc.ok()).toBeTruthy();

-      await expect(datagrid.getByLabel('Loading data')).toBeHidden();
+        await expect(datagrid.getByLabel('Loading data')).toBeHidden();

-      await expect(docNameRow1).toHaveText(/.*/);
-      await expect(docNameRow2).toHaveText(/.*/);
-      const textDocNameRow1Desc = await docNameRow1.textContent();
-      const textDocNameRow2Desc = await docNameRow2.textContent();
+        await expect(docNameRow1).toHaveText(/.*/);
+        await expect(docNameRow2).toHaveText(/.*/);
+        const textDocNameRow1Desc = await docNameRow1.textContent();
+        const textDocNameRow2Desc = await docNameRow2.textContent();

-      expect(
-        textDocNameRow1Desc &&
-          textDocNameRow2Desc &&
-          textDocNameRow1Desc.localeCompare(textDocNameRow2Desc, 'en', {
-            caseFirst: 'false',
-            ignorePunctuation: true,
-          }) >= 0,
-      ).toBeTruthy();
-    });
-  });
+        expect(
+          textDocNameRow1Desc &&
+            textDocNameRow2Desc &&
+            textDocNameRow1Desc.localeCompare(textDocNameRow2Desc, 'en', {
+              caseFirst: 'false',
+              ignorePunctuation: true,
+            }) >= 0,
+        ).toBeTruthy();
+      });
+    },
+  );

  test('checks the pagination', async ({ page }) => {
    const responsePromisePage1 = page.waitForResponse(
@@ -1,6 +1,6 @@
 {
  "name": "app-e2e",
-  "version": "1.2.0",
+  "version": "1.2.1",
  "private": true,
  "scripts": {
    "lint": "eslint . --ext .ts",
@@ -21,6 +21,6 @@
  "dependencies": {
    "convert-stream": "1.0.2",
    "jsdom": "24.1.1",
-    "pdf-parse": "^1.1.1"
+    "pdf-parse": "1.1.1"
  }
 }
@@ -1,6 +1,6 @@
 {
  "name": "app-impress",
-  "version": "1.2.0",
+  "version": "1.2.1",
  "private": true,
  "scripts": {
    "dev": "next dev",
@@ -53,7 +53,12 @@ export const DocsGrid = () => {
  const pagination = usePagination({
    pageSize: PAGE_SIZE,
  });
-  const [sortModel, setSortModel] = useState<SortModel>([]);
+  const [sortModel, setSortModel] = useState<SortModel>([
+    {
+      field: 'updated_at',
+      sort: 'desc',
+    },
+  ]);
  const { page, pageSize, setPagesCount } = pagination;
  const [docs, setDocs] = useState<Doc[]>([]);

@@ -1,6 +1,6 @@
 {
  "name": "y-webrtc-signaling",
-  "version": "1.2.0",
+  "version": "1.2.1",
  "description": "WebRTC server for Yjs",
  "repository": "https://github.com/numerique-gouv/impress",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "impress",
-  "version": "1.2.0",
+  "version": "1.2.1",
  "private": true,
  "workspaces": {
    "packages": [
@@ -1,6 +1,6 @@
 {
  "name": "eslint-config-impress",
-  "version": "1.2.0",
+  "version": "1.2.1",
  "license": "MIT",
  "scripts": {
    "lint": "eslint --ext .js ."
@@ -1,6 +1,6 @@
 {
  "name": "packages-i18n",
-  "version": "1.2.0",
+  "version": "1.2.1",
  "private": true,
  "scripts": {
    "extract-translation": "yarn extract-translation:impress",
@@ -1,7 +1,7 @@
 image:
  repository: lasuite/impress-backend
  pullPolicy: Always
-  tag: "v1.2.0"
+  tag: "v1.2.1"

 backend:
  migrateJobAnnotations:
@@ -24,10 +24,18 @@ backend:
      secretKeyRef:
        name: backend
        key: DJANGO_SUPERUSER_PASSWORD
-    DJANGO_EMAIL_HOST: "snap-mail.numerique.gouv.fr"
-    DJANGO_EMAIL_PORT: 465
-    DJANGO_EMAIL_USE_SSL: True
-    DJANGO_EMAIL_FROM: "noreply@docs.numerique.gouv.fr"
+    DJANGO_EMAIL_HOST: "smtp.tem.scw.cloud"
+    DJANGO_EMAIL_PORT: 587
+    DJANGO_EMAIL_USE_TLS: True
+    DJANGO_EMAIL_FROM: "noreply@docs.beta.numerique.gouv.fr"
+    DJANGO_EMAIL_HOST_USER:
+      secretKeyRef:
+        name: backend
+        key: DJANGO_EMAIL_HOST_USER
+    DJANGO_EMAIL_HOST_PASSWORD:
+      secretKeyRef:
+        name: backend
+        key: DJANGO_EMAIL_HOST_PASSWORD
    DJANGO_SILENCED_SYSTEM_CHECKS: security.W008,security.W004
    OIDC_OP_JWKS_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/jwks
    OIDC_OP_AUTHORIZATION_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/authorize
@@ -116,13 +124,13 @@ frontend:
  image:
    repository: lasuite/impress-frontend
    pullPolicy: Always
-    tag: "v1.2.0"
+    tag: "v1.2.1"

 webrtc:
  image:
    repository: lasuite/impress-y-webrtc-signaling
    pullPolicy: Always
-    tag: "v1.2.0"
+    tag: "v1.2.1"

 ingress:
  enabled: true
@@ -1,7 +1,7 @@
 image:
  repository: lasuite/impress-backend
  pullPolicy: Always
-  tag: "v1.2.0"
+  tag: "v1.2.1"

 backend:
  migrateJobAnnotations:
@@ -24,10 +24,18 @@ backend:
      secretKeyRef:
        name: backend
        key: DJANGO_SUPERUSER_PASSWORD
-    DJANGO_EMAIL_HOST: "snap-mail.numerique.gouv.fr"
-    DJANGO_EMAIL_PORT: 465
-    DJANGO_EMAIL_USE_SSL: True
-    DJANGO_EMAIL_FROM: "noreply@docs.numerique.gouv.fr"
+    DJANGO_EMAIL_HOST: "smtp.tem.scw.cloud"
+    DJANGO_EMAIL_PORT: 587
+    DJANGO_EMAIL_USE_TLS: True
+    DJANGO_EMAIL_FROM: "noreply@docs.beta.numerique.gouv.fr"
+    DJANGO_EMAIL_HOST_USER:
+      secretKeyRef:
+        name: backend
+        key: DJANGO_EMAIL_HOST_USER
+    DJANGO_EMAIL_HOST_PASSWORD:
+      secretKeyRef:
+        name: backend
+        key: DJANGO_EMAIL_HOST_PASSWORD
    DJANGO_SILENCED_SYSTEM_CHECKS: security.W008,security.W004
    OIDC_OP_JWKS_ENDPOINT: https://auth.agentconnect.gouv.fr/api/v2/jwks
    OIDC_OP_AUTHORIZATION_ENDPOINT: https://auth.agentconnect.gouv.fr/api/v2/authorize
@@ -116,13 +124,13 @@ frontend:
  image:
    repository: lasuite/impress-frontend
    pullPolicy: Always
-    tag: "v1.2.0"
+    tag: "v1.2.1"

 webrtc:
  image:
    repository: lasuite/impress-y-webrtc-signaling
    pullPolicy: Always
-    tag: "v1.2.0"
+    tag: "v1.2.1"

 ingress:
  enabled: true
@@ -24,10 +24,18 @@ backend:
      secretKeyRef:
        name: backend
        key: DJANGO_SUPERUSER_PASSWORD
-    DJANGO_EMAIL_HOST: "snap-mail.numerique.gouv.fr"
-    DJANGO_EMAIL_PORT: 465
-    DJANGO_EMAIL_USE_SSL: True
-    DJANGO_EMAIL_FROM: "noreply@docs.numerique.gouv.fr"
+    DJANGO_EMAIL_HOST: "smtp.tem.scw.cloud"
+    DJANGO_EMAIL_PORT: 587
+    DJANGO_EMAIL_USE_TLS: True
+    DJANGO_EMAIL_FROM: "noreply@docs.beta.numerique.gouv.fr"
+    DJANGO_EMAIL_HOST_USER:
+      secretKeyRef:
+        name: backend
+        key: DJANGO_EMAIL_HOST_USER
+    DJANGO_EMAIL_HOST_PASSWORD:
+      secretKeyRef:
+        name: backend
+        key: DJANGO_EMAIL_HOST_PASSWORD
    DJANGO_SILENCED_SYSTEM_CHECKS: security.W008,security.W004
    OIDC_OP_JWKS_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/jwks
    OIDC_OP_AUTHORIZATION_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/authorize
@@ -6,5 +6,11 @@ stringData:
  DJANGO_SUPERUSER_EMAIL: {{ .Values.djangoSuperUserEmail }}
  DJANGO_SUPERUSER_PASSWORD: {{ .Values.djangoSuperUserPass }}
  DJANGO_SECRET_KEY: {{ .Values.djangoSecretKey }}
+{{- if .Values.djangoEmailHostUser }}
+  DJANGO_EMAIL_HOST_USER: {{ .Values.djangoEmailHostUser }}
+{{- end }}
+{{- if .Values.djangoEmailHostPassword }}
+  DJANGO_EMAIL_HOST_PASSWORD: {{ .Values.djangoEmailHostPassword }}
+{{- end }}
  OIDC_RP_CLIENT_ID: {{ .Values.oidc.clientId }}
  OIDC_RP_CLIENT_SECRET: {{ .Values.oidc.clientSecret }}
@@ -2,10 +2,10 @@
  <mj-include path="./partial/header.mjml" />

  <mj-body mj-class="bg--blue-100">
-    <mj-wrapper css-class="wrapper" padding="0 40px 40px 40px">
-      <mj-section background-url="{% base64_static 'images/mail-header-background.png' %}" background-size="cover" background-repeat="no-repeat" background-position="0 -30px">
+    <mj-wrapper css-class="wrapper" padding="0 25px 0px 25px">
+      <mj-section background-url="{{site.domain}}/assets/mail-header-background.png" background-size="cover" background-repeat="no-repeat" background-position="0 -30px">
        <mj-column>
-            <mj-image align="center" src="{% base64_static 'images/logo-suite-numerique.png' %}" width="250px" align="left" alt="{%trans 'La Suite Numérique' %}" />
+            <mj-image align="center" src="{{site.domain}}/assets/logo-suite-numerique.png" width="250px" align="left" alt="{%trans 'La Suite Numérique' %}" />
        </mj-column>
      </mj-section>
      <mj-section mj-class="bg--white-100" padding="30px 20px 60px 20px">
@@ -30,7 +30,7 @@
              <li>{% trans "Invite members of your community to your document in just a few clicks."%}</li>
            </ul>
          </mj-text>
-          <mj-button href="//{{site.domain}}/docs/{{document_id}}/" background-color="#000091" color="white" padding-bottom="30px">
+          <mj-button href="{{site.domain}}/docs/{{document_id}}/" background-color="#000091" color="white" padding-bottom="30px">
            {% trans "Visit Docs"%}
          </mj-button>
          <mj-text>{% trans "We are confident that Docs will help you increase efficiency and productivity while strengthening the bond among members." %}</mj-text>
@@ -46,7 +46,5 @@
      </mj-section>
    </mj-wrapper>
  </mj-body>
-
-  <mj-include path="./partial/footer.mjml" />
 </mjml>

@@ -1,6 +1,6 @@
 {
  "name": "mail_mjml",
-  "version": "1.2.0",
+  "version": "1.2.1",
  "description": "An util to generate html and text django's templates from mjml templates",
  "type": "module",
  "dependencies": {
Author	SHA1	Message	Date
Anthony LC	58eaea000c	🔖(patch) release 1.2.1 Changed: - ♻️ Change ordering docs datagrid - 🔥(helm) use scaleway email	2024-08-23 16:27:52 +02:00
Anthony LC	7d97a037f6	🧑‍💻(makefile) bump-packages-version Create the command bump-packages-version in Makefile. This command will bump the version of all the javascript packages in the project.	2024-08-23 16:27:52 +02:00
Anthony LC	c830b4dae6	♻️(email) replace base64 image with a link The emails were too big, gmail by example was not able to display them correctly. It was caused by base64 image, so they are replaced with a link to the image. We fixed the link to the website, it will improve the score of the email.	2024-08-23 15:37:01 +02:00
Anthony LC	a0fe98e156	🔥(helm) configure staging to use scaleway email Change staging configuration to use scaleway transactionnal email	2024-08-23 15:37:01 +02:00
Anthony LC	fa105e5b54	📌(e2e) pin pdf-parse to 1.1.1 pdf-parse was not pinned to a specific version. This could lead to unexpected behavior if the package is updated. This change pins pdf-parse to version 1.1.1.	2024-08-23 14:29:52 +02:00
Anthony LC	ced850aecf	♻️(frontend) datagrid ordered by updated_at desc The datagrid is now ordered by updated_at desc.	2024-08-23 14:29:52 +02:00
Anthony LC	3a420c0416	♻️(backend) document list order by updated_at desc Document list is now ordered by updated_at in descending order. Test cases were improved as well.	2024-08-23 14:29:52 +02:00