From cf71deacc6aac929c06931d3efc3b5e0e78c34dd Mon Sep 17 00:00:00 2001 From: "priya.basker" Date: Fri, 19 Jan 2024 10:15:58 +0000 Subject: [PATCH 01/30] Added basic styles --- templates/base/navigation.html | 13 +- templates/home copy.html | 157 ------------------------ templates/hometest.html | 173 --------------------------- templates/partial/filter.html | 6 +- templates/partial/search_result.html | 53 ++++++++ templates/search.html | 56 +-------- 6 files changed, 61 insertions(+), 397 deletions(-) delete mode 100644 templates/home copy.html delete mode 100644 templates/hometest.html create mode 100644 templates/partial/search_result.html diff --git a/templates/base/navigation.html b/templates/base/navigation.html index 3d91de5a..5b25376a 100644 --- a/templates/base/navigation.html +++ b/templates/base/navigation.html @@ -24,18 +24,13 @@ diff --git a/templates/home copy.html b/templates/home copy.html deleted file mode 100644 index 5d2967d0..00000000 --- a/templates/home copy.html +++ /dev/null @@ -1,157 +0,0 @@ -{% extends "base/base.html" %} -{% load static %} - - - -
-
-
-
-
-

Cookies on [name of service]

-
-

We use some essential cookies to make this service work.

-

We’d also like to use analytics cookies so we can understand how you use the service and make improvements.

-
-
-
-
- - - View cookies -
-
-
-
- Skip to main content - -
-
-

- Alpha - - - This is a new service – your feedback will help us to improve it. - -

-
- Back -
-

Customised page template

-
-
- - - - - - diff --git a/templates/hometest.html b/templates/hometest.html deleted file mode 100644 index 7ee3b89e..00000000 --- a/templates/hometest.html +++ /dev/null @@ -1,173 +0,0 @@ -{% load static %} - - - - - - - GOV.UK - Customised page template - - - - - - - - - - - - - -
-
-
-
-
-

Cookies on [name of service]

-
-

We use some essential cookies to make this service work.

-

We’d also like to use analytics cookies so we can understand how you use the service and make improvements.

-
-
-
-
- - - View cookies -
-
-
-
- Skip to main content - -
-
-

- Alpha - - - This is a new service – your feedback will help us to improve it. - -

-
- Back -
-

Customised page template

-
-
- - - - - - diff --git a/templates/partial/filter.html b/templates/partial/filter.html index 8c9d2283..37cca882 100644 --- a/templates/partial/filter.html +++ b/templates/partial/filter.html @@ -19,12 +19,12 @@

Selected filters

Type

Status

diff --git a/templates/partial/search_result.html b/templates/partial/search_result.html new file mode 100644 index 00000000..c65f0edb --- /dev/null +++ b/templates/partial/search_result.html @@ -0,0 +1,53 @@ +
+
+

+ {{result.title}} +

+ +

{{result.summary}}

+ +
+ +
+
Registered by
+
+ {{result.registered_by}} +
+
+ +
+
Database Name
+
+ {{result.database_name}} +
+
+ + +
+
First created
+
+ {{result.first_created}} +
+
+ +
+
Refresh period
+
+ {{result.refresh_period}} +
+
+ +
+
Retention period
+
+ {{result.retention_period}} +
+
+
+
Tags
+
+ {{ result.tags |join:", " }} +
+
+
+
diff --git a/templates/search.html b/templates/search.html index 9dde25e1..3f67fc9f 100644 --- a/templates/search.html +++ b/templates/search.html @@ -38,61 +38,7 @@

236 Results

{% for result in results %} -
-
-

- {{result.title}} -

- -

{{result.summary}}

- -
- -
-
Registered by
-
- {{result.registered_by}} -
-
- -
-
Database Name
-
- {{result.database_name}} -
-
- - -
-
First created
-
- {{result.first_created}} -
-
- -
-
Refresh period
-
- {{result.refresh_period}} -
-
- -
-
Retention period
-
- {{result.retention_period}} -
-
-
-
Tags
-
- {{ result.tags |join:", " }} -
-
-
-
-
- + {% include "partial/search_result.html" %} {%endfor%} From 42deb44c4ff623f4d4cfd189e562957ce583e84e Mon Sep 17 00:00:00 2001 From: "priya.basker" Date: Fri, 19 Jan 2024 14:08:20 +0000 Subject: [PATCH 02/30] Add pagination template --- home/views.py | 2 -- sample_data/sample_search_page.yaml | 2 +- templates/base/navigation.html | 2 +- templates/partial/filter.html | 28 ++++++++++++++++++------- templates/partial/pagination.html | 31 ++++++++++++++++++++++++++++ templates/partial/search_result.html | 4 +++- templates/search.html | 5 ++++- 7 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 templates/partial/pagination.html diff --git a/home/views.py b/home/views.py index 8a2687c4..43bbe379 100644 --- a/home/views.py +++ b/home/views.py @@ -5,12 +5,10 @@ # Create your views here. def home_view(request): context = {} - context["service_name"] = "Daap Data Catalogue" return render(request, "home.html", context) def search_view(request): context = {} - context["service_name"] = "Daap Data Catalogue" context.update(settings.SAMPLE_SEARCH_RESULTS) return render(request, "search.html", context) diff --git a/sample_data/sample_search_page.yaml b/sample_data/sample_search_page.yaml index d447e314..69bf8382 100644 --- a/sample_data/sample_search_page.yaml +++ b/sample_data/sample_search_page.yaml @@ -1,7 +1,7 @@ # Example search results for prototyping results: - title: Data supporting HMCTS ‘Commonality’ study - summary: Dataset supporting the study on the extent of commonalities between individuals who become involved in violent extremist groups and violent criminal gangs, and the processes by ... + summary: Dataset supporting the study on the extent of commonalities between individuals who become involved in violent extremist groups and violent criminal gangs. registered_by: HMCTS Behavioural Science Team database_name: Output_CommStud first_created: 23/10/2021 diff --git a/templates/base/navigation.html b/templates/base/navigation.html index 5b25376a..2c506ea8 100644 --- a/templates/base/navigation.html +++ b/templates/base/navigation.html @@ -18,7 +18,7 @@
- {{ service_name}} + Data Catalogue
+ + {% endblock content %} From 9506b20f63be42560fe20297264d9e1b85a05be6 Mon Sep 17 00:00:00 2001 From: "priya.basker" Date: Fri, 19 Jan 2024 16:36:39 +0000 Subject: [PATCH 03/30] Added filter functionality --- home/urls.py | 1 + home/views.py | 12 ++++++++++++ sample_data/sample_search_page.yaml | 5 +++++ templates/partial/filter.html | 11 +++++++---- templates/partial/search_result.html | 7 +++++++ templates/search.html | 9 ++++----- 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/home/urls.py b/home/urls.py index 3c0cea7a..d09647d2 100644 --- a/home/urls.py +++ b/home/urls.py @@ -6,4 +6,5 @@ urlpatterns = [ path("", views.home_view, name="home"), path("search", views.search_view, name="search"), + path("search/filter", views.filter_view, name="filter"), ] diff --git a/home/views.py b/home/views.py index 43bbe379..1410d489 100644 --- a/home/views.py +++ b/home/views.py @@ -2,11 +2,23 @@ from django.shortcuts import render +def filter_json_dict(json_dict, target_value): + filtered_dict = {key: value for key, value in json_dict.items() if value == target_value} + return filtered_dict + # Create your views here. def home_view(request): context = {} return render(request, "home.html", context) +def filter_view(request): + data = {} + data.update(settings.SAMPLE_SEARCH_RESULTS) + + filtered_results =[item for item in data['results'] if item['domain_name'] == 'HMPPS'] + context={'results': filtered_results, 'total': len(filtered_results)} + + return render(request, "search.html", context) def search_view(request): context = {} diff --git a/sample_data/sample_search_page.yaml b/sample_data/sample_search_page.yaml index 69bf8382..0239d04c 100644 --- a/sample_data/sample_search_page.yaml +++ b/sample_data/sample_search_page.yaml @@ -3,6 +3,7 @@ results: - title: Data supporting HMCTS ‘Commonality’ study summary: Dataset supporting the study on the extent of commonalities between individuals who become involved in violent extremist groups and violent criminal gangs. registered_by: HMCTS Behavioural Science Team + domain_name: HMCTS database_name: Output_CommStud first_created: 23/10/2021 refresh_period: None @@ -14,6 +15,7 @@ results: - title: Gang violence in UK prisons summary: Source data for the official Q2 2023 statistics on gang violence in prisons registered_by: D&A Statistics Team + domain_name: HMPPS database_name: GangStatQ32023v1 first_created: 31/06/2023 refresh_period: None @@ -25,6 +27,7 @@ results: - title: NOMIS gang violence extracts summary: Daily extracts of NOMIS tables related to gang violence, including non-association data, violent incidents data, movement data. Data extracts are anonymised at source registered_by: NART Team + domain_name: HMPPS database_name: DailyGangExports first_created: 01/01/2001 refresh_period: Daily @@ -36,6 +39,7 @@ results: - title: Modelling output summary: Output of experimental model run on most working days aiming to predict upticks and downticks in violent activity in prisons, based on prisoner moves of known gang members registered_by: D&A Data Modelling Team + domain_name: HMPPS database_name: ViolentMoves_model first_created: 01/11/2023 (1 week ago) refresh_period: Daily @@ -47,6 +51,7 @@ results: - title: Non-association data summary: Data held in NOMIS for each prisoner, detailing any other person (prisoner, visitor, payee, violent gang member, victim...) that they are not allowed to associate with registered_by: NOMIS Team + domain_name: HMPPS database_name: non-association-list first_created: 01/01/2001 refresh_period: Daily diff --git a/templates/partial/filter.html b/templates/partial/filter.html index bb89a972..0a3a3552 100644 --- a/templates/partial/filter.html +++ b/templates/partial/filter.html @@ -7,6 +7,7 @@

