Merge pull request #250 from UW-GAC/deploy/stage

Deploy to prod

.github/workflows/ci.yml

@@ -50,7 +50,7 @@ jobs:
         # ahead of planned upgrades we can add versions as
         # needed
         python-version: [3.8]
-        mariadb-version: ["10.3"]
+        mariadb-version: ["10.3", "10.4"]
 
     services:
       mysql:

add_cdsa_example_data.py

@@ -9,6 +9,7 @@
     ManagedGroupFactory,
     WorkspaceGroupSharingFactory,
 )
+from django.conf import settings
 
 from primed.cdsa.tests import factories
 from primed.duo.tests.factories import DataUseModifierFactory, DataUsePermissionFactory
@@ -17,16 +18,23 @@
 from primed.users.models import User
 from primed.users.tests.factories import UserFactory
 
+# Create major versions
+major_version = factories.AgreementMajorVersionFactory.create(version=1)
+
 # Create some agreement versions
-v10 = factories.AgreementVersionFactory.create(major_version=1, minor_version=0)
-v11 = factories.AgreementVersionFactory.create(major_version=1, minor_version=1)
+v10 = factories.AgreementVersionFactory.create(
+    major_version=major_version, minor_version=0
+)
+v11 = factories.AgreementVersionFactory.create(
+    major_version=major_version, minor_version=1
+)
 
 # Create a couple signed CDSAs.
 dup = DataUsePermissionFactory.create(abbreviation="GRU")
 dum = DataUseModifierFactory.create(abbreviation="NPU")
 
 # create the CDSA auth group
-cdsa_group = ManagedGroupFactory.create(name="PRIMED_CDSA")
+cdsa_group = ManagedGroupFactory.create(name=settings.ANVIL_CDSA_GROUP_NAME)
 
 # Create some study sites.
 StudySiteFactory.create(short_name="CARDINAL", full_name="CARDINAL")

config/settings/local.py

@@ -76,3 +76,4 @@
 ANVIL_DATA_ACCESS_GROUP_PREFIX = env(
     "ANVIL_DATA_ACCESS_GROUP_PREFIX", default="DEV_PRIMED"
 )
+ANVIL_CDSA_GROUP_NAME = env("ANVIL_CDSA_GROUP_NAME", default="DEV_PRIMED_CDSA")

primed/cdsa/adapters.py

@@ -1,4 +1,5 @@
 from anvil_consortium_manager.adapters.workspace import BaseWorkspaceAdapter
+from anvil_consortium_manager.forms import WorkspaceForm
 
 from . import forms, models, tables
 
@@ -12,6 +13,7 @@ class CDSAWorkspaceAdapter(BaseWorkspaceAdapter):
         "Workspaces containing data from the Consortium Data Sharing Agreement."
     )
     list_table_class = tables.CDSAWorkspaceTable
+    workspace_form_class = WorkspaceForm
     workspace_data_model = models.CDSAWorkspace
     workspace_data_form_class = forms.CDSAWorkspaceForm
     workspace_detail_template_name = "cdsa/cdsaworkspace_detail.html"

primed/cdsa/admin.py

@@ -4,17 +4,33 @@
 from . import models
 
 
+@admin.register(models.AgreementMajorVersion)
+class AgreementMajorVersion(SimpleHistoryAdmin):
+    """Admin class for the `AgreementMajorVersion` model."""
+
+    list_display = (
+        "version",
+        "is_valid",
+    )
+    list_filter = (
+        "version",
+        "is_valid",
+    )
+    sortable_by = ("version",)
+
+
 @admin.register(models.AgreementVersion)
 class AgreementVersion(SimpleHistoryAdmin):
     """Admin class for the `AgreementVersion` model."""
 
     list_display = (
         "full_version",
-        "major_version",
-        "minor_version",
         "date_approved",
     )
-    list_filter = ("major_version",)
+    list_filter = (
+        "major_version",
+        "major_version__is_valid",
+    )
     sortable_by = (
         "major_version",
         "minor_version",
@@ -38,6 +54,7 @@ class SignedAgreement(SimpleHistoryAdmin):
         "type",
         "is_primary",
         "version",
+        "status",
     )
     search_fields = (
         "representative",
@@ -63,6 +80,7 @@ class MemberAgreementAdmin(SimpleHistoryAdmin):
     list_filter = (
         "study_site",
         "signed_agreement__is_primary",
+        "signed_agreement__status",
     )
 
 
@@ -77,6 +95,7 @@ class DataAffiliateAgreementAdmin(SimpleHistoryAdmin):
     list_filter = (
         "study",
         "signed_agreement__is_primary",
+        "signed_agreement__status",
     )
 
 
@@ -88,7 +107,10 @@ class NonDataAffiliateAgreementAdmin(SimpleHistoryAdmin):
         "signed_agreement",
         "affiliation",
     )
-    list_filter = ("signed_agreement__is_primary",)
+    list_filter = (
+        "signed_agreement__is_primary",
+        "signed_agreement__status",
+    )
 
 
 @admin.register(models.CDSAWorkspace)