Updated volto-datablocks, volto-embed imports

jsconfig.json

@@ -7,13 +7,13 @@
             "@eeacms/volto-grid-block": [
                 "develop/volto-grid-block/src"
             ],
-            "@eeacms/volto-datablocks": [
+            "volto-datablocks": [
                 "develop/volto-datablocks/src"
             ],
             "volto-addons": [
                 "develop/volto-addons/src"
             ],
-            "@eeacms/volto-embed": [
+            "volto-embed": [
                 "develop/volto-embed/src"
             ],
             "volto-matomo": [

mrs.developer.json

@@ -13,8 +13,7 @@
   "volto-datablocks": {
     "url": "https://github.com/eea/volto-datablocks.git",
     "branch": "master",
-    "path": "src",
-    "package": "@eeacms/volto-datablocks"
+    "path": "src"
   },
   "volto-addons": {
     "url": "https://github.com/eea/volto-addons.git",
@@ -24,8 +23,7 @@
   "volto-embed": {
     "url": "https://github.com/eea/volto-embed.git",
     "branch": "master",
-    "path": "src",
-    "package": "@eeacms/volto-embed"
+    "path": "src"
   },
   "volto-matomo": {
     "url": "https://github.com/eea/volto-matomo.git",

package.json

@@ -34,8 +34,8 @@
     "@eeacms/volto-grid-block",
     "@eeacms/volto-matomo",
     "@eeacms/volto-sentry-rancher-config",
-    "@eeacms/volto-datablocks",
-    "@eeacms/volto-embed",
+    "volto-datablocks",
+    "volto-embed",
     "volto-addons"
   ],
   "scripts": {

src/components/manage/Blocks/DetailedLink/View.jsx

@@ -6,7 +6,7 @@ import { Link } from 'react-router-dom';
 import { settings } from '~/config';
 import cx from 'classnames';
 import './style.css';
-import { deleteQueryParam } from '@eeacms/volto-datablocks/actions';
+import { deleteQueryParam } from 'volto-datablocks/actions';
 
 const getPath = (url) => {
   if (!url) return '';

src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx

@@ -4,8 +4,8 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { isArray } from 'lodash';
 import { Dropdown, Header } from 'semantic-ui-react';
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
-import DiscodataSqlBuilder from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
+import { setQueryParam } from 'volto-datablocks/actions';
+import DiscodataSqlBuilder from 'volto-datablocks/DiscodataSqlBuilder/View';
 import ReactTooltip from 'react-tooltip';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import moment from 'moment';

src/components/manage/Blocks/DiscodataComponents/List/View.jsx

@@ -4,7 +4,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { isArray, isDate } from 'lodash';
 import { Link } from 'react-router-dom';
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import { setQueryParam } from 'volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import moment from 'moment';
 import cx from 'classnames';

src/components/manage/Blocks/DiscodataComponents/Select/View.jsx

@@ -4,7 +4,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { isArray } from 'lodash';
 import { Dropdown } from 'semantic-ui-react';
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import { setQueryParam } from 'volto-datablocks/actions';
 
 import cx from 'classnames';
 

src/components/manage/Blocks/DiscodataComponentsBlock/Edit.jsx

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import qs from 'query-string';
 import View from './View';
-import DiscodataSqlBuilderEdit from '@eeacms/volto-datablocks/DiscodataSqlBuilder/Edit';
+import DiscodataSqlBuilderEdit from 'volto-datablocks/DiscodataSqlBuilder/Edit';
 
 const makeChoices = (keys) => keys && keys.map((k) => [k, k]);
 

src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx

@@ -8,8 +8,8 @@ import { arrayToTree } from 'performant-array-to-tree';
 import qs from 'query-string';
 import { Table, Dropdown, List, Header } from 'semantic-ui-react';
 import './style.css';
-import DiscodataSqlBuilderView from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
-import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
+import DiscodataSqlBuilderView from 'volto-datablocks/DiscodataSqlBuilder/View';
+import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
 import cx from 'classnames';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';

src/components/manage/Blocks/DiscodataOpenlayersMapBlock/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 

src/components/manage/Blocks/DiscodataOpenlayersMapBlock/PrivacyProtection.jsx

@@ -8,7 +8,7 @@ import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';
 import { settings } from '~/config';
 
-import '@eeacms/volto-embed/css/embed-styles.css';
+import 'volto-embed/css/embed-styles.css';
 
 const key = (domain_key) => `accept-${domain_key}`;
 

src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx

@@ -16,7 +16,7 @@ import { isArray } from 'lodash';
 import { Icon as VoltoIcon, Toast } from '@plone/volto/components';
 import PrivacyProtection from './PrivacyProtection';
 // VOLTO-DATABLOCKS
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import { setQueryParam } from 'volto-datablocks/actions';
 // SEMANTIC REACT UI
 import { Grid, Header } from 'semantic-ui-react';
 // SVGs

src/components/manage/Blocks/DiscodataTableBlock/Edit.jsx

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { injectIntl } from 'react-intl';
 import View from './View';
-import DiscodataSqlBuilderEdit from '@eeacms/volto-datablocks/DiscodataSqlBuilder/Edit';
+import DiscodataSqlBuilderEdit from 'volto-datablocks/DiscodataSqlBuilder/Edit';
 
 const schema = {
   itemsCountKey: {

src/components/manage/Blocks/DiscodataTableBlock/View.jsx

@@ -8,8 +8,8 @@ import { Table, Pagination } from 'semantic-ui-react';
 import downSVG from '@plone/volto/icons/down-key.svg';
 import upSVG from '@plone/volto/icons/up-key.svg';
 import { Icon } from '@plone/volto/components';
-import DiscodataSqlBuilderView from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import DiscodataSqlBuilderView from 'volto-datablocks/DiscodataSqlBuilder/View';
+import { setQueryParam } from 'volto-datablocks/actions';
 import { Dimmer, Loader } from 'semantic-ui-react';
 import LinearProgress from '@material/react-linear-progress';
 

src/components/manage/Blocks/FiltersBlock/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 

src/components/manage/Blocks/FiltersBlock/View.jsx

@@ -8,7 +8,7 @@ import { Icon } from '@plone/volto/components';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import { settings } from '~/config';
 import _uniqueId from 'lodash/uniqueId';
 import axios from 'axios';

src/components/manage/Blocks/GlossarySearchBlock/View.jsx

@@ -16,7 +16,7 @@ import {
 } from 'volto-addons/actions';
 import Highlighter from 'react-highlight-words';
 import cx from 'classnames';
-import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
 import './style.css';
 
 const messages = defineMessages({

src/components/manage/Blocks/Iframe/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 import './style.css';

src/components/manage/Blocks/LinkButton/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 

src/components/manage/Blocks/NavigationBlock/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 

src/components/manage/Blocks/NavigationBlock/View.jsx

@@ -15,7 +15,7 @@ import {
 import {
   deleteQueryParam,
   setQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import { useEffect } from 'react';
 
 const View = ({ content, ...props }) => {

src/components/manage/Blocks/PollutantIndex/View.jsx

@@ -2,11 +2,11 @@ import React, { useState, useEffect, useRef } from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { Tab, Dropdown, Table } from 'semantic-ui-react';
-import DiscodataSqlBuilder from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
+import DiscodataSqlBuilder from 'volto-datablocks/DiscodataSqlBuilder/View';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import cx from 'classnames';
 import './style.css';
 

src/components/manage/Blocks/QueryParamButton/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 

src/components/manage/Blocks/QueryParamText/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 import './style.css';

src/components/manage/Blocks/SidebarBlock/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
+import RenderFields from 'volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 

src/components/manage/Blocks/SidebarBlock/View.jsx

@@ -12,7 +12,7 @@ import {
   getBasePath,
 } from 'volto-tabsview/helpers';
 
-import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
 
 import { getFacilities, getInstallations, getLcps } from '~/helpers/api';
 

src/components/manage/Blocks/SiteBlocks/Header/View.jsx

@@ -6,7 +6,7 @@ import QueryBuilder from '../QueryBuilder';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import './style.css';
 
 const View = (props) => {

src/components/manage/Blocks/SiteBlocks/LcpDetails/View.jsx

@@ -6,7 +6,7 @@ import { Link } from 'react-router-dom';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import './style.css';
 
 const View = (props) => {

src/components/manage/Blocks/SiteBlocks/PollutantsFacilityDetails/View.jsx

@@ -5,7 +5,7 @@ import ReactTooltip from 'react-tooltip';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';
 import CompetentAuthority from '../CompetentAuthority';

src/components/manage/Blocks/SiteBlocks/PollutantsSiteDetails/View.jsx

@@ -6,7 +6,7 @@ import ReactTooltip from 'react-tooltip';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import _uniqueId from 'lodash/uniqueId';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import CompetentAuthority from '../CompetentAuthority';

src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef } from 'react';
-import DiscodataSqlBuilder from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
+import DiscodataSqlBuilder from 'volto-datablocks/DiscodataSqlBuilder/View';
 import Flags from '~/components/manage/Blocks/Flags/View';
 
 const QueryBuilder = (props) => {

src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/View.jsx

@@ -5,7 +5,7 @@ import ReactTooltip from 'react-tooltip';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import PermitingAuthority from '../PermitingAuthority';
 import cx from 'classnames';

src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View.jsx

@@ -5,7 +5,7 @@ import ReactTooltip from 'react-tooltip';
 import {
   setQueryParam,
   deleteQueryParam,
-} from '@eeacms/volto-datablocks/actions';
+} from 'volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import PermitingAuthority from '../PermitingAuthority';
 import cx from 'classnames';

src/components/theme/View/DefaultView.jsx

@@ -13,7 +13,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import { Container, Image } from 'semantic-ui-react';
 import { map } from 'lodash';
 import qs from 'query-string';
-import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import { setQueryParam } from 'volto-datablocks/actions';
 
 import { blocks } from '~/config';
 

src/components/theme/View/DiscodataView.jsx

@@ -6,7 +6,7 @@ import qs from 'query-string';
 /* ROOT IMPORTS */
 import DefaultViewNoHeading from './DefaultViewNoHeading';
 /* LOCAL IMPORTS */
-import { getDiscodataResource, setQueryParam } from '@eeacms/volto-datablocks/actions';
+import { getDiscodataResource, setQueryParam } from 'volto-datablocks/actions';
 import { Dimmer, Loader } from 'semantic-ui-react';
 /* =================================================== */
 const DiscodataView = (props) => {

src/config.js

@@ -19,7 +19,7 @@ import {
   installExpendableList,
   installFolderListing,
 } from 'volto-addons';
-import { installDiscodataBlocks } from '@eeacms/volto-datablocks';
+import { installDiscodataBlocks } from 'volto-datablocks';
 import { applyConfig as eprtrConfig } from './localconfig';
 
 const consoleError = console.error.bind(console);

src/customizations/volto/components/theme/App/App.jsx

@@ -102,10 +102,6 @@ class App extends Component {
     const action = getView(this.props.pathname);
     const isCmsUI = isCmsUi(this.props.pathname);
     const ConnectionRefusedView = views.errorViews.ECONNREFUSED;
-    console.error('APP: has error ?', this.state.hasError);
-    if (this.state.hasError) {
-      console.error('APP: error info ', this.state.errorInfo);
-    }
     return (
       <Fragment>
         <BodyClass className={`view-${action}view`} />
@@ -137,7 +133,8 @@ class App extends Component {
           <Segment basic className="content-area">
             <main>
               <OutdatedBrowser />
-              {this.props.connectionRefused ? (
+              <h1>APP</h1>
+              {/* {this.props.connectionRefused ? (
                 <ConnectionRefusedView />
               ) : this.state.hasError ? (
                 <Error
@@ -148,7 +145,7 @@ class App extends Component {
                 renderRoutes(this.props.route.routes, {
                   staticContext: this.props.staticContext,
                 })
-              )}
+              )} */}
             </main>
           </Segment>
         </MultilingualRedirector>