From ab676f699411cb5e0dc7c30c7477d5918a8b7f2e Mon Sep 17 00:00:00 2001
From: "Ph. SW." <philippe.milink@gmx.fr>
Date: Sat, 20 Jul 2024 15:40:57 +0200
Subject: [PATCH] =?UTF-8?q?Teste=20et=20corrige=20l'affichage=20de=20quelq?=
 =?UTF-8?q?ues=20=C3=A9l=C3=A9ments=20de=20la=20sidebar=20des=20contenus?=
 =?UTF-8?q?=20(#6599)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Corrige l'affichage des versions identiques dans la sidebar
* Affiche le lien "Exports du contenu" sur la page publique
---
 .../sidebar/administration_actions.part.html  |   6 -
 .../includes/sidebar/exports.part.html        |   3 +-
 .../includes/sidebar/public_actions.part.html |  39 ++++-
 .../includes/sidebar/validation.part.html     |   3 +-
 zds/tutorialv2/models/database.py             |   4 +
 .../tests_contentvalidationview.py            |   8 +-
 .../tests/tests_views/tests_display.py        | 159 ++++++++++++++++++
 zds/tutorialv2/tests/utils.py                 |   8 +
 zds/tutorialv2/views/display/config.py        |  54 ++++--
 9 files changed, 245 insertions(+), 39 deletions(-)
 create mode 100644 zds/tutorialv2/tests/tests_views/tests_display.py
 create mode 100644 zds/tutorialv2/tests/utils.py

diff --git a/templates/tutorialv2/includes/sidebar/administration_actions.part.html b/templates/tutorialv2/includes/sidebar/administration_actions.part.html
index 2ae5450331..55507d9b11 100644
--- a/templates/tutorialv2/includes/sidebar/administration_actions.part.html
+++ b/templates/tutorialv2/includes/sidebar/administration_actions.part.html
@@ -7,12 +7,6 @@
         <h3>{% trans "Administration" %}</h3>
 
         <ul>
-            {% if administration_actions.show_exports_request %}
-                <li>
-                    {% include "tutorialv2/includes/sidebar/exports.part.html" %}
-                </li>
-            {% endif %}
-
             {% if administration_actions.show_versions_history_link %}
                 <li>
                     <a href="{% url "content:history" content.pk content.slug_repository %}" class="ico-after history blue">
diff --git a/templates/tutorialv2/includes/sidebar/exports.part.html b/templates/tutorialv2/includes/sidebar/exports.part.html
index 2dbd95122c..c15975aee5 100644
--- a/templates/tutorialv2/includes/sidebar/exports.part.html
+++ b/templates/tutorialv2/includes/sidebar/exports.part.html
@@ -1,10 +1,11 @@
+{% load get_item %}
 {% load i18n %}
 
 <a href="#exports-modal" class="open-modal ico-after gear blue"
    data-exports-id="{{ content.pk }}"
    data-exports-api="{% url "api:content:list_exports" content.pk %}"
    data-request-export-api="{% url "api:content:generate_export" content.pk %}">
-  {% trans "Exports du contenu" %}
+    {{ public_actions.messages|get_item:"export_content" }}
 </a>
 
 <div class="modal modal-flex" id="exports-modal" data-modal-close="Fermer">
diff --git a/templates/tutorialv2/includes/sidebar/public_actions.part.html b/templates/tutorialv2/includes/sidebar/public_actions.part.html
index 695709f92e..e028195fcf 100644
--- a/templates/tutorialv2/includes/sidebar/public_actions.part.html
+++ b/templates/tutorialv2/includes/sidebar/public_actions.part.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load captureas %}
 {% load crispy_forms_tags %}
+{% load get_item %}
 
 {% if public_actions.show_block %}
     <div class="mobile-menu-bloc mobile-all-links mobile-show-ico" data-title="Version publique">
@@ -14,26 +15,35 @@ <h3>{% trans "Version publique" %}</h3>
                 </li>
             {% endif %}
 
-            {% if public_actions.show_identical_version_message %}
+            {% if public_actions.show_identical_public_version_message %}
                 <li class="inactive">
                     <span class="ico-after pin disabled">
-                        {% trans "La version publique est identique à cette version." %}
+                        {{ public_actions.messages|get_item:"public_is_same" }}
                     </span>
                 </li>
             {% endif %}
 
-            {% if public_actions.show_page_link %}
+            {% if public_actions.show_identical_draft_version_message %}
+                <li class="inactive">
+                    <span class="ico-after pin disabled">
+                        {{ public_actions.messages|get_item:"draft_is_same" }}
+                    </span>
+                </li>
+            {% endif %}
+
+            {% if public_actions.show_more_recent_draft_version_link %}
                 <li>
