@plone/volto 14.0.0-alpha.37 → 14.0.0-alpha.38

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## 14.0.0-alpha.38 (2021-11-30)
+
+### Bugfix
+
+- Use subrequest in hero block to not lost locking token. @cekk
+- Always add lang attr in html @nzambello
+- Fix time widget position on 24h format @nzambello
+
+### Internal
+
+- Remove getNavigation from Login.jsx @iRohitSingh
+- Allow listing block to be used in non-content pages (when used in a slot it
+  shouldn't crash on add/edit pages) @tiberiuichim
+- Fix typo "toolbalWidth" @iRohitSingh
+
 ## 14.0.0-alpha.37 (2021-11-26)
 
 ### Bugfix

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "14.0.0-alpha.37",
+  "version": "14.0.0-alpha.38",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"

package/src/components/manage/Blocks/HeroImageLeft/Edit.jsx

@@ -274,15 +274,19 @@ class Edit extends Component {
     });
     readAsDataURL(file).then((data) => {
       const fields = data.match(/^data:(.*);(.*),(.*)$/);
-      this.props.createContent(getBaseUrl(this.props.pathname), {
-        '@type': 'Image',
-        image: {
-          data: fields[3],
-          encoding: fields[2],
-          'content-type': fields[1],
-          filename: file.name,
+      this.props.createContent(
+        getBaseUrl(this.props.pathname),
+        {
+          '@type': 'Image',
+          image: {
+            data: fields[3],
+            encoding: fields[2],
+            'content-type': fields[1],
+            filename: file.name,
+          },
         },
-      });
+        this.props.block,
+      );
     });
   }
 
