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

Author: ssadhu-sl

.github/workflows/security-scan.yml

@@ -8,7 +8,7 @@ on:
 env:
   APPLICATION: digital-land-platform
   DOCKER_REPO: public.ecr.aws/l6z6v3j6
-  ZAP_VERSION: 2.11.1
+  ZAP_VERSION: 2.15.0
 
 jobs:
   dynamic-audit:

application/core/models.py

@@ -91,6 +91,7 @@ class DatasetModel(DigitalLandDateFieldsModel):
     attribution_text: str = None
     licence: str = None
     licence_text: str = None
+    consideration: str = None
 
 
 class TypologyModel(DigitalLandDateFieldsModel):

application/db/models.py

@@ -107,6 +107,7 @@ class DatasetOrm(Base):
     themes = Column(ARRAY(Text), nullable=True)
     attribution_id = Column(Text, nullable=True)
     licence_id = Column(Text, nullable=True)
+    consideration = Column(Text, nullable=True)
 
     _attribution = relationship(
         "AttributionOrm",

application/templates/components/entity-value/macro.jinja

@@ -54,7 +54,7 @@
             <code class="app-code-block" tabindex="0">{{ value }}</code>
         {%- elif field in ["local-resilience-forum","local-authority-type","ownership-status","planning-permission-type","planning-permission-type","planning-permission-status","green-belt-core","ancient-woodland-status","design-code-category","design-code-status","listed-building-grade","park-and-garden-grade"] %}
             <a class ="govuk-link" href="{{ '/prefix/' + field + "/reference/" + value }}">{{ value }}</a>
-        {%- elif field in ["local-authority-district","local-planning-authority","parish"] %}
+        {%- elif field in ["local-authority-district","local-planning-authority","parish","region"] %}
             <a class ="govuk-link" href="{{ '/prefix/statistical-geography/reference/' + value }}">{{ value }}</a>
         {%- elif field in ["combined-authority","local-authority"] %}
             <a class ="govuk-link" href="{{ '/prefix/local-authority/reference/' + value }}">{{ value }}</a>
@@ -82,7 +82,7 @@
             {%- endif %}
         {%- elif field == "twitter" %}
             <a class ="govuk-link" href="https://twitter.com/{{ value }}">@{{ value }}</a>
-        {%- elif field in ["website","opendatacommunities","documentation-url","document-url","site-plan-url"] %}
+        {%- elif field in ["website","opendatacommunities"] or field.endswith("-url") or field.endswith("-uri") %}
             <a class ="govuk-link" href="{{ value }}">{{ value }}</a>
         {%- elif field in ["wikipedia"] %}
             <a class ="govuk-link" href="{{ 'https://en.wikipedia.org/wiki/' + value }}">{{ value }}</a>

application/templates/dataset.html

@@ -205,6 +205,20 @@ <h2 class="govuk-heading-s govuk-!-margin-bottom-0" id="specification">
             </li>
           </ul>
         </nav>
+        {% if dataset['consideration'] %}
+        <hr class="govuk-section-break govuk-section-break--m">
+        <h2 class="govuk-heading-s govuk-!-margin-bottom-0" id="data-design">
+          Designing the data
+        </h2>
+        <p class="govuk-hint govuk-!-font-size-14">You can see details about how this dataset has been designed for planning.data.gov.uk</p>
+        <nav role="navigation" aria-labelledby="specification">
+          <ul class="govuk-list govuk-!-font-size-16">
+            <li>
+              <a class="govuk-link" href="https://design.planning.data.gov.uk/planning-consideration/{{ dataset['consideration'] }}">{{ dataset['consideration'] }} planning consideration</a>
+            </li>
+          </ul>
+        </nav>
+        {% endif %}
       </aside>
 
     </div>

docker-compose.security.yml

@@ -40,7 +40,7 @@ services:
       retries: 5
 
   zap:
-    image: owasp/zap2docker-stable:${ZAP_VERSION-2.11.1}
+    image: ghcr.io/zaproxy/zaproxy:${ZAP_VERSION-2.15.0}
     command: bash -c "zap.sh -cmd -addonupdate; zap.sh -cmd -autorun /zap/wrk/zap.yaml"
     volumes:
       - .:/zap/wrk

migrations/versions/180800810b09_add_consideration_to_dataset.py

@@ -0,0 +1,25 @@
+"""add consideration to dataset
+
+Revision ID: 180800810b09
+Revises: f9c99b89b3c1
+Create Date: 2024-06-26 13:46:25.381348
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "180800810b09"
+down_revision = "f9c99b89b3c1"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column("dataset", sa.Column("consideration", sa.Text, nullable=True))
+
+
+def downgrade():
+    op.drop_column("dataset", "consideration")

tests/test_data/datasets.csv

@@ -1,7 +1,7 @@
-dataset|name|entry_date|start_date|end_date|collection|description|key_field|paint_options|plural|prefix|text|typology|wikidata|wikipedia|themes|attribution|licence
-greenspace|Greenspace|2022-01-07|||greenspace|Greenspace||"{ ""colour"": ""#78AA00"" }"|Greenspaces||# This is some markdown that will render in the dataset page |geography|Q1234567|Greenspace_(United_Kingdom)|heritage|crown-copyright|ogl3
-forest|Forest|2022-01-07|||forest|Forest||"{ ""colour"": ""#85994b"" }"|Forests|||geography|Q7654321|Forest_(United_Kingdom)|environment,heritage|crown-copyright|ogl3
-brownfield-site|Brownfield site|2022-01-07|||brownfield-site|Brownfield site||"{ ""colour"": ""#85994b"" }"|Brownfield sites|||geography|Q111222|Brownfield_site_(United_Kingdom)|environment,housing|crown-copyright|ogl3
-historical-monument|Historical monument|2022-01-07|||historical-monument|Historical monument||"{ ""colour"": ""#85994b"" }"|Historical monuments|||geography|Q333444|Historical_monument_(United_Kingdom)|heritage|crown-copyright|ogl3
-tree|Tree|2021-12-27|||tree-preservation-order|"An individual tree"||"{ ""colour"": ""#3B453D"", ""type"": ""point"" }"|Trees|||geography|Q10884|Tree|environment|crown-copyright|ogl3
-conservation-area|Conservation area|2022-06-06|||conservation-area|Special architectural or historic interest, the character or appearance of which it is desirable to preserve or enhance||"{ ""colour"": ""#78AA00"" }"|Conservation areas|||geography|Q5162904|Conservation_area_(United_Kingdom)|heritage|crown-copyright|ogl3
+dataset|name|entry_date|start_date|end_date|collection|description|key_field|paint_options|plural|prefix|text|typology|wikidata|wikipedia|themes|attribution|licence|consideration
+greenspace|Greenspace|2022-01-07|||greenspace|Greenspace||"{ ""colour"": ""#78AA00"" }"|Greenspaces||# This is some markdown that will render in the dataset page |geography|Q1234567|Greenspace_(United_Kingdom)|heritage|crown-copyright|ogl3|greenspace
+forest|Forest|2022-01-07|||forest|Forest||"{ ""colour"": ""#85994b"" }"|Forests|||geography|Q7654321|Forest_(United_Kingdom)|environment,heritage|crown-copyright|ogl3|forest
+brownfield-site|Brownfield site|2022-01-07|||brownfield-site|Brownfield site||"{ ""colour"": ""#85994b"" }"|Brownfield sites|||geography|Q111222|Brownfield_site_(United_Kingdom)|environment,housing|crown-copyright|ogl3|brownfield-land
+historical-monument|Historical monument|2022-01-07|||historical-monument|Historical monument||"{ ""colour"": ""#85994b"" }"|Historical monuments|||geography|Q333444|Historical_monument_(United_Kingdom)|heritage|crown-copyright|ogl3|historic-monument
+tree|Tree|2021-12-27|||tree-preservation-order|"An individual tree"||"{ ""colour"": ""#3B453D"", ""type"": ""point"" }"|Trees|||geography|Q10884|Tree|environment|crown-copyright|ogl3|tree-preservation-orders
+conservation-area|Conservation area|2022-06-06|||conservation-area|Special architectural or historic interest, the character or appearance of which it is desirable to preserve or enhance||"{ ""colour"": ""#78AA00"" }"|Conservation areas|||geography|Q5162904|Conservation_area_(United_Kingdom)|heritage|crown-copyright|ogl3|conservation-areas