Merge remote-tracking branch 'origin/main' into gazettes

laws-africa · Aug 6, 2024 · 8e3fdce · 8e3fdce
2 parents 0336204 + 6b11282
commit 8e3fdce
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 13 deletions.
diff --git a/peachjam/js/components/FindDocuments/AdvancedSearchFields.vue b/peachjam/js/components/FindDocuments/AdvancedSearchFields.vue
@@ -104,12 +104,18 @@ export default {
       fields: [{
         field: 'all',
         label: self.$t('Any field')
-      },{
+      }, {
         field: 'title',
         label: self.$t('Title')
       }, {
-        field: 'judges',
-        label: self.$t('Judges')
+        field: 'citation',
+        label: self.$t('Citation')
+      }, {
+        field: 'case_number',
+        label: self.$t('Case number')
+      }, {
+        field: 'case_name',
+        label: self.$t('Case parties')
       }, {
         field: 'case_summary',
         label: self.$t('Case summary')

diff --git a/peachjam/js/components/clipboard.ts b/peachjam/js/components/clipboard.ts
@@ -10,8 +10,23 @@ export class CopyToClipboard {
 
   async copy () {
     try {
+      const text = this.root.dataset.value;
+      const html = this.root.dataset.valueHtml;
+
       if (navigator && navigator.clipboard) {
-        await navigator.clipboard.writeText(this.root.dataset.value || '');
+        const items: Record<string, Blob> = {};
+
+        if (text) {
+          const type = 'text/plain';
+          items[type] = new Blob([text], { type });
+        }
+
+        if (html) {
+          const type = 'text/html';
+          items[type] = new Blob([html], { type });
+        }
+
+        await navigator.clipboard.write([new ClipboardItem(items)]);
 
         this.root.innerText = this.root.dataset.confirmation || 'Copied!';
         setTimeout(() => {

diff --git a/peachjam/settings.py b/peachjam/settings.py
@@ -100,6 +100,7 @@
     "allauth.account.middleware.AccountMiddleware",
     "django.middleware.cache.FetchFromCacheMiddleware",
     "django_htmx.middleware.HtmxMiddleware",
+    "django.contrib.sites.middleware.CurrentSiteMiddleware",
 ]
 
 ROOT_URLCONF = "peachjam.urls"

diff --git a/peachjam/static/js/app-prod.js b/peachjam/static/js/app-prod.js
diff --git a/peachjam/static/js/app-prod.js.map b/peachjam/static/js/app-prod.js.map
diff --git a/peachjam/static/js/pdf.worker-prod.js b/peachjam/static/js/pdf.worker-prod.js
diff --git a/peachjam/templates/peachjam/_document_table.html b/peachjam/templates/peachjam/_document_table.html
@@ -10,7 +10,7 @@
           <div class="align-items-center"
                role="button"
                data-sort="{% if form.sort.value == "title" %}-title{% else %}title{% endif %}">
-            {% trans 'Title' %}
+            {{ doc_table_title_label|default_if_none:"Title" }}
             <i class="bi ms-2 {% if form.sort.value == "title" %}bi-sort-down{% endif %} {% if form.sort.value == "-title" %}bi-sort-up{% endif %}"></i>
           </div>
         </th>
@@ -29,7 +29,7 @@
           <div class="align-items-center"
                role="button"
                data-sort="{% if form.sort.value == "date" %}-date{% else %}date{% endif %}">
-            {% trans 'Date' %}
+            {{ doc_table_date_label|default_if_none:"Date" }}
             <i class="bi ms-2 {% if form.sort.value == "-date" %}bi-sort-down{% endif %} {% if form.sort.value == "date" %}bi-sort-up{% endif %}"></i>
           </div>
         </th>

diff --git a/peachjam/templates/peachjam/_quick_search.html b/peachjam/templates/peachjam/_quick_search.html
@@ -1,4 +1,5 @@
-<form action="{% url 'search:search' %}" method="get" class="d-flex">
+{% load i18n %}
+<form action="{% url 'search:search' %}" method="get" class="d-flex mb-1">
   <input type="text"
          class="form-control flex-grow-1"
          name="q"
@@ -13,3 +14,4 @@
   {% if locality %}<input type="hidden" name="locality" value="{{ locality }}"/>{% endif %}
   {% if doc_type %}<input type="hidden" name="doc_type" value="{{ doc_type }}"/>{% endif %}
 </form>
+<a href="{% url 'search:search' %}?show-advanced-tab=1&doc_type={{ doc_type }}">{% trans "Advanced search" %}</a>
diff --git a/peachjam/templates/peachjam/judgment_detail.html b/peachjam/templates/peachjam/judgment_detail.html
@@ -36,7 +36,8 @@
               class="btn btn-outline-secondary btn-xs ms-2"
               title="{% trans "Copy to clipboard" %}"
               data-component="CopyToClipboard"
-              data-value="{{ document.mnc }}"
+              data-value='{{ document.mnc }}'
+              data-value-html='<a href="https://{{ request.site.domain }}{{ document.get_absolute_url }}">{{ document.mnc }}</a>'
               data-confirmation="{% trans "Copied!" %}">
         {% trans "Copy" %}
       </button>

diff --git a/peachjam/templates/peachjam/layouts/document_detail.html b/peachjam/templates/peachjam/layouts/document_detail.html
@@ -183,7 +183,8 @@ <h1>{{ document.title }}</h1>
                                     class="btn btn-outline-secondary btn-xs ms-2"
                                     title="{% trans "Copy to clipboard" %}"
                                     data-component="CopyToClipboard"
-                                    data-value="{{ document.citation }}"
+                                    data-value='{{ document.citation }}'
+                                    data-value-html='<a href="https://{{ request.site.domain }}{{ document.get_absolute_url }}">{{ document.citation }}</a>'
                                     data-confirmation="{% trans "Copied!" %}">
                               {% trans "Copy" %}
                             </button>
@@ -210,7 +211,8 @@ <h1>{{ document.title }}</h1>
                                           class="btn btn-outline-secondary btn-xs ms-2"
                                           title="{% trans "Copy to clipboard" %}"
                                           data-component="CopyToClipboard"
-                                          data-value="{{ alternative_name.title }}"
+                                          data-value='{{ alternative_name.title }}'
+                                          data-value-html='<a href="https://{{ request.site.domain }}{{ document.get_absolute_url }}">{{ alternative_name.title }}</a>'
                                           data-confirmation="{% trans "Copied!" %}">
                                     {% trans "Copy" %}
                                   </button>

diff --git a/peachjam/views/courts.py b/peachjam/views/courts.py
@@ -39,6 +39,8 @@ def get_context_data(self, **kwargs):
         context["doc_type"] = "Judgment"
         context["page_title"] = self.page_title()
         context["doc_table_show_jurisdiction"] = False
+        context["doc_table_title_label"] = _("Citation")
+        context["doc_table_date_label"] = _("Judgment date")
         context["doc_count_noun"] = _("judgment")
         context["doc_count_noun_plural"] = _("judgments")
 

diff --git a/peachjam/views/generic_views.py b/peachjam/views/generic_views.py
@@ -144,6 +144,8 @@ def get_context_data(self, **kwargs):
             if context["paginator"]
             else context["object_list"].count()
         )
+        context["doc_table_title_label"] = _("Title")
+        context["doc_table_date_label"] = _("Date")
 
         return context
 

diff --git a/peachjam_search/views.py b/peachjam_search/views.py
@@ -431,6 +431,8 @@ class DocumentSearchViewSet(BaseDocumentViewSet):
         "content": None,
         "court": None,
         "alternative_names": {"boost": 4},
+        "case_number": None,
+        "case_name": None,
     }
 
     faceted_search_fields = {