Merge pull request #9 from eea/develop

Add UniversalItem
eea · Sep 27, 2022 · 2c33065 · 2c33065
2 parents 962af8e + be9eba6
commit 2c33065
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 49 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,62 +4,58 @@ 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).
 
-#### [0.1.5](https://github.com/eea/volto-globalsearch/compare/0.1.4...0.1.5)
+### [0.1.6](https://github.com/eea/volto-globalsearch/compare/0.1.5...0.1.6) - 27 September 2022
 
-- Dropdown filters [`#7`](https://github.com/eea/volto-globalsearch/pull/7)
-- Use simple facet view for reading time [`7b1d61c`](https://github.com/eea/volto-globalsearch/commit/7b1d61c533ce64061ec1430c3d3b71b3f904c74b)
-- New version of facets for globalsearch [`b3cef12`](https://github.com/eea/volto-globalsearch/commit/b3cef1264f7f5d0f2c30710b1cdfd82c5adc3f98)
-- Switch to simple MultiTermFacet [`33b5062`](https://github.com/eea/volto-globalsearch/commit/33b5062347761044b94c94f9cdb33528370140bf)
-- Don't show minutes in reading time [`e35bf3d`](https://github.com/eea/volto-globalsearch/commit/e35bf3dc6b6270f21d6211b57ae68f617f2129bc)
+#### :hammer_and_wrench: Others
 
-#### [0.1.4](https://github.com/eea/volto-globalsearch/compare/0.1.3...0.1.4)
+- Fix dependencies [kreafox - [`50ad307`](https://github.com/eea/volto-globalsearch/commit/50ad307d64140c43df9dded27c0b532923885764)]
+- Add UniversalItem [kreafox - [`bd71e6b`](https://github.com/eea/volto-globalsearch/commit/bd71e6b7c6f9f57563c0eefd60ebeaeb53fff43f)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`c2d848e`](https://github.com/eea/volto-globalsearch/commit/c2d848e1efa456f53d883c50769882101e1ce19f)]
+### [0.1.5](https://github.com/eea/volto-globalsearch/compare/0.1.4...0.1.5) - 28 July 2022
 
-> 30 June 2022
+#### :hammer_and_wrench: Others
 
-- develop [`#6`](https://github.com/eea/volto-globalsearch/pull/6)
+- Use simple facet view for reading time [kreafox - [`7b1d61c`](https://github.com/eea/volto-globalsearch/commit/7b1d61c533ce64061ec1430c3d3b71b3f904c74b)]
+- New version of facets for globalsearch [Tiberiu Ichim - [`b3cef12`](https://github.com/eea/volto-globalsearch/commit/b3cef1264f7f5d0f2c30710b1cdfd82c5adc3f98)]
+- Switch to simple MultiTermFacet [Tiberiu Ichim - [`33b5062`](https://github.com/eea/volto-globalsearch/commit/33b5062347761044b94c94f9cdb33528370140bf)]
+- Don't show minutes in reading time [Tiberiu Ichim - [`e35bf3d`](https://github.com/eea/volto-globalsearch/commit/e35bf3dc6b6270f21d6211b57ae68f617f2129bc)]
+### [0.1.4](https://github.com/eea/volto-globalsearch/compare/0.1.3...0.1.4) - 30 June 2022
 
-#### [0.1.3](https://github.com/eea/volto-globalsearch/compare/0.1.2...0.1.3)
+#### :hammer_and_wrench: Others
 
-> 10 June 2022
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`5dce07b`](https://github.com/eea/volto-globalsearch/commit/5dce07ba7d1e82776a426e9746d5dab1b0acf738)]
+### [0.1.3](https://github.com/eea/volto-globalsearch/compare/0.1.2...0.1.3) - 10 June 2022
 
-- Fix dependencies [`#5`](https://github.com/eea/volto-globalsearch/pull/5)
+### [0.1.2](https://github.com/eea/volto-globalsearch/compare/0.1.1...0.1.2) - 10 June 2022
 
-#### [0.1.2](https://github.com/eea/volto-globalsearch/compare/0.1.1...0.1.2)
+#### :hammer_and_wrench: Others
 
-> 10 June 2022
+- Change layout component [kreafox - [`0c84f55`](https://github.com/eea/volto-globalsearch/commit/0c84f558596f68cff1243ed01cbec3307d1e1fc7)]
+### [0.1.1](https://github.com/eea/volto-globalsearch/compare/0.1.0...0.1.1) - 9 June 2022
 
-- Develop [`#4`](https://github.com/eea/volto-globalsearch/pull/4)
-- New design v1 [`#3`](https://github.com/eea/volto-globalsearch/pull/3)
-- Change layout component [`0c84f55`](https://github.com/eea/volto-globalsearch/commit/0c84f558596f68cff1243ed01cbec3307d1e1fc7)
+#### :hammer_and_wrench: Others
 
-#### [0.1.1](https://github.com/eea/volto-globalsearch/compare/0.1.0...0.1.1)
+- updated versions [Zoltan Szabo - [`af47bcf`](https://github.com/eea/volto-globalsearch/commit/af47bcfc92b9f64bf05825717c70d430a02af0e4)]
+- Update versions [Tiberiu Ichim - [`6a367af`](https://github.com/eea/volto-globalsearch/commit/6a367affd02af1ddfad1686007ab2615d2f278af)]
+### [0.1.0](https://github.com/eea/volto-globalsearch/compare/0.0.1...0.1.0) - 7 June 2022
 
-> 9 June 2022
+#### :hammer_and_wrench: Others
 
-- Develop [`#2`](https://github.com/eea/volto-globalsearch/pull/2)
-- updated versions [`af47bcf`](https://github.com/eea/volto-globalsearch/commit/af47bcfc92b9f64bf05825717c70d430a02af0e4)
-- Update versions [`6a367af`](https://github.com/eea/volto-globalsearch/commit/6a367affd02af1ddfad1686007ab2615d2f278af)
+- fixed stylelint for less file [Zoltan Szabo - [`162704c`](https://github.com/eea/volto-globalsearch/commit/162704c502109e8ab0d7903568ff42603c3bc852)]
+- prettier less file [Zoltan Szabo - [`6bd424c`](https://github.com/eea/volto-globalsearch/commit/6bd424c1dae2ceceaf412339c3096dc575c0bc65)]
+- ignore eslint for *.json files [Zoltan Szabo - [`e18919e`](https://github.com/eea/volto-globalsearch/commit/e18919e1255818c5cf33bf769cca078d75ca3422)]
+- formatting [Zoltan Szabo - [`18282ed`](https://github.com/eea/volto-globalsearch/commit/18282ed159865bcbc50e2fd17417cf6d90d3e593)]
+- updated dependencies [Zoltan Szabo - [`cfcf46e`](https://github.com/eea/volto-globalsearch/commit/cfcf46ee33b23bb31f76955c12a857411f042daf)]
+- [JENKINSFILE] fix after bootstrap [valentinab25 - [`61c8c46`](https://github.com/eea/volto-globalsearch/commit/61c8c46891edf3b52768f12cf7505c034ef7bb89)]
+### 0.0.1 - 19 May 2022
 
-#### [0.1.0](https://github.com/eea/volto-globalsearch/compare/0.0.1...0.1.0)
+#### :hammer_and_wrench: Others
 
-> 7 June 2022
-
-- Develop [`#1`](https://github.com/eea/volto-globalsearch/pull/1)
-- fixed stylelint for less file [`162704c`](https://github.com/eea/volto-globalsearch/commit/162704c502109e8ab0d7903568ff42603c3bc852)
-- prettier less file [`6bd424c`](https://github.com/eea/volto-globalsearch/commit/6bd424c1dae2ceceaf412339c3096dc575c0bc65)
-- ignore eslint for *.json files [`e18919e`](https://github.com/eea/volto-globalsearch/commit/e18919e1255818c5cf33bf769cca078d75ca3422)
-- formatting [`18282ed`](https://github.com/eea/volto-globalsearch/commit/18282ed159865bcbc50e2fd17417cf6d90d3e593)
-- updated dependencies [`cfcf46e`](https://github.com/eea/volto-globalsearch/commit/cfcf46ee33b23bb31f76955c12a857411f042daf)
-
-#### 0.0.1
-
-> 19 May 2022
-
-- WIP [`be733dd`](https://github.com/eea/volto-globalsearch/commit/be733dd1b600855d330cf92fbdcbf75bdade37dc)
-- enable nlp for globalsearch [`af84cf8`](https://github.com/eea/volto-globalsearch/commit/af84cf80adecb402ee32e248a1939f32342e35cf)
-- Disable thumbnail for datahub series [`07fcfda`](https://github.com/eea/volto-globalsearch/commit/07fcfda64a357ce6e91242b254b2c93759b60298)
-- Remove console.log calls [`fb7b1ed`](https://github.com/eea/volto-globalsearch/commit/fb7b1ed4b2ceea4afc716532e1122380460a95f1)
-- Depend onf volto-searchlib [`b2150f3`](https://github.com/eea/volto-globalsearch/commit/b2150f3f0f9a469622e499d8f4814e15777946a2)
-- Add stuff from searchlib [`86735df`](https://github.com/eea/volto-globalsearch/commit/86735dfd46a46754983bf4f8b22ec9b2f120f100)
-- Run bootstrap [`b219853`](https://github.com/eea/volto-globalsearch/commit/b219853d799a21f5db4460ad18c251a21e73da8f)
-- Initial commit [`51e39a1`](https://github.com/eea/volto-globalsearch/commit/51e39a1daef6e253c79d212da68183bc4e93b63f)
+- WIP [Tiberiu Ichim - [`be733dd`](https://github.com/eea/volto-globalsearch/commit/be733dd1b600855d330cf92fbdcbf75bdade37dc)]
+- enable nlp for globalsearch [Zoltan Szabo - [`af84cf8`](https://github.com/eea/volto-globalsearch/commit/af84cf80adecb402ee32e248a1939f32342e35cf)]
+- Disable thumbnail for datahub series [Zoltan Szabo - [`07fcfda`](https://github.com/eea/volto-globalsearch/commit/07fcfda64a357ce6e91242b254b2c93759b60298)]
+- Remove console.log calls [Tiberiu Ichim - [`fb7b1ed`](https://github.com/eea/volto-globalsearch/commit/fb7b1ed4b2ceea4afc716532e1122380460a95f1)]
+- Depend onf volto-searchlib [Tiberiu Ichim - [`b2150f3`](https://github.com/eea/volto-globalsearch/commit/b2150f3f0f9a469622e499d8f4814e15777946a2)]
+- Add stuff from searchlib [Tiberiu Ichim - [`86735df`](https://github.com/eea/volto-globalsearch/commit/86735dfd46a46754983bf4f8b22ec9b2f120f100)]
+- Run bootstrap [Tiberiu Ichim - [`b219853`](https://github.com/eea/volto-globalsearch/commit/b219853d799a21f5db4460ad18c251a21e73da8f)]
+- Initial commit [Tiberiu Ichim - [`51e39a1`](https://github.com/eea/volto-globalsearch/commit/51e39a1daef6e253c79d212da68183bc4e93b63f)]
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,9 +4,9 @@ pipeline {
   environment {
         GIT_NAME = "volto-globalsearch"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu,prod-www.eea.europa.eu"
         DEPENDENCIES = ""
-        VOLTO = "alpha"
+        VOLTO = "16.0.0-alpha.14"
     }
 
   stages {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-globalsearch",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "@eeacms/volto-globalsearch: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -17,15 +17,17 @@
     "url": "git@github.com:eea/volto-globalsearch.git"
   },
   "dependencies": {
-    "@eeacms/volto-searchlib": "*"
+    "@eeacms/volto-searchlib": "*",
+    "@eeacms/volto-listing-block": "*"
   },
   "devDependencies": {
     "@plone/scripts": "*",
     "@cypress/code-coverage": "^3.9.5",
     "babel-plugin-transform-class-properties": "^6.24.1"
   },
   "addons": [
-    "@eeacms/volto-searchlib"
+    "@eeacms/volto-searchlib",
+    "@eeacms/volto-listing-block"
   ],
   "scripts": {
     "release": "release-it",

diff --git a/src/config/index.js b/src/config/index.js
@@ -2,6 +2,8 @@ import { suiFacet, mergeConfig } from '@eeacms/search';
 import { getGlobalsearchThumbUrl, getGlobalsearchIconUrl } from './../utils';
 import { typesForClustersOptionsFilter } from './clusters';
 
+import { UniversalItem } from '@eeacms/volto-listing-block';
+
 // import WebsiteFilterListComponent from './../components/WebsiteFilterListComponent';
 
 import contentTypeNormalize from './json/contentTypeNormalize.json';
@@ -69,6 +71,11 @@ export default function install(config) {
   );
 
   config.resolve.typesForClustersOptionsFilter = typesForClustersOptionsFilter;
+
+  config.resolve.UniversalItem = {
+    component: UniversalItem,
+  };
+
   // config.resolve.WebsiteFilterListComponent = {
   //   component: WebsiteFilterListComponent,
   // };