From 39f294378e794c2a359717c53effccd6f008e7e6 Mon Sep 17 00:00:00 2001
From: Adrienne Stilp <amstilp@uw.edu>
Date: Thu, 21 Mar 2024 11:23:47 -0700
Subject: [PATCH 01/10] Add django-constnace to requirements files

I can't run pip-compile since the macports MariaDB ports are broken
due to a change in libxml2, so I manually edited the requirements.txt
file. Not ideal.
---
 requirements/requirements.in  | 3 +++
 requirements/requirements.txt | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/requirements/requirements.in b/requirements/requirements.in
index dfc31fc7..d6d790fd 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -66,3 +66,6 @@ django-htmx
 certifi>=2023.7.22
 urllib3>=1.26.18
 sqlparse>=0.4.4
+
+# Dynamic settings
+django-constance
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 6b04b099..ea1d67ab 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -65,6 +65,8 @@ django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-con
     # via -r requirements/requirements.in
 django-autocomplete-light==3.11.0
     # via django-anvil-consortium-manager
+django-constance==2.9.1
+    # via -r requirements/requirements.in
 django-crispy-forms==2.1
     # via
     #   -r requirements/requirements.in
@@ -88,6 +90,9 @@ django-maintenance-mode==0.21.1
     # via -r requirements/requirements.in
 django-model-utils==4.4.0
     # via -r requirements/requirements.in
+django-picklefield==3.1.0
+    # via -r requirements/requirements.in
+    # django-constnace
 django-simple-history==3.5.0
     # via
     #   -r requirements/requirements.in

From 33f89b5c48672ae633b8fcb85960e68083ef5dda Mon Sep 17 00:00:00 2001
From: Adrienne Stilp <amstilp@uw.edu>
Date: Thu, 21 Mar 2024 11:52:31 -0700
Subject: [PATCH 02/10] Install django-constance into the project

Add django-constance to the third party apps section, and set the
specific required settings for this app. We'll use the database
backend for now, since we aren't using redis.
---
 config/settings/base.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/config/settings/base.py b/config/settings/base.py
index 9710eaeb..da185606 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -85,6 +85,7 @@
     "simple_history",
     "dbbackup",
     "django_htmx",
