@eeacms/volto-clms-theme 1.0.69 → 1.0.70

package/CHANGELOG.md

@@ -4,8 +4,24 @@ 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.0.70](https://github.com/eea/volto-clms-theme/compare/1.0.69...1.0.70)
+
+- test [`030fee9`](https://github.com/eea/volto-clms-theme/commit/030fee91c17a03a5a3449500af23429d47c2b168)
+- gemet inspire themes label renaming [`669643a`](https://github.com/eea/volto-clms-theme/commit/669643a41d16c84c044b564047fee161a10a1e80)
+- fix te3st [`5b49612`](https://github.com/eea/volto-clms-theme/commit/5b49612b558765f326f14aaae8b195e21d02c461)
+- fix test [`a0fade3`](https://github.com/eea/volto-clms-theme/commit/a0fade3fa8dfb9bcce669b73e6181d9fe32af1b8)
+- fix routing on vertical tabs with search filters [`d5515a1`](https://github.com/eea/volto-clms-theme/commit/d5515a163fee044405070848b9b65c27b3cab34c)
+- search widget modification [`79fd282`](https://github.com/eea/volto-clms-theme/commit/79fd282cd4daf6bfc3f974ce28e89b6aa69106b8)
+- test [`0f4654a`](https://github.com/eea/volto-clms-theme/commit/0f4654a1b5b2b6c27cc403f4a4e15c447ce5e2df)
+- test [`2797b10`](https://github.com/eea/volto-clms-theme/commit/2797b10c42dca21f31b898de8b4483d5f3bf39c3)
+- test [`e0a1f29`](https://github.com/eea/volto-clms-theme/commit/e0a1f296b29abdb4aad93517171fc4f14218a6f0)
+- test [`8bd1316`](https://github.com/eea/volto-clms-theme/commit/8bd1316153da80952c2db8188dd71bd10d0466eb)
+
 #### [1.0.69](https://github.com/eea/volto-clms-theme/compare/1.0.68...1.0.69)
 
+> 17 February 2022
+
+- Develop [`#206`](https://github.com/eea/volto-clms-theme/pull/206)
 - new set of action and reducers to import WMS layers from a new endpoint [`#204`](https://github.com/eea/volto-clms-theme/pull/204)
 - Bugs n improvements [`#205`](https://github.com/eea/volto-clms-theme/pull/205)
 - add react-input-range to transformIgnorePatterns [`e3c704d`](https://github.com/eea/volto-clms-theme/commit/e3c704d4e0569d55b1c5cf50a3bf3191452aea38)

package/package.json

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

package/src/components/Blocks/CclButtonBlock/CclButtonBlockEdit.test.jsx

@@ -8,8 +8,6 @@ import React from 'react';
 import configureStore from 'redux-mock-store';
 import renderer from 'react-test-renderer';
 
-// import { shallow } from 'enzyme';
-
 Enzyme.configure({ adapter: new Adapter() });
 
 global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
@@ -34,6 +32,7 @@ describe('CclButtonBlockEdit', () => {
       style: 'default',
       download: false,
     };
+
     // const component = shallow(
     const component = mount(
       <Provider store={store}>
@@ -42,8 +41,12 @@ describe('CclButtonBlockEdit', () => {
             data={data}
             selected={false}
             block="1234"
-            onChangeBlock={() => {}}
-            setSidebarTab={() => {}}
+            onChangeBlock={() => {
+              return 'test';
+            }}
+            setSidebarTab={() => {
+              return 'test';
+            }}
           />
         </MemoryRouter>
       </Provider>,
@@ -74,10 +77,18 @@ describe('CclButtonBlockEdit', () => {
             data={data}
             selected={false}
             block="1234"
-            onChangeBlock={() => {}}
-            onSelectBlock={() => {}}
-            onChangeField={() => {}}
-            setSidebarTab={() => {}}
+            onChangeBlock={() => {
+              return 'test';
+            }}
+            onSelectBlock={() => {
+              return 'test';
+            }}
+            onChangeField={() => {
+              return 'test';
+            }}
+            setSidebarTab={() => {
+              return 'test';
+            }}
           />
         </MemoryRouter>
       </Provider>,
@@ -109,10 +120,18 @@ describe('CclButtonBlockEdit', () => {
             data={data}
             selected={false}
             block="1234"
-            onChangeBlock={() => {}}
-            onSelectBlock={() => {}}
-            onChangeField={() => {}}
-            setSidebarTab={() => {}}
+            onChangeBlock={() => {
+              return 'test';
+            }}
+            onSelectBlock={() => {
+              return 'test';
+            }}
+            onChangeField={() => {
+              return 'test';
+            }}
+            setSidebarTab={() => {
+              return 'test';
+            }}
           />
         </MemoryRouter>
       </Provider>,

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/rewriteOptions.js

@@ -9,6 +9,28 @@ export const portal_types_labels = {
   TechnicalLibrary: 'Product documentation',
 };
 
+export const category_labels = {
+  farming: 'Farming',
+  biota: 'Biota',
+  boundaries: 'Boundaries',
+  climatologyMeteorologyAtmosphere: 'Climatology / Meteorology / Atmosphere',
+  economy: 'Economy',
+  elevation: 'Elevation',
+  environment: 'Environment',
+  geoscientificInformation: 'Geoscientific Information',
+  health: 'Health',
+  imageryBaseMapsEarthCover: 'Imagery / Base Maps / Earth Cover',
+  intelligenceMilitary: 'Intelligence / Military',
+  inlandWaters: 'InlandWaters',
+  location: 'Location',
+  oceans: 'Oceans',
+  planningCadastre: 'Planning Cadastre',
+  society: 'Society',
+  structure: 'Structure',
+  transportation: 'Transportation',
+  utilitiesCommunication: 'Utilities / Communication',
+};
+
 const rewriteOptions = (name, choices) => {
   var result = choices;
   if (name === 'review_state') {
@@ -27,7 +49,6 @@ const rewriteOptions = (name, choices) => {
     'Tender',
     'TechnicalLibrary',
   ];
-
   if (name === 'portal_type') {
     result = choices
       .filter((opt) => portal_types.includes(opt.value))
@@ -43,6 +64,20 @@ const rewriteOptions = (name, choices) => {
         return 0;
       });
   }
+  if (name === 'classificationTopicCategory') {
+    result = choices
+      .map((opt) => {
+        return { ...opt, label: category_labels[opt.value] };
+      })
+      .sort((a, b) => {
+        if (a.label < b.label) {
+          return -1;
+        } else if (a.label > b.label) {
+          return 1;
+        }
+        return 0;
+      });
+  }
   return result;
 };
 

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/CclVerticalFaqTabsView.jsx

@@ -61,7 +61,7 @@ const CclVerticalFaqTabsView = (props) => {
                 className={cx('card', tab === activeTab && 'active')}
               >
                 <NavLink
-                  to={'#tab' + tabIndex}
+                  to={'#tab=' + tabIndex}
                   className="collapsed"
                   onClick={(e) => {
                     handleActive(activeTab, tab, setActiveTab);

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/CclVerticalTabsView.jsx

@@ -80,7 +80,7 @@ const CclVerticalTabsView = (props) => {
                   <span>{title || defaultTitle}</span>
                 ) : (
                   <NavLink
-                    to={'#tab' + tabIndex}
+                    to={'#tab=' + tabIndex}
                     className="collapsed"
                     onClick={(e) => {
                       handleClick(e, tab, activeTab, setActiveTab);

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/RoutingHOC.jsx

@@ -16,7 +16,7 @@ const RoutingHOC = (TabView) =>
       ) {
         return rTabsList[0];
       }
-      return rTabsList[window.location.hash.substring(4) - 1];
+      return rTabsList[window.location.hash.match(/.*&?#?tab=(.*)/)[1] - 1];
     }
     React.useEffect(() => {
       const isReload =

package/src/customizations/volto/components/theme/SearchWidget/SearchWidget.jsx

@@ -90,7 +90,7 @@ class SearchWidget extends Component {
   onSubmit(event) {
     const section = this.state.section ? `&path=${this.props.pathname}` : '';
     this.props.history.push(
-      `/${this.props.locale}/search?SearchableText=${this.state.text}${section}`,
+      `/${this.props.locale}/global-search?SearchableText=${this.state.text}${section}`,
     );
     event.preventDefault();
   }
@@ -104,7 +104,7 @@ class SearchWidget extends Component {
     return (
       <Form
         className="ccl-header-search"
-        action="/search"
+        action="/global-search"
         onSubmit={this.onSubmit}
       >
         <Input