Sidebar update

eea · Aug 30, 2020 · a5e4e1a · a5e4e1a
1 parent a3d19c3
commit a5e4e1a
Show file tree

Hide file tree

Showing 14 changed files with 789 additions and 804 deletions.
diff --git a/jsconfig.json b/jsconfig.json
@@ -2,11 +2,14 @@
     "compilerOptions": {
         "paths": {
             "@eeacms/volto-tabs-block": [
-                "develop/volto-tabsblock/src"
+                "develop/volto-tabs-block/src"
             ],
             "volto-tabsview": [
                 "develop/volto-tabsview/src"
             ],
+            "volto-grid-block": [
+                "develop/volto-grid-block/src"
+            ],
             "volto-datablocks": [
                 "develop/volto-datablocks/src"
             ],

diff --git a/mrs.developer.json b/mrs.developer.json
@@ -10,6 +10,11 @@
     "branch": "master",
     "path": "src"
   },
+  "volto-grid-block": {
+    "url": "https://github.com/eea/volto-grid-block.git",
+    "branch": "master",
+    "path": "src"
+  },
   "volto-datablocks": {
     "url": "https://github.com/eea/volto-datablocks.git",
     "branch": "master",

diff --git a/package.json b/package.json
@@ -11,7 +11,8 @@
     "@eeacms/volto-metadata-block",
     "@eeacms/volto-tabs-block",
     "volto-addons",
-    "volto-datablocks"
+    "volto-datablocks",
+    "volto-grid-block"
   ],
   "scripts": {
     "start": "razzle start",
@@ -103,7 +104,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",
-    "@plone/volto": "github:eea/volto#7.8.2-beta.3",
+    "@plone/volto": "github:eea/volto#7.11.1-beta.1",
     "axios": "^0.20.0",
     "jsonp": "^0.2.1",
     "ol": "^6.4.3",
@@ -115,7 +116,7 @@
     "react-loadable": "^5.5.0",
     "react-sizeme": "^2.6.12",
     "react-visibility-sensor": "^5.1.1",
-    "volto-slate": "github:eea/volto-slate#0.5.2"
+    "volto-slate": "github:eea/volto-slate#0.6.0.beta.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.8.4",

diff --git a/src/components/manage/Blocks/DetailedLink/Edit.jsx b/src/components/manage/Blocks/DetailedLink/Edit.jsx
@@ -31,7 +31,9 @@ const Edit = (props) => {
   }, [props.pages])
 
   useEffect(() => {
-    props.dispatch(getPage(pageLink));
+    if (pageLink) {
+      props.dispatch(getPage(pageLink));
+    }
     /* eslint-disable-next-line */
   }, [pageLink])
 

diff --git a/src/components/manage/Blocks/NavigationBlock/Edit.jsx b/src/components/manage/Blocks/NavigationBlock/Edit.jsx
@@ -10,7 +10,7 @@ const getSchema = (props) => {
   return {
     parent: {
       title: 'Parent page',
-      type: 'link',
+      widget: 'object_by_path',
     },
     className: {
       title: 'Classname',

diff --git a/src/components/manage/Blocks/NavigationBlock/View.jsx b/src/components/manage/Blocks/NavigationBlock/View.jsx
@@ -58,7 +58,10 @@ const View = ({ content, ...props }) => {
       </Menu>
     </div>
   ) : (
-    ''
+    <p>
+      There are no pages inside of selected page. Make sure you add pages or
+      delete the block
+    </p>
   );
 };