Merge pull request #628 from PEM-Humboldt/release/1.10.0

Release/1.10.0

.eslintrc

@@ -1,6 +1,6 @@
 {
   "extends": "airbnb",
-  "parser": "babel-eslint",
+  "parser": "react-scripts/node_modules/babel-eslint",
   "rules": {
     "react/forbid-prop-types": "off",
     "react/no-array-index-key": "off",
@@ -17,5 +17,8 @@
         "paths": ["src"]
       }
     }
+  },
+  "env": {
+    "browser": true
   }
 }

.github/workflows/feature.yml

@@ -10,15 +10,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v2
       with:
-        node-version: 14.15
-    - run: |
-        npm install -g yarn
-        yarn install
-        yarn workspaces foreach run build-pkg
+        node-version-file: '.nvmrc'
+        cache: yarn
+    - run: yarn install
+    - run: yarn workspaces foreach run build-pkg
     - name: Run linter
       run: yarn workspaces foreach run lint
       env:

.github/workflows/release.yml

@@ -10,15 +10,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v2
       with:
-        node-version: 14.15
-    - run: |
-        npm install -g yarn
-        yarn install
-        yarn workspaces foreach run build-pkg
+        node-version-file: '.nvmrc'
+        cache: yarn
+    - run: yarn install
+    - run: yarn workspaces foreach run build-pkg
     - name: Run linter
       run: yarn workspaces foreach run lint
       env:

.gitignore

@@ -14,3 +14,5 @@ build
 !.yarn/versions
 .pnp.*
 .parcel-cache
+
+packages/**/package-lock.json

.yarnrc.yml

@@ -3,5 +3,7 @@ nodeLinker: node-modules
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: "@yarnpkg/plugin-workspace-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-berry.cjs
+yarnPath: .yarn/releases/yarn-3.1.1.cjs

package.json

