@eeacms/volto-arcgis-block 0.1.184 → 0.1.185

package/CHANGELOG.md

@@ -4,6 +4,11 @@ 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.185](https://github.com/eea/volto-arcgis-block/compare/0.1.184...0.1.185) - 23 August 2023
+
+#### :hammer_and_wrench: Others
+
+- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`6eca911`](https://github.com/eea/volto-arcgis-block/commit/6eca911654c9b73edda8556ce3ad8f94f09dccb7)]
 ### [0.1.184](https://github.com/eea/volto-arcgis-block/compare/0.1.183...0.1.184) - 21 August 2023
 
 #### :hammer_and_wrench: Others

package/Makefile

@@ -70,6 +70,11 @@ start:			## Start development environment
 	echo "Running:	${DOCKER_COMPOSE} up"
 	${DOCKER_COMPOSE} up
 
+.PHONY: shell
+shell:			## Start a shell in the frontend container
+	echo "Running:	${DOCKER_COMPOSE} run frontend bash"
+	${DOCKER_COMPOSE} run --entrypoint=bash frontend
+
 .PHONY: cypress-open
 cypress-open:		## Open cypress integration tests
 	NODE_ENV=development  $(NODE_MODULES)/cypress/bin/cypress open

package/docker-compose.yml

@@ -1,11 +1,12 @@
 version: "3"
 services:
   backend:
-    image: plone/plone-backend:${PLONE_VERSION:-6}
+    image: eeacms/plone-backend
     ports:
       - "8080:8080"
     environment:
       SITE: "Plone"
+      PROFILES: "eea.kitkat:testing"
 
   frontend: 
     build:
@@ -23,6 +24,9 @@ services:
     volumes:
       - ./:/app/src/addons/${ADDON_PATH}
     environment:
+      CI: "true"
+      NODE_ENV: "development"
+      RAZZLE_JEST_CONFIG: "src/addons/${ADDON_PATH}/jest-addon.config.js"
       RAZZLE_INTERNAL_API_PATH: "http://backend:8080/Plone"
       RAZZLE_DEV_PROXY_API_PATH: "http://backend:8080/Plone"
       HOST: "0.0.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.184",
+  "version": "0.1.185",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",

package/src/components/MapViewer/BookmarkWidget.jsx

@@ -92,12 +92,16 @@ class BookmarkWidget extends React.Component {
 
     this.Bookmarks.when(() => {
       this.Bookmarks.bookmarks.on('change', () => {
-        if (this.userID != null) {
+        localStorage.setItem(
+          BOOKMARK_SESSION_KEY + '_' + this.userID,
+          JSON.stringify(this.Bookmarks.bookmarks.items),
+        );
+        /*if (this.userID != null) {
           localStorage.setItem(
             BOOKMARK_SESSION_KEY + '_' + this.userID,
             JSON.stringify(this.Bookmarks.bookmarks.items),
           );
-        }
+        }*/
       });
       this.Bookmarks.on('bookmark-edit', () => {
         if (this.userID != null) {

package/src/components/MapViewer/MapViewer.jsx

@@ -416,34 +416,19 @@ export const CheckLogin = ({ reference }) => {
   );
 };
 export const CheckUserID = ({ reference }) => {
-  let { user_id, isLoggedIn } = useCartState();
-  if (isLoggedIn) {
-    return (
-      <>
-        {
-          <BookmarkWidget
-            view={reference.view}
-            map={reference.map}
-            mapViewer={reference}
-            userID={user_id}
-          />
-        }
-      </>
-    );
-  } else {
-    return (
-      <>
-        {
-          <BookmarkWidget
-            view={reference.view}
-            map={reference.map}
-            mapViewer={reference}
-            userID={null}
-          />
-        }
-      </>
-    );
-  }
+  let { user_id } = useCartState();
+  return (
+    <>
+      {
+        <BookmarkWidget
+          view={reference.view}
+          map={reference.map}
+          mapViewer={reference}
+          userID={user_id}
+        />
+      }
+    </>
+  );
 };
 
 export default compose(