@eeacms/volto-marine-policy 2.0.14 → 2.0.16

package/CHANGELOG.md

@@ -4,6 +4,31 @@ 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).
 
+### [2.0.16](https://github.com/eea/volto-marine-policy/compare/2.0.15...2.0.16) - 15 July 2025
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-openlayers-map@1.0.1 [EEA Jenkins - [`9d21a45`](https://github.com/eea/volto-marine-policy/commit/9d21a45dc040ffafa93a1dcdb10b521c429b7fe3)]
+- Release @eeacms/volto-openlayers-map@1.0.0 [EEA Jenkins - [`6f7be1b`](https://github.com/eea/volto-marine-policy/commit/6f7be1b5c4830c639c71a94ba404bf0df6dd14f4)]
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`efe44fc`](https://github.com/eea/volto-marine-policy/commit/efe44fcb0bde4e0339f4a9fea70fb49fb878a095)]
+
+#### :hammer_and_wrench: Others
+
+- fix eslint [laszlocseh - [`5ab04fb`](https://github.com/eea/volto-marine-policy/commit/5ab04fb5734c00c2fc2f8b2a3fa381b5a5f40a71)]
+- added NIS listing view [laszlocseh - [`64258c1`](https://github.com/eea/volto-marine-policy/commit/64258c1094b5ae57547f965b066c52e2e29f9fd8)]
+- added middleware for NIS download [laszlocseh - [`796f3ab`](https://github.com/eea/volto-marine-policy/commit/796f3abc08d632079486eb7c5e7517dfb1d83657)]
+### [2.0.15](https://github.com/eea/volto-marine-policy/compare/2.0.14...2.0.15) - 16 June 2025
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`5b37969`](https://github.com/eea/volto-marine-policy/commit/5b3796962e97e62cde61dfe0e78e85e340eefc0c)]
+
+#### :hammer_and_wrench: Others
+
+- small change to demo sites map viewer legend position [laszlocseh - [`0891fdf`](https://github.com/eea/volto-marine-policy/commit/0891fdf38b439804c27c3442a731637ed415ea2b)]
 ### [2.0.14](https://github.com/eea/volto-marine-policy/compare/2.0.13...2.0.14) - 15 May 2025
 
 #### :rocket: Dependency updates

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-marine-policy",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "description": "@eeacms/volto-marine-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -35,7 +35,7 @@
     "@eeacms/volto-eea-website-theme": "*",
     "@eeacms/volto-embed": "*",
     "@eeacms/volto-globalsearch": "2.1.2",
-    "@eeacms/volto-openlayers-map": "0.3.2",
+    "@eeacms/volto-openlayers-map": "1.0.1",
     "@eeacms/volto-searchlib": "2.0.16",
     "@eeacms/volto-tabs-block": "*",
     "axios": "0.30.0",

package/src/components/Blocks/DemoSitesExplorer/DemoSitesExplorerView.js

@@ -36,6 +36,7 @@ export default function DemoSitesExplorerView(props) {
   const [filters, setFilters] = React.useState([]);
   const [map, setMap] = React.useState();
   const [highlightedIndex, setHighlightedIndex] = React.useState(-1);
+  const columnsLength = hideFilters ? 12 : 8;
 
   React.useEffect(() => {
     const _filters = getFilters(activeItems, indicatorOnly);
@@ -82,7 +83,11 @@ export default function DemoSitesExplorerView(props) {
       <Grid.Row>
         {cases.length ? (
           <Grid columns={12}>
-            <Grid.Column mobile={8} tablet={8} computer={8}>
+            <Grid.Column
+              mobile={columnsLength}
+              tablet={columnsLength}
+              computer={columnsLength}
+            >
               <DemoSitesMap
                 items={cases}
                 activeItems={activeItems}
@@ -96,14 +101,14 @@ export default function DemoSitesExplorerView(props) {
                 setHighlightedIndex={setHighlightedIndex}
               />
             </Grid.Column>
-            <Grid.Column
-              mobile={4}
-              tablet={4}
-              computer={4}
-              className="right-side-filters"
-            >
-              <Grid.Row>
-                {!hideFilters ? (
+            {!hideFilters ? (
+              <Grid.Column
+                mobile={4}
+                tablet={4}
+                computer={4}
+                className="right-side-filters"
+              >
+                <Grid.Row>
                   <VisibilitySensor>
                     <ObjectivesChart
                       items={cases}
@@ -119,31 +124,52 @@ export default function DemoSitesExplorerView(props) {
                       setInitialized={setInitialized}
                     />
                   </VisibilitySensor>
-                ) : (
-                  ''
-                )}
-              </Grid.Row>
-              <Grid.Row>
-                <div className="legend">
-                  {/* <div className="legend-row legend-subtitle">Legend</div> */}
-                  <div className="legend-row">
-                    <div className="circle">
-                      <div className="dot-demosite"></div>
+                </Grid.Row>
+                <Grid.Row>
+                  <div className="legend">
+                    {/* <div className="legend-row legend-subtitle">Legend</div> */}
+                    <div className="legend-row">
+                      <div className="circle">
+                        <div className="dot-demosite"></div>
+                      </div>
+                      <div>Demo site</div>
                     </div>
-                    <div>Demo site</div>
-                  </div>
-                  <div className="legend-row">
-                    <div className="circle">
-                      <div className="dot-region"></div>
+                    <div className="legend-row">
+                      <div className="circle">
+                        <div className="dot-region"></div>
+                      </div>
+                      <div>Associated region</div>
                     </div>
-                    <div>Associated region</div>
                   </div>
-                </div>
-              </Grid.Row>
-            </Grid.Column>
+                </Grid.Row>
+              </Grid.Column>
+            ) : (
+              ''
+            )}
           </Grid>
         ) : null}
       </Grid.Row>
+      {hideFilters ? (
+        <Grid.Row stretched={true}>
+          <div className="legend position-bottom">
+            {/* <div className="legend-row legend-subtitle">Legend</div> */}
+            <div className="legend-row">
+              <div className="circle">
+                <div className="dot-demosite"></div>
+              </div>
+              <div>Demo site</div>
+            </div>
+            <div className="legend-row">
+              <div className="circle">
+                <div className="dot-region"></div>
+              </div>
+              <div>Associated region</div>
+            </div>
+          </div>
+        </Grid.Row>
+      ) : (
+        ''
+      )}
     </div>
   );
 }

package/src/components/Blocks/DemoSitesExplorer/styles.less

@@ -409,12 +409,17 @@
 
 .legend {
   // position: absolute;
-  bottom: 2em;
+  // bottom: 2em;
   display: flex;
   flex-direction: row;
   align-items: flex-start;
+  justify-content: center;
   gap: 1em;
 
+  &.position-bottom {
+    margin-top: 1em;
+  }
+
   .legend-row {
     display: flex;
     align-items: center;

package/src/components/index.js

@@ -3,6 +3,7 @@ export StickyHeader from './theme/Header/StickyHeader';
 export HeroSectionView from './theme/View/HeroSectionView';
 export FullwidthView from './theme/View/FullwidthView';
 export MetadataListingView from './theme/MetadataListingView/MetadataListingView';
+export NISListingView from './theme/NISListingView/NISListingView';
 export ItemMetadata from './theme/ItemMetadata/ItemMetadata';
 export ItemTitle from './theme/ItemMetadata/ItemTitle';
 export MetadataHeader from './theme/MetadataListingView/MetadataHeader';

package/src/components/theme/NISListingView/NISListingView.jsx

@@ -0,0 +1,43 @@
+import { Link } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import './style.less';
+
+const NISListingView = ({ items, isEditMode }) => {
+  return (
+    <div className="items">
+      {items.map((item, index) => (
+        <div className="listing-item" key={item['@id']}>
+          <div className="listing-body">
+            <h3>
+              <Link to={item['@id']}>{item.title}</Link>
+            </h3>
+            <div className="listing-metadata">
+              {item.nis_species_name_accepted && (
+                <div className="metadata-item">
+                  <b>Species name accepted:</b> {item.nis_species_name_accepted}
+                </div>
+              )}
+              {item.nis_region && (
+                <div className="metadata-item">
+                  <b>Region:</b> {item.nis_region}
+                </div>
+              )}
+              {item.nis_subregion && (
+                <div className="metadata-item">
+                  <b>Subregion:</b> {item.nis_subregion}
+                </div>
+              )}
+            </div>
+          </div>
+        </div>
+      ))}
+    </div>
+  );
+};
+
+NISListingView.propTypes = {
+  items: PropTypes.arrayOf(PropTypes.any).isRequired,
+  isEditMode: PropTypes.bool,
+};
+
+export default NISListingView;

package/src/components/theme/NISListingView/style.less

@@ -0,0 +1,11 @@
+.listing-metadata {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 1em;
+}
+
+.metadata-item {
+  align-items: baseline;
+  padding: 8px 15px;
+  background-color: #ebebeb;
+}

package/src/express-middleware.js

@@ -30,7 +30,10 @@ export default function middleware(config) {
   // TODO: do we want catch all?
   // middleware.all(['**/@@*'], viewMiddleware);
 
-  middleware.all(['**/@@demo-sites-map.arcgis.json'], viewMiddleware);
+  middleware.all(
+    ['**/@@demo-sites-map.arcgis.json', '**/@@nis-export'],
+    viewMiddleware,
+  );
   middleware.id = 'viewsMiddleware';
   config.settings.expressMiddleware.push(middleware);
   return config;

package/src/index.js

@@ -5,6 +5,7 @@ import {
   DatabaseItemView,
   MetadataListingView,
   SimpleListingView,
+  NISListingView,
 } from './components';
 // import installAppExtras from './components/theme/AppExtras';
 // import HomePageView from '@eeacms/volto-eea-website-theme/components/theme/Homepage/HomePageView';
@@ -153,6 +154,12 @@ const applyConfig = (config) => {
         template: SimpleListingView,
         isDefault: false,
       },
+      {
+        id: 'nis',
+        title: 'NIS Listing',
+        template: NISListingView,
+        isDefault: false,
+      },
     ],
   };