@eeacms/volto-clms-theme 1.1.67 → 1.1.68

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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).
 
+### [1.1.68](https://github.com/eea/volto-clms-theme/compare/1.1.67...1.1.68) - 24 October 2023
+
+#### :rocket: New Features
+
+- feat: copy to clipboard labeled [Ion Lizarazu - [`8ec0ce1`](https://github.com/eea/volto-clms-theme/commit/8ec0ce1bb28e7e2c3b8f8acb4297e035d4117840)]
+
+#### :hammer_and_wrench: Others
+
+- remove unneeded imports [Ion Lizarazu - [`b18c5fc`](https://github.com/eea/volto-clms-theme/commit/b18c5fc4e7557d9fea90a0c3a1f2e3956f9145d0)]
+- enable apiExpanders call by default [Mikel Larreategi - [`796acab`](https://github.com/eea/volto-clms-theme/commit/796acabd9c86edd27a075370f61cc634a41b139e)]
+- style components [Mikel Larreategi - [`7c5fc8a`](https://github.com/eea/volto-clms-theme/commit/7c5fc8a004eed8c30781a0e0c239de143ff08cce)]
+- CLMS-2658 CLMS-2656 show new fields in the dataset view [Mikel Larreategi - [`452b387`](https://github.com/eea/volto-clms-theme/commit/452b38762329ebc9e8a199041c4d7745eedb7511)]
 ### [1.1.67](https://github.com/eea/volto-clms-theme/compare/1.1.66...1.1.67) - 23 October 2023
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.67",
+  "version": "1.1.68",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/Blocks/CclRelatedListingBlock/CclRelatedListingEdit.jsx

@@ -16,27 +16,22 @@ const CclRelatedListingEdit = (props) => {
   let libraries = searchSubrequests?.[props.id]?.items || [];
   const variationsConfig =
     config.blocks.blocksConfig['relatedListing'].variations;
-  let TemplateView = '';
+  let TemplateView = <></>;
   let template_id = '';
-  for (let variation in variationsConfig) {
-    if (!data?.variation && variationsConfig[variation].isDefault) {
-      TemplateView = variationsConfig[variation].template;
-      template_id = variationsConfig[variation].id;
-      data.variation = template_id;
-    }
-    if (variationsConfig[variation].id === data?.variation) {
-      TemplateView = variationsConfig[variation].template;
-      template_id = variationsConfig[variation].id;
-    }
-  }
-  if (template_id === '') {
-    for (let variation in variationsConfig) {
-      if (variationsConfig[variation].isDefault) {
-        TemplateView = variationsConfig[variation].template;
-        template_id = variationsConfig[variation].id;
-        data.variation = template_id;
-      }
-    }
+
+  var defaultVariation = variationsConfig.find(
+    (configVar) => configVar.isDefault,
+  );
+  if (variationsConfig.some((variation) => variation.id === data.variation)) {
+    const theVariation = variationsConfig.find(
+      (variation) => variation.id === data.variation,
+    );
+    TemplateView = theVariation?.template;
+    template_id = theVariation.templateId;
+  } else {
+    TemplateView = defaultVariation.template;
+    template_id = defaultVariation.id;
+    data.variation = template_id;
   }
   if (!data.content_type) {
     data.content_type = 'News Item';
@@ -45,7 +40,7 @@ const CclRelatedListingEdit = (props) => {
     <>
       <div className="technical-libraries">
         <h2>Related Listings</h2>
-        {libraries.length > 0 ? (
+        {libraries.length > 0 && template_id ? (
           <TemplateView items={libraries} variation={template_id} />
         ) : (
           <p>There are no related {data.content_type} items.</p>

package/src/components/Blocks/CclRelatedListingBlock/CclRelatedListingView.jsx

@@ -46,30 +46,25 @@ const CclRelatedListingView = (props) => {
   let libraries = searchSubrequests?.items || [];
   const variationsConfig =
     config.blocks.blocksConfig['relatedListing'].variations;
-  let TemplateView = '';
+  let TemplateView = <></>;
   let template_id = '';
-  var defaultVariation = variationsConfig.filter(
+  var defaultVariation = variationsConfig.find(
     (configVar) => configVar.isDefault,
-  )[0];
+  );
 
-  if (!data?.variation) {
-    TemplateView = defaultVariation.template;
-    template_id = defaultVariation.id;
-    data.variation = template_id;
-  } else {
-    var variation = variationsConfig.filter(
+  if (variationsConfig.some((configVar1) => configVar1.id === data.variation)) {
+    var variation = variationsConfig.find(
       (configVar1) => configVar1.id === data.variation,
-    )[0];
+    );
     TemplateView = variation.template;
     template_id = variation.id;
     data.variation = template_id;
-  }
-
-  if (template_id === '') {
+  } else {
     TemplateView = defaultVariation.template;
     template_id = defaultVariation.id;
     data.variation = template_id;
   }
+
   if (!data.content_type) {
     data.content_type = 'News Item';
   }

package/src/components/Blocks/CclRelatedListingBlock/schema.js

@@ -25,7 +25,6 @@ const Schema = (props) => {
       },
       variation: {
         title: 'Variation',
-        type: 'array',
         choices: [...variations],
       },
     },

package/src/components/CLMSDatasetDetailView/CLMSDatasetDetailView.jsx

@@ -3,7 +3,9 @@ import { FormattedMessage } from 'react-intl';
 import { connect, useDispatch, useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import { compose } from 'redux';
-import { Modal, Segment, Grid } from 'semantic-ui-react';
+import { Modal, Segment, Grid, Icon, Label } from 'semantic-ui-react';
+import { toast } from 'react-toastify';
+import { Toast } from '@plone/volto/components';
 
 import { getUser } from '@plone/volto/actions';
 import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
@@ -19,6 +21,8 @@ import { GeonetworkImporterButtons } from './GeonetworkImporterButtons';
 import jwtDecode from 'jwt-decode';
 import PropTypes from 'prop-types';
 
+import './styles.less';
+
 /**
  * Full view component.
  * @module components/theme/View/CLMSDatasetDetailView
@@ -63,6 +67,36 @@ const CLMSDatasetDetailView = ({ content, token }) => {
         )
     : false;
 
+  const ClickableUrl = ({ title, url }) => {
+    return (
+      url && (
+        <Grid.Row className="characteristic-row">
+          <strong>{title}: </strong>
+          <br />
+          <Label basic size="large">
+            {url}
+            <Icon
+              name="copy"
+              size="large"
+              style={{ cursor: 'pointer' }}
+              onClick={() => {
+                navigator.clipboard.writeText(url);
+                toast.success(
+                  <Toast
+                    success
+                    autoClose={5000}
+                    title={'URL copied to clipboard'}
+                    content={`The ${title} URL has been successfully copied to clipboard`}
+                  />,
+                );
+              }}
+            ></Icon>
+          </Label>
+        </Grid.Row>
+      )
+    );
+  };
+
   return (
     <div className="ccl-container ">
       <h1 className="page-title">{content.title}</h1>
@@ -318,6 +352,21 @@ const CLMSDatasetDetailView = ({ content, token }) => {
                 </CclButton>
               </div>
             )}
+
+            {(content?.metadata_wms_url ||
+              content?.metadata_wmts_url ||
+              content?.metadata_rest_api_url) && (
+              <div className="url-container">
+                <div className="citation-title">Services</div>
+
+                <ClickableUrl title="WMS" url={content.metadata_wms_url} />
+                <ClickableUrl title="WMTS" url={content.metadata_wmts_url} />
+                <ClickableUrl
+                  title="REST API"
+                  url={content.metadata_rest_api_url}
+                />
+              </div>
+            )}
           </nav>
         </div>
       </CclTabs>

package/src/components/CLMSDatasetDetailView/DataSetInfoContent.jsx

@@ -166,7 +166,10 @@ const DataSetInfoContent = (props) => {
                           <CharacteristicsMetadata
                             title="Release / Major version"
                             value={props?.characteristics_release_major_version}
-                            extraSpace={true}
+                          />
+                          <CharacteristicsMetadata
+                            title="Projection"
+                            value={props?.characteristics_projection}
                           />
                           <CharacteristicsMetadata
                             title="Spatial coverage"

package/src/components/CLMSDatasetDetailView/styles.less

@@ -0,0 +1,3 @@
+.url-container {
+  word-break: break-word;
+}

package/src/index.js

@@ -182,6 +182,20 @@ const applyConfig = (config) => {
     showTags: false,
     ownDomain: 'land.copernicus.eu',
     track_search_paths: ['/en/global-search', '/en/dataset-catalog'],
+    apiExpanders: [
+      ...config.settings.apiExpanders,
+      {
+        match: '',
+        GET_CONTENT: ['breadcrumbs', 'actions', 'types', 'translations'],
+      },
+      {
+        match: '',
+        GET_CONTENT: ['navigation'],
+        querystring: (config) => ({
+          'expand.navigation.depth': config.settings.navDepth,
+        }),
+      },
+    ],
   };
 
   config.settings.slate.toolbarButtons = [