@eeacms/volto-arcgis-block 0.1.292 → 0.1.294

package/.eslintrc.js

@@ -0,0 +1,61 @@
+const fs = require('fs');
+const path = require('path');
+const projectRootPath = fs.realpathSync(__dirname + '/../../../');
+
+let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto');
+let configFile;
+if (fs.existsSync(`${projectRootPath}/tsconfig.json`))
+  configFile = `${projectRootPath}/tsconfig.json`;
+else if (fs.existsSync(`${projectRootPath}/jsconfig.json`))
+  configFile = `${projectRootPath}/jsconfig.json`;
+
+if (configFile) {
+  const jsConfig = require(configFile).compilerOptions;
+  const pathsConfig = jsConfig.paths;
+  if (pathsConfig['@plone/volto'])
+    voltoPath = `./${jsConfig.baseUrl}/${pathsConfig['@plone/volto'][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,
+]);
+
+const addonExtenders = reg.getEslintExtenders().map((m) => require(m));
+
+const defaultConfig = {
+  extends: `${voltoPath}/.eslintrc`,
+  settings: {
+    'import/resolver': {
+      alias: {
+        map: [
+          ['@plone/volto', '@plone/volto/src'],
+          ['@plone/volto-slate', '@plone/volto/packages/volto-slate/src'],
+          ['@root/routes', '@plone/volto/src'],
+          ...addonAliases,
+          ['@package', `${__dirname}/src`],
+          // ['@root', `${__dirname}/src`],
+          ['~', `${__dirname}/src`],
+        ],
+        extensions: ['.js', '.jsx', '.json'],
+      },
+      'babel-plugin-root-import': {
+        rootPathSuffix: 'src',
+      },
+    },
+  },
+  rules: {
+    'react/jsx-no-target-blank': 'off',
+  },
+};
+
+const config = addonExtenders.reduce(
+  (acc, extender) => extender.modify(acc),
+  defaultConfig,
+);
+
+module.exports = config;

package/CHANGELOG.md

@@ -4,6 +4,21 @@ 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.294](https://github.com/eea/volto-arcgis-block/compare/0.1.293...0.1.294) - 11 July 2024
+
+#### :hammer_and_wrench: Others
+
+- Update dependency on volto-clms-utils [Tiberiu Ichim - [`dc12ac0`](https://github.com/eea/volto-arcgis-block/commit/dc12ac0ec9c8a7be4a05beefa016f25e026d0164)]
+- No need for this lib; add proper eslintrc [Tiberiu Ichim - [`427bf65`](https://github.com/eea/volto-arcgis-block/commit/427bf65ee2a6094eee107fc671be2ae3ad2c10dd)]
+- Use component from volto-clms-utils [Tiberiu Ichim - [`093591c`](https://github.com/eea/volto-arcgis-block/commit/093591cae60b774a18a5f665debff3e2c20a8902)]
+- Fix name of library [Tiberiu Ichim - [`9479a3c`](https://github.com/eea/volto-arcgis-block/commit/9479a3c9c319812f3c886ecd39dcd547667316bc)]
+- Lazyload highcharts [Tiberiu Ichim - [`f4d45cd`](https://github.com/eea/volto-arcgis-block/commit/f4d45cd01fb41b77119f581da2ac1aab010dacae)]
+### [0.1.293](https://github.com/eea/volto-arcgis-block/compare/0.1.292...0.1.293) - 3 July 2024
+
+#### :hammer_and_wrench: Others
+
+- Merge pull request #795 from eea/develop [Unai Bolivar - [`cc47124`](https://github.com/eea/volto-arcgis-block/commit/cc47124271a918b3ff95653483b161f418335ecc)]
+- CLMS-271616 CLMS-270893 (Feat): Scroll position solved when accessing from portfolio [Urkorue - [`d3d5705`](https://github.com/eea/volto-arcgis-block/commit/d3d5705418acf28f256046e7d86f1380ddbb5723)]
 ### [0.1.292](https://github.com/eea/volto-arcgis-block/compare/0.1.291...0.1.292) - 28 June 2024
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.292",
+  "version": "0.1.294",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",
@@ -58,7 +58,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@eeacms/volto-clms-utils": "0.1.12",
+    "@eeacms/volto-clms-utils": "^0.1.13",
     "@fortawesome/fontawesome-svg-core": "1.2.35",
     "@fortawesome/free-solid-svg-icons": "5.15.3",
     "@fortawesome/react-fontawesome": "0.1.14",

package/src/components/MapViewer/AreaWidget.jsx

@@ -1,6 +1,6 @@
 import React, { createRef } from 'react';
 import { loadModules } from 'esri-loader';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { FontAwesomeIcon } from '@eeacms/volto-clms-utils/components';
 
 var Graphic,
   Extent,

package/src/components/MapViewer/InfoWidget.jsx

@@ -1,11 +1,16 @@
 import React, { createRef } from 'react';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { loadModules } from 'esri-loader';
-import Highcharts from 'highcharts';
-import HighchartsReact from 'highcharts-react-official';
 import { Loader } from 'semantic-ui-react';
+import loadable from '@loadable/component';
+import { injectLazyLibs } from '@plone/volto/helpers/Loadable';
+import { FontAwesomeIcon } from '@eeacms/volto-clms-utils/components';
+
 var GeometryEngine, Graphic, esriRequest;
 
+// import Highcharts from 'highcharts';
+
+const HighchartsReact = loadable(() => import('highcharts-react-official'));
+
 class InfoWidget extends React.Component {
   /**
    * Creator of the InfoWidget widget class
@@ -22,9 +27,10 @@ class InfoWidget extends React.Component {
     this.menuClass =
       'esri-icon-description esri-widget--button esri-widget esri-interactive';
     this.infoData = {};
+    this.Highcharts = props.highcharts;
   }
 
-  loader() {
+  async loader() {
     return loadModules([
       'esri/geometry/geometryEngine',
       'esri/Graphic',
@@ -1072,7 +1078,7 @@ class InfoWidget extends React.Component {
                       <>
                         {this.loadVariableSelector(this.state.layerIndex)}
                         <HighchartsReact
-                          highcharts={Highcharts}
+                          highcharts={this.Highcharts}
                           options={this.loadInfoChart(this.state.layerIndex)}
                         />
                         {this.loadStatisticsSelector(this.state.layerIndex)}
@@ -1111,4 +1117,4 @@ class InfoWidget extends React.Component {
   }
 }
 
-export default InfoWidget;
+export default injectLazyLibs('highcharts')(InfoWidget);

package/src/components/MapViewer/MenuWidget.jsx

@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom';
 import React, { createRef } from 'react';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { FontAwesomeIcon } from '@eeacms/volto-clms-utils/components';
 import { loadModules, loadCss } from 'esri-loader';
 import useCartState from '@eeacms/volto-clms-utils/cart/useCartState';
 import { Modal, Popup } from 'semantic-ui-react';
@@ -955,7 +955,7 @@ class MenuWidget extends React.Component {
             .setAttribute('aria-expanded', 'true');
           let mapMenu = document
             .querySelector(elem + ' input')
-            .closest('.map-menu-dataset');
+            .closest('.map-menu-dataset-dropdown');
           if (mapMenu) {
             // mapMenu is null for Corine and was blocking.
             scrollPosition = mapMenu.offsetTop;
@@ -1938,7 +1938,7 @@ class MenuWidget extends React.Component {
     //CLMS-2684
     //let zoom = this.view.get('zoom');
     /* let scale = this.view.scale;
-    Object.keys(this.activeLayersJSON).forEach((key) => { 
+    Object.keys(this.activeLayersJSON).forEach((key) => {
       let activeLayer = this.activeLayersJSON[key];
       let layerTitle = activeLayer.props.children[0].props.children;
       if (layerTitle.includes('raster')) {
@@ -2273,28 +2273,28 @@ class MenuWidget extends React.Component {
 
     // Create node
     let template = `
-    <div class="esri-legend__layer"> 
-      <div class="esri-legend__layer-table esri-legend__layer-table--size-ramp" > 
-        <div class="esri-legend__layer-caption"> 
-          ${title} 
-        </div> 
-        <div class="esri-legend__layer-body"> 
-          <div class="esri-legend__layer-row"> 
-            <div class="esri-legend__layer-cell esri-legend__layer-cell--symbols" > 
-              <div class="esri-legend__symbol"> 
-                <img crossorigin="anonymous" 
-                  alt="" 
+    <div class="esri-legend__layer">
+      <div class="esri-legend__layer-table esri-legend__layer-table--size-ramp" >
+        <div class="esri-legend__layer-caption">
+          ${title}
+        </div>
+        <div class="esri-legend__layer-body">
+          <div class="esri-legend__layer-row">
+            <div class="esri-legend__layer-cell esri-legend__layer-cell--symbols" >
+              <div class="esri-legend__symbol">
+                <img crossorigin="anonymous"
+                  alt=""
                   src="${imageURL}"
-                  style="opacity: 1" 
-                /> 
-              </div> 
-            </div> 
-            <div 
+                  style="opacity: 1"
+                />
+              </div>
+            </div>
+            <div
               class="esri-legend__layer-cell esri-legend__layer-cell--info"
-            ></div> 
-          </div> 
-        </div> 
-      </div> 
+            ></div>
+          </div>
+        </div>
+      </div>
     </div>`;
 
     node.innerHTML = template;

package/src/components/UseCasesMapViewer/InfoWidget.jsx

@@ -1,6 +1,6 @@
 import React, { createRef } from 'react';
 import { Loader } from 'semantic-ui-react';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { FontAwesomeIcon } from '@eeacms/volto-clms-utils/components';
 
 let layerControl,
   navigationControl,

package/src/index.js

@@ -1,3 +1,5 @@
+import loadable from '@loadable/component';
+
 import world from '@plone/volto/icons/world.svg';
 import menu from '@plone/volto/icons/menu.svg';
 
@@ -11,7 +13,8 @@ import { ARCGIS_BLOCK } from '@eeacms/volto-arcgis-block/constants';
 import { USE_CASES_BLOCK } from '@eeacms/volto-arcgis-block/constants';
 // CUSTOM REDUCERS IMPORT
 import reducers from './reducers';
-export default (config) => {
+
+export default function applyConfig(config) {
   config.blocks.blocksConfig[ARCGIS_BLOCK] = {
     id: ARCGIS_BLOCK, // The name (id) of the block
     title: 'Arcgis Map', // The display name of the block
@@ -61,5 +64,10 @@ export default (config) => {
     ...config.addonReducers,
     ...reducers,
   };
+
+  config.settings.loadables.highcharts = loadable.lib(() =>
+    import('highcharts'),
+  );
+
   return config;
-};
+}