Dp 3047 present additional metadata items #91

mitchdawson1982 · 2024-02-20T23:02:15Z

resolves ministryofjustice/analytical-platform#3047 & ministryofjustice/analytical-platform#2961

Adds

sensitivityLevel & whereToAccessDataset as additional filters in the UI and now passes the values of these fields into the filter for searching.
Selected filters are moved into their own partial template and there is now logic to build them based on the clear-filter_href dictionary keys that is passed in the context.

Changes

domain to a single select element from multi-select check box
Clear filter link is now only displayed if there are filters to clear rather than on all requests
encode_without_filter now checks for the type of value and responds appropriately

Also:

update pre-commit
- add sync_with_poetry hook to keep pre-commit in sync with pyproject.toml
- config flake8
- config isort to use black via pyproject.toml
Add .secrets.baseline for detect-secrets
move testing libraries to dev.dependencies in pyproject.toml

- add sync_with_poetry hook to keep pre-commit in sync with pyproject.toml - config flake8 - config isort to use black via pyproject.toml Add .secrets.baseline for detect-secrets move testing libraries to dev.dependencies in pyproject.toml

…ted in later PR)

add default for dict.get() [linting]

…to_access choice value to 'Analytical_Platform' to avoid spaces. q exit quit() q ��[200~classifications~classifications

home/admin.py

home/forms/search.py

home/service/search.py

home/templatetags/clear_filter.py

templates/partial/filter.html

…e full query builder

Domain will have top level and subdomain selections, and work similarly to "Topic/Sub-Topic" on GOV.UK search. The form will submit domain and subdomain as separate fields, so we need to combine them on the backend. If javascript is not enabled, then the subdomain field is not displayed and it will work as before. This is tested using jest and jest-dom.

The chromedriver library updates more frequently than the chrome distributed in ubuntu-latest, but these need to be the same version, otherwise axe-core breaks. As a workaround, try to install a version that matches whatever chrome is on the path. See also dequelabs/axe-core-npm#401 (comment)

…ted in later PR)

…e full query builder

home/forms/search.py

mitchdawson1982 added 3 commits February 19, 2024 15:19

update form with updated fields

e78b725

update form with updated fields

0ec2c6d

implement custom property search

7fc7684

mitchdawson1982 marked this pull request as draft February 20, 2024 23:11

tom-webber and others added 10 commits February 21, 2024 13:48

update pre-commit

95f65b5

- add sync_with_poetry hook to keep pre-commit in sync with pyproject.toml - config flake8 - config isort to use black via pyproject.toml Add .secrets.baseline for detect-secrets move testing libraries to dev.dependencies in pyproject.toml

linting

ccdebcb

linting and formatting for readability

a1fb168

revert domains (plural) -> domain (singular) changes (may be implemen…

1079046

…ted in later PR)

add descriptions and code annotations for added helper functions

2e78f6d

add default for dict.get() [linting]

keep original indent for domain filters

c8d5d6f

linting

9f35250

add pre-commit instructions/details to readme

8a181a9

Changed value for selection option an empty string and updated where_…

a46b1c6

…to_access choice value to 'Analytical_Platform' to avoid spaces. q exit quit() q ��[200~classifications~classifications

Make domain a single choice field

389a609

mitchdawson1982 force-pushed the dp-3047-present-additional-metadata-items branch from bfbc39f to 389a609 Compare February 22, 2024 14:51

MatMoore reviewed Feb 22, 2024

View reviewed changes

mitchdawson1982 added 14 commits February 24, 2024 20:58

Removed admin.py as not required

4de3eb3

Moved filter code to new partial template

90c4368

refactor domain and subdomain choices to get the urn value

c3ccd25

build filter strings method to create filter search strings

001becb

refactor classifications and where to access string generation, remov…

298b8c1

…e full query builder

refactor where to access href creation

64ff26f

add get_keys and format_label template filter functions

78fa710

Update broken tests

d76b377

add selected filters partial

9858ab8

update packages

cafc012

refactor encode_without_filter function

39fc25a

remove redundant code

93679f4

update tests with singular domain, classifications and where_to_access

a98d658

Update dingular domain and add linting fixes

e827a3e

LavMatt and others added 17 commits February 26, 2024 12:58

markdown and trim for table descriptions in data product detail page

b987082

remove self.data_product_name from dataproductservice

36ba9e5

try reinstalling deps for selenium tests

2a37387

revert workflow change

f853f7a

Revert template - will add backend later

54cb4bd

Add test

2b1fd7d

update form with updated fields

83e7508

update form with updated fields

517f266

implement custom property search

b4abaed

revert domains (plural) -> domain (singular) changes (may be implemen…

5441f57

…ted in later PR)

Make domain a single choice field

6660d5b

refactor classifications and where to access string generation, remov…

5348c64

…e full query builder

refactor where to access href creation

962aefd

update packages

e34a241

linter updates

35075f8

mitchdawson1982 dismissed MatMoore’s stale review via 35075f8 February 26, 2024 13:32

mitchdawson1982 and others added 3 commits February 26, 2024 15:23

remove duplicated function

c259e99

update search result ui fields

14e602f

Merge branch 'main' into dp-3047-present-additional-metadata-items

e94bb03

mitchdawson1982 force-pushed the dp-3047-present-additional-metadata-items branch from 59d5cfb to 861c1a1 Compare February 26, 2024 16:04

fix result type in conftest

52ec70f

mitchdawson1982 force-pushed the dp-3047-present-additional-metadata-items branch from 861c1a1 to 52ec70f Compare February 26, 2024 16:13

LavMatt reviewed Feb 26, 2024

View reviewed changes

home/forms/search.py Outdated Show resolved Hide resolved

mitchdawson1982 added 2 commits February 26, 2024 16:47

remove official-sensitive classification

260e14f

add Custom Properties match display and rename 'list' to value_list

84fb52e

LavMatt approved these changes Feb 26, 2024

View reviewed changes

mitchdawson1982 merged commit 91ed261 into main Feb 26, 2024
3 checks passed

mitchdawson1982 deleted the dp-3047-present-additional-metadata-items branch February 26, 2024 16:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dp 3047 present additional metadata items #91

Dp 3047 present additional metadata items #91

mitchdawson1982 commented Feb 20, 2024 •

edited

Loading

Dp 3047 present additional metadata items #91

Dp 3047 present additional metadata items #91

Conversation

mitchdawson1982 commented Feb 20, 2024 • edited Loading

mitchdawson1982 commented Feb 20, 2024 •

edited

Loading