@@ -9,48 +9,59 @@
     "lint": "eslint src --ext .js,.jsx"
   },
   "dependencies": {
-    "@material-ui/core": "^4.0.0",
-    "@material-ui/icons": "^4.9.1",
-    "@material-ui/lab": "^4.0.0-alpha.57",
-    "@nivo/bar": "^0.69.0",
-    "@nivo/bullet": "^0.69.1",
-    "@nivo/core": "^0.69.0",
-    "@nivo/line": "^0.69.0",
-    "@nivo/pie": "^0.69.0",
-    "@nivo/tooltip": "^0.69.0",
-    "@vx/axis": "0.0.170",
-    "@vx/glyph": "0.0.170",
-    "@vx/grid": "0.0.170",
-    "@vx/group": "0.0.165",
-    "@vx/responsive": "0.0.165",
-    "@vx/scale": "0.0.165",
-    "@vx/tooltip": "0.0.165",
-    "axios": "0.21.1",
+    "@emotion/react": "~11.7.1",
+    "@emotion/styled": "~11.6.0",
+    "@mui/icons-material": "~5.4.2",
+    "@mui/material": "~5.4.2",
+    "@mui/styles": "~5.4.2",
+    "@nivo/bar": "~0.79.0",
+    "@nivo/bullet": "~0.79.0",
+    "@nivo/core": "~0.79.0",
+    "@nivo/line": "~0.79.0",
+    "@nivo/pie": "~0.79.0",
+    "@nivo/tooltip": "~0.79.0",
+    "@vx/axis": "~0.0.199",
+    "@vx/glyph": "~0.0.199",
+    "@vx/grid": "~0.0.199",
+    "@vx/group": "~0.0.199",
+    "@vx/responsive": "~0.0.199",
+    "@vx/scale": "~0.0.199",
+    "@vx/tooltip": "~0.0.199",
+    "axios": "~0.26.0",
     "cbm-dashboard": "1.0.0",
-    "chart.js": "^2.8.0",
+    "chart.js": "~3.7.1",
     "indicators": "1.0.0",
     "leaflet": "1.4.0",
     "leaflet-draw": "^1.0.4",
-    "prop-types": "15.6.2",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-json-to-csv": "^1.0.4",
+    "prop-types": "15.8.1",
+    "react": "~17.0.2",
+    "react-dom": "~17.0.2",
+    "react-json-to-csv": "~1.0.4",
     "react-leaflet": "2.7.0",
     "react-leaflet-draw": "0.19.0",
-    "react-router-dom": "5.2.0",
+    "react-router-dom": "5.3.0",
     "react-scripts": "4.0.2",
-    "react-spring": "^9.1.2",
-    "styled-components": "^5.2.3"
+    "react-spring": "~9.1.2",
+    "styled-components": "~5.3.3"
+  },
+  "dependenciesMeta": {
+    "@react-spring/core": {
+      "built": false
+    },
+    "parcel": {
+      "built": false
+    }
   },
   "devDependencies": {
-    "eslint": "^7.19.0",
-    "eslint-config-airbnb": "^18.2.1",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.22.0",
-    "eslint-plugin-react-hooks": "^1.7.0",
-    "husky": "^4.3.6",
-    "lint-staged": "^10.5.3"
+    "eslint": "~7.19.0",
+    "eslint-config-airbnb": "~18.2.1",
+    "eslint-plugin-import": "~2.25.4",
+    "eslint-plugin-jsx-a11y": "~6.5.1",
+    "eslint-plugin-react": "~7.22.0",
+    "eslint-plugin-react-hooks": "~1.7.0",
+    "husky": "~4.3.8",
+    "lint-staged": "~10.5.4",
+    "yarn-audit-fix": "~9.0.11"
   },
   "lint-staged": {
     "**/*.{js,jsx}": "eslint"

packages/cbm-dashboard/package.json

@@ -6,33 +6,29 @@
   "dependencies": {
     "@material-ui/core": "^4.11.3",
     "@material-ui/icons": "^4.11.2",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "papaparse": "^5.3.0",
-    "plotly.js": "^1.58.4",
-    "prop-types": "^15.7.2",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-plotly.js": "^2.5.1"
+    "babel-plugin-transform-runtime": "~6.23.0",
+    "papaparse": "~5.3.1",
+    "plotly.js": "~2.9.0",
+    "prop-types": "~15.8.1",
+    "react": "~17.0.2",
+    "react-dom": "~17.0.2",
+    "react-plotly.js": "~2.5.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.10",
-    "@babel/preset-env": "^7.12.11",
-    "@babel/preset-react": "^7.12.10",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^17.1.0",
-    "@rollup/plugin-node-resolve": "^11.2.0",
-    "eslint": "^7.17.0",
-    "eslint-config-airbnb": "^18.2.1",
-    "eslint-config-prettier": "^7.1.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-react": "^7.22.0",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "parcel": "1.12.3",
-    "prettier": "^2.2.1",
-    "rollup": "^2.39.0",
-    "rollup-plugin-css-only": "^3.1.0"
+    "@babel/core": "~7.17.2",
+    "@babel/preset-env": "~7.16.11",
+    "@babel/preset-react": "~7.16.7",
+    "@rollup/plugin-babel": "~5.3.0",
+    "@rollup/plugin-commonjs": "~17.1.0",
+    "@rollup/plugin-node-resolve": "~13.1.3",
+    "eslint": "~7.17.0",
+    "eslint-config-airbnb": "~18.2.1",
+    "eslint-config-prettier": "~7.1.0",
+    "eslint-plugin-prettier": "~3.3.1",
+    "parcel": "1.12.4",
+    "prettier": "~2.5.1",
+    "rollup": "~2.67.2",
+    "rollup-plugin-css-only": "~3.1.0"
   },
   "scripts": {
     "dev": "parcel index.html",

packages/indicators/package.json

@@ -6,31 +6,27 @@
   "dependencies": {
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "^4.11.2",
-    "firebase": "^9.3.0",
-    "prop-types": "^15.7.2",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-masonry-component": "^6.3.0"
+    "firebase": "~9.6.6",
+    "prop-types": "~15.8.1",
+    "react": "~17.0.2",
+    "react-dom": "~17.0.2",
+    "react-masonry-component": "~6.3.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.5",
-    "@babel/preset-env": "^7.15.4",
-    "@babel/preset-react": "^7.14.5",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^20.0.0",
-    "@rollup/plugin-node-resolve": "^13.0.6",
-    "eslint": "^7.17.0",
-    "eslint-config-airbnb": "^18.2.1",
-    "eslint-config-prettier": "^7.1.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-react": "^7.22.0",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "parcel": "^2.0.0-rc.0",
-    "prettier": "^2.3.2",
-    "rollup": "^2.59.0",
-    "rollup-plugin-css-only": "^3.1.0"
+    "@babel/core": "~7.17.2",
+    "@babel/preset-env": "~7.16.11",
+    "@babel/preset-react": "~7.16.7",
+    "@rollup/plugin-babel": "~5.3.0",
+    "@rollup/plugin-commonjs": "~20.0.0",
+    "@rollup/plugin-node-resolve": "~13.1.3",
+    "eslint": "~7.17.0",
+    "eslint-config-airbnb": "~18.2.1",
+    "eslint-config-prettier": "~7.1.0",
+    "eslint-plugin-prettier": "~3.3.1",
+    "parcel": "~2.3.1",
+    "prettier": "~2.5.1",
+    "rollup": "~2.67.2",
+    "rollup-plugin-css-only": "~3.1.0"
   },
   "scripts": {
     "dev": "parcel index.html",

src/app/Uim.jsx

@@ -1,8 +1,8 @@
 import { PropTypes } from 'prop-types';
-import AccountCircle from '@material-ui/icons/AccountCircle';
-import AccountCircleOutlined from '@material-ui/icons/AccountCircleOutlined';
-import CloseIcon from '@material-ui/icons/Close';
-import Modal from '@material-ui/core/Modal';
+import AccountCircle from '@mui/icons-material/AccountCircle';
+import AccountCircleOutlined from '@mui/icons-material/AccountCircleOutlined';
+import CloseIcon from '@mui/icons-material/Close';
+import Modal from '@mui/material/Modal';
 import React, { Component } from 'react';
 
 import AppContext from 'app/AppContext';

src/components/ConfirmationModal.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Modal from '@material-ui/core/Modal';
+import Modal from '@mui/material/Modal';
 
 const ConfirmationModal = ({
   open, onClose, message, onContinue, onCancel, styleCustom,

src/components/DownloadCSV.jsx

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 
-import DownloadIcon from '@material-ui/icons/GetApp';
+import DownloadIcon from '@mui/icons-material/GetApp';
 import CsvDownload from 'react-json-to-csv';
 
 const DownloadCSV = (props) => {

src/components/MapViewer.jsx

@@ -1,8 +1,8 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 
-import { Modal } from '@material-ui/core';
-import CloseIcon from '@material-ui/icons/Close';
+import { Modal } from '@mui/material';
+import CloseIcon from '@mui/icons-material/Close';
 import {
   ImageOverlay,
   Map,
@@ -117,14 +117,14 @@ class MapViewer extends React.Component {
     } = this.props;
     const { openErrorModal } = this.state;
     return (
-      <Map ref={this.mapRef} center={config.params.center} zoom={5} onClick={this.onMapClick}>
+      <Map id="map" ref={this.mapRef} center={config.params.center} zoom={5}>
         {mapTitle}
         <Modal
           aria-labelledby="simple-modal-title"
           aria-describedby="simple-modal-description"
           open={loadingLayer}
           disableAutoFocus
-          container={this}
+          container={() => document.getElementById('map')}
           style={{ position: 'absolute' }}
           BackdropProps={{ style: { position: 'absolute' } }}
         >
@@ -146,10 +146,9 @@ class MapViewer extends React.Component {
           aria-describedby="simple-modal-description"
           open={layerError && openErrorModal}
           onClose={() => { this.setState({ openErrorModal: false }); }}
-          container={this}
+          container={() => document.getElementById('map')}
           style={{ position: 'absolute' }}
           BackdropProps={{ style: { position: 'absolute' } }}
-          disableBackdropClick={false}
         >
           <div className="generalAlarm">
             <h2>
@@ -181,22 +180,7 @@ class MapViewer extends React.Component {
           ))
         )}
         {/* TODO: Catch warning from OpenStreetMap when cannot load the tiles */}
-        {/** TODO: Mostrar bajo este formato raster this.CapaBiomasSogamoso de cada estrategia de
-          Compensaciones */}
-        {/* <WMSTileLayer
-          srs="EPSG:4326"
-          layers="Biotablero:strategy_sogamoso_111_1_c"
-          url="http://indicadores.humboldt.org.co/geoserver/Biotablero/wms?service=WMS&styles=raster_strategy"
-          opacity={1}
-          alt="Regiones"
-          styles="raster_strategy"
-          format="image/png"
-          transparent
-        /> */}
-        {/** TODO: La carga del WMSTileLayer depende del usuario activo,
-            se debe ajustar esta carga cuando se implementen los usuarios */}
         {userLogged && (
-          // TODO: Implementing WMSTileLayer load from Compensator
           <WMSTileLayer
             layers="Biotablero:Regiones_geb"
             format="image/png"