@eeacms/volto-arcgis-block 0.1.252 → 0.1.254

package/CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [0.1.254](https://github.com/eea/volto-arcgis-block/compare/0.1.253...0.1.254) - 29 January 2024
+
+### [0.1.253](https://github.com/eea/volto-arcgis-block/compare/0.1.252...0.1.253) - 29 January 2024
+
+#### :hammer_and_wrench: Others
+
+- arcgis rollback [Unai Bolivar - [`10c2f5b`](https://github.com/eea/volto-arcgis-block/commit/10c2f5b527d398019360b83bf92dec04e76c1951)]
+- arcgis rollback attempted again [Unai Bolivar - [`a2e8d8a`](https://github.com/eea/volto-arcgis-block/commit/a2e8d8a9ce184c69af4941403863a8af3bf9a50c)]
+- Removed .eslintrc added by auto commit in favor of the existing eslintrc [David Ichim - [`06f72ad`](https://github.com/eea/volto-arcgis-block/commit/06f72ad9295ac0779ecbc302413c2f6fc930db95)]
+- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`3342be4`](https://github.com/eea/volto-arcgis-block/commit/3342be4ece40d845b0dea9b74d95f98981af42dc)]
+- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`71ba8d5`](https://github.com/eea/volto-arcgis-block/commit/71ba8d55b836cda0a52198c16f7d95da4324c711)]
+- arcgis rollback revised [Unai Bolivar - [`5a7954d`](https://github.com/eea/volto-arcgis-block/commit/5a7954de4cf0009a26804e707f850c855f9a09d8)]
+- arcgis rollback [Unai Bolivar - [`80def4b`](https://github.com/eea/volto-arcgis-block/commit/80def4b1c3605d118cc54863ee131080f9887be2)]
 ### [0.1.252](https://github.com/eea/volto-arcgis-block/compare/0.1.251...0.1.252) - 25 January 2024
 
 #### :hammer_and_wrench: Others

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2024-01-25T07:53:02.154Z\n"
+"POT-Creation-Date: 2024-01-25T15:51:08.167Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.252",
+  "version": "0.1.254",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",

package/src/components/MapViewer/InfoWidget.jsx

@@ -389,115 +389,61 @@ class InfoWidget extends React.Component {
   identifyWMS(layer, event) {
     let layerId = this.getLayerName(layer);
     let url = layer.featureInfoUrl ? layer.featureInfoUrl : layer.url;
-    if (this?.props?.hotspotData) {
-      for (let key in this.props.hotspotData) {
-        let item = this.props.hotspotData[key];
-        for (let prop in item) {
-          if (prop === layerId) {
-            return esriRequest(url, {
-              responseType: 'html',
-              sync: 'true',
-              query: {
-                request: 'GetFeatureInfo',
-                service: 'WMS',
-                version: '1.3.0',
-                SRS: 'EPSG:' + this.props.view.spatialReference.latestWkid,
-                CRS: 'EPSG:' + this.props.view.spatialReference.latestWkid,
-                BBOX:
-                  '' +
-                  this.props.view.extent.xmin +
-                  ', ' +
-                  this.props.view.extent.ymin +
-                  ', ' +
-                  this.props.view.extent.xmax +
-                  ', ' +
-                  this.props.view.extent.ymax,
-                HEIGHT: this.props.view.height,
-                WIDTH: this.props.view.width,
-                X: event.screenPoint.x,
-                Y: event.screenPoint.y,
-                QUERY_LAYERS: layerId,
-                INFO_FORMAT: 'application/json',
-                TIME: '/',
-                FEATURE_COUNT: '' + 1,
-              },
-            })
-              .then((response) => {
-                let format = response.requestOptions.query.INFO_FORMAT;
-                let data;
-                if (format.includes('text')) {
-                  data = new window.DOMParser().parseFromString(
-                    response.data,
-                    'text/html',
-                  );
-                } else if (format.includes('json')) {
-                  data = JSON.parse(response.data);
-                }
-                return data;
-              })
-              .then((data) => {
-                return data;
-              });
-          }
-        }
+    return this.wmsCapabilities(url).then((xml) => {
+      let version = this.parseCapabilities(xml, 'wms_capabilities')[0]
+        .attributes['version'];
+      let format = this.parseFormat(xml, layerId);
+      let times = '';
+      let nTimes = 1;
+      if (layer.isTimeSeries) {
+        times = this.parseTime(xml, layerId);
+        nTimes = times.length;
       }
-    } else {
-      return this.wmsCapabilities(url).then((xml) => {
-        let version = this.parseCapabilities(xml, 'wms_capabilities')[0]
-          .attributes['version'];
-        let format = this.parseFormat(xml);
-        let times = '';
-        let nTimes = 1;
-        if (layer.isTimeSeries) {
-          times = this.parseTime(xml, layerId);
-          nTimes = times.length;
-        }
-        return esriRequest(url, {
-          responseType: 'html',
-          sync: 'true',
-          query: {
-            request: 'GetFeatureInfo',
-            service: 'WMS',
-            version: version,
-            SRS: 'EPSG:' + this.props.view.spatialReference.latestWkid,
-            CRS: 'EPSG:' + this.props.view.spatialReference.latestWkid,
-            BBOX:
-              '' +
-              this.props.view.extent.xmin +
-              ', ' +
-              this.props.view.extent.ymin +
-              ', ' +
-              this.props.view.extent.xmax +
-              ', ' +
-              this.props.view.extent.ymax,
-            HEIGHT: this.props.view.height,
-            WIDTH: this.props.view.width,
-            X: event.screenPoint.x,
-            Y: event.screenPoint.y,
-            QUERY_LAYERS: layerId,
-            INFO_FORMAT: format,
-            TIME: times ? times[0] + '/' + times[nTimes - 1] : '',
-            FEATURE_COUNT: '' + nTimes,
-          },
+      return esriRequest(url, {
+        responseType: 'html',
+        sync: 'true',
+        query: {
+          request: 'GetFeatureInfo',
+          service: 'WMS',
+          version: version,
+          SRS: 'EPSG:' + this.props.view.spatialReference.latestWkid,
+          CRS: 'EPSG:' + this.props.view.spatialReference.latestWkid,
+          BBOX:
+            '' +
+            this.props.view.extent.xmin +
+            ', ' +
+            this.props.view.extent.ymin +
+            ', ' +
+            this.props.view.extent.xmax +
+            ', ' +
+            this.props.view.extent.ymax,
+          HEIGHT: this.props.view.height,
+          WIDTH: this.props.view.width,
+          X: event.screenPoint.x,
+          Y: event.screenPoint.y,
+          QUERY_LAYERS: layerId,
+          INFO_FORMAT: format,
+          TIME: times ? times[0] + '/' + times[nTimes - 1] : '',
+          FEATURE_COUNT: '' + nTimes,
+        },
+      })
+        .then((response) => {
+          let format = response.requestOptions.query.INFO_FORMAT;
+          let data;
+          if (format.includes('text')) {
+            data = new window.DOMParser().parseFromString(
+              response.data,
+              'text/html',
+            );
+          } else if (format.includes('json')) {
+            data = JSON.parse(response.data);
+          }
+          return data; // Added return statement
         })
-          .then((response) => {
-            let format = response.requestOptions.query.INFO_FORMAT;
-            let data;
-            if (format.includes('text')) {
-              data = new window.DOMParser().parseFromString(
-                response.data,
-                'text/html',
-              );
-            } else if (format.includes('json')) {
-              data = JSON.parse(response.data);
-            }
-            return data;
-          })
-          .then((data) => {
-            return data;
-          });
-      });
-    }
+        .then((data) => {
+          return data;
+        });
+    });
   }
 
   wmsCapabilities(url) {

package/src/components/MapViewer/LoadingSpinner.jsx

@@ -1,7 +1,5 @@
 import React, { createRef } from 'react';
 import './css/ArcgisMap.css';
-import { loadModules } from 'esri-loader';
-var watchUtils;
 class LoadingSpinner extends React.Component {
   constructor(props) {
     super(props);
@@ -16,12 +14,6 @@ class LoadingSpinner extends React.Component {
     this.listenForLayerChanges = this.listenForLayerChanges.bind(this);
   }
 
-  loader() {
-    return loadModules(['esri/core/watchUtils']).then(([_watchUtils]) => {
-      watchUtils = _watchUtils;
-    });
-  }
-
   listenForLayerChanges() {
     this.props.view.map.layers.on('change', (event) => {
       if (event.added.length > 0)
@@ -62,25 +54,12 @@ class LoadingSpinner extends React.Component {
   }
 
   async componentDidMount() {
-    await this.loader();
-    //this.props.view.when(() => {
-    //  this.props.view.ui.add(this.container.current, 'manual');
-    //  this.listenForLayerChanges();
-    //});
-    watchUtils.when(this.props.view, 'ready', (isReady) => {
-      if (isReady) {
-        this.props.view.ui.add(this.container.current, 'manual');
-        this.listenForLayerChanges();
-      }
+    this.props.view.when(() => {
+      this.props.view.ui.add(this.container.current, 'manual');
+      this.listenForLayerChanges();
     });
   }
 
-  componentDidUpdate(prevState) {
-    //    if (this.state.loading !== prevState.loading) {
-    //      this.showLoading();
-    //    }
-  }
-
   render() {
     return (
       <div

package/.eslintrc.js

@@ -1,55 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const projectRootPath = fs.existsSync('./project')
-  ? fs.realpathSync('./project')
-  : fs.realpathSync('./../../../');
-const packageJson = require(path.join(projectRootPath, 'package.json'));
-const jsConfig = require(path.join(projectRootPath, 'jsconfig.json')).compilerOptions;
-
-const pathsConfig = jsConfig.paths;
-
-let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto');
-
-Object.keys(pathsConfig).forEach(pkg => {
-  if (pkg === '@plone/volto') {
-    voltoPath = `./${jsConfig.baseUrl}/${pathsConfig[pkg][0]}`;
-  }
-});
-const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
-const reg = new AddonConfigurationRegistry(projectRootPath);
-
-// Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
-const addonAliases = Object.keys(reg.packages).map(o => [
-  o,
-  reg.packages[o].modulePath,
-]);
-
-
-module.exports = {
-  extends: `${projectRootPath}/node_modules/@plone/volto/.eslintrc`,
-  settings: {
-    'import/resolver': {
-      alias: {
-        map: [
-          ['@plone/volto', '@plone/volto/src'],
-          ...addonAliases,
-          ['@package', `${__dirname}/src`],
-          ['~', `${__dirname}/src`],
-        ],
-        extensions: ['.js', '.jsx', '.json'],
-      },
-      'babel-plugin-root-import': {
-        rootPathSuffix: 'src',
-      },
-    },
-  },
-  rules: {
-    'react/jsx-no-target-blank': [
-      'error',
-      {
-        allowReferrer: true,
-      },
-    ],
-  }
-};

package/.project.eslintrc.js

@@ -1,46 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const projectRootPath = fs.realpathSync('./project');    // __dirname
-const packageJson = require(path.join(projectRootPath, 'package.json'));
-const jsConfig = require(path.join(projectRootPath, 'jsconfig.json')).compilerOptions;
-
-const pathsConfig = jsConfig.paths;
-
-let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto');
-
-Object.keys(pathsConfig).forEach(pkg => {
-  if (pkg === '@plone/volto') {
-    voltoPath = `./${jsConfig.baseUrl}/${pathsConfig[pkg][0]}`;
-  }
-});
-const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
-const reg = new AddonConfigurationRegistry(projectRootPath);
-
-// Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
-const addonAliases = Object.keys(reg.packages).map(o => [
-  o,
-  reg.packages[o].modulePath,
-]);
-
-
-module.exports = {
-  extends: `${projectRootPath}/node_modules/@plone/volto/.eslintrc`,
-  settings: {
-    'import/resolver': {
-      alias: {
-        map: [
-          ['@plone/volto', '@plone/volto/src'],
-          ...addonAliases,
-          ['@package', `${__dirname}/src`],
-          ['~', `${__dirname}/src`],
-        ],
-        extensions: ['.js', '.jsx', '.json'],
-      },
-      'babel-plugin-root-import': {
-        rootPathSuffix: 'src',
-      },
-    },
-  },
-};
-