@eeacms/volto-clms-theme 1.1.249 → 1.1.251

package/CHANGELOG.md

@@ -4,6 +4,17 @@ 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.251](https://github.com/eea/volto-clms-theme/compare/1.1.250...1.1.251) - 16 September 2025
+
+#### :bug: Bug Fixes
+
+- fix: file card not displaying fme task id when processed by FME [ana-oprea - [`1876f63`](https://github.com/eea/volto-clms-theme/commit/1876f635635705ccb0878a257023d2d9848647ff)]
+
+### [1.1.250](https://github.com/eea/volto-clms-theme/compare/1.1.249...1.1.250) - 10 September 2025
+
+#### :hammer_and_wrench: Others
+
+- Refs #290926 - Simplify DoubleRangeSpatialFacet (now we only use the values ​​at the ends of the range). [GhitaB - [`c570dce`](https://github.com/eea/volto-clms-theme/commit/c570dce61e27b371ef7f22d9aa85e8e62fbc7481)]
 ### [1.1.249](https://github.com/eea/volto-clms-theme/compare/1.1.248...1.1.249) - 9 September 2025
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.249",
+  "version": "1.1.251",
   "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/VoltoSearchBlock/DoubleRangeSpatialFacet.jsx

@@ -1,76 +1,47 @@
 import 'react-input-range/lib/css/index.css';
 
 import React from 'react';
-
 import InputRange from 'react-input-range';
 import { Segment } from 'semantic-ui-react';
 import { selectFacetStateToValue } from '@plone/volto/components/manage/Blocks/Search/components/base';
 import { doubleRangeFacetSchemaEnhancer } from './utils.js';
 
-const mToKm = (m) => {
-  return m >= 1000 ? Math.round((m / 1000) * 10) / 10 + 'km' : m + 'm';
-};
-
-const realToCoded = (number, step) => {
-  // the meters are going to be the same
-  if (number <= 1000) return number;
-  // for the km we are going to code any km after the first as tens
-  // so 2 km will be 1020 and 3 km will be 1040
-  const relation = step ? parseInt(step) : 1;
-  const thousands = Math.floor(number / 1000);
-  const hundreds = Math.floor((number - thousands * 1000) / 100);
-  const tens = Math.floor((number - thousands * 1000 - hundreds * 100) / 10);
-  let finalThousands = thousands;
-  if (hundreds > 0 || tens > 0) finalThousands = thousands + 1;
-  return 1000 + parseInt(finalThousands * relation);
-};
+const mToKm = (m) =>
+  m >= 1000 ? `${Math.round((m / 1000) * 10) / 10}km` : `${m}m`;
 
-const codedToReal = (number, step) => {
-  // the meters are going to be the same
-  if (number <= 1000) return number;
-  // for the km we have to decode any tens after 1000
-  // so 1020 will be 2 km and 1040 will be 3 km
-  const relation = step ? parseInt(step) : 1;
-  const codedThousands = parseInt(number) - 1000;
-  return parseInt(codedThousands * (1000 / relation));
-};
-
-const convertToRange = (values, step) => {
-  const nums = values
+const extractNumbers = (values) =>
+  values
     .map((o) => {
-      const raw = o.value !== undefined ? o.value : o;
-
-      if (typeof raw === 'string') {
-        return parseInt(raw.replace(/[a-zA-Z]/g, ''), 10);
-      }
-
-      if (typeof raw === 'number') {
-        return raw;
-      }
-
+      const raw = o?.value ?? o;
+      if (typeof raw === 'string')
+        return parseInt(raw.replace(/[^\d]/g, ''), 10);
+      if (typeof raw === 'number') return raw;
       return NaN;
     })
     .filter((n) => !isNaN(n));
 
+const convertToRange = (values) => {
+  const nums = extractNumbers(values);
   return {
-    min: realToCoded(Math.min(...nums), step),
-    max: realToCoded(Math.max(...nums), step),
+    min: Math.min(...nums),
+    max: Math.max(...nums),
   };
 };
 
 const DoubleRangeSpatialFacet = (props) => {
   const { facet, choices, onChange, value } = props;
-  const facetValue = value;
-  var [open, setOpen] = React.useState(facet.expandedByDefault ?? false);
+  const [open, setOpen] = React.useState(facet.expandedByDefault ?? false);
 
-  const startingValues = convertToRange(choices, facet?.step);
+  const startingValues = convertToRange(choices);
+  const currentValues =
+    value.length > 0 ? convertToRange(value) : startingValues;
 
-  const onChangeRange = (nValue, onChangeR, sValue) => {
+  const onChangeRange = (nValue) => {
     const fixedValue = {
-      min: nValue.min < sValue.min ? sValue.min : nValue.min,
-      max: nValue.max > sValue.max ? sValue.max : nValue.max,
+      min: Math.max(nValue.min, startingValues.min),
+      max: Math.min(nValue.max, startingValues.max),
     };
-    onChangeR(
+    onChange(
       facet.field.value,
       [...Array(fixedValue.max - fixedValue.min + 1).keys()].map((i) =>
         (i + fixedValue.min).toString(),
@@ -86,7 +57,7 @@ const DoubleRangeSpatialFacet = (props) => {
         onClick={() => setOpen(!open)}
         onKeyDown={() => setOpen(!open)}
         tabIndex={0}
-        role={'button'}
+        role="button"
       >
         <legend className="ccl-form-legend">{facet.title}</legend>
       </div>
@@ -96,37 +67,11 @@ const DoubleRangeSpatialFacet = (props) => {
             minValue={startingValues.min}
             maxValue={startingValues.max}
             step={facet.step ? parseInt(facet.step) : 1}
-            value={
-              facetValue.length > 0
-                ? {
-                    min: convertToRange(facetValue, facet?.step).min,
-                    max: convertToRange(facetValue, facet?.step).max,
-                  }
-                : {
-                    min: startingValues.min,
-                    max: startingValues.max,
-                  }
-            }
-            onChange={(changedValue) =>
-              onChangeRange(
-                {
-                  min: codedToReal(changedValue.min, facet?.step),
-                  max: codedToReal(changedValue.max, facet?.step),
-                },
-                onChange,
-                {
-                  min: codedToReal(startingValues.min, facet?.step),
-                  max: codedToReal(startingValues.max, facet?.step),
-                },
-              )
+            value={currentValues}
+            onChange={onChangeRange}
+            formatLabel={(value) =>
+              facet.field.value === 'spatial_resolution' ? mToKm(value) : value
             }
-            formatLabel={(value) => {
-              if (facet.field.value === 'spatial_resolution') {
-                return mToKm(codedToReal(value, facet?.step));
-              } else {
-                return value;
-              }
-            }}
           />
         </Segment>
         <br />
@@ -137,9 +82,7 @@ const DoubleRangeSpatialFacet = (props) => {
 
 const doubleRangeValueToQuery = ({ value, facet }) => {
   if (!value || value.length === 0) return undefined;
-
-  const numericValues = value.map((v) => parseInt(v, 10)).sort((a, b) => a - b);
-
+  const numericValues = extractNumbers(value).sort((a, b) => a - b);
   return {
     i: facet.field.value,
     o: 'plone.app.querystring.operation.int.between', // implemented by us in clms.types
@@ -150,4 +93,5 @@ const doubleRangeValueToQuery = ({ value, facet }) => {
 DoubleRangeSpatialFacet.schemaEnhancer = doubleRangeFacetSchemaEnhancer;
 DoubleRangeSpatialFacet.stateToValue = selectFacetStateToValue;
 DoubleRangeSpatialFacet.valueToQuery = doubleRangeValueToQuery;
+
 export default DoubleRangeSpatialFacet;

package/src/components/CLMSDownloadsView/FileCard.jsx

@@ -165,7 +165,7 @@ const FileCard = (props) => {
           >
             <Header as="h3">{`Task ID: ${item?.TaskID}`}</Header>
             <Header.Subheader as="h4">{`Job ID: ${
-              item?.cdse_task_role === 'parent'
+              item?.cdse_task_role === 'parent' && !item?.FMETaskId
                 ? 'CDSE PROCESSING...'
                 : item?.FMETaskId
             }`}</Header.Subheader>