+    "constance",
 ]
 
 LOCAL_APPS = [
@@ -368,6 +369,13 @@
 # https://django-tables2.readthedocs.io/en/latest/pages/custom-rendering.html?highlight=django_tables2_template#available-templates
 DJANGO_TABLES2_TEMPLATE = "django_tables2/bootstrap5.html"
 
+# django-constance
+# ------------------------------------------------------------------------------
+CONSTANCE_CONFIG = {}
+CONSTANCE_BACKEND = "constance.backends.database.DatabaseBackend"
+CONSTANCE_IGNORE_ADMIN_VERSION_CHECK = True
+CONSTANCE_DATABASE_CACHE_BACKEND = "default"
+
 # django-anvil-consortium-manager
 # ------------------------------------------------------------------------------
 ANVIL_API_SERVICE_ACCOUNT_FILE = env("ANVIL_API_SERVICE_ACCOUNT_FILE")

From a73e35b14919f1ce2d8f8df74378df5d92cbf30c Mon Sep 17 00:00:00 2001
From: Adrienne Stilp <amstilp@uw.edu>
Date: Thu, 21 Mar 2024 12:01:11 -0700
Subject: [PATCH 03/10] Disable constance caching

This isn't working locally - maybe we can enable it in prod later.
---
 config/settings/base.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/settings/base.py b/config/settings/base.py
index da185606..50296358 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -374,7 +374,8 @@
 CONSTANCE_CONFIG = {}
 CONSTANCE_BACKEND = "constance.backends.database.DatabaseBackend"
 CONSTANCE_IGNORE_ADMIN_VERSION_CHECK = True
-CONSTANCE_DATABASE_CACHE_BACKEND = "default"
+# CONSTANCE_DATABASE_CACHE_BACKEND = "default"
+CONSTANCE_DATABASE_CACHE_AUTOFILL_TIMEOUT = None
 
 # django-anvil-consortium-manager
 # ------------------------------------------------------------------------------

From 9903886b479e3f63efb024bafddcedb8f3f9b304 Mon Sep 17 00:00:00 2001
From: Adrienne Stilp <amstilp@uw.edu>
Date: Thu, 21 Mar 2024 12:02:40 -0700
Subject: [PATCH 04/10] Add a SITE_ANNOUNCEMENT constant to constance

---
 config/settings/base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/settings/base.py b/config/settings/base.py
index 50296358..24f58d19 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -371,7 +371,9 @@
 
 # django-constance
 # ------------------------------------------------------------------------------
-CONSTANCE_CONFIG = {}
+CONSTANCE_CONFIG = {
+    "SITE_ANNOUNCEMENT": ("", "Site-wide announcement message", str),
+}
 CONSTANCE_BACKEND = "constance.backends.database.DatabaseBackend"
 CONSTANCE_IGNORE_ADMIN_VERSION_CHECK = True
 # CONSTANCE_DATABASE_CACHE_BACKEND = "default"

From cf1aff5478c551de8793791eeee82acdddedeb72 Mon Sep 17 00:00:00 2001
From: Adrienne Stilp <amstilp@uw.edu>
Date: Thu, 21 Mar 2024 15:08:40 -0700
Subject: [PATCH 05/10] Change account link alert bg to warning

---
 primed/templates/base.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/primed/templates/base.html b/primed/templates/base.html
index 59db3d77..275bab1d 100644
--- a/primed/templates/base.html
+++ b/primed/templates/base.html
@@ -120,13 +120,12 @@
       {% endif %}
 
       {% if not request.user.account %}
-      <div class="alert alert-info" role="alert">
+      <div class="alert alert-warning" role="alert">
         <i class="bi bi-exclamation-triangle-fill me-1"></i>
         You must <a href="{% url 'anvil_consortium_manager:accounts:link' %}">link your AnVIL account</a> before you can access any data on AnVIL.
       </div>
       {% endif %}
 
-
       {% block content %}
               <div class="my-3 alert alert-warning" role="alert">
                 <i class="bi bi-cone-striped"></i>

From 7e456574750f520303f226b14b3c0f1ce3588dcc Mon Sep 17 00:00:00 2001
From: Adrienne Stilp <amstilp@uw.edu>
Date: Thu, 21 Mar 2024 15:47:05 -0700
Subject: [PATCH 06/10] Remove min-height css setting for navbar

This was causing the ACM navbar to be much bigger than it needed
to be.
---
 primed/static/css/project.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/primed/static/css/project.css b/primed/static/css/project.css
index 6243cad2..78fa7855 100644
--- a/primed/static/css/project.css
+++ b/primed/static/css/project.css
@@ -134,7 +134,6 @@ h3, .h3 {
 }
 
 h4, .h4 {
-  font-size: calc(1.275rem + 0.3vw);
 }
 
 @media (min-width: 1200px) {
@@ -12012,9 +12011,6 @@ a.navbar-brand:hover {
   background-color: unset;
 }
 
-.navbar {
-  min-height: 132px;
-}
 
 .navbar-brand {
   height: 100px;

From a1a0447331ee4965ccc334f7fd7f1281f589ee61 Mon Sep 17 00:00:00 2001
From: Adrienne Stilp <amstilp@uw.edu>
Date: Thu, 21 Mar 2024 15:53:11 -0700
Subject: [PATCH 07/10] Only show account link message if user is logged in

---
 primed/primed_anvil/tests/test_views.py | 6 ++++++
 primed/templates/base.html              | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/primed/primed_anvil/tests/test_views.py b/primed/primed_anvil/tests/test_views.py
index b84d4c5f..d7ff92fe 100644
--- a/primed/primed_anvil/tests/test_views.py
+++ b/primed/primed_anvil/tests/test_views.py
@@ -133,6 +133,12 @@ def test_user_has_not_linked_account(self):
             response, reverse("anvil_consortium_manager:accounts:link")
         )
 
+    def test_unauthenticated_user_has_not_linked_account_message(self):
+        response = self.client.get(settings.LOGIN_URL, follow=True)
+        self.assertNotContains(
+            response, reverse("anvil_consortium_manager:accounts:link")
+        )
+
     def test_staff_view_links(self):
         user = UserFactory.create()
         user.user_permissions.add(
diff --git a/primed/templates/base.html b/primed/templates/base.html
index 275bab1d..775702fc 100644
--- a/primed/templates/base.html
+++ b/primed/templates/base.html
@@ -119,7 +119,7 @@
           {% endfor %}
       {% endif %}
 
-      {% if not request.user.account %}
+      {% if request.user.is_authenticated and not request.user.account %}
       <div class="alert alert-warning" role="alert">
         <i class="bi bi-exclamation-triangle-fill me-1"></i>
         You must <a href="{% url 'anvil_consortium_manager:accounts:link' %}">link your AnVIL account</a> before you can access any data on AnVIL.

From d7566fb317594d6640553793a7e0755e4b56bfd6 Mon Sep 17 00:00:00 2001
From: Adrienne Stilp <amstilp@uw.edu>
Date: Thu, 21 Mar 2024 15:54:13 -0700
Subject: [PATCH 08/10] Move alerts above ACM navbar

---
 primed/templates/base.html | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/primed/templates/base.html b/primed/templates/base.html
index 775702fc..8b2cb7a0 100644
--- a/primed/templates/base.html
+++ b/primed/templates/base.html
@@ -108,23 +108,26 @@
       </div>
     </nav>
 
+    <main class="flex-shrink-0">
+      <div class="container">
+
+    {% if request.user.is_authenticated and not request.user.account %}
+    <div class="alert alert-warning" role="alert">
+      <i class="bi bi-exclamation-triangle-fill me-1"></i>
+      You must <a href="{% url 'anvil_consortium_manager:accounts:link' %}">link your AnVIL account</a> before you can access any data on AnVIL.
+    </div>
+    {% endif %}
+
+    {% if messages %}
+    {% for message in messages %}
+        <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %} alert-dismissible fade show" role="alert">{{ message }}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>
+    {% endfor %}
+{% endif %}
+
     {% block extra_navbar %}
     {% endblock %}
-    <main class="flex-shrink-0">
-    <div class="container">
-
-      {% if messages %}
-          {% for message in messages %}
-              <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %} alert-dismissible fade show" role="alert">{{ message }}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>
-          {% endfor %}
-      {% endif %}
-
-      {% if request.user.is_authenticated and not request.user.account %}
-      <div class="alert alert-warning" role="alert">
-        <i class="bi bi-exclamation-triangle-fill me-1"></i>
-        You must <a href="{% url 'anvil_consortium_manager:accounts:link' %}">link your AnVIL account</a> before you can access any data on AnVIL.
-      </div>
-      {% endif %}
+
+
 
       {% block content %}
               <div class="my-3 alert alert-warning" role="alert">

From 025891489f203324b6164d015781bc6ad6bc8171 Mon Sep 17 00:00:00 2001
From: Adrienne Stilp <amstilp@uw.edu>
Date: Thu, 21 Mar 2024 16:57:43 -0700
Subject: [PATCH 09/10] Add constance database app to installed apps

This is not documented, but appears to be required:
https://github.com/jazzband/django-constance/issues/526
---
 config/settings/base.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/settings/base.py b/config/settings/base.py
index 24f58d19..2f408147 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -86,6 +86,7 @@
     "dbbackup",
     "django_htmx",
     "constance",
+    "constance.backends.database",
 ]
 
 LOCAL_APPS = [

From 00a7fe9734dd2ee9fe9248b74b3a2ca3c7154557 Mon Sep 17 00:00:00 2001
From: Adrienne Stilp <amstilp@uw.edu>
Date: Thu, 21 Mar 2024 17:00:24 -0700
Subject: [PATCH 10/10] Add a constance setting to show a site announcement

Add the ANNOUNCEMENT_TEXT setting to constance with the default as
a blank string: "". If the setting is set to a non-blank string,
then show an alert with the announcement. Otherwise, do not show any
alert. Add tests.
---
 config/settings/base.py                 |  4 +++-
 primed/primed_anvil/tests/test_views.py | 19 +++++++++++++++++++
 primed/templates/base.html              | 25 ++++++++++++++++---------
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/config/settings/base.py b/config/settings/base.py
index 2f408147..61828a23 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -207,6 +207,7 @@
                 "django.template.context_processors.static",
                 "django.template.context_processors.tz",
                 "django.contrib.messages.context_processors.messages",
+                "constance.context_processors.config",
                 "primed.utils.context_processors.settings_context",
             ],
         },