@@ -459,9 +463,9 @@ class Edit extends Component {
 export default compose(
   injectIntl,
   connect(
-    (state) => ({
-      request: state.content.create,
-      content: state.content.data,
+    (state, ownProps) => ({
+      request: state.content.subrequests[ownProps.block] || {},
+      content: state.content.subrequests[ownProps.block]?.data,
     }),
     { createContent },
   ),

package/src/components/manage/Blocks/HeroImageLeft/Edit.test.jsx

@@ -8,11 +8,16 @@ import Edit from './Edit';
 global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
 
 const mockStore = configureStore();
+const blockId = '1234';
+
 test('renders an edit hero block component', () => {
   const store = mockStore({
     content: {
       create: {},
       data: {},
+      subrequests: {
+        [blockId]: {},
+      },
     },
     intl: {
       locale: 'en',
@@ -24,7 +29,7 @@ test('renders an edit hero block component', () => {
       <Edit
         data={{ url: 'hero' }}
         selected={false}
-        block="1234"
+        block={blockId}
         content={{}}
         request={{
           loading: false,

package/src/components/manage/Blocks/Listing/withQuerystringResults.jsx

@@ -4,7 +4,7 @@ import hoistNonReactStatics from 'hoist-non-react-statics';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 
 import { getContent, getQueryStringResults } from '@plone/volto/actions';
-import { usePagination } from '@plone/volto/helpers';
+import { usePagination, getBaseUrl } from '@plone/volto/helpers';
 
 import config from '@plone/volto/registry';
 
@@ -22,7 +22,7 @@ export default function withQuerystringResults(WrappedComponent) {
     const { b_size = settings.defaultPageSize } = querystring; // batchsize
 
     // save the path so it won't trigger dispatch on eager router location change
-    const [initialPath] = React.useState(path);
+    const [initialPath] = React.useState(getBaseUrl(path));
 
     const copyFields = ['limit', 'query', 'sort_on', 'sort_order', 'depth'];
 

package/src/components/theme/App/App.jsx

@@ -8,7 +8,7 @@ import jwtDecode from 'jwt-decode';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
-import { asyncConnect } from '@plone/volto/helpers';
+import { asyncConnect, Helmet } from '@plone/volto/helpers';
 import { Segment } from 'semantic-ui-react';
 import { renderRoutes } from 'react-router-config';
 import { Slide, ToastContainer, toast } from 'react-toastify';
@@ -19,6 +19,7 @@ import cx from 'classnames';
 import config from '@plone/volto/registry';
 import { PluggablesProvider } from '@plone/volto/components/manage/Pluggable';
 import { visitBlocks } from '@plone/volto/helpers/Blocks/Blocks';
+import { injectIntl } from 'react-intl';
 
 import Error from '@plone/volto/error';
 
@@ -109,8 +110,16 @@ class App extends Component {
     const isCmsUI = isCmsUi(this.props.pathname);
     const ConnectionRefusedView = views.errorViews.ECONNREFUSED;
 
+    const language =
+      this.props.content?.language?.token ?? this.props.intl?.locale;
+
     return (
       <PluggablesProvider>
+        {language && (
+          <Helmet>
+            <html lang={language} />
+          </Helmet>
+        )}
         <BodyClass className={`view-${action}view`} />
 
         {/* Body class depending on content type */}
@@ -262,6 +271,7 @@ export default compose(
         __SERVER__ && dispatch(getWorkflow(getBaseUrl(location.pathname))),
     },
   ]),
+  injectIntl,
   connect(
     (state, props) => ({
       pathname: props.location.pathname,

package/src/components/theme/ContentMetadataTags/ContentMetadataTags.jsx

@@ -4,7 +4,6 @@ import config from '@plone/volto/registry';
 
 const ContentMetadataTags = (props) => {
   const {
-    language,
     opengraph_title,
     opengraph_description,
     seo_title,
@@ -48,7 +47,6 @@ const ContentMetadataTags = (props) => {
   return (
     <>
       <Helmet>
-        {language && <html lang={language.token} />}
         <title>{seo_title || title}</title>
         <meta name="description" content={seo_description || description} />
         <meta

package/src/components/theme/Login/Login.jsx

@@ -22,7 +22,7 @@ import qs from 'query-string';
 import { withRouter } from 'react-router-dom';
 
 import { Icon } from '@plone/volto/components';
-import { getNavigation, login } from '@plone/volto/actions';
+import { login } from '@plone/volto/actions';
 import { toast } from 'react-toastify';
 import { Toast } from '@plone/volto/components';
 
@@ -318,6 +318,6 @@ export default compose(
           .replace(/\/logout$/, '') ||
         '/',
     }),
-    { login, getNavigation },
+    { login },
   ),
 )(Login);

package/test.py

@@ -0,0 +1,8 @@
+asd = 1
+
+if asd == 2:
+    print("if1")
+elif asd:
+    print("elif1")
+elif asd == 1:
+    print("elif2")

package/theme/themes/pastanaga/extras/sidebar.less

@@ -98,10 +98,10 @@
   }
 
   &.full-size {
-    width: calc(100% - @toolbalWidth);
+    width: calc(100% - @toolbarWidth);
 
     &.no-toolbar {
-      width: calc(100% - @toolbalWidthMin);
+      width: calc(100% - @toolbarWidthMin);
     }
   }
 

package/theme/themes/pastanaga/extras/time-picker-overrides.less

@@ -35,6 +35,7 @@
 
     .rc-time-picker-panel-inner {
       width: @timePickerWidthNarrow;
+      right: 84px;
     }
   }
 

package/theme/themes/pastanaga/extras/toolbar.less

@@ -245,7 +245,7 @@ body:not(.has-sidebar):not(.has-sidebar-collapsed) {
       justify-content: center;
 
       button {
-        width: @toolbalWidth;
+        width: @toolbarWidth;
         height: 20px;
         padding: 0;
         border: 0;
@@ -342,23 +342,23 @@ body:not(.has-sidebar):not(.has-sidebar-collapsed) {
 
   @media only screen and (min-width: @largestMobileScreen) {
     .toolbar {
-      width: @toolbalWidthMin;
+      width: @toolbarWidthMin;
       height: 100%;
       flex-direction: row;
       justify-content: flex-end;
       transition: width 0.3s cubic-bezier(0.6, -0.28, 0.735, 0.045);
 
       & + .pusher {
-        margin-right: @toolbalWidthMin;
+        margin-right: @toolbarWidthMin;
         transition: margin-right 0.3s cubic-bezier(0.6, -0.28, 0.735, 0.045);
       }
 
       &.expanded {
-        width: @toolbalWidth;
+        width: @toolbarWidth;
         height: 100%;
 
         & + .pusher {
-          margin-right: @toolbalWidth;
+          margin-right: @toolbarWidth;
           transition: margin-right 0.3s cubic-bezier(0.6, -0.28, 0.735, 0.045);
         }
 
@@ -397,7 +397,7 @@ body:not(.has-sidebar):not(.has-sidebar-collapsed) {
 
       &-content {
         position: fixed;
-        left: @toolbalWidth;
+        left: @toolbarWidth;
         width: 320px;
       }
 
@@ -458,14 +458,14 @@ body:not(.has-sidebar):not(.has-sidebar-collapsed) {
 
       &-handler {
         display: flex;
-        width: @toolbalWidthMin;
+        width: @toolbarWidthMin;
         height: 100%;
         flex-direction: column;
         justify-content: center;
 
         button {
-          width: @toolbalWidthMin;
-          height: @toolbalWidth;
+          width: @toolbarWidthMin;
+          height: @toolbarWidth;
 
           &::before {
             left: 8px;

package/theme/themes/pastanaga/globals/site.variables

@@ -9,8 +9,8 @@
 @fontName          : 'Poppins';
 
 @googleFontSizes   : '300,400,500,700,400italic,700italic&display=swap';
-@toolbalWidth: 80px;
-@toolbalWidthMin: 20px;
+@toolbarWidth: 80px;
+@toolbarWidthMin: 20px;
 @fullSizeIcon: 36px;