From b5b93e8a24e40e7a261a4b2e52ff2269c87c83f4 Mon Sep 17 00:00:00 2001 From: Miu Razvan Date: Wed, 21 Oct 2020 22:24:49 +0300 Subject: [PATCH] Upgrade --- package.json | 10 +-- .../Blocks/DiscodataComponentsBlock/View.jsx | 2 +- src/components/manage/Blocks/Iframe/View.jsx | 4 +- theme/site/globals/site.overrides | 17 +++- yarn.lock | 90 +++++++++++++------ 5 files changed, 88 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index 1cc2f48..9e475df 100644 --- a/package.json +++ b/package.json @@ -108,15 +108,15 @@ "node": "^10 || ^12" }, "dependencies": { - "@eeacms/volto-blocks-form": "github:eea/volto-blocks-form#0.4.1", + "@eeacms/volto-blocks-form": "github:eea/volto-blocks-form#0.5.2", "@eeacms/volto-metadata-block": "github:eea/volto-metadata-block#1.0.1", - "@eeacms/volto-object-widget": "github:eea/volto-object-widget#0.2.1", + "@eeacms/volto-object-widget": "github:eea/volto-object-widget#0.2.3", "@eeacms/volto-widget-toggle": "github:eea/volto-widget-toggle#0.1.0", "@eeacms/volto-widgets-view": "github:eea/volto-widgets-view#1.0.1", - "@eeacms/volto-slate-metadata-mentions": "github:eea/volto-slate-metadata-mentions#0.4.1", + "@eeacms/volto-slate-metadata-mentions": "github:eea/volto-slate-metadata-mentions#0.4.2", "@material/react-linear-progress": "^0.15.0", - "@plone/volto": "github:eea/volto#8.0.0-beta.11", - "volto-slate": "github:eea/volto-slate#0.8.1", + "@plone/volto": "github:eea/volto#8.2.6-beta1", + "volto-slate": "github:eea/volto-slate#0.9.0-beta.4", "axios": "^0.20.0", "jsonp": "^0.2.1", "ol": "^6.4.3", diff --git a/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx b/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx index cd19967..094fd36 100644 --- a/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx +++ b/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx @@ -542,7 +542,7 @@ const renderComponents = {
{Object.entries(batConclusions) - .filter((key) => key) + .filter((key) => key && key !== 'null' && key !== 'NULL') .map(([key, conclusion]) => (
diff --git a/src/components/manage/Blocks/Iframe/View.jsx b/src/components/manage/Blocks/Iframe/View.jsx index 94aa296..9e4af3c 100644 --- a/src/components/manage/Blocks/Iframe/View.jsx +++ b/src/components/manage/Blocks/Iframe/View.jsx @@ -26,8 +26,8 @@ const View = ({ content, ...props }) => { const [flags, setFlags] = useState({}); const [windowWidth, windowHeight] = useWindowSize(); const breakPoints = { - desktop: [Infinity, 992], - tablet: [991, 768], + desktop: [Infinity, 982], + tablet: [981, 768], mobile: [767, 0], }; const { data } = props; diff --git a/theme/site/globals/site.overrides b/theme/site/globals/site.overrides index 28031fe..0084313 100644 --- a/theme/site/globals/site.overrides +++ b/theme/site/globals/site.overrides @@ -1607,7 +1607,7 @@ b { background-color: #4296B3; border-radius: 10px; display: grid; - grid-template-columns: repeat(3, 1fr); + grid-template-columns: repeat(1, 1fr); grid-gap: 10px; > div { position: relative; @@ -1648,4 +1648,19 @@ b { .mdc-linear-progress__bar-inner { background-color: #4296B2 !important; +} + +@media only screen and (max-width: 982px) { + body.has-toolbar:not(.has-sidebar):not(.has-sidebar-collapsed) .ui.container.grid-layout { + margin-left: 0 !important; + margin-right: 0 !important; + padding-left: 0 !important; + padding-right: 0 !important; + } + .ui.container.grid-layout { + margin-left: 0 !important; + margin-right: 0 !important; + padding-left: 0 !important; + padding-right: 0 !important; + } } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index ab03203..fac19df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1267,21 +1267,21 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@eeacms/volto-blocks-form@github:eea/volto-blocks-form#0.4.1": - version "0.4.0" - resolved "https://codeload.github.com/eea/volto-blocks-form/tar.gz/4aa988c0d65f2fa7a939e632fb02b95ed6b73e37" +"@eeacms/volto-blocks-form@github:eea/volto-blocks-form#0.5.2": + version "0.5.0" + resolved "https://codeload.github.com/eea/volto-blocks-form/tar.gz/f75fc97a7642d1d28dedcc2da7ea9d007114c8cd" "@eeacms/volto-metadata-block@github:eea/volto-metadata-block#1.0.1": version "1.0.1" resolved "https://codeload.github.com/eea/volto-metadata-block/tar.gz/3623f2947ed2dc0287525c8c31af9e06a6b2fc1a" -"@eeacms/volto-object-widget@github:eea/volto-object-widget#0.2.1": +"@eeacms/volto-object-widget@github:eea/volto-object-widget#0.2.3": version "0.1.0" - resolved "https://codeload.github.com/eea/volto-object-widget/tar.gz/08644af193e963de1b449db7500d8ee17bb4c853" + resolved "https://codeload.github.com/eea/volto-object-widget/tar.gz/ca7b1944000adbba2ecf09ac31dd3c7bb1b9a46e" -"@eeacms/volto-slate-metadata-mentions@github:eea/volto-slate-metadata-mentions#0.4.1": +"@eeacms/volto-slate-metadata-mentions@github:eea/volto-slate-metadata-mentions#0.4.2": version "0.3.0" - resolved "https://codeload.github.com/eea/volto-slate-metadata-mentions/tar.gz/bcbe713655f502512ca48a357c77314113cdcc18" + resolved "https://codeload.github.com/eea/volto-slate-metadata-mentions/tar.gz/a6bd37538e68a185d8e1d05f6a10bc615ed18f7c" "@eeacms/volto-widget-toggle@github:eea/volto-widget-toggle#0.1.0": version "0.1.0" @@ -1920,9 +1920,9 @@ dependencies: "@types/node" ">= 8" -"@plone/volto@github:eea/volto#8.0.0-beta.11": - version "8.2.0" - resolved "https://codeload.github.com/eea/volto/tar.gz/bc0064a58536d28f3dd6fb8db17a3d5a6e515568" +"@plone/volto@github:eea/volto#8.2.6-beta1": + version "8.2.6" + resolved "https://codeload.github.com/eea/volto/tar.gz/77f254ec51aa7de61d8a486bb34d651259b993d6" dependencies: "@babel/core" "7.9.6" "@babel/plugin-proposal-decorators" "7.8.3" @@ -2036,7 +2036,7 @@ react-dnd "5.0.0" react-dnd-html5-backend "5.0.1" react-dom "16.13.1" - react-dropzone "5.1.0" + react-dropzone "11.1.0" react-fast-compare "2.0.4" react-image-gallery "1.0.7" react-intl "3.8.0" @@ -2059,6 +2059,7 @@ redux-actions "2.6.5" redux-connect "10.0.0" redux-devtools-extension "2.13.8" + redux-localstorage-simple "^2.3.1" redux-mock-store "1.5.4" redux-thunk "2.3.0" release-it "14.0.3" @@ -3183,12 +3184,10 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -attr-accept@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-1.1.3.tgz#48230c79f93790ef2775fcec4f0db0f5db41ca52" - integrity sha512-iT40nudw8zmCweivz6j58g+RT33I4KbaIvRUhjNmDwO2WmsQUxFEZZYZ5w3vXe5x5MX9D7mfvA/XaLOZYFR9EQ== - dependencies: - core-js "^2.5.0" +attr-accept@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b" + integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg== autobind-decorator@^2.1.0: version "2.4.0" @@ -4592,6 +4591,11 @@ cliui@^5.0.0: strip-ansi "^5.2.0" wrap-ansi "^5.1.0" +clone-function@>=1.0.1: + version "1.0.6" + resolved "https://registry.yarnpkg.com/clone-function/-/clone-function-1.0.6.tgz#428471937750bca9c48ecbfbc16f6e232f74a03d" + integrity sha1-QoRxk3dQvKnEjsv7wW9uIy90oD0= + clone-regexp@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.1.tgz#051805cd33173375d82118fc0918606da39fd60f" @@ -7219,6 +7223,13 @@ file-loader@^4.3.0: loader-utils "^1.2.3" schema-utils "^2.5.0" +file-selector@^0.1.12: + version "0.1.13" + resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.1.13.tgz#5efd977ca2bca1700992df1b10e254f4e73d2df4" + integrity sha512-T2efCBY6Ps+jLIWdNQsmzt/UnAjKOEAlsZVdnQztg/BtAZGNL4uX1Jet9cMM8gify/x4CSudreji2HssGBNVIQ== + dependencies: + tslib "^2.0.1" + file-uri-to-path@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" @@ -11752,6 +11763,11 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" +object-foreach@>=0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/object-foreach/-/object-foreach-0.1.2.tgz#d7421c5b40e3b6a3ef57ac624368d21d8f8d2dec" + integrity sha1-10IcW0DjtqPvV6xiQ2jSHY+NLew= + object-inspect@^1.7.0, object-inspect@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" @@ -11770,6 +11786,14 @@ object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== +object-merge@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/object-merge/-/object-merge-2.5.1.tgz#077e8915ce38ea7294788448c5dd339e34df4227" + integrity sha1-B36JFc446nKUeIRIxd0znjTfQic= + dependencies: + clone-function ">=1.0.1" + object-foreach ">=0.1.2" + object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" @@ -14138,13 +14162,14 @@ react-draggable@^4.0.3: classnames "^2.2.5" prop-types "^15.6.0" -react-dropzone@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-5.1.0.tgz#04993c1fd45316a39da1d8c77c5f73a9c0f79b89" - integrity sha512-cIYp3GCm0I4fckmQJhrFSKq/W91Ma1BZTCXMr7hg1jnVYmERsa6bruJroci4Lq9QvdoAnh+6r6SVQ2v6CVQ6Hg== +react-dropzone@11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-11.1.0.tgz#c225f3c53450c80fbd80954361dc039090bfc14c" + integrity sha512-gJT6iJadyTbevrigm6KZFaei/yNWfokzs1idumO7fXtRNPiGFDUpsQ+trHWwUO3yWOtJibpbo5tLZggjm+KV5w== dependencies: - attr-accept "^1.1.3" - prop-types "^15.6.2" + attr-accept "^2.0.0" + file-selector "^0.1.12" + prop-types "^15.7.2" react-error-overlay@^6.0.6, react-error-overlay@^6.0.7: version "6.0.7" @@ -14479,7 +14504,7 @@ react-transition-group@^4: loose-envify "^1.4.0" prop-types "^15.6.2" -react-visibility-sensor@^5.1.1: +react-visibility-sensor@5.1.1, react-visibility-sensor@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/react-visibility-sensor/-/react-visibility-sensor-5.1.1.tgz#5238380960d3a0b2be0b7faddff38541e337f5a9" integrity sha512-cTUHqIK+zDYpeK19rzW6zF9YfT4486TIgizZW53wEZ+/GPBbK7cNS0EHyJVyHYacwFEvvHLEKfgJndbemWhB/w== @@ -14755,6 +14780,13 @@ redux-devtools-extension@2.13.8: resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.8.tgz#37b982688626e5e4993ff87220c9bbb7cd2d96e1" integrity sha512-8qlpooP2QqPtZHQZRhx3x3OP5skEV1py/zUdMY28WNAocbafxdG2tRD1MWE7sp8obGMNYuLWanhhQ7EQvT1FBg== +redux-localstorage-simple@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/redux-localstorage-simple/-/redux-localstorage-simple-2.3.1.tgz#108a75939eacb2d910103b84a8a4a9f6aef28433" + integrity sha512-lxzFtkjJMn5Oyi46OpcjtVjwsBJL6/5TWE9YJwSpt+bhJSQ6dlGedydFk2us84h3W9sWrhQ0RO9G3yJlJ2waaw== + dependencies: + object-merge "2.5.1" + redux-mock-store@1.5.4: version "1.5.4" resolved "https://registry.yarnpkg.com/redux-mock-store/-/redux-mock-store-1.5.4.tgz#90d02495fd918ddbaa96b83aef626287c9ab5872" @@ -17156,6 +17188,11 @@ tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== +tslib@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" + integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" @@ -17793,15 +17830,16 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -"volto-slate@github:eea/volto-slate#0.8.1": +"volto-slate@github:eea/volto-slate#0.9.0-beta.4": version "0.7.1" - resolved "https://codeload.github.com/eea/volto-slate/tar.gz/765d4db6fa711c4b7bc80eef67148f931a71cbaf" + resolved "https://codeload.github.com/eea/volto-slate/tar.gz/104267231061869a22d9ab63aeeb9c68e8b72b4b" dependencies: "@types/jest" "^25.2.3" classnames "2.2.6" image-extensions "1.1.0" is-url "1.2.4" jsdom "16.2.2" + react-visibility-sensor "5.1.1" slate "^0.59" slate-history "^0.59" slate-hyperscript "^0.59"