-                    <a href="{{ public_content_object.get_absolute_url_online }}" class="ico-after online blue">
-                        {% trans "Voir la page publique" %}
+                    <a href="{{ object.get_absolute_url }}" class="ico-after online blue">
+                        {{ public_actions.messages|get_item:"draft_is_more_recent" }}
                     </a>
                 </li>
             {% endif %}
 
-            {% if public_actions.show_stats_link %}
+            {% if public_actions.show_page_link %}
                 <li>
-                    {% url "content:stats-content" content.pk content.slug as stats_url %}
-                    <a href="{{ stats_url }}" class="ico-after stats blue">{% trans "Voir les statistiques" %}</a>
+                    <a href="{{ public_content_object.get_absolute_url_online }}" class="ico-after online blue">
+                        {% trans "Voir la page publique" %}
+                    </a>
                 </li>
             {% endif %}
 
@@ -47,6 +57,19 @@ <h3>{% trans "Version publique" %}</h3>
                 </li>
             {% endif %}
 
+            {% if public_actions.show_stats_link %}
+                <li>
+                    {% url "content:stats-content" content.pk content.slug as stats_url %}
+                    <a href="{{ stats_url }}" class="ico-after stats blue">{% trans "Voir les statistiques" %}</a>
+                </li>
+            {% endif %}
+
+            {% if public_actions.show_exports_request %}
+                <li>
+                    {% include "tutorialv2/includes/sidebar/exports.part.html" %}
+                </li>
+            {% endif %}
+
             {% if public_actions.show_content_revoke %}
                 <li>
                     <a href="#unpublish" class="ico-after open-modal cross blue">
diff --git a/templates/tutorialv2/includes/sidebar/validation.part.html b/templates/tutorialv2/includes/sidebar/validation.part.html
index b26e7977ab..2599de71f7 100644
--- a/templates/tutorialv2/includes/sidebar/validation.part.html
+++ b/templates/tutorialv2/includes/sidebar/validation.part.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 {% load captureas %}
+{% load get_item %}
 
 
 {% if display_config.validation_actions.show_validation_actions %}
