@eeacms/volto-clms-theme 1.1.60 → 1.1.62

package/CHANGELOG.md

@@ -4,11 +4,16 @@ 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.60](https://github.com/eea/volto-clms-theme/compare/1.1.59...1.1.60) - 18 October 2023
+### [1.1.62](https://github.com/eea/volto-clms-theme/compare/1.1.61...1.1.62) - 18 October 2023
 
 #### :hammer_and_wrench: Others
 
-- add control of the download queue in the selection form [Mikel Larreategi - [`29420be`](https://github.com/eea/volto-clms-theme/commit/29420be0f597a4087d4b48eb8e37b564d2221d9f)]
+- cleanup [Mikel Larreategi - [`87c90a8`](https://github.com/eea/volto-clms-theme/commit/87c90a822b5a5a374a63821a28caf1880d1bed54)]
+- clms-2644 filter in all available attributes of the prepackaged files not just in some hard-coded ones [Mikel Larreategi - [`559aac7`](https://github.com/eea/volto-clms-theme/commit/559aac7c031152b8f2a721425d85d388c1a56c16)]
+### [1.1.61](https://github.com/eea/volto-clms-theme/compare/1.1.60...1.1.61) - 18 October 2023
+
+### [1.1.60](https://github.com/eea/volto-clms-theme/compare/1.1.59...1.1.60) - 18 October 2023
+
 ### [1.1.59](https://github.com/eea/volto-clms-theme/compare/1.1.58...1.1.59) - 17 October 2023
 
 ### [1.1.58](https://github.com/eea/volto-clms-theme/compare/1.1.57...1.1.58) - 17 October 2023

package/package.json

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

package/src/components/CclDownloadTable/CclDownloadTable.jsx

@@ -102,20 +102,17 @@ function CclDownloadTable(props) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [cartSelection, currentPage]);
 
+  const hasText = (item, text) => {
+    /* A function to search over all attributes in an object, except given ones */
+    let { path, name, UID, unique_id, ...rest } = item;
+    return Object.values(rest).find((value) => {
+      return value && value.toLowerCase().includes(text.toLocaleLowerCase());
+    });
+  };
+
   React.useEffect(() => {
-    let fItems = prePackagedCollection.filter(
-      (item) =>
-        item?.title?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
-        item?.file?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
-        item?.area?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
-        item?.year?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
-        item?.version?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
-        item?.resolution
-          ?.toLowerCase()
-          .includes(filterText.toLocaleLowerCase()) ||
-        item?.type?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
-        item?.format?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
-        item?.size?.toLowerCase().includes(filterText.toLocaleLowerCase()),
+    let fItems = prePackagedCollection.filter((item) =>
+      hasText(item, filterText),
     );
     if (filterText) {
       setCurrentPageItems(fItems.slice(0, 10));
@@ -295,7 +292,10 @@ function CclDownloadTable(props) {
                     <div className="image-modal">
                       <img
                         src={
-                          prepackage_grid_image
+                          props.dataset.download_grid_image_for_prepackages
+                            ? props.dataset.download_grid_image_for_prepackages
+                                .download
+                            : prepackage_grid_image
                             ? prepackage_grid_image
                             : PlaceHolder
                         }
@@ -328,25 +328,6 @@ function CclDownloadTable(props) {
                 {columns.map((column, key) => (
                   <th key={key}>{schema?.properties[column]?.title}</th>
                 ))}
-                {/* {columns.map((column) => {
-                  return (
-                    column !== '@id' &&
-                    column !== 'UID' &&
-                    column !== 'unique_id' &&
-                    column !== '' && <th>{column}</th>
-                  );
-                })} */}
-                {/* {columns.includes('title') && <th>Title</th>}
-                {columns.includes('file') && <th>File name</th>}
-                {columns.includes('area') && (
-                  <th>{dataset.download_table_area_of_interest_title}</th>
-                )}
-                {columns.includes('year') && <th>Year</th>}
-                {columns.includes('version') && <th>Version</th>}
-                {columns.includes('resolution') && <th>Resolution</th>}
-                {columns.includes('type') && <th>Type</th>}
-                {columns.includes('format') && <th>Format</th>}
-                {columns.includes('size') && <th>Size</th>} */}
               </tr>
             </thead>
             <tbody>
@@ -387,42 +368,6 @@ function CclDownloadTable(props) {
                             </td>
                           );
                         })}
-                        {/* {columns.includes('title') && (
-                          <td>{contentOrDash(dataset_file?.title)}</td>
-                        )}
-                        {columns.includes('file') && (
-                          <td>{contentOrDash(dataset_file?.file)}</td>
-                        )}
-                        {columns.includes('area') && (
-                          <td>{contentOrDash(dataset_file?.area)}</td>
-                        )}
-                        {columns.includes('year') && (
-                          <td>{contentOrDash(dataset_file?.year)}</td>
-                        )}
-                        {columns.includes('version') && (
-                          <td>{contentOrDash(dataset_file?.version)}</td>
-                        )}
-                        {columns.includes('resolution') && (
-                          <td>{contentOrDash(dataset_file?.resolution)}</td>
-                        )}
-                        {columns.includes('type') && (
-                          <td>
-                            <span
-                              className={
-                                'tag tag-' +
-                                (dataset_file?.type?.toLowerCase() || 'raster')
-                              }
-                            >
-                              {contentOrDash(dataset_file?.type)}
-                            </span>
-                          </td>
-                        )}
-                        {columns.includes('format') && (
-                          <td>{contentOrDash(dataset_file?.format)}</td>
-                        )}
-                        {columns.includes('size') && (
-                          <td>{contentOrDash(dataset_file?.size)}</td>
-                        )} */}
                       </tr>
                     );
                   })