@eeacms/volto-globalsearch 1.0.13 → 1.0.15

package/CHANGELOG.md

@@ -4,6 +4,20 @@ 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.15](https://github.com/eea/volto-globalsearch/compare/1.0.14...1.0.15) - 14 March 2023
+
+#### :hammer_and_wrench: Others
+
+- use registry.resolve for healthcheck [Zoltan Szabo - [`77ac70f`](https://github.com/eea/volto-globalsearch/commit/77ac70f2b82c8db9a22f9a6d3ccae901d9b10002)]
+- Add healthcheck [Tiberiu Ichim - [`1860323`](https://github.com/eea/volto-globalsearch/commit/1860323629fa54fbd52ecf9d16ac5ccd0a3a8f7d)]
+### [1.0.14](https://github.com/eea/volto-globalsearch/compare/1.0.13...1.0.14) - 10 March 2023
+
+#### :hammer_and_wrench: Others
+
+- test(Jenkinsfile): Use latest stable volto for testing [Zoltan Szabo - [`f0f9449`](https://github.com/eea/volto-globalsearch/commit/f0f94497767e6a7cf8ecb721fabddba757d7aebd)]
+- use the correct thumbnails for the new eea site [Zoltan Szabo - [`5e2a38f`](https://github.com/eea/volto-globalsearch/commit/5e2a38ffe2559b9d64e6431cf3b08bfe8c9b4bae)]
+- update landing page config [Zoltan Szabo - [`e00c526`](https://github.com/eea/volto-globalsearch/commit/e00c5268bad30215808497ec0f1b8072a7288f05)]
+- use current year for Publishing year facet [Zoltan Szabo - [`01e6cf2`](https://github.com/eea/volto-globalsearch/commit/01e6cf26dadd5e43d121cf2230dad32da7d12d79)]
 ### [1.0.13](https://github.com/eea/volto-globalsearch/compare/1.0.12...1.0.13) - 7 March 2023
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-globalsearch",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "@eeacms/volto-globalsearch: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/config/facets.js

@@ -48,6 +48,9 @@ const languageCodes = [
   'tr',
 ];
 
+const today = new Date();
+const currentYear = today.getFullYear();
+
 const facets = [
   booleanFacet(() => ({
     field: 'IncludeArchived',
@@ -167,7 +170,7 @@ const facets = [
     // TODO: implement split in buckets
     ranges: makeRange({
       step: 1,
-      normalRange: [1994, 2022],
+      normalRange: [1994, currentYear],
       includeOutlierStart: false,
       includeOutlierEnd: false,
     }),

package/src/config/global-search-base-config.js

@@ -22,7 +22,8 @@ const globalSearchBaseConfig = {
   runtime_mappings: build_runtime_mappings(clusters),
   useSearchPhrases: false,
   searchAsYouType: false,
-  landingPageURL: '/en/advanced-search',
+  landingPageURL: null,
+  healthcheck: 'getGlobalSearchHealthcheck',
   getActiveFilters: 'getGlobalSearchActiveFilters',
 
   ...vocabs,

package/src/config/global-search-config.js

@@ -3,6 +3,7 @@ import cloneDeep from 'lodash.clonedeep';
 import globalSearchBaseConfig from './global-search-base-config.js';
 
 let globalSearchConfig = cloneDeep(globalSearchBaseConfig);
+globalSearchConfig.landingPageURL = '/en/advanced-search';
 
 globalSearchConfig.facets = globalSearchConfig.facets.filter(
   (facet) => facet['field'] !== 'subject.keyword',

package/src/config/healthcheck.js

@@ -0,0 +1,23 @@
+import runRequest from '@eeacms/search/lib/runRequest';
+import buildRequest from '@eeacms/search/lib/search/query';
+
+export default function healthcheck(appConfig) {
+  // is index ok?
+  // return index update date
+  // run default query, see number of results
+  // nlpservice provides answer based on extracted term
+  // number of documents with error in data raw, type of error
+
+  return new Promise((resolve, reject) => {
+    const body = buildRequest({ filters: [] }, appConfig);
+    runRequest(body, appConfig).then((resp) => {
+      let total;
+      try {
+        total = resp.body.hits.total.value;
+        resolve({ documentCount: total });
+      } catch {
+        reject({ total: -1 });
+      }
+    });
+  });
+}

package/src/config/index.js

@@ -4,6 +4,8 @@ import {
   isFilterValueDefaultValue,
 } from '@eeacms/search';
 import { getGlobalsearchThumbUrl, getGlobalsearchIconUrl } from './../utils';
+import healthcheck from './healthcheck';
+
 import { typesForClustersOptionsFilter } from './clusters';
 
 import { UniversalCard } from '@eeacms/volto-listing-block';
@@ -108,6 +110,8 @@ export default function install(config) {
     },
   };
 
+  config.resolve.getGlobalSearchHealthcheck = healthcheck;
+
   config.resolve.getGlobalsearchIconUrl = getGlobalsearchIconUrl(
     contentTypeNormalize,
   );

package/src/config/views.js

@@ -83,6 +83,18 @@ export default {
       // clusterIcons,
       sortField: 'issued.date',
       sortDirection: 'desc',
+      default_filters: [
+        {
+          field: 'language',
+          values: ['en'],
+        },
+      ],
+      //TODO: This is a temporary solution, until we find another way to detect if there was any interaction on the landing page
+      filterForAllResults: {
+        field: 'items_count_language',
+        value: 1,
+      },
+
       sections: [
         {
           id: 'topics',

package/src/utils.js

@@ -167,7 +167,8 @@ export const getGlobalsearchThumbUrl = (contentTypeNormalize) => (
     result.about?.raw?.indexOf('://biodiversity.europa.eu') !== -1 ||
     result.about?.raw?.indexOf('://forest.eea.europa.eu') !== -1 ||
     result.about?.raw?.indexOf('://climate-energy.eea.europa.eu') !== -1 ||
-    result.about?.raw?.indexOf('://industry.eea.europa.eu') !== -1
+    result.about?.raw?.indexOf('://industry.eea.europa.eu') !== -1 ||
+    result.about?.raw?.indexOf('://www.eea.europa.eu/en/') !== -1
   ) {
     if (result.image_preview) {
       image = result.image_preview.raw;
@@ -175,8 +176,9 @@ export const getGlobalsearchThumbUrl = (contentTypeNormalize) => (
     }
   }
   if (
-    result.about?.raw?.startsWith('http://www.eea.europa.eu') ||
-    result.about?.raw?.startsWith('https://www.eea.europa.eu')
+    (result.about?.raw?.startsWith('http://www.eea.europa.eu') ||
+      result.about?.raw?.startsWith('https://www.eea.europa.eu')) &&
+    result.about?.raw?.indexOf('://www.eea.europa.eu/en/') === -1
   ) {
     image = result.about.raw + '/image_preview';
     has_img = true;