@@ -19,7 +20,7 @@ <h3>{% if content.requires_validation %}{% trans "Validation"%}{%else %}{%trans
             {% if display_config.validation_actions.show_identical_message %}
                 <li class="inactive">
                     <span class="ico-after pin disabled">
-                        {% trans "La version en validation est identique à cette version." %}
+                        {{ display_config.validation_actions.messages|get_item:"validation_is_same" }}
                     </span>
                 </li>
             {% endif %}
diff --git a/zds/tutorialv2/models/database.py b/zds/tutorialv2/models/database.py
index a39153f24e..08a483a43c 100644
--- a/zds/tutorialv2/models/database.py
+++ b/zds/tutorialv2/models/database.py
@@ -302,6 +302,10 @@ def is_public(self, sha: str) -> bool:
         """Return True if the given sha corresponds to the public version, and False otherwise."""
         return self.in_public() and sha == self.sha_public
 
+    def is_draft_more_recent_than_public(self) -> bool:
+        """Return True if there is a draft version more recent than the published version, and False otherwise."""
+        return self.in_public() and self.in_drafting() and self.sha_public != self.sha_draft
+
     def is_picked(self):
         return self.in_public() and self.sha_public == self.sha_picked
 
diff --git a/zds/tutorialv2/tests/tests_views/tests_contentvalidationview.py b/zds/tutorialv2/tests/tests_views/tests_contentvalidationview.py
index c634b93439..45116c1f75 100644
--- a/zds/tutorialv2/tests/tests_views/tests_contentvalidationview.py
+++ b/zds/tutorialv2/tests/tests_views/tests_contentvalidationview.py
@@ -4,13 +4,7 @@
 from zds.tutorialv2.tests import TutorialTestMixin, override_for_contents
 from zds.member.tests.factories import ProfileFactory, StaffProfileFactory
 from zds.tutorialv2.tests.factories import PublishableContentFactory, ValidationFactory
-
-
-def request_validation(content):
-    """Emulate a proper validation request."""
-    ValidationFactory(content=content, status="PENDING")
-    content.sha_validation = content.sha_draft
-    content.save()
+from zds.tutorialv2.tests.utils import request_validation
 
 
 @override_for_contents()
diff --git a/zds/tutorialv2/tests/tests_views/tests_display.py b/zds/tutorialv2/tests/tests_views/tests_display.py
new file mode 100644
index 0000000000..feeaeb3c1c
--- /dev/null
+++ b/zds/tutorialv2/tests/tests_views/tests_display.py
@@ -0,0 +1,159 @@
+from copy import deepcopy
+
+from django.conf import settings
+from django.test import TestCase
+from django.test.utils import override_settings
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
+
+from zds.member.tests.factories import ProfileFactory
+from zds.tutorialv2.tests import TutorialTestMixin
+from zds.tutorialv2.tests.factories import PublishedContentFactory
+from zds.tutorialv2.tests.utils import request_validation
+from zds.tutorialv2.views.display.config import PublicActionsState, ValidationActions
+from zds.utils.tests.factories import LicenceFactory
+
+
+overridden_zds_app = deepcopy(settings.ZDS_APP)
+overridden_zds_app["content"]["repo_private_path"] = settings.BASE_DIR / "contents-private-test"
+overridden_zds_app["content"]["repo_public_path"] = settings.BASE_DIR / "contents-public-test"
+overridden_zds_app["content"]["extra_content_generation_policy"] = "NONE"
+
+
+@override_settings(MEDIA_ROOT=settings.BASE_DIR / "media-test")
+@override_settings(ZDS_APP=overridden_zds_app)
+@override_settings(ES_ENABLED=False)
+class DisplayConfigTests(TutorialTestMixin, TestCase):
+    TEXT_FIRST_MODIFICATION = "Modified introduction"
+    TEXT_SECOND_MODIFICATION = "Modified Introduction"
+
+    def setUp(self):
+        self.overridden_zds_app = overridden_zds_app
+        overridden_zds_app["content"]["default_licence_pk"] = LicenceFactory().pk
+
+        self.user_author = ProfileFactory().user
+        self.client.force_login(self.user_author)
+
+        # Publish an article:
+        self.article = PublishedContentFactory(author_list=[self.user_author], type="ARTICLE")
+
+    def _new_draft_version(self, text):
+        # Create a new draft version:
+        versioned = self.article.load_version()
+        result = self.client.post(
+            reverse("content:edit", args=[self.article.pk, self.article.slug]),
+            {
+                "title": self.article.title,
+                "description": self.article.description,
+                "introduction": text,
+                "conclusion": "Modified conclusion",
+                "type": self.article.type,
+                "subcategory": self.article.subcategory.first().pk,
+                "last_hash": versioned.compute_hash(),
+            },
+            follow=False,
+        )
+        self.assertEqual(result.status_code, 302)
+        self.article.refresh_from_db()  # the previous request changes sha_draft
+
+    def test_sidebar_items_on_public_page(self):
+        def common_tests():
+            public_page = self.client.get(self.article.get_absolute_url_online())
+
+            self.assertNotContains(public_page, PublicActionsState.messages["public_is_same"])
+            self.assertContains(public_page, PublicActionsState.messages["export_content"])
+            self.assertNotContains(public_page, ValidationActions.messages["validation_is_same"])
+
+            return public_page
+
+        public_page = common_tests()
+        self.assertContains(public_page, PublicActionsState.messages["draft_is_same"])
+        self.assertNotContains(public_page, PublicActionsState.messages["draft_is_more_recent"])
+
+        self._new_draft_version(self.TEXT_FIRST_MODIFICATION)
+
+        public_page = common_tests()
+        self.assertNotContains(public_page, self.TEXT_FIRST_MODIFICATION)
+        self.assertNotContains(public_page, PublicActionsState.messages["draft_is_same"])
+        self.assertContains(public_page, PublicActionsState.messages["draft_is_more_recent"])
+
+        request_validation(self.article)
+
+        public_page = common_tests()
+        self.assertNotContains(public_page, self.TEXT_FIRST_MODIFICATION)
+        self.assertNotContains(public_page, PublicActionsState.messages["draft_is_same"])
+        self.assertContains(public_page, PublicActionsState.messages["draft_is_more_recent"])
+
+        # Now a new draft version, to have different version from validation:
+        self._new_draft_version(self.TEXT_SECOND_MODIFICATION)
+
+        public_page = common_tests()
+        self.assertNotContains(public_page, self.TEXT_FIRST_MODIFICATION)
+        self.assertNotContains(public_page, self.TEXT_SECOND_MODIFICATION)
+        self.assertNotContains(public_page, PublicActionsState.messages["draft_is_same"])
+        self.assertContains(public_page, PublicActionsState.messages["draft_is_more_recent"])
+
+    def test_sidebar_items_on_draft_page(self):
+        def common_tests():
+            draft_page = self.client.get(
+                reverse("content:view", args=[self.article.pk, self.article.slug]), follow=False
+            )
+
+            self.assertNotContains(draft_page, PublicActionsState.messages["draft_is_same"])
+            self.assertNotContains(draft_page, PublicActionsState.messages["draft_is_more_recent"])
+            self.assertNotContains(draft_page, PublicActionsState.messages["export_content"])
+
+            return draft_page
+
+        draft_page = common_tests()
+        self.assertContains(draft_page, PublicActionsState.messages["public_is_same"])
+        self.assertNotContains(draft_page, ValidationActions.messages["validation_is_same"])
+
+        self._new_draft_version(self.TEXT_FIRST_MODIFICATION)
+
+        draft_page = common_tests()
+        self.assertContains(draft_page, self.TEXT_FIRST_MODIFICATION)
+        self.assertNotContains(draft_page, PublicActionsState.messages["public_is_same"])
+        self.assertNotContains(draft_page, ValidationActions.messages["validation_is_same"])
+
+        request_validation(self.article)
+
+        draft_page = common_tests()
+        self.assertContains(draft_page, self.TEXT_FIRST_MODIFICATION)
+        self.assertNotContains(draft_page, PublicActionsState.messages["public_is_same"])
+        self.assertContains(draft_page, ValidationActions.messages["validation_is_same"])
+
+        # Now a new draft version, to have different version from validation:
+        self._new_draft_version(self.TEXT_SECOND_MODIFICATION)
+
+        draft_page = common_tests()
+        self.assertContains(draft_page, self.TEXT_SECOND_MODIFICATION)
+        self.assertNotContains(draft_page, self.TEXT_FIRST_MODIFICATION)
+        self.assertNotContains(draft_page, PublicActionsState.messages["public_is_same"])
+        self.assertNotContains(draft_page, ValidationActions.messages["validation_is_same"])
+
+    def test_sidebar_items_on_validation_page(self):
+        def common_tests():
+            validation_page = self.client.get(
+                reverse("content:validation-view", args=[self.article.pk, self.article.slug]), follow=False
+            )
+
+            self.assertContains(validation_page, self.TEXT_FIRST_MODIFICATION)
+            self.assertNotContains(validation_page, PublicActionsState.messages["draft_is_same"])
+            self.assertNotContains(validation_page, PublicActionsState.messages["public_is_same"])
+            self.assertNotContains(validation_page, PublicActionsState.messages["draft_is_more_recent"])
+            self.assertNotContains(validation_page, PublicActionsState.messages["export_content"])
+            self.assertNotContains(validation_page, ValidationActions.messages["validation_is_same"])
+
+            return validation_page
+
+        self._new_draft_version(self.TEXT_FIRST_MODIFICATION)
+        request_validation(self.article)
+
+        validation_page = common_tests()
+
+        # Now a new draft version, to have different version from validation:
+        self._new_draft_version(self.TEXT_SECOND_MODIFICATION)
+
+        validation_page = common_tests()
+        self.assertNotContains(validation_page, self.TEXT_SECOND_MODIFICATION)
diff --git a/zds/tutorialv2/tests/utils.py b/zds/tutorialv2/tests/utils.py
new file mode 100644
index 0000000000..814f43778c
--- /dev/null
+++ b/zds/tutorialv2/tests/utils.py
@@ -0,0 +1,8 @@
+from zds.tutorialv2.tests.factories import ValidationFactory
+
+
+def request_validation(content):
+    """Emulate a proper validation request."""
+    ValidationFactory(content=content, status="PENDING")
+    content.sha_validation = content.sha_draft
+    content.save()
diff --git a/zds/tutorialv2/views/display/config.py b/zds/tutorialv2/views/display/config.py
index 767952b5b6..7e6344a4cf 100644
--- a/zds/tutorialv2/views/display/config.py
+++ b/zds/tutorialv2/views/display/config.py
@@ -1,3 +1,5 @@
+from django.utils.translation import gettext_lazy as _
+
 from zds.tutorialv2.models.database import PublishableContent
 from zds.tutorialv2.models.versioned import VersionedContent
 
@@ -17,8 +19,7 @@ def show_block(self) -> bool:
             self.enabled
             and self.is_allowed
             and (
-                self.show_exports_request()
-                or self.show_versions_history_link()
+                self.show_versions_history_link()
                 or self.show_events_history_link()
                 or self.show_opinion_publish()
                 or self.show_opinion_moderated()
@@ -27,9 +28,6 @@ def show_block(self) -> bool:
             )
         )
 
