Merge branch 'release/1.10.11'

Htbaa · Htbaa · commit 10c486016382 · 2023-11-28T15:13:07.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+**1.10.11 (2023-11-28)**
+
+- Nieuwe versies van ondersteunende software bibliotheken in gebruik genomen.
+- Fix voor jQuery deprecation van `ready()` in de backend.
+- Als Gutenberg gebruikt werd als editor voor locaties dan werd de kaart om een locatie te selecteren niet weergegeven. Dit is nu opgelost door pas te renderen wanneer Gutenberg klaar is.
+- Action `gh_dim_shortcode` toegevoegd die wordt aangeroepen bij uitvoeren shortcode.
+
 **1.10.10 (2023-09-05)**
 
 - PDOK Locatieserver is verhuisd naar een nieuw adres. Nieuwe URL's overgenomen voor de zoekdienst.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gh-datainmap",
-  "version": "1.10.10",
+  "version": "1.10.11",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -19,36 +19,34 @@
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
     "classnames": "^2.3.1",
-    "core-js": "~3.15.2",
+    "core-js": "~3.33.3",
     "lodash": "^4.17.21",
-    "ol": "~6.5.0",
-    "proj4": "^2.7.5",
+    "ol": "~8.2.0",
+    "proj4": "^2.9.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-redux": "^7.2.2",
     "react-transition-group": "^4.4.2",
-    "redux": "^4.1.1",
+    "redux": "^4.2.1",
     "redux-debounced": "^0.5.0",
     "redux-devtools-extension": "^2.13.9",
     "redux-thunk": "^2.3.0",
-    "whatwg-fetch": "^3.6.1"
+    "whatwg-fetch": "^3.6.19"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/preset-env": "^7.15.0",
-    "@babel/preset-react": "^7.14.5",
-    "archiver": "^4.0.2",
-    "babel-loader": "^8.2.2",
+    "@babel/core": "^7.23.3",
+    "@babel/preset-env": "^7.23.3",
+    "@babel/preset-react": "^7.23.3",
+    "babel-loader": "^9.1.3",
     "babel-preset-react": "^6.24.1",
-    "css-loader": "^3.6.0",
-    "html-loader": "^0.5.5",
-    "markdown-it": "^12.0.4",
+    "css-loader": "^6.8.1",
+    "html-loader": "^4.2.0",
     "node-sass": "^7.0.3",
     "remote-redux-devtools": "^0.5.16",
     "sass": "^1.35.1",
-    "sass-loader": "^10.0.0",
-    "style-loader": "^1.3.0",
-    "webpack": "^4.46.0",
-    "webpack-cli": "^3.3.12"
+    "sass-loader": "^13.3.2",
+    "style-loader": "^3.3.3",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.1.4"
   }
 }
diff --git a/plugins/gh-datainmap/DESCRIPTION.md b/plugins/gh-datainmap/DESCRIPTION.md
@@ -16,7 +16,7 @@ Met de zoekfunctie, welke gebruik maakt van de API van PDOK, is het mogelijk om
 
 # Licentie
 
-Copyright 2020-2022 Gemeente Heerenveen
+Copyright 2020-2023 Gemeente Heerenveen
 
 Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/gh-datainmap.php b/plugins/gh-datainmap/gh-datainmap.php
@@ -3,7 +3,7 @@
 Plugin Name: Data In Map
 Plugin URI: https://github.com/OpenWebconcept/plugin-datainmap
 Description: Data In Map is a plugin for displaying maps.
-Version: 1.10.10
+Version: 1.10.11
 Requires at least: 5.0
 Requires PHP: 7.2
 Author: Gemeente Heerenveen
@@ -12,7 +12,7 @@
 License URI: https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
 License: EUPL v1.2
 
-Copyright 2020-2022 Gemeente Heerenveen
+Copyright 2020-2023 Gemeente Heerenveen
 
 Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 You may not use this work except in compliance with the Licence.
@@ -26,7 +26,7 @@
 */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
-if ( ! defined('GH_DIM_VERSION')) define('GH_DIM_VERSION', '1.10.10');
+if ( ! defined('GH_DIM_VERSION')) define('GH_DIM_VERSION', '1.10.11');
 if ( ! defined('GH_DIM_FILE')) define('GH_DIM_FILE', __FILE__);
 if ( ! defined('GH_DIM_DIR')) define('GH_DIM_DIR', dirname(__FILE__));
 if ( ! defined('GH_DIM_DEBUG')) define('GH_DIM_DEBUG', false);
