From 1532b131b1a4560ebe919252db31f7bb586792ab Mon Sep 17 00:00:00 2001
From: Teodor <teodorvoicu87@gmail.com>
Date: Mon, 29 Jan 2024 17:42:51 +0200
Subject: [PATCH 1/9] change UI for advanced search button

---
 .../manage/Widgets/GeolocationWidget.jsx      | 27 ++++++++++---------
 src/components/manage/Widgets/public.less     | 26 +++++++++++++++---
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/components/manage/Widgets/GeolocationWidget.jsx b/src/components/manage/Widgets/GeolocationWidget.jsx
index 2d732a1..fe6a84c 100644
--- a/src/components/manage/Widgets/GeolocationWidget.jsx
+++ b/src/components/manage/Widgets/GeolocationWidget.jsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { Grid, Button, Segment } from 'semantic-ui-react';
+import { Grid, Button } from 'semantic-ui-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { useSelector, useDispatch } from 'react-redux';
 import { FormFieldWrapper, Icon, SidebarPopup } from '@plone/volto/components';
@@ -199,13 +199,17 @@ const GeolocationWidget = (props) => {
                 />
               </Grid.Column>
             </Grid.Row>
-            <Grid.Row stretched>
-              <Segment attached className="actions">
+            <Grid.Row stretched style={{ padding: '10px 0' }}>
+              <Grid.Column width="4">
+                <div className="wrapper">
+                  <label htmlFor="advanced-search-button ">
+                    {intl.formatMessage(messages.search)}
+                  </label>
+                </div>
+              </Grid.Column>
+              <Grid.Column width="8" className="search-grid-column">
                 <Button
-                  size="mini"
-                  basic
-                  primary
-                  floated="left"
+                  className="advanced-search-button"
                   onClick={(event) => {
                     setPopup(true);
                     event.preventDefault();
@@ -213,15 +217,12 @@ const GeolocationWidget = (props) => {
                 >
                   <Icon
                     name={zoomSVG}
-                    size="30px"
-                    className="addSVG"
+                    size="22px"
                     title={intl.formatMessage(messages.search)}
                   />
+                  Search
                 </Button>
-                <label className={'popup-label'}>
-                  {intl.formatMessage(messages.search)}
-                </label>
-              </Segment>
+              </Grid.Column>
               <SidebarPopup open={isOpenPopup}>
                 <SearchGeoName
                   id={id}
diff --git a/src/components/manage/Widgets/public.less b/src/components/manage/Widgets/public.less
index b0de411..601b35f 100644
--- a/src/components/manage/Widgets/public.less
+++ b/src/components/manage/Widgets/public.less
@@ -3,10 +3,28 @@
   vertical-align: sub;
 }
 
-.ui.attached.segment.actions {
-  display: flex;
-  align-items: center;
-  gap: 1rem;
+.search-grid-column {
+  padding-left: 10px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  .advanced-search-button {
+    display: flex !important;
+    justify-content: center !important;
+    align-items: center !important;
+    padding: 7px 10px !important;
+    width: 55%;
+    border: 2px solid #004b7f !important;
+    background-color: transparent !important;
+    border-radius: 10px !important;
+    color: #004b7f !important;
+    cursor: pointer;
+    font-size: 16px;
+    opacity: 0.8;
+  }
+}
+
+.wrapper {
+  border-bottom: 1px solid #edf1f2 !important;
 }
 
 // Temporary style fix

From 200f2486589fc1ce5d890aecdccd2bdb2b120451 Mon Sep 17 00:00:00 2001
From: eea-jenkins <eea-github@googlegroups.com>
Date: Mon, 29 Jan 2024 16:48:54 +0100
Subject: [PATCH 2/9] style: Automated code fix

---
 src/components/manage/Widgets/public.less | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/manage/Widgets/public.less b/src/components/manage/Widgets/public.less
index 601b35f..547984e 100644
--- a/src/components/manage/Widgets/public.less
+++ b/src/components/manage/Widgets/public.less
@@ -4,15 +4,16 @@
 }
 
 .search-grid-column {
-  padding-left: 10px;
   padding-top: 5px;
   padding-bottom: 5px;
+  padding-left: 10px;
+
   .advanced-search-button {
     display: flex !important;
-    justify-content: center !important;
+    width: 55%;
     align-items: center !important;
+    justify-content: center !important;
     padding: 7px 10px !important;
-    width: 55%;
     border: 2px solid #004b7f !important;
     background-color: transparent !important;
     border-radius: 10px !important;

From 3645338ddaab8ca8965cdfae4f2ba79837b88fec Mon Sep 17 00:00:00 2001
From: Teodor <teodorvoicu87@gmail.com>
Date: Tue, 30 Jan 2024 13:49:51 +0200
Subject: [PATCH 3/9] fix search button in metadata section

---
 src/components/manage/Widgets/public.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/manage/Widgets/public.less b/src/components/manage/Widgets/public.less
index 547984e..2e4fea9 100644
--- a/src/components/manage/Widgets/public.less
+++ b/src/components/manage/Widgets/public.less
@@ -10,7 +10,7 @@
 
   .advanced-search-button {
     display: flex !important;
-    width: 55%;
+    max-width: 110px;
     align-items: center !important;
     justify-content: center !important;
     padding: 7px 10px !important;

From 93df3b7b12b5f17416c95ca1824d51570e04524e Mon Sep 17 00:00:00 2001
From: valentinab25 <valentinab25>
Date: Wed, 31 Jan 2024 13:33:40 +0200
Subject: [PATCH 4/9] test: Update jest,Jenkinsfile,lint to
 volto-addons-template PR30

---
 .env                 |  3 ++
 .eslintrc.js         | 65 ++++++++++++++++++++++++++++++++++++++++++++
 .gitignore           |  1 -
 .project.eslintrc.js | 48 --------------------------------
 Jenkinsfile          |  9 +++++-
 Makefile             |  9 ++++--
 jest-addon.config.js | 20 +++++++++++---
 jest.setup.js        | 65 ++++++++++++++++++++++++++++++++++++++++++++
 package.json         |  3 +-
 9 files changed, 165 insertions(+), 58 deletions(-)
 create mode 100644 .env
 create mode 100644 .eslintrc.js
 delete mode 100644 .project.eslintrc.js
 create mode 100644 jest.setup.js

diff --git a/.env b/.env
new file mode 100644
index 0000000..ef282fa
--- /dev/null
+++ b/.env
@@ -0,0 +1,3 @@
+# Jest configuration variables
+# - possible values: ON, OFF
+JEST_USE_SETUP=OFF
\ No newline at end of file
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000..0cbd65c
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,65 @@
+const fs = require('fs');
+const path = require('path');
+const projectRootPath = fs.realpathSync(__dirname + '/../../../');
+
+let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto');
+let configFile;
+if (fs.existsSync(`${projectRootPath}/tsconfig.json`))
+  configFile = `${projectRootPath}/tsconfig.json`;
+else if (fs.existsSync(`${projectRootPath}/jsconfig.json`))
+  configFile = `${projectRootPath}/jsconfig.json`;
+
+if (configFile) {
+  const jsConfig = require(configFile).compilerOptions;
+  const pathsConfig = jsConfig.paths;
+  if (pathsConfig['@plone/volto'])
+    voltoPath = `./${jsConfig.baseUrl}/${pathsConfig['@plone/volto'][0]}`;
+}
+
+const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
+const reg = new AddonConfigurationRegistry(projectRootPath);
+
+// Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
+const addonAliases = Object.keys(reg.packages).map((o) => [
+  o,
+  reg.packages[o].modulePath,
+]);
+
+const addonExtenders = reg.getEslintExtenders().map((m) => require(m));
+
+const defaultConfig = {
+  extends: `${voltoPath}/.eslintrc`,
+  settings: {
+    'import/resolver': {
+      alias: {
+        map: [
+          ['@plone/volto', '@plone/volto/src'],
+          ['@plone/volto-slate', '@plone/volto/packages/volto-slate/src'],
+          ...addonAliases,
+          ['@package', `${__dirname}/src`],
+          ['@root', `${__dirname}/src`],
+          ['~', `${__dirname}/src`],
+        ],
+        extensions: ['.js', '.jsx', '.json'],
+      },
+      'babel-plugin-root-import': {
+        rootPathSuffix: 'src',
+      },
+    },
+  },
+  rules: {
+    'react/jsx-no-target-blank': [
+      'error',
+      {
+        allowReferrer: true,
+      },
+    ],
+  }
+};
+
+const config = addonExtenders.reduce(
+  (acc, extender) => extender.modify(acc),
+  defaultConfig,
+);
+
+module.exports = config;
diff --git a/.gitignore b/.gitignore
index 53b9801..f1be4ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 .vscode/
 .history
-.eslintrc.js
 .nyc_output
 project
 coverage
diff --git a/.project.eslintrc.js b/.project.eslintrc.js
deleted file mode 100644
index 765070f..0000000
--- a/.project.eslintrc.js
+++ /dev/null
@@ -1,48 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const projectRootPath = fs.existsSync('./project')
-  ? fs.realpathSync('./project')
-  : fs.realpathSync('./../../../');
-const packageJson = require(path.join(projectRootPath, 'package.json'));
-const jsConfig = require(path.join(projectRootPath, 'jsconfig.json')).compilerOptions;
-
-const pathsConfig = jsConfig.paths;
-
-let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto');
-
-Object.keys(pathsConfig).forEach(pkg => {
-  if (pkg === '@plone/volto') {
-    voltoPath = `./${jsConfig.baseUrl}/${pathsConfig[pkg][0]}`;
-  }
-});
-const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
-const reg = new AddonConfigurationRegistry(projectRootPath);
-
-// Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
-const addonAliases = Object.keys(reg.packages).map(o => [
-  o,
-  reg.packages[o].modulePath,
-]);
-
-
-module.exports = {
-  extends: `${projectRootPath}/node_modules/@plone/volto/.eslintrc`,
-  settings: {
-    'import/resolver': {
-      alias: {
-        map: [
-          ['@plone/volto', '@plone/volto/src'],
-          ...addonAliases,
-          ['@package', `${__dirname}/src`],
-          ['~', `${__dirname}/src`],
-        ],
-        extensions: ['.js', '.jsx', '.json'],
-      },
-      'babel-plugin-root-import': {
-        rootPathSuffix: 'src',
-      },
-    },
-  },
-};
-
diff --git a/Jenkinsfile b/Jenkinsfile
index 776b290..a00a74d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -162,10 +162,16 @@ pipeline {
                 script {
                   try {
                     sh '''docker run --pull always --rm -d --name="$IMAGE_NAME-plone" -e SITE="Plone" -e PROFILES="$BACKEND_PROFILES" -e ADDONS="$BACKEND_ADDONS" eeacms/plone-backend'''
-                    sh '''docker run -d --shm-size=3g --link $IMAGE_NAME-plone:plone --name="$IMAGE_NAME-cypress" -e "RAZZLE_INTERNAL_API_PATH=http://plone:8080/Plone" --entrypoint=make --workdir=/app/src/addons/$GIT_NAME $IMAGE_NAME-frontend start-ci'''
+                    sh '''docker run -d --shm-size=4g --link $IMAGE_NAME-plone:plone --name="$IMAGE_NAME-cypress" -e "RAZZLE_INTERNAL_API_PATH=http://plone:8080/Plone" --entrypoint=make --workdir=/app/src/addons/$GIT_NAME $IMAGE_NAME-frontend start-ci'''
+                    frontend = sh script:'''docker exec --workdir=/app/src/addons/${GIT_NAME} $IMAGE_NAME-cypress make check-ci''', returnStatus: true
+                    if ( frontend != 0 ) {
+                      sh '''docker logs $IMAGE_NAME-cypress; exit 1'''
+                    }
+
                     sh '''timeout -s 9 1800 docker exec --workdir=/app/src/addons/${GIT_NAME} $IMAGE_NAME-cypress make cypress-ci'''
                   } finally {
                     try {
+                      if ( frontend == 0 ) {
                       sh '''rm -rf cypress-videos cypress-results cypress-coverage cypress-screenshots'''
                       sh '''mkdir -p cypress-videos cypress-results cypress-coverage cypress-screenshots'''
                       videos = sh script: '''docker cp $IMAGE_NAME-cypress:/app/src/addons/$GIT_NAME/cypress/videos cypress-videos/''', returnStatus: true
@@ -189,6 +195,7 @@ pipeline {
                         sh '''for file in $(find cypress-results -name *.xml); do if [ $(grep -E 'failures="[1-9].*"' $file | wc -l) -eq 0 ]; then testname=$(grep -E 'file=.*failures="0"' $file | sed 's#.* file=".*\\/\\(.*\\.[jsxt]\\+\\)" time.*#\\1#' );  rm -f cypress-videos/videos/$testname.mp4; fi; done'''
                         archiveArtifacts artifacts: 'cypress-videos/**/*.mp4', fingerprint: true, allowEmptyArchive: true
                       }
+                      }
                     } finally {
                       catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
                         junit testResults: 'cypress-results/**/*.xml', allowEmptyResults: true
diff --git a/Makefile b/Makefile
index efbf2fb..c583f3f 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ cypress-open:		## Open cypress integration tests
 
 .PHONY: cypress-run
 cypress-run:	## Run cypress integration tests
-	CYPRESS_API_PATH="${RAZZLE_DEV_PROXY_API_PATH}" NODE_ENV=development  $(NODE_MODULES)/cypress/bin/cypress run --browser chromium
+	CYPRESS_API_PATH="${RAZZLE_DEV_PROXY_API_PATH}" NODE_ENV=development  $(NODE_MODULES)/cypress/bin/cypress run
 
 .PHONY: test
 test:			## Run jest tests
@@ -155,8 +155,11 @@ start-ci:
 	cd ../..
 	yarn start
 
+.PHONY: check-ci
+check-ci:
+	$(NODE_MODULES)/.bin/wait-on -t 240000  http://localhost:3000
+
 .PHONY: cypress-ci
 cypress-ci:
 	$(NODE_MODULES)/.bin/wait-on -t 240000  http://localhost:3000
-	NODE_ENV=development make cypress-run
-
+	CYPRESS_API_PATH="${RAZZLE_DEV_PROXY_API_PATH}" NODE_ENV=development  $(NODE_MODULES)/cypress/bin/cypress run --browser chromium
diff --git a/jest-addon.config.js b/jest-addon.config.js
index 3c86610..5601ce3 100644
--- a/jest-addon.config.js
+++ b/jest-addon.config.js
@@ -1,3 +1,5 @@
+require('dotenv').config({ path: __dirname + '/.env' })
+
 module.exports = {
   testMatch: ['**/src/addons/**/?(*.)+(spec|test).[jt]s?(x)'],
   collectCoverageFrom: [
@@ -9,16 +11,21 @@ module.exports = {
     '@plone/volto/cypress': '<rootDir>/node_modules/@plone/volto/cypress',
     '@plone/volto/babel': '<rootDir>/node_modules/@plone/volto/babel',
     '@plone/volto/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
-    '@package/(.*)$': '<rootDir>/src/$1',
-    '@root/(.*)$': '<rootDir>/src/$1',
+    '@package/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
+    '@root/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
     '@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1',
     '@eeacms/(.*?)/(.*)$': '<rootDir>/node_modules/@eeacms/$1/src/$2',
-    '@plone/volto-slate':
+    '@plone/volto-slate$':
       '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
+    '@plone/volto-slate/(.*)$':
+      '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src/$1',
     '~/(.*)$': '<rootDir>/src/$1',
     'load-volto-addons':
       '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',
   },
+  transformIgnorePatterns: [
+    '/node_modules/(?!(@plone|@root|@package|@eeacms)/).*/',
+  ],
   transform: {
     '^.+\\.js(x)?$': 'babel-jest',
     '^.+\\.(png)$': 'jest-file',
@@ -33,4 +40,9 @@ module.exports = {
       statements: 5,
     },
   },
-};
+  ...(process.env.JEST_USE_SETUP === 'ON' && {
+    setupFilesAfterEnv: [
+      '<rootDir>/node_modules/@eeacms/volto-widget-geolocation/jest.setup.js',
+    ],
+  }),
+}
diff --git a/jest.setup.js b/jest.setup.js
new file mode 100644
index 0000000..85b16f7
--- /dev/null
+++ b/jest.setup.js
@@ -0,0 +1,65 @@
+import { jest } from '@jest/globals';
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import { blocksConfig } from '@plone/volto/config/Blocks';
+import installSlate from '@plone/volto-slate/index';
+
+var mockSemanticComponents = jest.requireActual('semantic-ui-react');
+var mockComponents = jest.requireActual('@plone/volto/components');
+var config = jest.requireActual('@plone/volto/registry').default;
+
+config.blocks.blocksConfig = {
+  ...blocksConfig,
+  ...config.blocks.blocksConfig,
+};
+
+jest.doMock('semantic-ui-react', () => ({
+  __esModule: true,
+  ...mockSemanticComponents,
+  Popup: ({ content, trigger }) => {
+    return (
+      <div className="popup">
+        <div className="trigger">{trigger}</div>
+        <div className="content">{content}</div>
+      </div>
+    );
+  },
+}));
+
+jest.doMock('@plone/volto/components', () => {
+  return {
+    __esModule: true,
+    ...mockComponents,
+    SidebarPortal: ({ children }) => <div id="sidebar">{children}</div>,
+  };
+});
+
+jest.doMock('@plone/volto/registry', () =>
+  [installSlate].reduce((acc, apply) => apply(acc), config),
+);
+
+const mockStore = configureStore([thunk]);
+
+global.fetch = jest.fn(() =>
+  Promise.resolve({
+    json: () => Promise.resolve({}),
+  }),
+);
+
+global.store = mockStore({
+  intl: {
+    locale: 'en',
+    messages: {},
+    formatMessage: jest.fn(),
+  },
+  content: {
+    create: {},
+    subrequests: [],
+  },
+  connected_data_parameters: {},
+  screen: {
+    page: {
+      width: 768,
+    },
+  },
+});
diff --git a/package.json b/package.json
index be1ca4f..d08df1a 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,8 @@
     "babel-plugin-transform-class-properties": "^6.24.1",
     "husky": "^8.0.3",
     "lint-staged": "^14.0.1",
-    "md5": "^2.3.0"
+    "md5": "^2.3.0",
+    "dotenv": "^16.3.2"
   },
   "lint-staged": {
     "src/**/*.{js,jsx,ts,tsx,json}": [

From fcd4d11684b804afd23e34a4f1157ecbcdac1f8a Mon Sep 17 00:00:00 2001
From: Alin Voinea <contact@avoinea.com>
Date: Thu, 1 Feb 2024 12:49:38 +0200
Subject: [PATCH 5/9] chore: package.json

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d08df1a..5c502db 100644
--- a/package.json
+++ b/package.json
@@ -30,10 +30,10 @@
     "@cypress/code-coverage": "^3.10.0",
     "@plone/scripts": "*",
     "babel-plugin-transform-class-properties": "^6.24.1",
+    "dotenv": "^16.3.2",
     "husky": "^8.0.3",
     "lint-staged": "^14.0.1",
-    "md5": "^2.3.0",
-    "dotenv": "^16.3.2"
+    "md5": "^2.3.0"
   },
   "lint-staged": {
     "src/**/*.{js,jsx,ts,tsx,json}": [

From e8523d2c7416bcbf0102b63f41e71433c9c435fd Mon Sep 17 00:00:00 2001
From: EEA Jenkins <eea-jenkins@users.noreply.github.com>
Date: Thu, 1 Feb 2024 20:06:58 +0200
Subject: [PATCH 6/9] Add Sonarqube tag using insitu-frontend addons list

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a00a74d..6e7256f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
   environment {
     GIT_NAME = "volto-widget-geolocation"
     NAMESPACE = "@eeacms"
-    SONARQUBE_TAGS = "volto.eea.europa.eu,clms.land.copernicus.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,water.europa.eu-marine,climate-adapt.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-en"
+    SONARQUBE_TAGS = "volto.eea.europa.eu,clms.land.copernicus.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,water.europa.eu-marine,climate-adapt.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-en,insitu-frontend.eionet.europa.eu"
     DEPENDENCIES = ""
     BACKEND_PROFILES = "eea.kitkat:testing"
     BACKEND_ADDONS = ""

From 2d6e58a8c03699700cf97ac4046d009298dbbe33 Mon Sep 17 00:00:00 2001
From: David Ichim <ichim.david@gmail.com>
Date: Mon, 19 Feb 2024 20:45:04 +0200
Subject: [PATCH 7/9] change(button): use volto add-item-button markup

- Refs #263695 we can remove custom css in favor of current styling from pastanaga
---
 .../manage/Widgets/GeolocationWidget.jsx      | 30 ++++++++++---------
 src/components/manage/Widgets/ListResults.jsx |  2 +-
 src/components/manage/Widgets/public.less     | 25 ----------------
 3 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/src/components/manage/Widgets/GeolocationWidget.jsx b/src/components/manage/Widgets/GeolocationWidget.jsx
index fe6a84c..77cae3d 100644
--- a/src/components/manage/Widgets/GeolocationWidget.jsx
+++ b/src/components/manage/Widgets/GeolocationWidget.jsx
@@ -208,20 +208,22 @@ const GeolocationWidget = (props) => {
                 </div>
               </Grid.Column>
               <Grid.Column width="8" className="search-grid-column">
-                <Button
-                  className="advanced-search-button"
-                  onClick={(event) => {
-                    setPopup(true);
-                    event.preventDefault();
-                  }}
-                >
-                  <Icon
-                    name={zoomSVG}
-                    size="22px"
-                    title={intl.formatMessage(messages.search)}
-                  />
-                  Search
-                </Button>
+                <div class="add-item-button-wrapper">
+                  <Button
+                    className="icon advanced-search-button"
+                    onClick={(event) => {
+                      setPopup(true);
+                      event.preventDefault();
+                    }}
+                  >
+                    <Icon
+                      name={zoomSVG}
+                      size="16px"
+                      title={intl.formatMessage(messages.search)}
+                    />
+                    Search
+                  </Button>
+                </div>
               </Grid.Column>
               <SidebarPopup open={isOpenPopup}>
                 <SearchGeoName
diff --git a/src/components/manage/Widgets/ListResults.jsx b/src/components/manage/Widgets/ListResults.jsx
index 8234f98..4ce82bc 100644
--- a/src/components/manage/Widgets/ListResults.jsx
+++ b/src/components/manage/Widgets/ListResults.jsx
@@ -96,7 +96,7 @@ const ListResults = ({
                       <a
                         href={`https://www.geonames.org/${item.geonameId}`}
                         target="_blank"
-                        rel="noreferrer"
+                        rel="noreferrer noopener"
                       >
                         {item.geonameId}
                       </a>
diff --git a/src/components/manage/Widgets/public.less b/src/components/manage/Widgets/public.less
index 2e4fea9..659a73f 100644
--- a/src/components/manage/Widgets/public.less
+++ b/src/components/manage/Widgets/public.less
@@ -3,31 +3,6 @@
   vertical-align: sub;
 }
 
-.search-grid-column {
-  padding-top: 5px;
-  padding-bottom: 5px;
-  padding-left: 10px;
-
-  .advanced-search-button {
-    display: flex !important;
-    max-width: 110px;
-    align-items: center !important;
-    justify-content: center !important;
-    padding: 7px 10px !important;
-    border: 2px solid #004b7f !important;
-    background-color: transparent !important;
-    border-radius: 10px !important;
-    color: #004b7f !important;
-    cursor: pointer;
-    font-size: 16px;
-    opacity: 0.8;
-  }
-}
-
-.wrapper {
-  border-bottom: 1px solid #edf1f2 !important;
-}
-
 // Temporary style fix
 .geo-field-wrapper {
   > .ui.grid .row .twelve.column {

From 65b98d1067fde38c3208775be637a3038f64ab34 Mon Sep 17 00:00:00 2001
From: David Ichim <ichim.david@gmail.com>
Date: Mon, 19 Feb 2024 20:52:01 +0200
Subject: [PATCH 8/9] Updated package version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index be1ca4f..b830b60 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-widget-geolocation",
-  "version": "5.1.7",
+  "version": "5.2.0",
   "description": "volto-widget-geolocation: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

From 62c4499af5efbd28456283e0f81a031927edaf9a Mon Sep 17 00:00:00 2001
From: EEA Jenkins <@users.noreply.github.com>
Date: Mon, 19 Feb 2024 19:04:30 +0000
Subject: [PATCH 9/9] Automated release 5.2.0

---
 CHANGELOG.md | 46 ++++++++++++++++++----------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8891b2d..b3b79e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +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).
 
+### [5.2.0](https://github.com/eea/volto-widget-geolocation/compare/5.1.7...5.2.0) - 19 February 2024
+
+#### :nail_care: Enhancements
+
+- change(button): of search to use volto styling for add item #66 from eea/advanced-search-ui [ichim-david - [`27a5cd2`](https://github.com/eea/volto-widget-geolocation/commit/27a5cd2cfec33b981a2339f0ad7d09b72be7ab78)]
+- change(button): use volto add-item-button markup [David Ichim - [`2d6e58a`](https://github.com/eea/volto-widget-geolocation/commit/2d6e58a8c03699700cf97ac4046d009298dbbe33)]
+
+#### :house: Internal changes
+
+- chore: package.json [Alin Voinea - [`fcd4d11`](https://github.com/eea/volto-widget-geolocation/commit/fcd4d11684b804afd23e34a4f1157ecbcdac1f8a)]
+- style: Automated code fix [eea-jenkins - [`200f248`](https://github.com/eea/volto-widget-geolocation/commit/200f2486589fc1ce5d890aecdccd2bdb2b120451)]
+
+#### :hammer_and_wrench: Others
+
+- Updated package version [David Ichim - [`65b98d1`](https://github.com/eea/volto-widget-geolocation/commit/65b98d1067fde38c3208775be637a3038f64ab34)]
+- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`93df3b7`](https://github.com/eea/volto-widget-geolocation/commit/93df3b7b12b5f17416c95ca1824d51570e04524e)]
+- fix search button in metadata section [Teodor - [`3645338`](https://github.com/eea/volto-widget-geolocation/commit/3645338ddaab8ca8965cdfae4f2ba79837b88fec)]
+- change UI for advanced search button [Teodor - [`1532b13`](https://github.com/eea/volto-widget-geolocation/commit/1532b131b1a4560ebe919252db31f7bb586792ab)]
 ### [5.1.7](https://github.com/eea/volto-widget-geolocation/compare/5.1.6...5.1.7) - 5 December 2023
 
 #### :bug: Bug Fixes
@@ -12,15 +30,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Refactor automated testing [valentinab25 - [`f922cca`](https://github.com/eea/volto-widget-geolocation/commit/f922ccab5b9aaafb4a339ba946d91ee5f20329c9)]
 
 #### :hammer_and_wrench: Others
 
-- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`82bcb17`](https://github.com/eea/volto-widget-geolocation/commit/82bcb1797f3345148c6a603f2e3cc33baf264989)]
-- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`b85472a`](https://github.com/eea/volto-widget-geolocation/commit/b85472ab313d3f93c4e270817a96596ffcd0f544)]
-- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`997043c`](https://github.com/eea/volto-widget-geolocation/commit/997043c4c14b77b2d99c83518843a42c93343075)]
-- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`af80bd8`](https://github.com/eea/volto-widget-geolocation/commit/af80bd8a135ff8cdc7f988ff7392c1612e4383cb)]
-- test: [JENKINS] Improve cypress time [valentinab25 - [`886d02a`](https://github.com/eea/volto-widget-geolocation/commit/886d02a83c00a2cac1ee1f878d5d036e2c28d0fd)]
 ### [5.1.6](https://github.com/eea/volto-widget-geolocation/compare/5.1.5...5.1.6) - 22 October 2023
 
 ### [5.1.5](https://github.com/eea/volto-widget-geolocation/compare/5.1.4...5.1.5) - 17 October 2023
@@ -47,7 +59,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`8bf8acb`](https://github.com/eea/volto-widget-geolocation/commit/8bf8acbca8df069456df12f1b4397cc7f19ebcdb)]
 - test: Fix package.json scripts to use makefile [Alin Voinea - [`b01f153`](https://github.com/eea/volto-widget-geolocation/commit/b01f1535b57cb0c0a4e17c3b8e82e260635719df)]
-- test: Fix eslint and yarn i18n [Alin Voinea - [`136fd03`](https://github.com/eea/volto-widget-geolocation/commit/136fd039d82952d5eb5481117d19715310b006a4)]
 - i18n: Add en [Alin Voinea - [`05a2dc9`](https://github.com/eea/volto-widget-geolocation/commit/05a2dc91a4fa487d828586cc909d9d343c3d1506)]
 - test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`0fce8cc`](https://github.com/eea/volto-widget-geolocation/commit/0fce8ccbcefc5f1b12b4248e962ce7ec1c822b5d)]
 ### [5.1.3](https://github.com/eea/volto-widget-geolocation/compare/5.1.2...5.1.3) - 10 August 2023
@@ -79,18 +90,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - test: jest should look for addons in node_modules Refs #253277 [valentinab25 - [`97afdc6`](https://github.com/eea/volto-widget-geolocation/commit/97afdc64e77ba6ed56a252dd425b13c0a9900601)]
 - test: add unit tests for util - refs #253277 [ana-oprea - [`5904795`](https://github.com/eea/volto-widget-geolocation/commit/5904795ce51f8c5fc3a8e5cf6812a72b284586b0)]
 - test: Fix test config, coverage Refs #253277 [valentinab25 - [`ae96b0a`](https://github.com/eea/volto-widget-geolocation/commit/ae96b0a75fb6c418281a83fe45901d68b88c08f2)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`e46d9a3`](https://github.com/eea/volto-widget-geolocation/commit/e46d9a3378b8991c38308bf820c85cb292628dc1)]
 ### [5.1.0](https://github.com/eea/volto-widget-geolocation/compare/5.0.3...5.1.0) - 27 March 2023
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`7155a34`](https://github.com/eea/volto-widget-geolocation/commit/7155a34e46cefc066790fa0d638be14e86e390c8)]
 ### [5.0.3](https://github.com/eea/volto-widget-geolocation/compare/5.0.2...5.0.3) - 2 March 2023
 
 #### :hammer_and_wrench: Others
 
 - map countrynames from taxonomy in geonames results [nileshgulia1 - [`444f50f`](https://github.com/eea/volto-widget-geolocation/commit/444f50fa31ac50f0e37675db80eceae0538f27d5)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`9cb2f2a`](https://github.com/eea/volto-widget-geolocation/commit/9cb2f2a7556d5688018cd148ef6957c6b904b6a3)]
 ### [5.0.2](https://github.com/eea/volto-widget-geolocation/compare/5.0.1...5.0.2) - 27 February 2023
 
 #### :hammer_and_wrench: Others
@@ -98,12 +106,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix proptype warning [nileshgulia1 - [`c9cc7c5`](https://github.com/eea/volto-widget-geolocation/commit/c9cc7c510d69fd980d6b8190144afdc3b1c3b594)]
 - Merge pull request #49 from eea/country_mapping_fix [Nilesh - [`27f7405`](https://github.com/eea/volto-widget-geolocation/commit/27f7405212bc77bdeef2b12398cba9ccbfbcf3d4)]
 - consume country names from country_mapping from backend if present [nileshgulia1 - [`ab91c4a`](https://github.com/eea/volto-widget-geolocation/commit/ab91c4a8bc5a80ee3d68f45194aaabfcf94394d5)]
-- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`df6a218`](https://github.com/eea/volto-widget-geolocation/commit/df6a218ce262fdec9d9733dfd924c60cdefca9b1)]
-- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`748246c`](https://github.com/eea/volto-widget-geolocation/commit/748246c00f5f10e1e1ddba7cebaa5bde289432e5)]
 - test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`ee943bd`](https://github.com/eea/volto-widget-geolocation/commit/ee943bd7fb8c6e0e37114c3c7be70158973f1d7b)]
-- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`745dede`](https://github.com/eea/volto-widget-geolocation/commit/745dede703c8c625be24feb97fe8af156235cc60)]
-- yarn 3 [Alin Voinea - [`71a7571`](https://github.com/eea/volto-widget-geolocation/commit/71a7571adcbc81480589ccce3959120d565e7015)]
-- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`5dff0ab`](https://github.com/eea/volto-widget-geolocation/commit/5dff0abc11b5397ac1ca85897a46bc37d0732c92)]
 ### [5.0.1](https://github.com/eea/volto-widget-geolocation/compare/5.0.0...5.0.1) - 16 November 2022
 
 #### :hammer_and_wrench: Others
@@ -114,14 +117,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Cleanup [Alin Voinea - [`2b53756`](https://github.com/eea/volto-widget-geolocation/commit/2b5375660e6184a5875b7ac87eb17902cc7bfab9)]
-- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`24fc1be`](https://github.com/eea/volto-widget-geolocation/commit/24fc1be54e9b5f52473a704928e9770df981894a)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`41b6a2c`](https://github.com/eea/volto-widget-geolocation/commit/41b6a2cccb276db1e6f57bd4d28318628ef87a08)]
 - update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`404894f`](https://github.com/eea/volto-widget-geolocation/commit/404894fcf6b5227a19f8292f881ce66476ce5e16)]
 ### [4.0.6](https://github.com/eea/volto-widget-geolocation/compare/4.0.5...4.0.6) - 30 June 2022
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`c706ec9`](https://github.com/eea/volto-widget-geolocation/commit/c706ec94c0d51443d81a788c1c100e6cc268b034)]
 ### [4.0.5](https://github.com/eea/volto-widget-geolocation/compare/4.0.4...4.0.5) - 20 June 2022
 
 #### :hammer_and_wrench: Others
@@ -137,40 +137,30 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - eslint [nileshgulia1 - [`c91d86c`](https://github.com/eea/volto-widget-geolocation/commit/c91d86c33a4756373294d1779d01f19775b8363d)]
 - fix filters [nileshgulia1 - [`9822e51`](https://github.com/eea/volto-widget-geolocation/commit/9822e5127bf0fb7e0a9957c63d78e7460d53cb5b)]
 - fix searchWidget for coremetadata behaviour [nileshgulia1 - [`3e28cc7`](https://github.com/eea/volto-widget-geolocation/commit/3e28cc74195851ebc0537abb021032fc8429ab06)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`54c8b1c`](https://github.com/eea/volto-widget-geolocation/commit/54c8b1c85acdda12b1f026f8fa80fb63db7c9f9d)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`bc64abe`](https://github.com/eea/volto-widget-geolocation/commit/bc64abe6c60580fe7e99545f75e552e8b9af4975)]
 ### [4.0.3](https://github.com/eea/volto-widget-geolocation/compare/4.0.2...4.0.3) - 3 January 2022
 
 ### [4.0.2](https://github.com/eea/volto-widget-geolocation/compare/4.0.1...4.0.2) - 18 December 2021
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`22b1599`](https://github.com/eea/volto-widget-geolocation/commit/22b1599e3c0a9ea6848bbf13b6447e54987c5ac3)]
 ### [4.0.1](https://github.com/eea/volto-widget-geolocation/compare/4.0.0...4.0.1) - 10 December 2021
 
 #### :hammer_and_wrench: Others
 
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`acaedb9`](https://github.com/eea/volto-widget-geolocation/commit/acaedb9198fac529c8db6c1dc744730d90abc4b5)]
-- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`150d263`](https://github.com/eea/volto-widget-geolocation/commit/150d263758c9651eba879292d92edd10efa0d864)]
-- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`d19460f`](https://github.com/eea/volto-widget-geolocation/commit/d19460f1beb0f9275220ade75bc5bb9d58571951)]
-- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`d77d8cf`](https://github.com/eea/volto-widget-geolocation/commit/d77d8cf8d04177df6f4564a78804b7a7e1ca5f67)]
-- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`1d5a574`](https://github.com/eea/volto-widget-geolocation/commit/1d5a5744b2bca35cd2a6d6ffe76c24a573cac62b)]
 ## [4.0.0](https://github.com/eea/volto-widget-geolocation/compare/3.0.3...4.0.0) - 24 September 2021
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`c374d87`](https://github.com/eea/volto-widget-geolocation/commit/c374d87267b340ba40cd61b53b24e8b9f135c974)]
 ### [3.0.3](https://github.com/eea/volto-widget-geolocation/compare/3.0.2...3.0.3) - 16 September 2021
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`f28a503`](https://github.com/eea/volto-widget-geolocation/commit/f28a503ea7ed70a857a1556d71ec50138086494b)]
 ### [3.0.2](https://github.com/eea/volto-widget-geolocation/compare/3.0.1...3.0.2) - 9 September 2021
 
 #### :hammer_and_wrench: Others
 
 - Fix volto-corsproxy dependency pin [Alin Voinea - [`ded8151`](https://github.com/eea/volto-widget-geolocation/commit/ded8151484d2d2406fafe3a3bfe3548a2d38b06a)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`045c761`](https://github.com/eea/volto-widget-geolocation/commit/045c761ff0958adea7ac2da3c28cbbf3dd6fcedb)]
 ### [3.0.1](https://github.com/eea/volto-widget-geolocation/compare/3.0.0...3.0.1) - 18 June 2021
 
 ## [3.0.0](https://github.com/eea/volto-widget-geolocation/compare/2.3.0...3.0.0) - 9 June 2021