@@ -373,8 +374,9 @@
 # django-constance
 # ------------------------------------------------------------------------------
 CONSTANCE_CONFIG = {
-    "SITE_ANNOUNCEMENT": ("", "Site-wide announcement message", str),
+    "ANNOUNCEMENT_TEXT": ("", "Site-wide announcement message", str),
 }
+
 CONSTANCE_BACKEND = "constance.backends.database.DatabaseBackend"
 CONSTANCE_IGNORE_ADMIN_VERSION_CHECK = True
 # CONSTANCE_DATABASE_CACHE_BACKEND = "default"
diff --git a/primed/primed_anvil/tests/test_views.py b/primed/primed_anvil/tests/test_views.py
index d7ff92fe..9e1b079f 100644
--- a/primed/primed_anvil/tests/test_views.py
+++ b/primed/primed_anvil/tests/test_views.py
@@ -3,6 +3,7 @@
 from anvil_consortium_manager import models as acm_models
 from anvil_consortium_manager.tests.factories import AccountFactory
 from anvil_consortium_manager.views import AccountList
+from constance.test import override_config
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
@@ -169,6 +170,24 @@ def test_view_links(self):
             response, '"{}"'.format(reverse("anvil_consortium_manager:index"))
         )
 
+    def test_site_announcement_no_text(self):
+        self.client.force_login(self.user)
+        response = self.client.get(self.get_url())
+        self.assertNotContains(response, """id="alert-announcement""")
+
+    @override_config(ANNOUNCEMENT_TEXT="This is a test announcement")
+    def test_site_announcement_text(self):
+        self.client.force_login(self.user)
+        response = self.client.get(self.get_url())
+        self.assertContains(response, """id="alert-announcement""")
+        self.assertContains(response, "This is a test announcement")
+
+    @override_config(ANNOUNCEMENT_TEXT="This is a test announcement")
+    def test_site_announcement_text_unauthenticated_user(self):
+        response = self.client.get(self.get_url(), follow=True)
+        self.assertContains(response, """id="alert-announcement""")
+        self.assertContains(response, "This is a test announcement")
+
 
 class StudyDetailTest(TestCase):
     """Tests for the StudyDetail view."""