Filter

+
@@ -17,17 +18,18 @@

Selected filters

Clear filters

-

Type

+

Domain

-

Status

+

DPIA Status

+
+ {% csrf_token %} @@ -97,6 +99,7 @@

Status

+ diff --git a/templates/partial/search_result.html b/templates/partial/search_result.html index ba33d34b..e3fc0eb4 100644 --- a/templates/partial/search_result.html +++ b/templates/partial/search_result.html @@ -16,6 +16,13 @@

+
+
Domain name
+
+ {{result.domain_name}} +
+
+
Database name
diff --git a/templates/search.html b/templates/search.html index 60a90813..071d4200 100644 --- a/templates/search.html +++ b/templates/search.html @@ -7,7 +7,7 @@
-
- -
-
Owner email
-
- {{result.metadata.owner_email}} -
-
- -
Domain name
{{result.metadata.domain.properties.name}}
- -
Last updated date
{{result.last_updated}}
- -
-
Refresh period
-
- -
-
- -
-
Retention period
-
- -
-
-
-
DPIA Status
-
- -
-
Tags
From 4414e8c4305648cc6f823e4ec072679cbd70af59 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 29 Jan 2024 14:14:59 +0000 Subject: [PATCH 21/30] Commit changes made by code formatters --- core/settings.py | 3 +- home/views.py | 87 +++++++++++++++-------------- sample_data/sample_search_page.yaml | 2 +- 3 files changed, 48 insertions(+), 44 deletions(-) diff --git a/core/settings.py b/core/settings.py index 438c1080..05c4f92b 100644 --- a/core/settings.py +++ b/core/settings.py @@ -123,7 +123,8 @@ "django.contrib.staticfiles.finders.AppDirectoriesFinder", ) -SAMPLE_SEARCH_RESULTS_FILENAME = BASE_DIR / "sample_data/sample_search_page.yaml" +SAMPLE_SEARCH_RESULTS_FILENAME = BASE_DIR / \ + "sample_data/sample_search_page.yaml" with open(SAMPLE_SEARCH_RESULTS_FILENAME) as f: SAMPLE_SEARCH_RESULTS = yaml.safe_load(f) diff --git a/home/views.py b/home/views.py index 4addd12d..daaafe36 100644 --- a/home/views.py +++ b/home/views.py @@ -3,32 +3,35 @@ from .services import get_catalogue_client from data_platform_catalogue.search_types import MultiSelectFilter + def filter_seleted_domains(domain_list, domains): - selected_domain={} + selected_domain = {} for domain in domain_list: if domain.value in domains: - selected_domain[domain.value]=domain.label + selected_domain[domain.value] = domain.label return selected_domain - + # Create your views here. def home_view(request): context = {} return render(request, "home.html", context) + def details_view(request): - id=request.GET.get('id') + id = request.GET.get('id') context = {} client = get_catalogue_client() - filter_value = [MultiSelectFilter("urn",id )] + filter_value = [MultiSelectFilter("urn", id)] search_results = client.search(query="", page=None, filters=filter_value) context["result"] = search_results.page_results[0] - + return render(request, "details.html", context) + def search_view(request): - + query = request.GET.get("query", "") page = request.GET.get("page", None) @@ -37,57 +40,57 @@ def search_view(request): # Fetch domainlist without query search_results = client.search(query="", page=None) context = {} - domain_list=search_results.facets['domains'] - context["domainlist"]=domain_list - + domain_list = search_results.facets['domains'] + context["domainlist"] = domain_list + if request.GET.getlist("domain"): - domains=request.GET.getlist("domain") - selected_domain=filter_seleted_domains(domain_list, domains) + domains = request.GET.getlist("domain") + selected_domain = filter_seleted_domains(domain_list, domains) context['selected_domain'] = selected_domain request.session['selected_domain'] = selected_domain request.session['domains'] = domains - filter_value = [MultiSelectFilter("domains",domains )] - - elif request.GET.get('clear_filter') == "True": - filter_value =[] - context['selected_domain'] ={} - elif request.GET.get('clear_label')=='True': - #Value to clear - label_value=request.GET.getlist("value") - - #Remove the selected value from list - domains= request.session.get('domains', None) - domains=list(set(domains) - set(label_value)) - - #Populated selected domain - selected_domain=filter_seleted_domains(domain_list, domains) + filter_value = [MultiSelectFilter("domains", domains)] + + elif request.GET.get('clear_filter') == "True": + filter_value = [] + context['selected_domain'] = {} + elif request.GET.get('clear_label') == 'True': + # Value to clear + label_value = request.GET.getlist("value") + + # Remove the selected value from list + domains = request.session.get('domains', None) + domains = list(set(domains) - set(label_value)) + + # Populated selected domain + selected_domain = filter_seleted_domains(domain_list, domains) context['domains'] = domains context['selected_domain'] = selected_domain - - #Reassign to session + + # Reassign to session request.session['selected_domain'] = selected_domain request.session['domains'] = domains if not domains: filter_value = [] else: - filter_value = [MultiSelectFilter("domains",domains )] + filter_value = [MultiSelectFilter("domains", domains)] - elif request.GET.get('query'): - domains= request.session.get('domains', None) - #Preserve filter - selected_domain=filter_seleted_domains(domain_list, domains) + elif request.GET.get('query'): + domains = request.session.get('domains', None) + # Preserve filter + selected_domain = filter_seleted_domains(domain_list, domains) context['selected_domain'] = selected_domain context['domains'] = domains - filter_value = [MultiSelectFilter("domains",domains )] - else: - filter_value =[] - context['selected_domain'] ={} - + filter_value = [MultiSelectFilter("domains", domains)] + else: + filter_value = [] + context['selected_domain'] = {} + # Search with filter - search_results = client.search(query=query, page=page, filters=filter_value) + search_results = client.search( + query=query, page=page, filters=filter_value) context["query"] = query context["results"] = search_results.page_results context["total_results"] = search_results.total_results - + return render(request, "search.html", context) - \ No newline at end of file diff --git a/sample_data/sample_search_page.yaml b/sample_data/sample_search_page.yaml index 1f209dcc..d447e314 100644 --- a/sample_data/sample_search_page.yaml +++ b/sample_data/sample_search_page.yaml @@ -55,4 +55,4 @@ results: - NOMIS - Non-association -total_results: 93 \ No newline at end of file +total_results: 93 From de4de802ae2e2999bd892007cf3dbff0ee4c4767 Mon Sep 17 00:00:00 2001 From: "priya.basker" Date: Mon, 29 Jan 2024 14:31:23 +0000 Subject: [PATCH 22/30] Updated query functionality --- home/views.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/home/views.py b/home/views.py index daaafe36..4d2dce11 100644 --- a/home/views.py +++ b/home/views.py @@ -79,9 +79,12 @@ def search_view(request): domains = request.session.get('domains', None) # Preserve filter selected_domain = filter_seleted_domains(domain_list, domains) - context['selected_domain'] = selected_domain - context['domains'] = domains - filter_value = [MultiSelectFilter("domains", domains)] + if not domains: + filter_value = [] + else: + context['selected_domain'] = selected_domain + context['domains'] = domains + filter_value = [MultiSelectFilter("domains", domains)] else: filter_value = [] context['selected_domain'] = {} From 52dcc5aac0344c925d16e23d9d988676deb69699 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 29 Jan 2024 14:32:00 +0000 Subject: [PATCH 23/30] Commit changes made by code formatters --- home/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/views.py b/home/views.py index 4d2dce11..2beb2cda 100644 --- a/home/views.py +++ b/home/views.py @@ -81,7 +81,7 @@ def search_view(request): selected_domain = filter_seleted_domains(domain_list, domains) if not domains: filter_value = [] - else: + else: context['selected_domain'] = selected_domain context['domains'] = domains filter_value = [MultiSelectFilter("domains", domains)] From db3574a85fc163df4e8f469dd1bdc9b43e653669 Mon Sep 17 00:00:00 2001 From: PriyaBasker23 <90777804+PriyaBasker23@users.noreply.github.com> Date: Mon, 29 Jan 2024 16:54:09 +0000 Subject: [PATCH 24/30] Update home/views.py Co-authored-by: Mitch Dawson <86007219+mitchdawson1982@users.noreply.github.com> --- home/views.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home/views.py b/home/views.py index 2beb2cda..63799851 100644 --- a/home/views.py +++ b/home/views.py @@ -43,7 +43,13 @@ def search_view(request): domain_list = search_results.facets['domains'] context["domainlist"] = domain_list - if request.GET.getlist("domain"): + domains = request.GET.getlist("domain", []) + if domains: + selected_domain = filter_seleted_domains(domain_list, domains) + context['selected_domain'] = selected_domain + request.session['selected_domain'] = selected_domain + request.session['domains'] = domains + filter_value = [MultiSelectFilter("domains", domains)] domains = request.GET.getlist("domain") selected_domain = filter_seleted_domains(domain_list, domains) context['selected_domain'] = selected_domain From c647f0fd6c173a794de8cf219cbab4ea6d4a1056 Mon Sep 17 00:00:00 2001 From: "priya.basker" Date: Mon, 29 Jan 2024 17:20:31 +0000 Subject: [PATCH 25/30] Updated requested information --- README.md | 2 +- home/helper.py | 15 ++++++--------- home/urls.py | 2 +- home/views.py | 14 +++----------- pyproject.toml | 1 - static/assets/js/htmx.min.js | 1 - templates/base/head.html | 1 - templates/partial/search_result.html | 2 +- 8 files changed, 12 insertions(+), 26 deletions(-) delete mode 100644 static/assets/js/htmx.min.js diff --git a/README.md b/README.md index ae9e59e0..35744aff 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ You will need npm (for javascript dependencies) and poetry (for python dependenc 2. Copy `.env.example` to `.env`. 3. You wil need to obtain an access token from Datahub catalogue and populate the `CATALOGUE_TOKEN` var in .env to be able to retrieve search data. https://datahub.apps-tools.development.data-platform.service.justice.gov.uk/settings/tokens -4. Run `poetry run python manage.py runserver` +5. Run `poetry run python manage.py runserver` Run `npm install` and then `npm run sass` to compile the stylesheets. diff --git a/home/helper.py b/home/helper.py index a68b0dc2..7952f7d9 100644 --- a/home/helper.py +++ b/home/helper.py @@ -1,9 +1,6 @@ -def filter_json_dict(json_dict, target_value): - filtered_dict = { - key: value for key, value in json_dict.items() if value == target_value - } - return filtered_dict - - -def sort_output(json_dict, sortvalue): - return None +def filter_seleted_domains(domain_list, domains): + selected_domain = {} + for domain in domain_list: + if domain.value in domains: + selected_domain[domain.value] = domain.label + return selected_domain \ No newline at end of file diff --git a/home/urls.py b/home/urls.py index 6da74019..4338d7bf 100644 --- a/home/urls.py +++ b/home/urls.py @@ -7,5 +7,5 @@ urlpatterns = [ path("", views.home_view, name="home"), path("search", views.search_view, name="search"), - path("details", views.details_view, name="details"), + path("details//", views.details_view, name="details"), ] diff --git a/home/views.py b/home/views.py index 63799851..11acf7ee 100644 --- a/home/views.py +++ b/home/views.py @@ -1,27 +1,19 @@ from django.conf import settings from django.shortcuts import render from .services import get_catalogue_client +from .helper import filter_seleted_domains from data_platform_catalogue.search_types import MultiSelectFilter -def filter_seleted_domains(domain_list, domains): - selected_domain = {} - for domain in domain_list: - if domain.value in domains: - selected_domain[domain.value] = domain.label - return selected_domain - - # Create your views here. def home_view(request): context = {} return render(request, "home.html", context) -def details_view(request): - id = request.GET.get('id') +def details_view(request, id): + context = {} - client = get_catalogue_client() filter_value = [MultiSelectFilter("urn", id)] search_results = client.search(query="", page=None, filters=filter_value) diff --git a/pyproject.toml b/pyproject.toml index 90e154d1..d2f6c06c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,6 @@ readme = "README.md" python = "^3.11" django = "^5.0.1" pyyaml = "^6.0.1" -htmx = "^0.0.0" gunicorn = "^21.2.0" whitenoise = "^6.6.0" ministryofjustice-data-platform-catalogue = "^0.7.0" diff --git a/static/assets/js/htmx.min.js b/static/assets/js/htmx.min.js deleted file mode 100644 index 47eb70fe..00000000 --- a/static/assets/js/htmx.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(e,t){if(typeof define==="function"&&define.amd){define([],t)}else if(typeof module==="object"&&module.exports){module.exports=t()}else{e.htmx=e.htmx||t()}})(typeof self!=="undefined"?self:this,function(){return function(){"use strict";var Q={onLoad:F,process:zt,on:de,off:ge,trigger:ce,ajax:Nr,find:C,findAll:f,closest:v,values:function(e,t){var r=dr(e,t||"post");return r.values},remove:_,addClass:z,removeClass:n,toggleClass:$,takeClass:W,defineExtension:Ur,removeExtension:Br,logAll:V,logNone:j,logger:null,config:{historyEnabled:true,historyCacheSize:10,refreshOnHistoryMiss:false,defaultSwapStyle:"innerHTML",defaultSwapDelay:0,defaultSettleDelay:20,includeIndicatorStyles:true,indicatorClass:"htmx-indicator",requestClass:"htmx-request",addedClass:"htmx-added",settlingClass:"htmx-settling",swappingClass:"htmx-swapping",allowEval:true,allowScriptTags:true,inlineScriptNonce:"",attributesToSettle:["class","style","width","height"],withCredentials:false,timeout:0,wsReconnectDelay:"full-jitter",wsBinaryType:"blob",disableSelector:"[hx-disable], [data-hx-disable]",useTemplateFragments:false,scrollBehavior:"smooth",defaultFocusScroll:false,getCacheBusterParam:false,globalViewTransitions:false,methodsThatUseUrlParams:["get"],selfRequestsOnly:false,ignoreTitle:false,scrollIntoViewOnBoost:true,triggerSpecsCache:null},parseInterval:d,_:t,createEventSource:function(e){return new EventSource(e,{withCredentials:true})},createWebSocket:function(e){var t=new WebSocket(e,[]);t.binaryType=Q.config.wsBinaryType;return t},version:"1.9.10"};var r={addTriggerHandler:Lt,bodyContains:se,canAccessLocalStorage:U,findThisElement:xe,filterValues:yr,hasAttribute:o,getAttributeValue:te,getClosestAttributeValue:ne,getClosestMatch:c,getExpressionVars:Hr,getHeaders:xr,getInputValues:dr,getInternalData:ae,getSwapSpecification:wr,getTriggerSpecs:it,getTarget:ye,makeFragment:l,mergeObjects:le,makeSettleInfo:T,oobSwap:Ee,querySelectorExt:ue,selectAndSwap:je,settleImmediately:nr,shouldCancel:ut,triggerEvent:ce,triggerErrorEvent:fe,withExtensions:R};var w=["get","post","put","delete","patch"];var i=w.map(function(e){return"[hx-"+e+"], [data-hx-"+e+"]"}).join(", ");var S=e("head"),q=e("title"),H=e("svg",true);function e(e,t=false){return new RegExp(`<${e}(\\s[^>]*>|>)([\\s\\S]*?)<\\/${e}>`,t?"gim":"im")}function d(e){if(e==undefined){return undefined}let t=NaN;if(e.slice(-2)=="ms"){t=parseFloat(e.slice(0,-2))}else if(e.slice(-1)=="s"){t=parseFloat(e.slice(0,-1))*1e3}else if(e.slice(-1)=="m"){t=parseFloat(e.slice(0,-1))*1e3*60}else{t=parseFloat(e)}return isNaN(t)?undefined:t}function ee(e,t){return e.getAttribute&&e.getAttribute(t)}function o(e,t){return e.hasAttribute&&(e.hasAttribute(t)||e.hasAttribute("data-"+t))}function te(e,t){return ee(e,t)||ee(e,"data-"+t)}function u(e){return e.parentElement}function re(){return document}function c(e,t){while(e&&!t(e)){e=u(e)}return e?e:null}function L(e,t,r){var n=te(t,r);var i=te(t,"hx-disinherit");if(e!==t&&i&&(i==="*"||i.split(" ").indexOf(r)>=0)){return"unset"}else{return n}}function ne(t,r){var n=null;c(t,function(e){return n=L(t,e,r)});if(n!=="unset"){return n}}function h(e,t){var r=e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.webkitMatchesSelector||e.oMatchesSelector;return r&&r.call(e,t)}function A(e){var t=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i;var r=t.exec(e);if(r){return r[1].toLowerCase()}else{return""}}function a(e,t){var r=new DOMParser;var n=r.parseFromString(e,"text/html");var i=n.body;while(t>0){t--;i=i.firstChild}if(i==null){i=re().createDocumentFragment()}return i}function N(e){return/",0);return i.querySelector("template").content}switch(r){case"thead":case"tbody":case"tfoot":case"colgroup":case"caption":return a(""+n+"
",1);case"col":return a(""+n+"
",2);case"tr":return a(""+n+"
",2);case"td":case"th":return a(""+n+"
",3);case"script":case"style":return a("
"+n+"
",1);default:return a(n,0)}}function ie(e){if(e){e()}}function I(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"}function k(e){return I(e,"Function")}function P(e){return I(e,"Object")}function ae(e){var t="htmx-internal-data";var r=e[t];if(!r){r=e[t]={}}return r}function M(e){var t=[];if(e){for(var r=0;r=0}function se(e){if(e.getRootNode&&e.getRootNode()instanceof window.ShadowRoot){return re().body.contains(e.getRootNode().host)}else{return re().body.contains(e)}}function D(e){return e.trim().split(/\s+/)}function le(e,t){for(var r in t){if(t.hasOwnProperty(r)){e[r]=t[r]}}return e}function E(e){try{return JSON.parse(e)}catch(e){b(e);return null}}function U(){var e="htmx:localStorageTest";try{localStorage.setItem(e,e);localStorage.removeItem(e);return true}catch(e){return false}}function B(t){try{var e=new URL(t);if(e){t=e.pathname+e.search}if(!/^\/$/.test(t)){t=t.replace(/\/+$/,"")}return t}catch(e){return t}}function t(e){return Tr(re().body,function(){return eval(e)})}function F(t){var e=Q.on("htmx:load",function(e){t(e.detail.elt)});return e}function V(){Q.logger=function(e,t,r){if(console){console.log(t,e,r)}}}function j(){Q.logger=null}function C(e,t){if(t){return e.querySelector(t)}else{return C(re(),e)}}function f(e,t){if(t){return e.querySelectorAll(t)}else{return f(re(),e)}}function _(e,t){e=g(e);if(t){setTimeout(function(){_(e);e=null},t)}else{e.parentElement.removeChild(e)}}function z(e,t,r){e=g(e);if(r){setTimeout(function(){z(e,t);e=null},r)}else{e.classList&&e.classList.add(t)}}function n(e,t,r){e=g(e);if(r){setTimeout(function(){n(e,t);e=null},r)}else{if(e.classList){e.classList.remove(t);if(e.classList.length===0){e.removeAttribute("class")}}}}function $(e,t){e=g(e);e.classList.toggle(t)}function W(e,t){e=g(e);oe(e.parentElement.children,function(e){n(e,t)});z(e,t)}function v(e,t){e=g(e);if(e.closest){return e.closest(t)}else{do{if(e==null||h(e,t)){return e}}while(e=e&&u(e));return null}}function s(e,t){return e.substring(0,t.length)===t}function G(e,t){return e.substring(e.length-t.length)===t}function J(e){var t=e.trim();if(s(t,"<")&&G(t,"/>")){return t.substring(1,t.length-2)}else{return t}}function Z(e,t){if(t.indexOf("closest ")===0){return[v(e,J(t.substr(8)))]}else if(t.indexOf("find ")===0){return[C(e,J(t.substr(5)))]}else if(t==="next"){return[e.nextElementSibling]}else if(t.indexOf("next ")===0){return[K(e,J(t.substr(5)))]}else if(t==="previous"){return[e.previousElementSibling]}else if(t.indexOf("previous ")===0){return[Y(e,J(t.substr(9)))]}else if(t==="document"){return[document]}else if(t==="window"){return[window]}else if(t==="body"){return[document.body]}else{return re().querySelectorAll(J(t))}}var K=function(e,t){var r=re().querySelectorAll(t);for(var n=0;n=0;n--){var i=r[n];if(i.compareDocumentPosition(e)===Node.DOCUMENT_POSITION_FOLLOWING){return i}}};function ue(e,t){if(t){return Z(e,t)[0]}else{return Z(re().body,e)[0]}}function g(e){if(I(e,"String")){return C(e)}else{return e}}function ve(e,t,r){if(k(t)){return{target:re().body,event:e,listener:t}}else{return{target:g(e),event:t,listener:r}}}function de(t,r,n){jr(function(){var e=ve(t,r,n);e.target.addEventListener(e.event,e.listener)});var e=k(r);return e?r:n}function ge(t,r,n){jr(function(){var e=ve(t,r,n);e.target.removeEventListener(e.event,e.listener)});return k(r)?r:n}var me=re().createElement("output");function pe(e,t){var r=ne(e,t);if(r){if(r==="this"){return[xe(e,t)]}else{var n=Z(e,r);if(n.length===0){b('The selector "'+r+'" on '+t+" returned no matches!");return[me]}else{return n}}}}function xe(e,t){return c(e,function(e){return te(e,t)!=null})}function ye(e){var t=ne(e,"hx-target");if(t){if(t==="this"){return xe(e,"hx-target")}else{return ue(e,t)}}else{var r=ae(e);if(r.boosted){return re().body}else{return e}}}function be(e){var t=Q.config.attributesToSettle;for(var r=0;r0){o=e.substr(0,e.indexOf(":"));t=e.substr(e.indexOf(":")+1,e.length)}else{o=e}var r=re().querySelectorAll(t);if(r){oe(r,function(e){var t;var r=i.cloneNode(true);t=re().createDocumentFragment();t.appendChild(r);if(!Se(o,e)){t=r}var n={shouldSwap:true,target:e,fragment:t};if(!ce(e,"htmx:oobBeforeSwap",n))return;e=n.target;if(n["shouldSwap"]){Fe(o,e,e,t,a)}oe(a.elts,function(e){ce(e,"htmx:oobAfterSwap",n)})});i.parentNode.removeChild(i)}else{i.parentNode.removeChild(i);fe(re().body,"htmx:oobErrorNoTarget",{content:i})}return e}function Ce(e,t,r){var n=ne(e,"hx-select-oob");if(n){var i=n.split(",");for(var a=0;a0){var r=t.replace("'","\\'");var n=e.tagName.replace(":","\\:");var i=o.querySelector(n+"[id='"+r+"']");if(i&&i!==o){var a=e.cloneNode();we(e,i);s.tasks.push(function(){we(e,a)})}}})}function Oe(e){return function(){n(e,Q.config.addedClass);zt(e);Nt(e);qe(e);ce(e,"htmx:load")}}function qe(e){var t="[autofocus]";var r=h(e,t)?e:e.querySelector(t);if(r!=null){r.focus()}}function m(e,t,r,n){Te(e,r,n);while(r.childNodes.length>0){var i=r.firstChild;z(i,Q.config.addedClass);e.insertBefore(i,t);if(i.nodeType!==Node.TEXT_NODE&&i.nodeType!==Node.COMMENT_NODE){n.tasks.push(Oe(i))}}}function He(e,t){var r=0;while(r-1){var t=e.replace(H,"");var r=t.match(q);if(r){return r[2]}}}function je(e,t,r,n,i,a){i.title=Ve(n);var o=l(n);if(o){Ce(r,o,i);o=Be(r,o,a);Re(o);return Fe(e,r,t,o,i)}}function _e(e,t,r){var n=e.getResponseHeader(t);if(n.indexOf("{")===0){var i=E(n);for(var a in i){if(i.hasOwnProperty(a)){var o=i[a];if(!P(o)){o={value:o}}ce(r,a,o)}}}else{var s=n.split(",");for(var l=0;l0){var o=t[0];if(o==="]"){n--;if(n===0){if(a===null){i=i+"true"}t.shift();i+=")})";try{var s=Tr(e,function(){return Function(i)()},function(){return true});s.source=i;return s}catch(e){fe(re().body,"htmx:syntax:error",{error:e,source:i});return null}}}else if(o==="["){n++}if(Qe(o,a,r)){i+="(("+r+"."+o+") ? ("+r+"."+o+") : (window."+o+"))"}else{i=i+o}a=t.shift()}}}function y(e,t){var r="";while(e.length>0&&!t.test(e[0])){r+=e.shift()}return r}function tt(e){var t;if(e.length>0&&Ze.test(e[0])){e.shift();t=y(e,Ke).trim();e.shift()}else{t=y(e,x)}return t}var rt="input, textarea, select";function nt(e,t,r){var n=[];var i=Ye(t);do{y(i,Je);var a=i.length;var o=y(i,/[,\[\s]/);if(o!==""){if(o==="every"){var s={trigger:"every"};y(i,Je);s.pollInterval=d(y(i,/[,\[\s]/));y(i,Je);var l=et(e,i,"event");if(l){s.eventFilter=l}n.push(s)}else if(o.indexOf("sse:")===0){n.push({trigger:"sse",sseEvent:o.substr(4)})}else{var u={trigger:o};var l=et(e,i,"event");if(l){u.eventFilter=l}while(i.length>0&&i[0]!==","){y(i,Je);var f=i.shift();if(f==="changed"){u.changed=true}else if(f==="once"){u.once=true}else if(f==="consume"){u.consume=true}else if(f==="delay"&&i[0]===":"){i.shift();u.delay=d(y(i,x))}else if(f==="from"&&i[0]===":"){i.shift();if(Ze.test(i[0])){var c=tt(i)}else{var c=y(i,x);if(c==="closest"||c==="find"||c==="next"||c==="previous"){i.shift();var h=tt(i);if(h.length>0){c+=" "+h}}}u.from=c}else if(f==="target"&&i[0]===":"){i.shift();u.target=tt(i)}else if(f==="throttle"&&i[0]===":"){i.shift();u.throttle=d(y(i,x))}else if(f==="queue"&&i[0]===":"){i.shift();u.queue=y(i,x)}else if(f==="root"&&i[0]===":"){i.shift();u[f]=tt(i)}else if(f==="threshold"&&i[0]===":"){i.shift();u[f]=y(i,x)}else{fe(e,"htmx:syntax:error",{token:i.shift()})}}n.push(u)}}if(i.length===a){fe(e,"htmx:syntax:error",{token:i.shift()})}y(i,Je)}while(i[0]===","&&i.shift());if(r){r[t]=n}return n}function it(e){var t=te(e,"hx-trigger");var r=[];if(t){var n=Q.config.triggerSpecsCache;r=n&&n[t]||nt(e,t,n)}if(r.length>0){return r}else if(h(e,"form")){return[{trigger:"submit"}]}else if(h(e,'input[type="button"], input[type="submit"]')){return[{trigger:"click"}]}else if(h(e,rt)){return[{trigger:"change"}]}else{return[{trigger:"click"}]}}function at(e){ae(e).cancelled=true}function ot(e,t,r){var n=ae(e);n.timeout=setTimeout(function(){if(se(e)&&n.cancelled!==true){if(!ct(r,e,Wt("hx:poll:trigger",{triggerSpec:r,target:e}))){t(e)}ot(e,t,r)}},r.pollInterval)}function st(e){return location.hostname===e.hostname&&ee(e,"href")&&ee(e,"href").indexOf("#")!==0}function lt(t,r,e){if(t.tagName==="A"&&st(t)&&(t.target===""||t.target==="_self")||t.tagName==="FORM"){r.boosted=true;var n,i;if(t.tagName==="A"){n="get";i=ee(t,"href")}else{var a=ee(t,"method");n=a?a.toLowerCase():"get";if(n==="get"){}i=ee(t,"action")}e.forEach(function(e){ht(t,function(e,t){if(v(e,Q.config.disableSelector)){p(e);return}he(n,i,e,t)},r,e,true)})}}function ut(e,t){if(e.type==="submit"||e.type==="click"){if(t.tagName==="FORM"){return true}if(h(t,'input[type="submit"], button')&&v(t,"form")!==null){return true}if(t.tagName==="A"&&t.href&&(t.getAttribute("href")==="#"||t.getAttribute("href").indexOf("#")!==0)){return true}}return false}function ft(e,t){return ae(e).boosted&&e.tagName==="A"&&t.type==="click"&&(t.ctrlKey||t.metaKey)}function ct(e,t,r){var n=e.eventFilter;if(n){try{return n.call(t,r)!==true}catch(e){fe(re().body,"htmx:eventFilter:error",{error:e,source:n.source});return true}}return false}function ht(a,o,e,s,l){var u=ae(a);var t;if(s.from){t=Z(a,s.from)}else{t=[a]}if(s.changed){t.forEach(function(e){var t=ae(e);t.lastValue=e.value})}oe(t,function(n){var i=function(e){if(!se(a)){n.removeEventListener(s.trigger,i);return}if(ft(a,e)){return}if(l||ut(e,a)){e.preventDefault()}if(ct(s,a,e)){return}var t=ae(e);t.triggerSpec=s;if(t.handledFor==null){t.handledFor=[]}if(t.handledFor.indexOf(a)<0){t.handledFor.push(a);if(s.consume){e.stopPropagation()}if(s.target&&e.target){if(!h(e.target,s.target)){return}}if(s.once){if(u.triggeredOnce){return}else{u.triggeredOnce=true}}if(s.changed){var r=ae(n);if(r.lastValue===n.value){return}r.lastValue=n.value}if(u.delayed){clearTimeout(u.delayed)}if(u.throttle){return}if(s.throttle>0){if(!u.throttle){o(a,e);u.throttle=setTimeout(function(){u.throttle=null},s.throttle)}}else if(s.delay>0){u.delayed=setTimeout(function(){o(a,e)},s.delay)}else{ce(a,"htmx:trigger");o(a,e)}}};if(e.listenerInfos==null){e.listenerInfos=[]}e.listenerInfos.push({trigger:s.trigger,listener:i,on:n});n.addEventListener(s.trigger,i)})}var vt=false;var dt=null;function gt(){if(!dt){dt=function(){vt=true};window.addEventListener("scroll",dt);setInterval(function(){if(vt){vt=false;oe(re().querySelectorAll("[hx-trigger='revealed'],[data-hx-trigger='revealed']"),function(e){mt(e)})}},200)}}function mt(t){if(!o(t,"data-hx-revealed")&&X(t)){t.setAttribute("data-hx-revealed","true");var e=ae(t);if(e.initHash){ce(t,"revealed")}else{t.addEventListener("htmx:afterProcessNode",function(e){ce(t,"revealed")},{once:true})}}}function pt(e,t,r){var n=D(r);for(var i=0;i=0){var t=wt(n);setTimeout(function(){xt(s,r,n+1)},t)}};t.onopen=function(e){n=0};ae(s).webSocket=t;t.addEventListener("message",function(e){if(yt(s)){return}var t=e.data;R(s,function(e){t=e.transformResponse(t,null,s)});var r=T(s);var n=l(t);var i=M(n.children);for(var a=0;a0){ce(u,"htmx:validation:halted",i);return}t.send(JSON.stringify(l));if(ut(e,u)){e.preventDefault()}})}else{fe(u,"htmx:noWebSocketSourceError")}}function wt(e){var t=Q.config.wsReconnectDelay;if(typeof t==="function"){return t(e)}if(t==="full-jitter"){var r=Math.min(e,6);var n=1e3*Math.pow(2,r);return n*Math.random()}b('htmx.config.wsReconnectDelay must either be a function or the string "full-jitter"')}function St(e,t,r){var n=D(r);for(var i=0;i0){setTimeout(i,n)}else{i()}}function Ht(t,i,e){var a=false;oe(w,function(r){if(o(t,"hx-"+r)){var n=te(t,"hx-"+r);a=true;i.path=n;i.verb=r;e.forEach(function(e){Lt(t,e,i,function(e,t){if(v(e,Q.config.disableSelector)){p(e);return}he(r,n,e,t)})})}});return a}function Lt(n,e,t,r){if(e.sseEvent){Rt(n,r,e.sseEvent)}else if(e.trigger==="revealed"){gt();ht(n,r,t,e);mt(n)}else if(e.trigger==="intersect"){var i={};if(e.root){i.root=ue(n,e.root)}if(e.threshold){i.threshold=parseFloat(e.threshold)}var a=new IntersectionObserver(function(e){for(var t=0;t0){t.polling=true;ot(n,r,e)}else{ht(n,r,t,e)}}function At(e){if(Q.config.allowScriptTags&&(e.type==="text/javascript"||e.type==="module"||e.type==="")){var t=re().createElement("script");oe(e.attributes,function(e){t.setAttribute(e.name,e.value)});t.textContent=e.textContent;t.async=false;if(Q.config.inlineScriptNonce){t.nonce=Q.config.inlineScriptNonce}var r=e.parentElement;try{r.insertBefore(t,e)}catch(e){b(e)}finally{if(e.parentElement){e.parentElement.removeChild(e)}}}}function Nt(e){if(h(e,"script")){At(e)}oe(f(e,"script"),function(e){At(e)})}function It(e){var t=e.attributes;for(var r=0;r0){var o=n.shift();var s=o.match(/^\s*([a-zA-Z:\-\.]+:)(.*)/);if(a===0&&s){o.split(":");i=s[1].slice(0,-1);r[i]=s[2]}else{r[i]+=o}a+=Bt(o)}for(var l in r){Ft(e,l,r[l])}}}function jt(e){Ae(e);for(var t=0;tQ.config.historyCacheSize){i.shift()}while(i.length>0){try{localStorage.setItem("htmx-history-cache",JSON.stringify(i));break}catch(e){fe(re().body,"htmx:historyCacheError",{cause:e,cache:i});i.shift()}}}function Yt(e){if(!U()){return null}e=B(e);var t=E(localStorage.getItem("htmx-history-cache"))||[];for(var r=0;r=200&&this.status<400){ce(re().body,"htmx:historyCacheMissLoad",o);var e=l(this.response);e=e.querySelector("[hx-history-elt],[data-hx-history-elt]")||e;var t=Zt();var r=T(t);var n=Ve(this.response);if(n){var i=C("title");if(i){i.innerHTML=n}else{window.document.title=n}}Ue(t,e,r);nr(r.tasks);Jt=a;ce(re().body,"htmx:historyRestore",{path:a,cacheMiss:true,serverResponse:this.response})}else{fe(re().body,"htmx:historyCacheMissLoadError",o)}};e.send()}function ar(e){er();e=e||location.pathname+location.search;var t=Yt(e);if(t){var r=l(t.content);var n=Zt();var i=T(n);Ue(n,r,i);nr(i.tasks);document.title=t.title;setTimeout(function(){window.scrollTo(0,t.scroll)},0);Jt=e;ce(re().body,"htmx:historyRestore",{path:e,item:t})}else{if(Q.config.refreshOnHistoryMiss){window.location.reload(true)}else{ir(e)}}}function or(e){var t=pe(e,"hx-indicator");if(t==null){t=[e]}oe(t,function(e){var t=ae(e);t.requestCount=(t.requestCount||0)+1;e.classList["add"].call(e.classList,Q.config.requestClass)});return t}function sr(e){var t=pe(e,"hx-disabled-elt");if(t==null){t=[]}oe(t,function(e){var t=ae(e);t.requestCount=(t.requestCount||0)+1;e.setAttribute("disabled","")});return t}function lr(e,t){oe(e,function(e){var t=ae(e);t.requestCount=(t.requestCount||0)-1;if(t.requestCount===0){e.classList["remove"].call(e.classList,Q.config.requestClass)}});oe(t,function(e){var t=ae(e);t.requestCount=(t.requestCount||0)-1;if(t.requestCount===0){e.removeAttribute("disabled")}})}function ur(e,t){for(var r=0;r=0}function wr(e,t){var r=t?t:ne(e,"hx-swap");var n={swapStyle:ae(e).boosted?"innerHTML":Q.config.defaultSwapStyle,swapDelay:Q.config.defaultSwapDelay,settleDelay:Q.config.defaultSettleDelay};if(Q.config.scrollIntoViewOnBoost&&ae(e).boosted&&!br(e)){n["show"]="top"}if(r){var i=D(r);if(i.length>0){for(var a=0;a0?l.join(":"):null;n["scroll"]=u;n["scrollTarget"]=f}else if(o.indexOf("show:")===0){var c=o.substr(5);var l=c.split(":");var h=l.pop();var f=l.length>0?l.join(":"):null;n["show"]=h;n["showTarget"]=f}else if(o.indexOf("focus-scroll:")===0){var v=o.substr("focus-scroll:".length);n["focusScroll"]=v=="true"}else if(a==0){n["swapStyle"]=o}else{b("Unknown modifier in hx-swap: "+o)}}}}return n}function Sr(e){return ne(e,"hx-encoding")==="multipart/form-data"||h(e,"form")&&ee(e,"enctype")==="multipart/form-data"}function Er(t,r,n){var i=null;R(r,function(e){if(i==null){i=e.encodeParameters(t,n,r)}});if(i!=null){return i}else{if(Sr(r)){return pr(n)}else{return mr(n)}}}function T(e){return{tasks:[],elts:[e]}}function Cr(e,t){var r=e[0];var n=e[e.length-1];if(t.scroll){var i=null;if(t.scrollTarget){i=ue(r,t.scrollTarget)}if(t.scroll==="top"&&(r||i)){i=i||r;i.scrollTop=0}if(t.scroll==="bottom"&&(n||i)){i=i||n;i.scrollTop=i.scrollHeight}}if(t.show){var i=null;if(t.showTarget){var a=t.showTarget;if(t.showTarget==="window"){a="body"}i=ue(r,a)}if(t.show==="top"&&(r||i)){i=i||r;i.scrollIntoView({block:"start",behavior:Q.config.scrollBehavior})}if(t.show==="bottom"&&(n||i)){i=i||n;i.scrollIntoView({block:"end",behavior:Q.config.scrollBehavior})}}}function Rr(e,t,r,n){if(n==null){n={}}if(e==null){return n}var i=te(e,t);if(i){var a=i.trim();var o=r;if(a==="unset"){return null}if(a.indexOf("javascript:")===0){a=a.substr(11);o=true}else if(a.indexOf("js:")===0){a=a.substr(3);o=true}if(a.indexOf("{")!==0){a="{"+a+"}"}var s;if(o){s=Tr(e,function(){return Function("return ("+a+")")()},{})}else{s=E(a)}for(var l in s){if(s.hasOwnProperty(l)){if(n[l]==null){n[l]=s[l]}}}}return Rr(u(e),t,r,n)}function Tr(e,t,r){if(Q.config.allowEval){return t()}else{fe(e,"htmx:evalDisallowedError");return r}}function Or(e,t){return Rr(e,"hx-vars",true,t)}function qr(e,t){return Rr(e,"hx-vals",false,t)}function Hr(e){return le(Or(e),qr(e))}function Lr(t,r,n){if(n!==null){try{t.setRequestHeader(r,n)}catch(e){t.setRequestHeader(r,encodeURIComponent(n));t.setRequestHeader(r+"-URI-AutoEncoded","true")}}}function Ar(t){if(t.responseURL&&typeof URL!=="undefined"){try{var e=new URL(t.responseURL);return e.pathname+e.search}catch(e){fe(re().body,"htmx:badResponseUrl",{url:t.responseURL})}}}function O(e,t){return t.test(e.getAllResponseHeaders())}function Nr(e,t,r){e=e.toLowerCase();if(r){if(r instanceof Element||I(r,"String")){return he(e,t,null,null,{targetOverride:g(r),returnPromise:true})}else{return he(e,t,g(r.source),r.event,{handler:r.handler,headers:r.headers,values:r.values,targetOverride:g(r.target),swapOverride:r.swap,select:r.select,returnPromise:true})}}else{return he(e,t,null,null,{returnPromise:true})}}function Ir(e){var t=[];while(e){t.push(e);e=e.parentElement}return t}function kr(e,t,r){var n;var i;if(typeof URL==="function"){i=new URL(t,document.location.href);var a=document.location.origin;n=a===i.origin}else{i=t;n=s(t,document.location.origin)}if(Q.config.selfRequestsOnly){if(!n){return false}}return ce(e,"htmx:validateUrl",le({url:i,sameHost:n},r))}function he(t,r,n,i,a,e){var o=null;var s=null;a=a!=null?a:{};if(a.returnPromise&&typeof Promise!=="undefined"){var l=new Promise(function(e,t){o=e;s=t})}if(n==null){n=re().body}var M=a.handler||Mr;var X=a.select||null;if(!se(n)){ie(o);return l}var u=a.targetOverride||ye(n);if(u==null||u==me){fe(n,"htmx:targetError",{target:te(n,"hx-target")});ie(s);return l}var f=ae(n);var c=f.lastButtonClicked;if(c){var h=ee(c,"formaction");if(h!=null){r=h}var v=ee(c,"formmethod");if(v!=null){if(v.toLowerCase()!=="dialog"){t=v}}}var d=ne(n,"hx-confirm");if(e===undefined){var D=function(e){return he(t,r,n,i,a,!!e)};var U={target:u,elt:n,path:r,verb:t,triggeringEvent:i,etc:a,issueRequest:D,question:d};if(ce(n,"htmx:confirm",U)===false){ie(o);return l}}var g=n;var m=ne(n,"hx-sync");var p=null;var x=false;if(m){var B=m.split(":");var F=B[0].trim();if(F==="this"){g=xe(n,"hx-sync")}else{g=ue(n,F)}m=(B[1]||"drop").trim();f=ae(g);if(m==="drop"&&f.xhr&&f.abortable!==true){ie(o);return l}else if(m==="abort"){if(f.xhr){ie(o);return l}else{x=true}}else if(m==="replace"){ce(g,"htmx:abort")}else if(m.indexOf("queue")===0){var V=m.split(" ");p=(V[1]||"last").trim()}}if(f.xhr){if(f.abortable){ce(g,"htmx:abort")}else{if(p==null){if(i){var y=ae(i);if(y&&y.triggerSpec&&y.triggerSpec.queue){p=y.triggerSpec.queue}}if(p==null){p="last"}}if(f.queuedRequests==null){f.queuedRequests=[]}if(p==="first"&&f.queuedRequests.length===0){f.queuedRequests.push(function(){he(t,r,n,i,a)})}else if(p==="all"){f.queuedRequests.push(function(){he(t,r,n,i,a)})}else if(p==="last"){f.queuedRequests=[];f.queuedRequests.push(function(){he(t,r,n,i,a)})}ie(o);return l}}var b=new XMLHttpRequest;f.xhr=b;f.abortable=x;var w=function(){f.xhr=null;f.abortable=false;if(f.queuedRequests!=null&&f.queuedRequests.length>0){var e=f.queuedRequests.shift();e()}};var j=ne(n,"hx-prompt");if(j){var S=prompt(j);if(S===null||!ce(n,"htmx:prompt",{prompt:S,target:u})){ie(o);w();return l}}if(d&&!e){if(!confirm(d)){ie(o);w();return l}}var E=xr(n,u,S);if(t!=="get"&&!Sr(n)){E["Content-Type"]="application/x-www-form-urlencoded"}if(a.headers){E=le(E,a.headers)}var _=dr(n,t);var C=_.errors;var R=_.values;if(a.values){R=le(R,a.values)}var z=Hr(n);var $=le(R,z);var T=yr($,n);if(Q.config.getCacheBusterParam&&t==="get"){T["org.htmx.cache-buster"]=ee(u,"id")||"true"}if(r==null||r===""){r=re().location.href}var O=Rr(n,"hx-request");var W=ae(n).boosted;var q=Q.config.methodsThatUseUrlParams.indexOf(t)>=0;var H={boosted:W,useUrlParams:q,parameters:T,unfilteredParameters:$,headers:E,target:u,verb:t,errors:C,withCredentials:a.credentials||O.credentials||Q.config.withCredentials,timeout:a.timeout||O.timeout||Q.config.timeout,path:r,triggeringEvent:i};if(!ce(n,"htmx:configRequest",H)){ie(o);w();return l}r=H.path;t=H.verb;E=H.headers;T=H.parameters;C=H.errors;q=H.useUrlParams;if(C&&C.length>0){ce(n,"htmx:validation:halted",H);ie(o);w();return l}var G=r.split("#");var J=G[0];var L=G[1];var A=r;if(q){A=J;var Z=Object.keys(T).length!==0;if(Z){if(A.indexOf("?")<0){A+="?"}else{A+="&"}A+=mr(T);if(L){A+="#"+L}}}if(!kr(n,A,H)){fe(n,"htmx:invalidPath",H);ie(s);return l}b.open(t.toUpperCase(),A,true);b.overrideMimeType("text/html");b.withCredentials=H.withCredentials;b.timeout=H.timeout;if(O.noHeaders){}else{for(var N in E){if(E.hasOwnProperty(N)){var K=E[N];Lr(b,N,K)}}}var I={xhr:b,target:u,requestConfig:H,etc:a,boosted:W,select:X,pathInfo:{requestPath:r,finalRequestPath:A,anchor:L}};b.onload=function(){try{var e=Ir(n);I.pathInfo.responsePath=Ar(b);M(n,I);lr(k,P);ce(n,"htmx:afterRequest",I);ce(n,"htmx:afterOnLoad",I);if(!se(n)){var t=null;while(e.length>0&&t==null){var r=e.shift();if(se(r)){t=r}}if(t){ce(t,"htmx:afterRequest",I);ce(t,"htmx:afterOnLoad",I)}}ie(o);w()}catch(e){fe(n,"htmx:onLoadError",le({error:e},I));throw e}};b.onerror=function(){lr(k,P);fe(n,"htmx:afterRequest",I);fe(n,"htmx:sendError",I);ie(s);w()};b.onabort=function(){lr(k,P);fe(n,"htmx:afterRequest",I);fe(n,"htmx:sendAbort",I);ie(s);w()};b.ontimeout=function(){lr(k,P);fe(n,"htmx:afterRequest",I);fe(n,"htmx:timeout",I);ie(s);w()};if(!ce(n,"htmx:beforeRequest",I)){ie(o);w();return l}var k=or(n);var P=sr(n);oe(["loadstart","loadend","progress","abort"],function(t){oe([b,b.upload],function(e){e.addEventListener(t,function(e){ce(n,"htmx:xhr:"+t,{lengthComputable:e.lengthComputable,loaded:e.loaded,total:e.total})})})});ce(n,"htmx:beforeSend",I);var Y=q?null:Er(b,n,T);b.send(Y);return l}function Pr(e,t){var r=t.xhr;var n=null;var i=null;if(O(r,/HX-Push:/i)){n=r.getResponseHeader("HX-Push");i="push"}else if(O(r,/HX-Push-Url:/i)){n=r.getResponseHeader("HX-Push-Url");i="push"}else if(O(r,/HX-Replace-Url:/i)){n=r.getResponseHeader("HX-Replace-Url");i="replace"}if(n){if(n==="false"){return{}}else{return{type:i,path:n}}}var a=t.pathInfo.finalRequestPath;var o=t.pathInfo.responsePath;var s=ne(e,"hx-push-url");var l=ne(e,"hx-replace-url");var u=ae(e).boosted;var f=null;var c=null;if(s){f="push";c=s}else if(l){f="replace";c=l}else if(u){f="push";c=o||a}if(c){if(c==="false"){return{}}if(c==="true"){c=o||a}if(t.pathInfo.anchor&&c.indexOf("#")===-1){c=c+"#"+t.pathInfo.anchor}return{type:f,path:c}}else{return{}}}function Mr(l,u){var f=u.xhr;var c=u.target;var e=u.etc;var t=u.requestConfig;var h=u.select;if(!ce(l,"htmx:beforeOnLoad",u))return;if(O(f,/HX-Trigger:/i)){_e(f,"HX-Trigger",l)}if(O(f,/HX-Location:/i)){er();var r=f.getResponseHeader("HX-Location");var v;if(r.indexOf("{")===0){v=E(r);r=v["path"];delete v["path"]}Nr("GET",r,v).then(function(){tr(r)});return}var n=O(f,/HX-Refresh:/i)&&"true"===f.getResponseHeader("HX-Refresh");if(O(f,/HX-Redirect:/i)){location.href=f.getResponseHeader("HX-Redirect");n&&location.reload();return}if(n){location.reload();return}if(O(f,/HX-Retarget:/i)){if(f.getResponseHeader("HX-Retarget")==="this"){u.target=l}else{u.target=ue(l,f.getResponseHeader("HX-Retarget"))}}var d=Pr(l,u);var i=f.status>=200&&f.status<400&&f.status!==204;var g=f.response;var a=f.status>=400;var m=Q.config.ignoreTitle;var o=le({shouldSwap:i,serverResponse:g,isError:a,ignoreTitle:m},u);if(!ce(c,"htmx:beforeSwap",o))return;c=o.target;g=o.serverResponse;a=o.isError;m=o.ignoreTitle;u.target=c;u.failed=a;u.successful=!a;if(o.shouldSwap){if(f.status===286){at(l)}R(l,function(e){g=e.transformResponse(g,f,l)});if(d.type){er()}var s=e.swapOverride;if(O(f,/HX-Reswap:/i)){s=f.getResponseHeader("HX-Reswap")}var v=wr(l,s);if(v.hasOwnProperty("ignoreTitle")){m=v.ignoreTitle}c.classList.add(Q.config.swappingClass);var p=null;var x=null;var y=function(){try{var e=document.activeElement;var t={};try{t={elt:e,start:e?e.selectionStart:null,end:e?e.selectionEnd:null}}catch(e){}var r;if(h){r=h}if(O(f,/HX-Reselect:/i)){r=f.getResponseHeader("HX-Reselect")}if(d.type){ce(re().body,"htmx:beforeHistoryUpdate",le({history:d},u));if(d.type==="push"){tr(d.path);ce(re().body,"htmx:pushedIntoHistory",{path:d.path})}else{rr(d.path);ce(re().body,"htmx:replacedInHistory",{path:d.path})}}var n=T(c);je(v.swapStyle,c,l,g,n,r);if(t.elt&&!se(t.elt)&&ee(t.elt,"id")){var i=document.getElementById(ee(t.elt,"id"));var a={preventScroll:v.focusScroll!==undefined?!v.focusScroll:!Q.config.defaultFocusScroll};if(i){if(t.start&&i.setSelectionRange){try{i.setSelectionRange(t.start,t.end)}catch(e){}}i.focus(a)}}c.classList.remove(Q.config.swappingClass);oe(n.elts,function(e){if(e.classList){e.classList.add(Q.config.settlingClass)}ce(e,"htmx:afterSwap",u)});if(O(f,/HX-Trigger-After-Swap:/i)){var o=l;if(!se(l)){o=re().body}_e(f,"HX-Trigger-After-Swap",o)}var s=function(){oe(n.tasks,function(e){e.call()});oe(n.elts,function(e){if(e.classList){e.classList.remove(Q.config.settlingClass)}ce(e,"htmx:afterSettle",u)});if(u.pathInfo.anchor){var e=re().getElementById(u.pathInfo.anchor);if(e){e.scrollIntoView({block:"start",behavior:"auto"})}}if(n.title&&!m){var t=C("title");if(t){t.innerHTML=n.title}else{window.document.title=n.title}}Cr(n.elts,v);if(O(f,/HX-Trigger-After-Settle:/i)){var r=l;if(!se(l)){r=re().body}_e(f,"HX-Trigger-After-Settle",r)}ie(p)};if(v.settleDelay>0){setTimeout(s,v.settleDelay)}else{s()}}catch(e){fe(l,"htmx:swapError",u);ie(x);throw e}};var b=Q.config.globalViewTransitions;if(v.hasOwnProperty("transition")){b=v.transition}if(b&&ce(l,"htmx:beforeTransition",u)&&typeof Promise!=="undefined"&&document.startViewTransition){var w=new Promise(function(e,t){p=e;x=t});var S=y;y=function(){document.startViewTransition(function(){S();return w})}}if(v.swapDelay>0){setTimeout(y,v.swapDelay)}else{y()}}if(a){fe(l,"htmx:responseError",le({error:"Response Status Error Code "+f.status+" from "+u.pathInfo.requestPath},u))}}var Xr={};function Dr(){return{init:function(e){return null},onEvent:function(e,t){return true},transformResponse:function(e,t,r){return e},isInlineSwap:function(e){return false},handleSwap:function(e,t,r,n){return false},encodeParameters:function(e,t,r){return null}}}function Ur(e,t){if(t.init){t.init(r)}Xr[e]=le(Dr(),t)}function Br(e){delete Xr[e]}function Fr(e,r,n){if(e==undefined){return r}if(r==undefined){r=[]}if(n==undefined){n=[]}var t=te(e,"hx-ext");if(t){oe(t.split(","),function(e){e=e.replace(/ /g,"");if(e.slice(0,7)=="ignore:"){n.push(e.slice(7));return}if(n.indexOf(e)<0){var t=Xr[e];if(t&&r.indexOf(t)<0){r.push(t)}}})}return Fr(u(e),r,n)}var Vr=false;re().addEventListener("DOMContentLoaded",function(){Vr=true});function jr(e){if(Vr||re().readyState==="complete"){e()}else{re().addEventListener("DOMContentLoaded",e)}}function _r(){if(Q.config.includeIndicatorStyles!==false){re().head.insertAdjacentHTML("beforeend","")}}function zr(){var e=re().querySelector('meta[name="htmx-config"]');if(e){return E(e.content)}else{return null}}function $r(){var e=zr();if(e){Q.config=le(Q.config,e)}}jr(function(){$r();_r();var e=re().body;zt(e);var t=re().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){var t=e.target;var r=ae(t);if(r&&r.xhr){r.xhr.abort()}});const r=window.onpopstate?window.onpopstate.bind(window):null;window.onpopstate=function(e){if(e.state&&e.state.htmx){ar();oe(t,function(e){ce(e,"htmx:restored",{document:re(),triggerEvent:ce})})}else{if(r){r(e)}}};setTimeout(function(){ce(e,"htmx:load",{});e=null},0)});return Q}()}); \ No newline at end of file diff --git a/templates/base/head.html b/templates/base/head.html index 7949af9b..94d85c4f 100644 --- a/templates/base/head.html +++ b/templates/base/head.html @@ -11,6 +11,5 @@ - \ No newline at end of file diff --git a/templates/partial/search_result.html b/templates/partial/search_result.html index 37c3eccf..1ea36fd9 100644 --- a/templates/partial/search_result.html +++ b/templates/partial/search_result.html @@ -4,7 +4,7 @@