-    def show_exports_request(self) -> bool:
-        return self.is_allowed
-
     def show_versions_history_link(self) -> bool:
         return self.is_allowed
 
@@ -50,16 +48,22 @@ def show_jsfiddle(self) -> bool:
 
 
 class PublicActionsState:
-    def __init__(
-        self, user, content: PublishableContent, versioned_content: VersionedContent, is_public_page=False, enabled=True
-    ):
+    messages = {
+        "draft_is_same": _("La version brouillon est identique à cette version."),
+        "draft_is_more_recent": _("La version brouillon est plus récente que cette version."),
+        "public_is_same": _("La version publique est identique à cette version."),
+        "export_content": _("Exports du contenu"),
+    }
+
+    def __init__(self, user, content: PublishableContent, versioned_content: VersionedContent):
         self.is_staff = user.has_perm("tutorialv2.change_publishablecontent")
         self.is_author_or_staff = content.is_author(user) or self.is_staff
         self.in_public = content.in_public()
         self.is_same_as_public = content.is_public(versioned_content.current_version)
+        self.is_same_as_draft = not content.is_draft_more_recent_than_public()
         self.requires_validation = content.requires_validation()
-        self.is_public_page = is_public_page
-        self.enabled = enabled
+        self.is_public_page = False
+        self.enabled = True
 
     def show_block(self) -> bool:
         return (
@@ -67,7 +71,10 @@ def show_block(self) -> bool:
             and self.is_author_or_staff
             and (
                 self.show_stats_link()
-                or self.show_identical_version_message()
+                or self.show_exports_request()
+                or self.show_identical_public_version_message()
+                or self.show_identical_draft_version_message()
+                or self.show_more_recent_draft_version_link()
                 or self.show_page_link()
                 or self.show_public_page_message()
                 or self.show_comparison_link()
@@ -76,11 +83,20 @@ def show_block(self) -> bool:
             )
         )
 