diff --git a/primed/templates/base.html b/primed/templates/base.html
index 8b2cb7a0..1789536c 100644
--- a/primed/templates/base.html
+++ b/primed/templates/base.html
@@ -111,18 +111,25 @@
     <main class="flex-shrink-0">
       <div class="container">
 
-    {% if request.user.is_authenticated and not request.user.account %}
-    <div class="alert alert-warning" role="alert">
-      <i class="bi bi-exclamation-triangle-fill me-1"></i>
-      You must <a href="{% url 'anvil_consortium_manager:accounts:link' %}">link your AnVIL account</a> before you can access any data on AnVIL.
-    </div>
+      {% if config.ANNOUNCEMENT_TEXT %}
+        <div class="alert alert-info" role="alert" id="alert-announcement">
+          <i class="bi bi-megaphone-fill me-1"></i>
+          {{ config.ANNOUNCEMENT_TEXT }}
+        </div>
+      {% endif %}
+
+      {% if request.user.is_authenticated and not request.user.account %}
+      <div class="alert alert-warning" role="alert">
+        <i class="bi bi-exclamation-triangle-fill me-1"></i>
+        You must <a href="{% url 'anvil_consortium_manager:accounts:link' %}">link your AnVIL account</a> before you can access any data on AnVIL.
+      </div>
     {% endif %}
 
     {% if messages %}
-    {% for message in messages %}
-        <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %} alert-dismissible fade show" role="alert">{{ message }}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>
-    {% endfor %}
-{% endif %}
+      {% for message in messages %}
+          <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %} alert-dismissible fade show" role="alert">{{ message }}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>
+      {% endfor %}
+    {% endif %}
 
     {% block extra_navbar %}
     {% endblock %}