- {{result.name}} + {{result.name}} {% if result.result_type.name == "DATA_PRODUCT" %} Data product From fb3d0275d6e21c84e59e7d76f50e6d772a8d031f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 29 Jan 2024 17:21:52 +0000 Subject: [PATCH 26/30] Commit changes made by code formatters --- README.md | 2 +- home/helper.py | 2 +- home/views.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 35744aff..ae9e59e0 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ You will need npm (for javascript dependencies) and poetry (for python dependenc 2. Copy `.env.example` to `.env`. 3. You wil need to obtain an access token from Datahub catalogue and populate the `CATALOGUE_TOKEN` var in .env to be able to retrieve search data. https://datahub.apps-tools.development.data-platform.service.justice.gov.uk/settings/tokens -5. Run `poetry run python manage.py runserver` +4. Run `poetry run python manage.py runserver` Run `npm install` and then `npm run sass` to compile the stylesheets. diff --git a/home/helper.py b/home/helper.py index 7952f7d9..181d2eb6 100644 --- a/home/helper.py +++ b/home/helper.py @@ -3,4 +3,4 @@ def filter_seleted_domains(domain_list, domains): for domain in domain_list: if domain.value in domains: selected_domain[domain.value] = domain.label - return selected_domain \ No newline at end of file + return selected_domain diff --git a/home/views.py b/home/views.py index 11acf7ee..6879a0c3 100644 --- a/home/views.py +++ b/home/views.py @@ -12,7 +12,7 @@ def home_view(request): def details_view(request, id): - + context = {} client = get_catalogue_client() filter_value = [MultiSelectFilter("urn", id)] From 9dc88115baf347403a80423a6baabba3028dc858 Mon Sep 17 00:00:00 2001 From: "priya.basker" Date: Mon, 29 Jan 2024 17:29:35 +0000 Subject: [PATCH 27/30] Added result type --- home/views.py | 12 +++--------- templates/details.html | 3 ++- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/home/views.py b/home/views.py index 6879a0c3..9751ab06 100644 --- a/home/views.py +++ b/home/views.py @@ -30,25 +30,19 @@ def search_view(request): client = get_catalogue_client() # Fetch domainlist without query + # This will be replaced ater matt creates a new function search_results = client.search(query="", page=None) context = {} domain_list = search_results.facets['domains'] context["domainlist"] = domain_list - domains = request.GET.getlist("domain", []) - if domains: + domains = request.GET.getlist("domain", []) + if domains: selected_domain = filter_seleted_domains(domain_list, domains) context['selected_domain'] = selected_domain request.session['selected_domain'] = selected_domain request.session['domains'] = domains filter_value = [MultiSelectFilter("domains", domains)] - domains = request.GET.getlist("domain") - selected_domain = filter_seleted_domains(domain_list, domains) - context['selected_domain'] = selected_domain - request.session['selected_domain'] = selected_domain - request.session['domains'] = domains - filter_value = [MultiSelectFilter("domains", domains)] - elif request.GET.get('clear_filter') == "True": filter_value = [] context['selected_domain'] = {} diff --git a/templates/details.html b/templates/details.html index 5650b0dd..e99172f5 100644 --- a/templates/details.html +++ b/templates/details.html @@ -7,7 +7,8 @@ Back
-
+
+ {{result.result_type.name}}

{{result.name}}

From e535a913404745e5a8006221be95a39066f312ae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 29 Jan 2024 17:30:29 +0000 Subject: [PATCH 28/30] Commit changes made by code formatters --- home/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home/views.py b/home/views.py index 9751ab06..d7d9a732 100644 --- a/home/views.py +++ b/home/views.py @@ -38,11 +38,11 @@ def search_view(request): domains = request.GET.getlist("domain", []) if domains: - selected_domain = filter_seleted_domains(domain_list, domains) - context['selected_domain'] = selected_domain - request.session['selected_domain'] = selected_domain - request.session['domains'] = domains - filter_value = [MultiSelectFilter("domains", domains)] + selected_domain = filter_seleted_domains(domain_list, domains) + context['selected_domain'] = selected_domain + request.session['selected_domain'] = selected_domain + request.session['domains'] = domains + filter_value = [MultiSelectFilter("domains", domains)] elif request.GET.get('clear_filter') == "True": filter_value = [] context['selected_domain'] = {} From 4d7e5ec4e8c9d76144b8b4929cf8e32403dc92be Mon Sep 17 00:00:00 2001 From: "priya.basker" Date: Mon, 29 Jan 2024 17:49:07 +0000 Subject: [PATCH 29/30] Added details page styles --- templates/details.html | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/templates/details.html b/templates/details.html index e99172f5..2d87d006 100644 --- a/templates/details.html +++ b/templates/details.html @@ -108,24 +108,25 @@

{{result.name}}

- - - -
-

IAO or Data Owner

-

- {{result.metadata.owner}}
+

+

IAO or Data Owner

+ + {{result.metadata.owner}} + +
+
+

Contact for Access requirement

+ {{result.metadata.owner_email}} -

+
- -
-

Contact for Access requirement

-

- {{result.domain_name}} -

+
+

Access requirement

+ + Processing the data might require + permission from IAO or Data ownwer +
-
From c7cccebf95bfb1e236957fa124e1da4c08eefe2d Mon Sep 17 00:00:00 2001 From: "priya.basker" Date: Mon, 29 Jan 2024 17:50:29 +0000 Subject: [PATCH 30/30] updated spelling error --- templates/details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/details.html b/templates/details.html index 2d87d006..af89355f 100644 --- a/templates/details.html +++ b/templates/details.html @@ -124,7 +124,7 @@

{{result.name}}

Access requirement

Processing the data might require - permission from IAO or Data ownwer + permission from IAO or Data owner