@eeacms/volto-clms-theme 1.1.90 → 1.1.92

package/CHANGELOG.md

@@ -4,6 +4,34 @@ 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.92](https://github.com/eea/volto-clms-theme/compare/1.1.91...1.1.92) - 12 December 2023
+
+#### :rocket: New Features
+
+- feat: add FME Job ID in the downloads page CLMS-2907 [Mikel Larreategi - [`7af59ad`](https://github.com/eea/volto-clms-theme/commit/7af59add01d655b29093061d50ca5346664d7501)]
+
+#### :hammer_and_wrench: Others
+
+- styles [Mikel Larreategi - [`c10774a`](https://github.com/eea/volto-clms-theme/commit/c10774ad2454e399fd4a0dc8f7973865fcf831cf)]
+### [1.1.91](https://github.com/eea/volto-clms-theme/compare/1.1.90...1.1.91) - 12 December 2023
+
+#### :rocket: New Features
+
+- feat: new field type for service desk form [Mikel Larreategi - [`4b22f00`](https://github.com/eea/volto-clms-theme/commit/4b22f00b2c52b23b45e5740f1f29d7e7ed3af818)]
+- feat: add a pop-up about formats [Mikel Larreategi - [`da7ee61`](https://github.com/eea/volto-clms-theme/commit/da7ee61424938148703f77d677a3d11fdb7cc07f)]
+- feat: add a pop-up about EPSG codes [Mikel Larreategi - [`c2163b6`](https://github.com/eea/volto-clms-theme/commit/c2163b6a940249a46af7db5057976c5c0f71122b)]
+- feat: enable add block button [Mikel Larreategi - [`53d0573`](https://github.com/eea/volto-clms-theme/commit/53d0573dfbecd117d044a7c25a68ce89294b5f61)]
+
+#### :bug: Bug Fixes
+
+- fix: CLMS-2898 reverted CLMS-1556 [Unai - [`d4c9e6e`](https://github.com/eea/volto-clms-theme/commit/d4c9e6e249de534705bd4e0bf0f2ed584026f0a5)]
+
+#### :hammer_and_wrench: Others
+
+- lint [Mikel Larreategi - [`b912406`](https://github.com/eea/volto-clms-theme/commit/b91240623d56c91e544902f84f52b51dddd550c5)]
+- eslint [Mikel Larreategi - [`d216ab5`](https://github.com/eea/volto-clms-theme/commit/d216ab514d0dcc4091084642c80868033ac6ae6b)]
+- fix [Mikel Larreategi - [`f8470ad`](https://github.com/eea/volto-clms-theme/commit/f8470ad0cb4f64ce54078b9ccba936e43960e9ab)]
+- style for span in active tab [Unai - [`ac9f312`](https://github.com/eea/volto-clms-theme/commit/ac9f312d48ae053cd94540167a45aea83d524b33)]
 ### [1.1.90](https://github.com/eea/volto-clms-theme/compare/1.1.89...1.1.90) - 4 December 2023
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/Blocks/CustomTemplates/VoltoFormBlock/customIdFieldSchema.js

@@ -125,7 +125,7 @@ export default (props) => {
       },
       field_type: {
         title: intl.formatMessage(messages.field_type),
-        type: 'array',
+        type: 'string',
         choices: [
           ...baseFieldTypeChoices,
           ...(config.blocks.blocksConfig.form.additionalFields?.map(

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/custom.less

@@ -88,3 +88,7 @@ div.tabs-block.edit a.item.active p.menu-item-text {
   border-style: none none solid none;
   font-weight: bold;
 }
+
+.left-menu .active span {
+  color: #fff;
+}

package/src/components/Blocks/customBlocks.js

@@ -78,6 +78,7 @@ import codeSVG from '@plone/volto/icons/code.svg';
 import upSVG from '@plone/volto/icons/up-key.svg';
 import ImageWidget from '@eeacms/volto-clms-theme/components/Widgets/ImageWidget';
 import AttachmentWithSizeLimit from '@eeacms/volto-clms-theme/components/Widgets/AttachmentWithSizeLimit';
+import TextareaWithRequestData from '@eeacms/volto-clms-theme/components/Widgets/TextareaWithRequestData';
 import TextWidget from '@plone/volto/components/manage/Widgets/TextWidget';
 import TextareaWidget from '@plone/volto/components/manage/Widgets/TextareaWidget';
 import EmailWidget from '@plone/volto/components/manage/Widgets/EmailWidget';
@@ -610,6 +611,11 @@ const customBlocks = (config) => ({
         label: 'Attachment (size limit)',
         component: AttachmentWithSizeLimit,
       },
+      {
+        id: 'text_area_with_request_data',
+        label: 'CCL Text Area with Request Data',
+        component: TextareaWithRequestData,
+      },
     ],
   },
   maps: {

package/src/components/CLMSDownloadCartView/CLMSCartContent.jsx

@@ -8,10 +8,12 @@ import {
   Select,
   Table,
   Pagination,
+  Popup,
 } from 'semantic-ui-react';
 
 import { Icon } from '@plone/volto/components';
 import { Toast } from '@plone/volto/components';
+import { UniversalLink } from '@plone/volto/components';
 import addDocumentSVG from '@plone/volto/icons/add-document.svg';
 import removeSVG from '@plone/volto/icons/delete.svg';
 import paginationLeftSVG from '@plone/volto/icons/left-key.svg';
@@ -20,6 +22,7 @@ import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
 import useCartState from '@eeacms/volto-clms-utils/cart/useCartState';
 import { cleanDuplicatesEntries } from '@eeacms/volto-clms-utils/utils';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import CclModal from '@eeacms/volto-clms-theme/components/CclModal/CclModal';
 
 import { getDownloadtool, postDownloadtool } from '../../actions';
 import { useFilteredPagination } from '../CclUtils/useFilteredPagination';
@@ -49,7 +52,7 @@ import {
 const CLMSCartContent = (props) => {
   const { localSessionCart, getNutsIDList } = props;
   const dispatch = useDispatch();
-  const { removeCartItem, /* removeCartItems, */ updateCart } = useCartState();
+  const { removeCartItem, removeCartItems, updateCart } = useCartState();
 
   // state connections
   const cart = useSelector((state) => state.cart_items.items);
@@ -143,17 +146,17 @@ const CLMSCartContent = (props) => {
 
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const setCartItemInProgress = (in_progress_unique_ids) => {
-    // let started_processing_items =
-    //   cartItems.length > 0
-    //     ? cartItems.filter((r) =>
-    //         in_progress_unique_ids.includes(r['unique_id']),
-    //       )
-    //     : [];
-    // var items_to_remove =
-    //   started_processing_items.length > 0
-    //     ? started_processing_items.map((item) => item.unique_id)
-    //     : [];
-    // removeCartItems(items_to_remove);
+    let started_processing_items =
+      cartItems.length > 0
+        ? cartItems.filter((r) =>
+            in_progress_unique_ids.includes(r['unique_id']),
+          )
+        : [];
+    var items_to_remove =
+      started_processing_items.length > 0
+        ? started_processing_items.map((item) => item.unique_id)
+        : [];
+    removeCartItems(items_to_remove);
     dispatch(getDownloadtool());
   };
 
@@ -196,6 +199,7 @@ const CLMSCartContent = (props) => {
         ? selectedItems.map((item) => item?.unique_id)
         : [];
     dispatch(postDownloadtool(body, unique_ids));
+    removeCartItem(unique_ids);
   };
 
   const downloadModal = () => {
@@ -271,7 +275,31 @@ const CLMSCartContent = (props) => {
                   <Table.HeaderCell width={5}>Static info</Table.HeaderCell>
                   <Table.HeaderCell>Configurable</Table.HeaderCell>
                   <Table.HeaderCell></Table.HeaderCell>
-                  <Table.HeaderCell>Projection</Table.HeaderCell>
+                  <Table.HeaderCell>
+                    Projection{' '}
+                    <CclModal
+                      draggable={false}
+                      trigger={
+                        /* eslint-disable jsx-a11y/anchor-is-valid */
+                        <a href="#">
+                          <Popup
+                            content="Explore EPSG details and coordinate systems with a click."
+                            trigger={
+                              <FontAwesomeIcon
+                                icon={['far', 'question-circle']}
+                              />
+                            }
+                          />
+                        </a>
+                      }
+                      size={'small'}
+                    >
+                      <div className="image-modal">
+                        Explore EPSG-related details in our{' '}
+                        <UniversalLink href="/faq">FAQ page</UniversalLink>
+                      </div>
+                    </CclModal>
+                  </Table.HeaderCell>
                   <Table.HeaderCell>Timeseries</Table.HeaderCell>
                   <Table.HeaderCell></Table.HeaderCell>
                 </Table.Row>
@@ -339,7 +367,32 @@ const CLMSCartContent = (props) => {
                         </div>
 
                         <div className="mb-2">
-                          <strong>Format: </strong>
+                          <strong>Format: </strong>{' '}
+                          <CclModal
+                            draggable={false}
+                            trigger={
+                              /* eslint-disable jsx-a11y/anchor-is-valid */
+                              <a href="#">
+                                <Popup
+                                  content="Explore Formats details and coordinate systems with a click."
+                                  trigger={
+                                    <FontAwesomeIcon
+                                      color="#000000"
+                                      icon={['far', 'question-circle']}
+                                    />
+                                  }
+                                />
+                              </a>
+                            }
+                            size={'small'}
+                          >
+                            <div className="image-modal">
+                              Explore format-related details in our{' '}
+                              <UniversalLink href="/faq">
+                                FAQ page
+                              </UniversalLink>
+                            </div>
+                          </CclModal>
                         </div>
                         {item?.layer !== null && (
                           <div className="mb-2">

package/src/components/CLMSDownloadsView/FileCard.jsx

@@ -156,6 +156,7 @@ const FileCard = (props) => {
             width={['In_progress', 'Queued'].includes(item?.Status) ? 8 : 10}
           >
             <Header as="h3">{`Task ID: ${item?.TaskID}`}</Header>
+            <Header.Subheader as="h4">{`Job ID: ${item?.FMETaskId}`}</Header.Subheader>
             <Segment basic className="file-datetimes">
               {item?.RegistrationDateTime && (
                 <>

package/src/components/CLMSDownloadsView/filecard.less

@@ -19,3 +19,7 @@
 .ui.column.grid.filecard .file-datetimes svg {
   cursor: pointer;
 }
+
+.ui.column.grid.filecard h4 {
+  color: rgba(0, 0, 0, 0.87);
+}

package/src/components/CLMSTechnicalLibraryView/CLMSTechnicalLibraryView.jsx

@@ -3,6 +3,11 @@ import CclButton from '../CclButton/CclButton';
 
 const CLMSTechnicalLibraryView = (props) => {
   const { content } = props;
+
+  const textToForm = encodeURIComponent(
+    `I want the following document ${content.title} ${content['@id']}`,
+  );
+
   return (
     <div className="ccl-container">
       <>
@@ -16,13 +21,12 @@ const CLMSTechnicalLibraryView = (props) => {
           {content.ondemand ? (
             <>
               <p>
-                You are requesting an on-demand document. Please contact the
-                service desk to obtain it.
+                You are requesting an on-demand document. Please contact the{' '}
+                <a href={`/en/contact-service-helpdesk?text=${textToForm}`}>
+                  service desk
+                </a>{' '}
+                to obtain it.
               </p>
-
-              <CclButton to={`/en/contact-service-helpdesk`}>
-                Helpdesk
-              </CclButton>
             </>
           ) : (
             <>

package/src/components/Widgets/TextareaWithRequestData.jsx

@@ -0,0 +1,18 @@
+import React from 'react';
+//import { injectIntl } from 'react-intl';
+import TextareaWidget from '@plone/volto/components/manage/Widgets/TextareaWidget';
+
+import { useLocation } from 'react-router-dom';
+
+const TextareaWithRequestData = (props) => {
+  const { search } = useLocation();
+
+  const hashMatch = decodeURIComponent(
+    search.includes('text') &&
+      search.match(/.*(\?text=.*)/)[1].replace(/\?text=/, ''),
+  );
+
+  return <TextareaWidget {...props} value={hashMatch} />;
+};
+
+export default TextareaWithRequestData;

package/src/index.js

@@ -323,6 +323,8 @@ const applyConfig = (config) => {
     ...reducers,
   };
 
+  config.experimental.addBlockButton.enabled = true;
+
   return config;
 };
 export default applyConfig;

package/theme/site/extras/styles.less

@@ -71,6 +71,12 @@ h3 {
   font-weight: bold;
 }
 
+h4 {
+  margin-bottom: 1rem;
+  font-size: 1.15rem;
+  font-weight: bold;
+}
+
 p {
   min-height: 1.6875rem;
   margin-bottom: 1rem;
@@ -490,9 +496,9 @@ body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
 }
 
 body.contenttype-document .right-content ul {
-    position: relative;
-    left: 0.5rem;
-    margin-bottom:1rem;
+  position: relative;
+  left: 0.5rem;
+  margin-bottom: 1rem;
 }
 .card-container {
   display: flex;