Merge branch 'develop' into feature/homepage-featured-story

.github/workflows/dev-depoly.yml

@@ -21,8 +21,8 @@ jobs:
         run: |
           eval `ssh-agent -s`
           ssh-add - <<< '${{ secrets.DEPLOY_KEY_FOR_CONFIG_REPO }}'
-          git clone -b develop git@github.com:ecds/readux-configs.git
-          mv readux-configs/* .
+          git clone -b "${{ github.head_ref || github.ref_name }}" "${{ secrets.DEPLOY_CONFIG_REPO}}"
+          mv "${{ secrets.CONFIG_REPO_NAME }}"/* .
           chmod +x config.sh
           chmod +x deploy.sh
 
@@ -44,4 +44,11 @@ jobs:
           role-session-name: GitHub-OIDC-frontend
 
       - name: Run Deploy
+        env:
+          AWS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_FSX_VOLUME: ${{ secrets.AWS_FSX_VOLUME }}
+          DATABASE_URL: ${{ secrets.DATABASE_URL_DEV}}
+          EMAIL_USER: ${{ secrets.EMAIL_USER }}
+          EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
         run: ./deploy.sh

apps/cms/models.py

@@ -1,16 +1,15 @@
 """CMS Models."""
-from urllib.parse import urlencode
 from modelcluster.fields import ParentalManyToManyField
 from wagtail.models import Page
 from wagtail.fields import RichTextField, StreamField
 from wagtail.admin.panels import FieldPanel, MultiFieldPanel
 from wagtailautocomplete.edit_handlers import AutocompletePanel
 from django.db import models
 from apps.cms.blocks import BaseStreamBlock
+from apps.readux.forms import AllCollectionsForm, AllVolumesForm
 from apps.readux.models import UserAnnotation
 from apps.iiif.kollections.models import Collection
 from apps.iiif.manifests.models import Manifest
-from apps.iiif.canvases.models import Canvas
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 
 
@@ -39,14 +38,87 @@ class CollectionsPage(Page):
         default="List",
         help_text="Select to show all volumes as a list or a grid of icons."
     )
-    collections = Collection.objects.all
-    volumes = Manifest.objects.all
+    collections = Collection.objects.all()
+    volumes = Manifest.objects.all()
     content_panels = Page.content_panels + [
         FieldPanel('page_title', classname="full"),
         FieldPanel('tagline', classname="full"),
         FieldPanel('paragraph', classname="full"),
         FieldPanel('layout', classname="full"),
     ]
+    initial = {"sort": "title", "order": "asc", "display": "grid"}
+    sort_fields = {
+        "title": "label",
+        "added": "created_at",
+        "volumes": "volumes_count",
+    }
+
+    def get_form(self, request):
+        """Get the form for setting sort and order"""
+        # use GET instead of default POST/PUT for form data
+        form_data = request.GET.copy()
+
+        # sort by chosen sort
+        if "sort" in form_data and bool(form_data.get("sort")):
+            form_data["sort"] = form_data.get("sort")
+
+        # Otherwise set all form values to default
+        for key, val in self.initial.items():
+            form_data.setdefault(key, val)
+
+        return AllCollectionsForm(data=form_data)
+
+    def get_queryset(self, form, queryset):
+        """Get the sorted set of objects to display"""
+
+        # return empty queryset if not valid
+        if not form.is_valid():
+            return queryset.none()
+
+        # get sort and order selections from form
+        search_opts = form.cleaned_data
+        sort = search_opts.get("sort", "title")
+        if sort not in self.sort_fields:
+            sort = "title"
+        order = search_opts.get("order", "asc")
+        sign = "-" if order == "desc" else ""
+
+        # include volume count in queryset if sort 
+        if "volumes" in sort:
+            queryset = queryset.annotate(volumes_count=models.Count("manifests"))
+
+        # build order_by query to sort results
+        queryset = queryset.order_by(f"{sign}{self.sort_fields[sort]}")
+
+        return queryset
+
+    def get_context(self, request):
+        """Context function."""
+        context = super().get_context(request)
+
+        form = self.get_form(request)
+        query_set = self.get_queryset(form, self.collections)
+
+        paginator = Paginator(query_set, 8) # Show 8 collections per page
+
+        page = request.GET.get("page", 1)
+        try:
+            collections = paginator.page(page)
+        except PageNotAnInteger:
+            # If page is not an integer, deliver first page.
+            collections = paginator.page(1)
+        except EmptyPage:
+            # If page is out of range (e.g. 9999), deliver last page of results.
+            page = paginator.num_pages
+            collections = paginator.page(page)
+
+        context.update({
+            "form": form,
+            "collections": collections,
+            "paginator_range": paginator.get_elided_page_range(page, on_each_side=2),
+        })
+
+        return context
 
 class VolumesPage(Page):
     """Content page"""
@@ -70,91 +142,81 @@ class VolumesPage(Page):
         FieldPanel('paragraph', classname="full"),
         FieldPanel('layout', classname="full"),
     ]
+    initial = {"sort": "title", "order": "asc", "display": "grid"}
+    sort_fields = {
+        "title": "label",
+        "author": "author",
+        "date": "date_sort_ascending",
+        "added": "created_at",
+    }
+
+    def get_form(self, request):
+        """Get the form for setting sort and order"""
+        # use GET instead of default POST/PUT for form data
+        form_data = request.GET.copy()
+
+        # sort by chosen sort
+        if "sort" in form_data and bool(form_data.get("sort")):
+            form_data["sort"] = form_data.get("sort")
+
+        # Otherwise set all form values to default
+        for key, val in self.initial.items():
+            form_data.setdefault(key, val)
+
+        return AllVolumesForm(data=form_data)
+
+    def get_queryset(self, form, queryset):
+        """Get the sorted set of objects to display"""
+
+        # return empty queryset if not valid
+        if not form.is_valid():
+            return queryset.none()
+
+        # get sort and order selections from form
+        search_opts = form.cleaned_data
+        sort = search_opts.get("sort", "title")
+        if sort not in self.sort_fields:
+            sort = "title"
+        order = search_opts.get("order", "asc")
+        sign = "-" if order == "desc" else ""
+
+        # build order_by query to sort results
+        if sort == "date" and order == "desc":
+            # special case for date, descending: need to use date_sort_descending field
+            # and sort nulls last
+            queryset = queryset.order_by(models.F("date_sort_descending").desc(nulls_last=True))
+        else:
+            queryset = queryset.order_by(f"{sign}{self.sort_fields[sort]}")
+
+        return queryset
 
     def get_context(self, request):
         """Context function."""
         context = super().get_context(request)
-        sort = request.GET.get('sort', None)
-        order = request.GET.get('order', None)
-        query_set = self.volumes
 
+        form = self.get_form(request)
+        query_set = self.get_queryset(form, self.volumes)
 
-        sort_options = ['title', 'author', 'date published', 'date added']
-        order_options = ['asc', 'desc']
-        if sort not in sort_options and order not in order_options:
-            sort = 'title'
-            order = 'asc'
-        elif sort not in sort_options:
-            sort = 'title'
-        elif order not in order_options:
-            order = 'asc'
-
-        if sort == 'title':
-            if order == 'asc':
-                query_set = query_set.order_by('label')
-            elif order == 'desc':
-                query_set = query_set.order_by('-label')
-        elif sort == 'author':
-            if order == 'asc':
-                query_set = query_set.order_by('author')
-            elif order == 'desc':
-                query_set = query_set.order_by('-author')
-        elif sort == 'date published':
-            if order == 'asc':
-                query_set = query_set.order_by('published_date_edtf')
-            elif order == 'desc':
-                query_set = query_set.order_by('-published_date_edtf')
-        elif sort == 'date added':
-            if order == 'asc':
-                query_set = query_set.order_by('created_at')
-            elif order == 'desc':
-                query_set = query_set.order_by('-created_at')
-
-        sort_url_params = request.GET.copy()
-        order_url_params = request.GET.copy()
-        if 'sort' in sort_url_params and 'order' in order_url_params:
-            del sort_url_params['sort']
-            del order_url_params['order']
-        elif 'sort' in sort_url_params:
-            del sort_url_params['sort']
-        elif 'order' in order_url_params:
-            del order_url_params['order']
-
-        paginator = Paginator(query_set, 10) # Show 10 volumes per page
-
-        page = request.GET.get('page')
+        paginator = Paginator(query_set, 8) # Show 8 volumes per page
+
+        page = request.GET.get("page", 1)
         try:
             volumes = paginator.page(page)
         except PageNotAnInteger:
             # If page is not an integer, deliver first page.
             volumes = paginator.page(1)
         except EmptyPage:
             # If page is out of range (e.g. 9999), deliver last page of results.
-            volumes = paginator.page(paginator.num_pages)
-
-        # make the variable 'volumes' available on the template
-        context['volumes'] = volumes
-#        context['volumespage'] = query_set.all
-        context['user_annotation'] = UserAnnotation.objects.filter(owner_id=request.user.id)
-        # annocount_list = []
-        # canvaslist = []
-        # for volume in query_set:
-        #     user_annotation_count = UserAnnotation.objects.filter(owner_id=request.user.id).filter(canvas__manifest__id=volume.id).count()
-            # annocount_list.append({volume.pid: user_annotation_count})
-            # context['user_annotation_count'] = annocount_list
-        #     canvasquery = Canvas.objects.filter(is_starting_page=1).filter(manifest__id=volume.id)
-        #     canvasquery2 = list(canvasquery)
-        #     canvaslist.append({volume.pid: canvasquery2})
-        #     context['firstthumbnail'] = canvaslist
-        # value = 0
-        # context['value'] = value
+            page = paginator.num_pages
+            volumes = paginator.page(page)
 
         context.update({
-            'sort_url_params': urlencode(sort_url_params),
-            'order_url_params': urlencode(order_url_params),
-            'sort': sort, 'sort_options': sort_options,
-            'order': order, 'order_options': order_options,
+            "form": form,
+            "volumes": volumes,
+            "user_annotation": UserAnnotation.objects.filter(owner_id=request.user.id),
+            "paginator_range": paginator.get_elided_page_range(page, on_each_side=2),
         })
+
         return context
 
 

apps/iiif/kollections/admin.py

@@ -4,7 +4,8 @@
 from django.contrib import admin
 from import_export import resources
 from import_export.admin import ImportExportModelAdmin
-from django_summernote.admin import SummernoteModelAdmin
+
+from apps.iiif.manifests.admin import SummernoteMixin
 from .models import Collection
 from ..manifests.models import Manifest
 
@@ -37,7 +38,7 @@ def manifest_pid(self, instance):
 
     manifest_pid.short_description = 'Manifest Local ID'
 
-class CollectionAdmin(ImportExportModelAdmin, SummernoteModelAdmin, admin.ModelAdmin):
+class CollectionAdmin(ImportExportModelAdmin, SummernoteMixin, admin.ModelAdmin):
     """Django admin configuration for a collection."""
     inlines = [
         ManifestInline,

apps/iiif/manifests/admin.py

@@ -47,7 +47,18 @@ class RelatedLinksInline(admin.TabularInline):
     extra = 1
     min_num = 0
 
-class ManifestAdmin(ImportExportModelAdmin, SummernoteModelAdmin, admin.ModelAdmin):
+class SummernoteMixin(SummernoteModelAdmin):
+    class Media:
+        # NOTE: have to include these js and css dependencies for summernote when not using iframe
+        js = (
+            "//code.jquery.com/jquery-3.7.1.min.js",
+            "//cdn.jsdelivr.net/npm/[email protected]/jquery.ui.widget.min.js",
+        )
+        css = {
+            "all": ["//cdn.jsdelivr.net/npm/[email protected]/dist/summernote-lite.min.css"],
+        }
+
+class ManifestAdmin(ImportExportModelAdmin, SummernoteMixin, admin.ModelAdmin):
     """Django admin configuration for manifests"""
     resource_class = ManifestResource
     exclude = ('id',)

apps/iiif/manifests/documents.py

@@ -2,17 +2,19 @@
 
 from os import environ
 from html import unescape
+
 from django.conf import settings
+from django.db.models.query import Prefetch
+from django.utils.html import strip_tags
+
 from django_elasticsearch_dsl import Document, fields
 from django_elasticsearch_dsl.registries import registry
+
 from elasticsearch_dsl import MetaField, Keyword, analyzer
-from django.db.models.query import Prefetch
-from django.utils.html import strip_tags
 from unidecode import unidecode
 
 from apps.iiif.annotations.models import Annotation
 from apps.iiif.canvases.models import Canvas
-from apps.iiif.kollections.models import Collection
 from apps.iiif.manifests.models import Manifest
 
 # TODO: Better English stemming (e.g. Rome to match Roman), multilingual stemming.
@@ -55,7 +57,7 @@ class ManifestDocument(Document):
     class Index:
         """Settings for Elasticsearch"""
 
-        name = f"readux_{environ['DJANGO_ENV']}_manifests"
+        name = f"{settings.INDEX_PREFIX}_manifests"
 
     class Django:
         """Settings for automatically pulling data from Django"""

apps/readux/documents.py

@@ -5,6 +5,7 @@
 from django_elasticsearch_dsl import Document, fields
 from django_elasticsearch_dsl.registries import registry
 from django.utils.html import strip_tags
+from django.conf import settings
 
 from apps.readux.models import UserAnnotation
 from apps.iiif.manifests.documents import stemmer
@@ -25,7 +26,7 @@ class UserAnnotationDocument(Document):
     class Index:
         """Settings for Elasticsearch"""
 
-        name = f"readux_{environ['DJANGO_ENV']}_annotations"
+        name = f"{settings.INDEX_PREFIX}_annotations"
 
     class Django:
         """Settings for automatically pulling data from Django"""