diff --git a/plugins/gh-datainmap/includes/ajax.php b/plugins/gh-datainmap/includes/ajax.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/menus.php b/plugins/gh-datainmap/includes/menus.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/metaboxes.php b/plugins/gh-datainmap/includes/metaboxes.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/post-type.php b/plugins/gh-datainmap/includes/post-type.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/settings.php b/plugins/gh-datainmap/includes/settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/shortcode.php b/plugins/gh-datainmap/includes/shortcode.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
@@ -178,6 +178,7 @@ function($a) {
         'proj4' => $proj4,
     ];
 
+    do_action('gh_dim_shortcode');
     $script_open = '<script type="text/javascript">';
     $script_contents = 'var GHDataInMap = '.wp_json_encode($GHDataInMap) . ';';
     $script_close = '</script>';
diff --git a/plugins/gh-datainmap/includes/tax-meta-image.php b/plugins/gh-datainmap/includes/tax-meta-image.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/taxonomy.php b/plugins/gh-datainmap/includes/taxonomy.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/plugins/gh-datainmap/includes/utils.php b/plugins/gh-datainmap/includes/utils.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/actions.js b/src/actions.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/admin-layers.js b/src/admin-layers.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/admin-location.js b/src/admin-location.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
@@ -39,7 +39,7 @@ const fieldsToggler = (selectFieldId, allFields = [], visibleFields = []) => {
 };
 
 // Location type (point, polygon etc.)
-$(document).ready(function() {
+$(function() {
     const allFields = [
         '#gh_dim_location_type',
         '#gh_dim_location',
diff --git a/src/admin-locationpicker.js b/src/admin-locationpicker.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
@@ -252,8 +252,5 @@ const App = () => {
         </Provider>
     )
 };
-
 // Delay rendering to prevent a hidden map with Gutenberg
-setTimeout(() => {
-    ReactDOM.render( App(), document.getElementById( settings.element ) );
-}, 50);
+wp.domReady(() => ReactDOM.render( App(), document.getElementById( settings.element ) ));
diff --git a/src/components/feature.js b/src/components/feature.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/components/featureslistbox.js b/src/components/featureslistbox.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/components/filter.js b/src/components/filter.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/components/map.js b/src/components/map.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
@@ -46,7 +46,7 @@ export class MapComponent extends Component {
         // Get zoom elements so we can provide them with a proper aria-label
         this.olMap.getControls().forEach((control) => {
             if(control.element.className.indexOf('ol-zoom') != -1) {
-                control.element.children.forEach((el) => {
+                Array.from(control.element.children).forEach((el) => {
                     el.setAttribute('aria-label', el.getAttribute('title') + ' ' + el.textContent);
                 });
             }
@@ -261,7 +261,7 @@ export class MapComponent extends Component {
         }
 
         const mapElement = this.refMap.current;
-        mapElement.getElementsByTagName('canvas').forEach((el) => {
+        Array.from(mapElement.getElementsByTagName('canvas')).forEach((el) => {
             el.setAttribute('aria-label', 'Kaart');
             el.setAttribute('role', 'img');
         });
diff --git a/src/components/search.js b/src/components/search.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/components/toggler.js b/src/components/toggler.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/containers/featurelink.js b/src/containers/featurelink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/containers/filterlink.js b/src/containers/filterlink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/containers/maplink.js b/src/containers/maplink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/containers/searchlink.js b/src/containers/searchlink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/containers/togglerlink.js b/src/containers/togglerlink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/datainmap.js b/src/datainmap.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/reducers/feature.js b/src/reducers/feature.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/reducers/filter.js b/src/reducers/filter.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/reducers/map.js b/src/reducers/map.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/util/feature.js b/src/util/feature.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/src/util/map-animations.js b/src/util/map-animations.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2022 Gemeente Heerenveen
+* Copyright 2020-2023 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
diff --git a/webpack.config.js b/webpack.config.js
@@ -82,7 +82,7 @@ module.exports = {
     devtool: 'cheap-source-map'
 };
 
-function licenseText() { return `Copyright 2020-2022 Gemeente Heerenveen
+function licenseText() { return `Copyright 2020-2023 Gemeente Heerenveen
 
 Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 You may not use this work except in compliance with the Licence.

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`/*`
`3`		`-* Copyright 2020-2022 Gemeente Heerenveen`
	`3`	`+* Copyright 2020-2023 Gemeente Heerenveen`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");`
`6`	`6`	`* You may not use this work except in compliance with the Licence.`