+    def show_exports_request(self) -> bool:
+        return self.is_author_or_staff and self.in_public and self.is_public_page
+
     def show_stats_link(self) -> bool:
         return self.is_author_or_staff and self.in_public
 
-    def show_identical_version_message(self) -> bool:
-        return self.is_author_or_staff and self.in_public and self.is_same_as_public
+    def show_identical_public_version_message(self) -> bool:
+        return self.is_author_or_staff and self.in_public and self.is_same_as_public and not self.is_public_page
+
+    def show_more_recent_draft_version_link(self) -> bool:
+        return self.is_author_or_staff and self.is_public_page and not self.is_same_as_draft
+
+    def show_identical_draft_version_message(self) -> bool:
+        return self.is_author_or_staff and self.is_public_page and self.is_same_as_draft
 
     def show_page_link(self) -> bool:
         return self.is_author_or_staff and self.in_public and not self.is_public_page
@@ -258,7 +274,11 @@ def show_exports(self) -> bool:
 
 
 class ValidationActions:
-    def __init__(self, user, content: PublishableContent, versioned_content: VersionedContent, enabled=True):
+    messages = {
+        "validation_is_same": _("La version en validation est identique à cette version."),
+    }
+
+    def __init__(self, user, content: PublishableContent, versioned_content: VersionedContent):
         self.is_staff = user.has_perm("tutorialv2.change_publishablecontent")
         self.is_author_or_staff = content.is_author(user) or self.is_staff
         self.in_validation = content.in_validation()
@@ -266,7 +286,8 @@ def __init__(self, user, content: PublishableContent, versioned_content: Version
         self.requires_validation = content.requires_validation()
         self.in_public = content.in_public()
         self.content_is_picked = content.is_picked()
-        self.enabled = enabled
+        self.enabled = True
+        self.is_validation_page = False
         validation = content.get_validation()
         self.reserved = (validation is not None) and validation.is_pending_valid()
 
@@ -294,7 +315,7 @@ def show_cancel_validation(self) -> bool:
         return self.enabled and self.is_author_or_staff and self.in_validation
 
     def show_identical_message(self) -> bool:
-        return self.enabled and self.is_author_or_staff and self.version_is_validation
+        return self.enabled and self.is_author_or_staff and self.version_is_validation and not self.is_validation_page
 
     def show_validation_admin(self) -> bool:
         return self.enabled and self.is_staff
@@ -491,3 +512,4 @@ def __init__(self, user, content: PublishableContent, versioned_content: Version
         self.validation_actions.show_validation_link = False
         self.online_config.enabled = False
         self.info_config.show_warn_typo = True
+        self.validation_actions.is_validation_page = True