Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
razvanMiu committed Sep 2, 2020
1 parent 427df5e commit 6e0a1c4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
3 changes: 0 additions & 3 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"compilerOptions": {
"paths": {
"@eeacms/volto-tabs-block": [
"develop/volto-tabs-block/src"
],
"volto-tabsview": [
"develop/volto-tabsview/src"
],
Expand Down
6 changes: 0 additions & 6 deletions mrs.developer.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 5 additions & 1 deletion src/helpers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down

0 comments on commit 6e0a1c4

Please sign in to comment.