From 6e0a1c4c27176f598b064da3d530f2d1291a87e1 Mon Sep 17 00:00:00 2001
From: Miu Razvan <miu.razvan28@gmail.com>
Date: Wed, 2 Sep 2020 17:48:59 +0300
Subject: [PATCH] Update

---
 jsconfig.json        | 3 ---
 mrs.developer.json   | 6 ------
 package.json         | 2 +-
 src/helpers/index.js | 6 +++++-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/jsconfig.json b/jsconfig.json
index 80ccf26..9847306 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,9 +1,6 @@
 {
     "compilerOptions": {
         "paths": {
-            "@eeacms/volto-tabs-block": [
-                "develop/volto-tabs-block/src"
-            ],
             "volto-tabsview": [
                 "develop/volto-tabsview/src"
             ],
diff --git a/mrs.developer.json b/mrs.developer.json
index c2920ae..3b9a2a6 100644
--- a/mrs.developer.json
+++ b/mrs.developer.json
@@ -1,10 +1,4 @@
 {
-  "volto-tabs-block": {
-    "url": "https://github.com/eea/volto-tabs-block.git",
-    "branch": "master",
-    "path": "src",
-    "package": "@eeacms/volto-tabs-block"
-  },
   "volto-tabsview": {
     "url": "https://github.com/eea/volto-tabsview.git",
     "branch": "master",
diff --git a/package.json b/package.json
index a2aa7af..270aa78 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
     "omelette": "ln -sf node_modules/@plone/volto/ omelette",
     "patches": "/bin/bash patches/patchit.sh > /dev/null 2>&1 ||true",
     "build": "razzle build",
-    "test": "razzle test --env=jsdom --passWithNoTests",
     "start:prod": "NODE_ENV=production node build/server.js",
     "i18n": "NODE_ENV=production node node_modules/@plone/volto/src/i18n.js",
     "develop:npx": "npx -p mrs-developer missdev --config=jsconfig.json --output=develop",
@@ -111,6 +110,7 @@
     "@eeacms/volto-metadata-block": "github:eea/volto-metadata-block#0.2.0",
     "@eeacms/volto-slate-metadata-mentions": "github:eea/volto-slate-metadata-mentions#0.2.0",
     "@eeacms/volto-widgets-view": "github:eea/volto-widgets-view#0.2.4",
+    "@eeacms/volto-tabs-block": "github:eea/volto-tabs-block#0.2.2",
     "@plone/volto": "github:eea/volto#7.11.1-beta.1",
     "axios": "^0.20.0",
     "jsonp": "^0.2.1",
diff --git a/src/helpers/index.js b/src/helpers/index.js
index 1d4e158..25a8dd1 100644
--- a/src/helpers/index.js
+++ b/src/helpers/index.js
@@ -21,9 +21,13 @@ export function addCustomGroup(config, customGroup) {
 }
 
 export function getBasePath(url) {
-  return getBaseUrl(url)
+  const parseUrl = url === '' ? '/' : url;
+  if (parseUrl) {
+    return getBaseUrl(url)
     .replace(settings.apiPath, '')
     .replace(settings.internalApiPath, '');
+  }
+  return '/'
 }
 
 export const objectHasData = (obj) => {