Merge pull request #376 from itk-dev/feature/HRIN-767-gis-map

HRIN-767: Added GIS map token

CHANGELOG.md

@@ -6,6 +6,9 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+* [PR-376](https://github.com/itk-dev/hoeringsportal/pull/376)
+ Added GIS map token
+
 ## [3.5.3] - 2023-11-08
 
 * [PR-370](https://github.com/itk-dev/hoeringsportal/pull/370)

composer.json

@@ -129,6 +129,7 @@
  "drupal/redirect": "^1.6",
  "drupal/search_autocomplete": "^2.0",
  "drupal/system_status": "^2.8",
+ "drupal/token_filter": "^2.1",
  "drupal/toolbar_visibility": "dev-3127402-drupal-9-readiness",
  "drupal/twig_tweak": "^2.1",
  "drupal/view_custom_table": "^2.0",
@@ -175,7 +176,8 @@
  "drupal/core-project-message": true,
  "dealerdirect/phpcodesniffer-composer-installer": true,
  "oomphinc/composer-installers-extender": true,
- "phpstan/extension-installer": true
+ "phpstan/extension-installer": true,
+ "chx/drupal-issue-fork": true
  }
  },
  "scripts": {

config/sync/core.extension.yml

@@ -98,6 +98,7 @@ module:
  telephone: 0
  text: 0
  token: 0
+ token_filter: 0
  toolbar: 0
  toolbar_visibility: 0
  twig_tweak: 0

config/sync/editor.editor.hearing_description.yml

@@ -0,0 +1,59 @@
+uuid: d4a16c11-faf2-4617-bd62-c28ad4eb5f31
+langcode: da
+status: true
+dependencies:
+ config:
+ - filter.format.hearing_description
+ module:
+ - ckeditor5
+format: hearing_description
+editor: ckeditor5
+settings:
+ toolbar:
+ items:
+ - bold
+ - italic
+ - '|'
+ - link
+ - '|'
+ - bulletedList
+ - numberedList
+ - '|'
+ - blockQuote
+ - '|'
+ - sourceEditing
+ - '|'
+ - heading
+ - tokenBrowser
+ plugins:
+ ckeditor5_heading:
+ enabled_headings:
+ - heading2
+ - heading3
+ - heading4
+ ckeditor5_list:
+ reversed: false
+ startIndex: true
+ ckeditor5_sourceEditing:
+ allowed_tags:
+ - '<cite>'
+ - '<a hreflang target>'
+ - '<blockquote cite>'
+ - '<ul type>'
+ - '<ol type>'
+ - '<h2 id>'
+ - '<h3 id>'
+ - '<h4 id>'
+ editor_advanced_link_link:
+ enabled_attributes:
+ - target
+ token_filter_token_browser:
+ token_types: { }
+image_upload:
+ status: false
+ scheme: public
+ directory: inline-images
+ max_size: ''
+ max_dimensions:
+ width: null
+ height: null

config/sync/field.field.node.hearing.field_description.yml

@@ -4,14 +4,15 @@ status: true
 dependencies:
  config:
  - field.storage.node.field_description
+ - filter.format.hearing_description
  - node.type.hearing
  module:
  - allowed_formats
  - text
 third_party_settings:
  allowed_formats:
  allowed_formats:
- - filtered_html
+ - hearing_description
 id: node.hearing.field_description
 field_name: field_description
 entity_type: node
@@ -22,5 +23,7 @@ required: true
 translatable: true
 default_value: { }
 default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats:
+ - hearing_description
 field_type: text_long

config/sync/filter.format.hearing_description.yml

@@ -0,0 +1,45 @@
+uuid: 15881684-2eac-4426-bae4-7e44d395c82a
+langcode: da
+status: true
+dependencies:
+ module:
+ - token_filter
+name: 'Hearing description'
+format: hearing_description
+weight: 0
+filters:
+ filter_autop:
+ id: filter_autop
+ provider: filter
+ status: true
+ weight: 9
+ settings: { }
+ filter_htmlcorrector:
+ id: filter_htmlcorrector
+ provider: filter
+ status: true
+ weight: -50
+ settings: { }
+ filter_url:
+ id: filter_url
+ provider: filter
+ status: false
+ weight: -50
+ settings:
+ filter_url_length: 72
+ filter_html:
+ id: filter_html
+ provider: filter
+ status: true
+ weight: 0
+ settings:
+ allowed_html: '<br> <p> <h2 id> <h3 id> <h4 id> <cite> <a hreflang target href> <blockquote cite> <ul type> <ol type start> <strong> <em> <li>'
+ filter_html_help: true
+ filter_html_nofollow: false
+ token_filter:
+ id: token_filter
+ provider: token_filter
+ status: true
+ weight: 15
+ settings:
+ replace_empty: '1'

config/sync/user.role.authenticated.yml

@@ -5,6 +5,7 @@ dependencies:
  config:
  - filter.format.citizen_proposal_content
  - filter.format.filtered_html
+ - filter.format.hearing_description
  module:
  - filter
  - media
@@ -21,4 +22,5 @@ permissions:
  - 'search content'
  - 'use text format citizen_proposal_content'
  - 'use text format filtered_html'
+ - 'use text format hearing_description'
  - 'view media'

web/modules/custom/hoeringsportal_data/src/Plugin/Field/FieldWidget/MapDefaultWidget.php

@@ -65,7 +65,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
  $geojsonUrl = 'http://geojson.io/';
  $geojsonUrlWithMap = $geojsonUrl . '#map=13/56.1464/10.1739';
  // @see https://github.com/mapbox/geojson.io/blob/gh-pages/API.md#datadataapplicationjson
- $geojsonUrlWithData = $geojsonUrl . '#data=data:application/json,' . urlencode(json_encode(json_decode($item->geojson)) ?? '');
+ $geojsonUrlWithData = $geojsonUrl . '#data=data:application/json,' . urlencode(json_encode(json_decode($item->geojson ?? 'null')) ?? '');
  $element['geojson'] = [
  '#type' => 'textarea',
  '#title' => t('GeoJSON'),

web/modules/custom/hoeringsportal_hearing/assets/css/gis-minimap.css

@@ -0,0 +1,11 @@
+.hoeringsportal-hearing-gis-minimap {
+ /* We use a `span` element to render the map (it's most times inside a `p` element). */
+ display: block;
+ height: 500px;
+}
+
+.hoeringsportal-hearing-gis-minimap.invalid-token {
+ color: #f00;
+ background: #ff0;
+ height: auto;
+}

web/modules/custom/hoeringsportal_hearing/hoeringsportal_hearing.install

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Code related to installing and updating this module.
+ */
+
+/**
+ * Update text format on hearing description.
+ */
+function hoeringsportal_hearing_update_9001() {
+ $storage = \Drupal::entityTypeManager()
+ ->getStorage('node');
+ $ids = $storage->getQuery()
+ ->condition('type', 'hearing')
+ ->accessCheck(FALSE)
+ ->execute();
+ $hearings = $storage->loadMultiple($ids);
+
+ $field_name = 'field_description';
+ $text_format = 'hearing_description';
+ foreach ($hearings as $hearing) {
+ if ($value = ($hearing->get($field_name)->getValue()[0] ?? NULL)) {
+ $value['format'] = $text_format;
+ $hearing->set($field_name, $value);
+
+ $hearing->save();
+ }
+ }
+}

web/modules/custom/hoeringsportal_hearing/hoeringsportal_hearing.libraries.yml

@@ -2,3 +2,11 @@ hearing-form:
  version: VERSION
  js:
  assets/js/form.js: {}
+
+gis-minimap:
+ version: VERSION
+ css:
+ theme:
+ assets/css/gis-minimap.css: {}
+ js:
+ https://webkort.aarhuskommune.dk/clientapi/minimap2/mmloader.js: { type: external, minified: true }

web/modules/custom/hoeringsportal_hearing/hoeringsportal_hearing.module

@@ -9,8 +9,10 @@ use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
+use Drupal\hoeringsportal_hearing\TokenHelper;
 
 /**
  * Implements hook_help().
@@ -82,6 +84,23 @@ function hoeringsportal_hearing_node_view(array &$build, EntityInterface $entity
  $new_title = $title . $state;
  $build['title'][0]['#context']['value'] = $new_title;
  }
-
  }
 }
+
+/**
+ * Implements hook_token_info().
+ *
+ * @see \Drupal\hoeringsportal_hearing\TokenHelper::tokenInfo()
+ */
+function hoeringsportal_hearing_token_info() {
+ return \Drupal::service(TokenHelper::class)->tokenInfo();
+}
+
+/**
+ * Implements hook_tokens().
+ *
+ * @see \Drupal\hoeringsportal_hearing\TokenHelper::tokens()
+ */
+function hoeringsportal_hearing_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
+ return \Drupal::service(TokenHelper::class)->tokens($type, $tokens, $data, $options, $bubbleable_metadata);
+}

web/modules/custom/hoeringsportal_hearing/hoeringsportal_hearing.services.yml

@@ -3,3 +3,5 @@ services:
  class: Drupal\hoeringsportal_hearing\EventSubscriber\EventSubscriber
  tags:
  - {name: event_subscriber}
+
+ Drupal\hoeringsportal_hearing\TokenHelper: