Merge pull request #21 from eea/develop

avoinea · web-flow · commit 4f0e90fbf7cb · 2022-06-13T23:51:56.000+03:00
Release
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "eea-website-backend"]
+	path = eea-website-backend
+	url = git@github.com:eea/eea-website-backend.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,21 @@ 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.14.0](https://github.com/eea/eea-website-frontend/compare/0.13.0...0.14.0)
+
+- Search integration [`#13`](https://github.com/eea/eea-website-frontend/pull/13)
+- Release @eeacms/volto-eea-website-policy@0.2.4 [`df86792`](https://github.com/eea/eea-website-frontend/commit/df86792ded96d6807a9fc83770b9b093527c3a5f)
+- Release @eeacms/volto-eea-website-theme@0.6.8 [`9d929cd`](https://github.com/eea/eea-website-frontend/commit/9d929cd53b48024feb301b2c694e86fb3a20f073)
+- Release @eeacms/volto-eea-design-system@0.5.1 [`9ea820f`](https://github.com/eea/eea-website-frontend/commit/9ea820fdce6701267e0f59a5e664f17903df9b6c)
+- Release @eeacms/volto-hero-block@0.1.1 [`62a0d85`](https://github.com/eea/eea-website-frontend/commit/62a0d85a830decaf447fcccbeae08b7588e43a3c)
+- Release @eeacms/volto-searchlib@0.3.4 [`2da760a`](https://github.com/eea/eea-website-frontend/commit/2da760a937f1fc96250c7405e92c810f6f9cf32f)
+- Release @eeacms/volto-eea-kitkat@6.1.1 [`64d1f1c`](https://github.com/eea/eea-website-frontend/commit/64d1f1cc526ad2821ad1aaa83d3af2d3959a4746)
+
 #### [0.13.0](https://github.com/eea/eea-website-frontend/compare/0.12.0...0.13.0)
 
+> 11 June 2022
+
+- Release [`#20`](https://github.com/eea/eea-website-frontend/pull/20)
 - Release @eeacms/volto-eea-kitkat@6.1.0 [`53673ff`](https://github.com/eea/eea-website-frontend/commit/53673ff8c386ef71f0fdda5fac638a019b9cada9)
 - Release @eeacms/volto-eea-design-system@0.5.0 [`ccca126`](https://github.com/eea/eea-website-frontend/commit/ccca126a51bf4f443f3201c009478418c1fb6a2e)
 - Release volto-hero-block 0.1.0 [`7332f1b`](https://github.com/eea/eea-website-frontend/commit/7332f1b4e6a42f665d46926320d0d60fb5ceba01)
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![Release](https://img.shields.io/github/v/release/eea/eea-website-frontend?sort=semver)](https://github.com/eea/eea-website-frontend/releases)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto/eea-website-frontend/master&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/eea-website-frontend/job/master/display/redirect)
 [![Pipeline develop](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Feea-website-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/eea-website-frontend/job/develop/lastBuild/display/redirect)
-[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Feea-website-frontend%2F0.13.0&build=last&subject=release%20v0.13.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/eea-website-frontend/job/0.13.0/lastBuild/display/redirect/)
+[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Feea-website-frontend%2F0.14.0&build=last&subject=release%20v0.14.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/eea-website-frontend/job/0.14.0/lastBuild/display/redirect/)
 
 ## Documentation
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.4'
 services:
   backend:
-    build: ./api/
+    build: ./eea-website-backend/
     ports:
     - "${BACKEND:-8080}:8080"
     environment:
diff --git a/eea-website-backend b/eea-website-backend
@@ -0,0 +1 @@
+Subproject commit 49b433d13cc840da3fbc7d1f1eb0b74b4fc5594e
diff --git a/jsconfig.json b/jsconfig.json
@@ -112,6 +112,15 @@
             "@eeacms/volto-call-to-action-block": [
                 "addons/volto-call-to-action-block/src"
             ],
+            "@eeacms/volto-searchlib": [
+                "addons/volto-searchlib/src"
+            ],
+            "@eeacms/volto-datahub": [
+                "addons/volto-datahub/src"
+            ],
+            "@eeacms/volto-globalsearch": [
+                "addons/volto-globalsearch/src"
+            ],
             "@eeacms/volto-hero-block": [
                 "addons/volto-hero-block/src"
             ]
diff --git a/jsconfig.json.prod b/jsconfig.json.prod
@@ -1,7 +1,6 @@
 {
     "compilerOptions": {
-        "paths": {
-        },
+        "paths": {},
         "baseUrl": "src"
     }
 }
diff --git a/mrs.developer.json b/mrs.developer.json
@@ -295,6 +295,38 @@
     "develop": true,
     "path": "src"
   },
+  "volto-searchlib": {
+    "develop": true,
+    "url": "git@github.com:eea/volto-searchlib.git",
+    "https": "https://github.com/eea/volto-searchlib.git",
+    "package": "@eeacms/volto-searchlib",
+    "branch": "develop",
+    "path": "src"
+  },
+  "eeacms-searchlib": {
+    "develop": false,
+    "url": "git@github.com:eea/eeacms-searchlib.git",
+    "https": "https://github.com/eea/eeacms-searchlib.git",
+    "package": "@eeacms/search",
+    "path": "src",
+    "branch": "develop"
+  },
+  "volto-datahub": {
+    "develop": true,
+    "url": "git@github.com:eea/volto-datahub.git",
+    "https": "https://github.com/eea/volto-datahub.git",
+    "package": "@eeacms/volto-datahub",
+    "path": "src",
+    "branch": "develop"
+  },
+  "volto-globalsearch": {
+    "develop": true,
+    "url": "git@github.com:eea/volto-globalsearch.git",
+    "https": "https://github.com/eea/volto-globalsearch.git",
+    "package": "@eeacms/volto-globalsearch",
+    "path": "src",
+    "branch": "develop"
+  },
   "volto-hero-block": {
     "url": "git@github.com:eea/volto-hero-block.git",
     "https": "https://github.com/eea/volto-hero-block.git",
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "eea-website-frontend",
   "description": "EEA Main Website frontend (Plone 6)",
   "license": "MIT",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "scripts": {
     "start": "razzle start",
     "postinstall": "yarn omelette && yarn patches",
@@ -56,6 +56,9 @@
     "@eeacms/volto-hero-block",
     "@eeacms/volto-eea-kitkat",
     "@eeacms/volto-slate-label",
+    "@eeacms/volto-searchlib",
+    "@eeacms/volto-globalsearch",
+    "@eeacms/volto-datahub",
     "@eeacms/volto-eea-design-system",
     "@eeacms/volto-eea-website-theme",
     "@eeacms/volto-eea-website-policy"
@@ -157,15 +160,22 @@
   "engines": {
     "node": "^12 || ^14 || ^16"
   },
+  "resolutions": {
+    "react-select": "4.3.1"
+  },
   "dependencies": {
+    "@eeacms/search": "0.2.11",
     "@eeacms/volto-call-to-action-block": "0.2.2",
+    "@eeacms/volto-datahub": "0.1.1",
     "@eeacms/volto-description-block": "0.3.0",
-    "@eeacms/volto-eea-design-system": "0.5.0",
-    "@eeacms/volto-eea-kitkat": "6.1.0",
-    "@eeacms/volto-eea-website-policy": "0.2.3",
-    "@eeacms/volto-eea-website-theme": "0.6.7",
-    "@eeacms/volto-hero-block": "0.1.0",
+    "@eeacms/volto-eea-design-system": "0.5.1",
+    "@eeacms/volto-eea-kitkat": "6.1.1",
+    "@eeacms/volto-eea-website-policy": "0.2.4",
+    "@eeacms/volto-eea-website-theme": "0.6.8",
+    "@eeacms/volto-globalsearch": "0.1.3",
+    "@eeacms/volto-hero-block": "0.1.1",
     "@eeacms/volto-quote-block": "0.3.1",
+    "@eeacms/volto-searchlib": "0.3.4",
     "@eeacms/volto-slate-label": "0.2.2",
     "@eeacms/volto-statistic-block": "0.1.2",
     "@eeacms/volto-tags-block": "0.2.3",
diff --git a/start_dev.sh b/start_dev.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+env \
+  DEBUG=esmiddleware \
+  RAZZLE_PROXY_ES_DSN_datahub=http://10.120.10.204:60168/data_searchui_datahub \
+  RAZZLE_PROXY_ES_DSN_globalsearch=http://10.120.10.204:60168/data_searchui \
+  RAZZLE_PROXY_QA_DSN_globalsearch=http://10.120.10.204:60022/api \
+  yarn start
+
+# RAZZLE_PROXY_ES_DSN_datahub=http://10.120.10.131:57664/data_searchui_datahub \
+# RAZZLE_PROXY_QA_DSN_globalsearch=http://localhost:8000/api \
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "eea-website-backend"]`
	`2`	`+ path = eea-website-backend`
	`3`	`+ url = git@github.com:eea/eea-website-backend.git`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`		`- "paths": {`
`4`		`- },`
	`3`	`+ "paths": {},`
`5`	`4`	`"baseUrl": "src"`
`6`	`5`	`}`
`7`	`6`	`}`