@eeacms/volto-bise-policy 1.3.11 → 1.3.13

package/src/index.js

@@ -1,5 +1,6 @@
 import { getBlocks } from '@plone/volto/helpers/Blocks/Blocks';
 import installLink from '@plone/volto-slate/editor/plugins/AdvancedLink';
+import { clientOnly } from '@eeacms/volto-openlayers-map';
 import { addStylingFieldsetSchemaEnhancer } from '@eeacms/volto-bise-policy/components/manage/Blocks/schema';
 
 import installBlocks from './components/manage/Blocks';
@@ -40,6 +41,40 @@ import {
 } from './components/Widgets/NRRWidgets';
 import RichTextWidget from './components/Widgets/RichTextWidget';
 
+// @eeacms/volto-openlayers-map registers one lazy loadable per `ol/*`
+// namespace, which makes webpack emit one async chunk (one script request)
+// for each of them. Point every loadable at the single `./openlayers` chunk
+// instead: see `src/openlayers.js` for the details.
+const OPENLAYERS_BUNDLES = {
+  ol: 'ol',
+  olControl: 'control',
+  olCoordinate: 'coordinate',
+  olExtent: 'extent',
+  olFormat: 'format',
+  olGeom: 'geom',
+  olInteraction: 'interaction',
+  olLayer: 'layer',
+  olLoadingstrategy: 'loadingstrategy',
+  olProj: 'proj',
+  olSource: 'source',
+  olStyle: 'style',
+  olTilegrid: 'tilegrid',
+  olOverlay: 'overlay',
+  olEvents: 'events',
+  olCondition: 'condition',
+  olRender: 'render',
+};
+
+const openlayersLoadables = () =>
+  Object.fromEntries(
+    Object.entries(OPENLAYERS_BUNDLES).map(([name, bundle]) => [
+      name,
+      clientOnly(() =>
+        import('./openlayers').then((module) => module.bundles[bundle]),
+      ),
+    ]),
+  );
+
 const restrictedBlocks = ['imagecards', 'embed_eea_tableau_block'];
 
 const customBlocks = [
@@ -84,6 +119,10 @@ const applyConfig = (config) => {
   config.settings = {
     ...config.settings,
     navDepth: 3,
+    loadables: {
+      ...config.settings.loadables,
+      ...openlayersLoadables(),
+    },
   };
 
   // Multi-lingual

package/src/openlayers.js

@@ -0,0 +1,51 @@
+/**
+ * Single code-split entry point for OpenLayers.
+ *
+ * `@eeacms/volto-openlayers-map` registers one lazy loadable per `ol/*`
+ * namespace (17 of them). Webpack emits a separate async chunk for each
+ * `import()`, so the first map on a page costs 17 extra script requests.
+ *
+ * Every loadable is pointed at this module instead (see `src/index.js`), so
+ * webpack emits a single chunk that they all share. Keeping the namespaces in
+ * one module preserves the module shape the add-on's components expect
+ * (`withOpenLayers` reads `ol.*`, `olOverlay.default`, etc.).
+ */
+import * as ol from 'ol';
+import * as control from 'ol/control';
+import * as coordinate from 'ol/coordinate';
+import * as extent from 'ol/extent';
+import * as format from 'ol/format';
+import * as geom from 'ol/geom';
+import * as interaction from 'ol/interaction';
+import * as layer from 'ol/layer';
+import * as loadingstrategy from 'ol/loadingstrategy';
+import * as proj from 'ol/proj';
+import * as source from 'ol/source';
+import * as style from 'ol/style';
+import * as tilegrid from 'ol/tilegrid';
+import Overlay from 'ol/Overlay';
+import * as events from 'ol/events';
+import * as condition from 'ol/events/condition';
+import * as render from 'ol/render';
+
+export const bundles = {
+  ol,
+  control,
+  coordinate,
+  extent,
+  format,
+  geom,
+  interaction,
+  layer,
+  loadingstrategy,
+  proj,
+  source,
+  style,
+  tilegrid,
+  // `withOpenLayers` reads `loaded.olOverlay.default`, so keep the ES module
+  // shape the `import('ol/Overlay')` loadable used to provide.
+  overlay: { default: Overlay },
+  events,
+  condition,
+  render,
+};

package/src/components/manage/Blocks/CaseStudyExplorer/CaseStudyFilters.jsx

@@ -1,383 +0,0 @@
-import React from 'react';
-
-import { centerAndResetMapZoom, scrollToElement } from './utils';
-import { withOpenLayers } from '@eeacms/volto-openlayers-map';
-
-const normalizeSearchInput = (searchInput) => searchInput.trim().toLowerCase();
-
-export function CaseStudyFilter(props) {
-  const {
-    filterTitle,
-    filters,
-    activeFilters,
-    setActiveFilters,
-    filterName,
-    map,
-    ol,
-  } = props;
-  const filterEntries = Object.entries(filters?.[filterName] || {});
-
-  const showInputs = (event) => {
-    event.currentTarget.parentElement.classList.add('active');
-  };
-
-  return (
-    <div className="filter-wrapper">
-      <button
-        className="ui basic button facet-btn"
-        disabled={!filterEntries.length}
-        onClick={(e) => showInputs(e)}
-      >
-        <span>
-          {filterTitle}
-          <i aria-hidden="true" className="icon angle down"></i>
-        </span>
-      </button>
-      <div className="filter-inputs-wrapper">
-        {!filterEntries.length ? (
-          <div className="filter-empty">No options available</div>
-        ) : filterEntries.length > 7 ? (
-          <input
-            type="text"
-            className="filterInputText"
-            onKeyUp={(e) => {
-              const filterValue = e.currentTarget.value.toUpperCase();
-              const inputs = e.currentTarget.nextSibling.children;
-
-              for (let i = 0; i < inputs.length; i++) {
-                let inputValue = inputs[i].textContent || inputs[i].innerText;
-                if (inputValue.toUpperCase().indexOf(filterValue) > -1) {
-                  inputs[i].style.display = 'block';
-                } else {
-                  inputs[i].style.display = 'none';
-                }
-              }
-            }}
-            placeholder="Quick search"
-            title="Type in a name"
-          />
-        ) : (
-          ''
-        )}
-
-        <div className="filter-inputs">
-          {filterEntries
-            .sort((item1, item2) => item1[1].localeCompare(item2[1]))
-            .map(([value, label], index) => (
-              <label
-                htmlFor={label + index}
-                className="filter-input"
-                key={value}
-              >
-                <input
-                  value={value}
-                  type="checkbox"
-                  id={label + index}
-                  onChange={(e) => {
-                    const temp = JSON.parse(JSON.stringify(activeFilters));
-                    if (e.target.checked) {
-                      temp[filterName].push(e.target.value);
-                    } else {
-                      temp[filterName] = temp[filterName].filter((value) => {
-                        if (value !== e.target.value) return value;
-                        return null;
-                      });
-                    }
-                    setActiveFilters(temp);
-                    scrollToElement('search-input');
-                    centerAndResetMapZoom({ map, ol });
-                  }}
-                />
-                <span>{label}</span>
-              </label>
-            ))}
-        </div>
-      </div>
-    </div>
-  );
-}
-
-function CaseStudyFiltersComponent(props) {
-  const { filters, activeFilters, setActiveFilters, map, ol } = props;
-
-  React.useEffect(() => {
-    window.addEventListener('click', (event) => {
-      const filters = document.getElementsByClassName('filter-wrapper');
-
-      for (let i = 0; i < filters.length; i++) {
-        if (!filters[i].contains(event.target)) {
-          filters[i].classList.remove('active');
-        }
-      }
-    });
-  }, []);
-
-  return (
-    <>
-      <CaseStudyFilter
-        filterTitle="Legislation"
-        filterName="nrr_legislation"
-        {...props}
-      />
-      <CaseStudyFilter
-        filterTitle="Biogeographical region"
-        filterName="nrr_biogeographical_region"
-        {...props}
-      />
-      <CaseStudyFilter
-        filterTitle="Measures"
-        filterName="measures_implemented"
-        filters={filters}
-        activeFilters={activeFilters}
-        setActiveFilters={setActiveFilters}
-        map={map}
-        ol={ol}
-      />
-
-      <CaseStudyFilter
-        filterTitle="Typology of measure"
-        filterName="typology_of_measures"
-        filters={filters}
-        activeFilters={activeFilters}
-        setActiveFilters={setActiveFilters}
-        map={map}
-        ol={ol}
-      />
-
-      <CaseStudyFilter
-        filterTitle="Current status"
-        filterName="current_status"
-        {...props}
-      />
-      <CaseStudyFilter
-        filterTitle="Habitat/ecosystem type"
-        filterName="habitat_ecosystem_type"
-        {...props}
-      />
-      <CaseStudyFilter
-        filterTitle="Scale of Planning"
-        filterName="scale_of_planning"
-        {...props}
-      />
-    </>
-  );
-}
-
-function SearchBoxComponent(props) {
-  const { setSearchInput, map, ol } = props;
-  const [showClearButton, setShowClearButton] = React.useState(false);
-
-  return (
-    <div className="header-content">
-      <div className="sui-search-box">
-        <div className="search-input">
-          <div className="terms-box">
-            <input
-              id="search-input"
-              placeholder="Search with a keyword..."
-              onChange={(event) => {
-                const _showClearButton = event.target.value ? true : false;
-                setShowClearButton(_showClearButton);
-              }}
-              onKeyDown={(event) => {
-                if (event.code !== 'Enter') {
-                  return;
-                }
-                let searchInput = normalizeSearchInput(event.target.value);
-
-                setSearchInput(searchInput);
-                scrollToElement('search-input');
-                centerAndResetMapZoom({ map, ol });
-              }}
-            ></input>
-            <div className="terms-box-left">
-              <div className="input-controls">
-                {showClearButton ? (
-                  <div className="ui button basic clear-button">
-                    <i
-                      aria-hidden="true"
-                      className="close icon"
-                      role="button"
-                      onClick={() => {
-                        const searchInputElement =
-                          document.getElementById('search-input');
-                        searchInputElement.value = '';
-                        setSearchInput('');
-                        setShowClearButton(false);
-                        scrollToElement('search-input');
-                        centerAndResetMapZoom({ map, ol });
-                      }}
-                    ></i>
-                  </div>
-                ) : (
-                  ''
-                )}
-              </div>
-              <div
-                className="search-icon"
-                role="button"
-                onClick={() => {
-                  const searchInputElement =
-                    document.getElementById('search-input');
-                  const searchInputVal = normalizeSearchInput(
-                    searchInputElement.value,
-                  );
-
-                  setSearchInput(searchInputVal);
-                  scrollToElement('search-input');
-                  centerAndResetMapZoom({ map, ol });
-                }}
-                onKeyDown={() => {}}
-                tabIndex="0"
-              >
-                <svg viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg">
-                  <path d="M37.3757 34.3789L30.2003 27.2246C32.5154 24.2751 33.7716 20.633 33.7669 16.8835C33.7669 13.5442 32.7767 10.28 30.9215 7.50351C29.0663 4.72705 26.4295 2.56305 23.3445 1.28518C20.2594 0.00731515 16.8647 -0.327033 13.5897 0.324418C10.3146 0.97587 7.30625 2.58386 4.94506 4.94506C2.58386 7.30625 0.97587 10.3146 0.324418 13.5897C-0.327033 16.8647 0.00731528 20.2594 1.28518 23.3445C2.56305 26.4295 4.72705 29.0664 7.50351 30.9215C10.28 32.7767 13.5442 33.7669 16.8835 33.7669C20.633 33.7716 24.2751 32.5154 27.2246 30.2003L34.3789 37.3757C34.5751 37.5735 34.8085 37.7306 35.0657 37.8377C35.3229 37.9448 35.5987 38 35.8773 38C36.1559 38 36.4318 37.9448 36.689 37.8377C36.9461 37.7306 37.1795 37.5735 37.3757 37.3757C37.5735 37.1795 37.7305 36.9461 37.8377 36.689C37.9448 36.4318 38 36.1559 38 35.8773C38 35.5987 37.9448 35.3229 37.8377 35.0657C37.7305 34.8085 37.5735 34.5751 37.3757 34.3789ZM4.22087 16.8835C4.22087 14.379 4.96352 11.9309 6.3549 9.8485C7.74628 7.76615 9.72391 6.14315 12.0377 5.18475C14.3515 4.22635 16.8975 3.97559 19.3538 4.46418C21.8101 4.95277 24.0664 6.15876 25.8373 7.92966C27.6081 9.70055 28.8141 11.9568 29.3027 14.4131C29.7913 16.8694 29.5406 19.4154 28.5822 21.7292C27.6238 24.043 26.0008 26.0206 23.9184 27.412C21.8361 28.8034 19.3879 29.546 16.8835 29.546C13.5251 29.546 10.3043 28.2119 7.92966 25.8373C5.55496 23.4626 4.22087 20.2418 4.22087 16.8835Z" />
-                </svg>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-function FilterGroup({
-  filterName,
-  filterLabel,
-  activeFilterCodes,
-  filters,
-  onRemoveFilter,
-}) {
-  return activeFilterCodes.length > 0 ? (
-    <div className="filter-wrapper">
-      <div className="filter-label">{filterLabel}</div>
-      {activeFilterCodes.map((filterCode) => {
-        const label = filters[filterName][filterCode];
-        return (
-          <div className="ui basic label filter-value" key={filterCode}>
-            <span>{label}</span>
-            <i
-              tabIndex="0"
-              onKeyPress={() => {}}
-              onClick={() => {
-                onRemoveFilter(filterName, filterCode);
-                scrollToElement('search-input');
-              }}
-              role="button"
-              className="close icon"
-            ></i>
-          </div>
-        );
-      })}
-    </div>
-  ) : null;
-}
-
-function ActiveFiltersComponent(props) {
-  const { filters, activeFilters, setActiveFilters } = props;
-  const hasActiveFilters = Object.entries(activeFilters).some(
-    ([_, filterList]) => filterList.length > 0,
-  );
-
-  const clearFilters = () => {
-    const filterInputs = document.querySelectorAll(
-      '#cse-filter .filter-input input',
-    );
-    for (let i = 0; i < filterInputs.length; i++) {
-      filterInputs[i].checked = false;
-    }
-    setActiveFilters(
-      Object.fromEntries(Object.keys(activeFilters).map((key) => [key, []])),
-    );
-    scrollToElement('search-input');
-  };
-
-  const removeFilter = (filterName, filterCode) => {
-    const temp = JSON.parse(JSON.stringify(activeFilters));
-    temp[filterName] = temp[filterName].filter((value) => value !== filterCode);
-
-    const filterInputs = document.querySelectorAll(
-      '#cse-filter .filter-input input',
-    );
-
-    for (let i = 0; i < filterInputs.length; i++) {
-      if (filterInputs[i].value === filterCode) {
-        filterInputs[i].checked = false;
-      }
-    }
-
-    setActiveFilters(temp);
-  };
-
-  return hasActiveFilters ? (
-    <div className="ui segment active-filter-list">
-      <div className="filter-list-header">
-        <h4 className="filter-list-title">Active filters</h4>
-        <button
-          onClick={clearFilters}
-          className="ui mini basic compact button clear-btn"
-        >
-          clear all
-        </button>
-      </div>
-      <div className="filter-list-content">
-        <div className="filter">
-          <FilterGroup
-            filterName="measures_implemented"
-            filterLabel="Measures implemented:"
-            activeFilterCodes={activeFilters.measures_implemented}
-            filters={filters}
-            onRemoveFilter={removeFilter}
-          />
-          <FilterGroup
-            filterName="typology_of_measures"
-            filterLabel="Typology of measures:"
-            activeFilterCodes={activeFilters.typology_of_measures}
-            filters={filters}
-            onRemoveFilter={removeFilter}
-          />
-          <FilterGroup
-            filterName="current_status"
-            filterLabel="Current status:"
-            activeFilterCodes={activeFilters.current_status}
-            filters={filters}
-            onRemoveFilter={removeFilter}
-          />
-          <FilterGroup
-            filterName="habitat_ecosystem_type"
-            filterLabel="Habitat/ecosystem type:"
-            activeFilterCodes={activeFilters.habitat_ecosystem_type}
-            filters={filters}
-            onRemoveFilter={removeFilter}
-          />
-          <FilterGroup
-            filterName="nrr_legislation"
-            filterLabel="Legislation:"
-            activeFilterCodes={activeFilters.nrr_legislation}
-            filters={filters}
-            onRemoveFilter={removeFilter}
-          />
-          <FilterGroup
-            filterName="nrr_biogeographical_region"
-            filterLabel="Biogeographical region:"
-            activeFilterCodes={activeFilters.nrr_biogeographical_region}
-            filters={filters}
-            onRemoveFilter={removeFilter}
-          />
-          <FilterGroup
-            filterName="scale_of_planning"
-            filterLabel="Scale of Planning:"
-            activeFilterCodes={activeFilters.scale_of_planning}
-            filters={filters}
-            onRemoveFilter={removeFilter}
-          />
-        </div>
-      </div>
-    </div>
-  ) : null;
-}
-
-export const CaseStudyFilters = withOpenLayers(CaseStudyFiltersComponent);
-export const SearchBox = withOpenLayers(SearchBoxComponent);
-export const ActiveFilters = withOpenLayers(ActiveFiltersComponent);

package/src/components/manage/Blocks/CaseStudyExplorer/CaseStudyFilters.test.jsx

@@ -1,90 +0,0 @@
-import './mockJsdom';
-import React from 'react';
-import '@testing-library/jest-dom';
-import { render } from '@testing-library/react';
-
-import {
-  CaseStudyFilters,
-  ActiveFilters,
-  SearchBox,
-  CaseStudyFilter,
-} from './CaseStudyFilters';
-import { createMockFilters } from './testUtils';
-
-jest.mock('@eeacms/volto-openlayers-map', () => ({
-  openlayers: {
-    proj: {
-      transform: jest.fn().mockReturnValue([0, 0]),
-    },
-  },
-  withOpenLayers: (Component) => (props) => (
-    <Component
-      {...props}
-      ol={{
-        proj: {
-          transform: jest.fn().mockReturnValue([0, 0]),
-        },
-      }}
-    />
-  ),
-}));
-
-window.URL.createObjectURL = function () {};
-global.URL.createObjectURL = jest.fn();
-
-const mockFilters = createMockFilters();
-const mockSetActiveFilters = jest.fn();
-
-describe('CaseStudyFilters', () => {
-  it('renders without crashing', () => {
-    const { container } = render(
-      <CaseStudyFilters
-        filters={mockFilters}
-        activeFilters={{ measures_implemented: [], typology_of_measures: [] }}
-        setActiveFilters={mockSetActiveFilters}
-      />,
-    );
-
-    expect(container).toBeTruthy();
-  });
-});
-
-describe('ActiveFilters', () => {
-  it('renders without crashing', () => {
-    render(
-      <ActiveFilters
-        filters={mockFilters}
-        activeFilters={{ measures_implemented: [], typology_of_measures: [] }}
-        setActiveFilters={mockSetActiveFilters}
-      />,
-    );
-  });
-});
-
-describe('SearchBox', () => {
-  it('renders without crashing', () => {
-    render(
-      <SearchBox
-        filters={mockFilters}
-        activeFilters={{ measures_implemented: [], typology_of_measures: [] }}
-        setActiveFilters={mockSetActiveFilters}
-        searchInput="bise"
-        setSearchInput={jest.fn()}
-      />,
-    );
-  });
-});
-
-describe('CaseStudyFilter', () => {
-  it('renders without crashing', () => {
-    render(
-      <CaseStudyFilter
-        filterTitle="Case study filter"
-        filters={mockFilters}
-        activeFilters={{ measures_implemented: [], typology_of_measures: [] }}
-        setActiveFilters={mockSetActiveFilters}
-        filterName="measures_implemented"
-      />,
-    );
-  });
-});