@plone/volto 16.30.1 → 16.30.3

package/package.json

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

package/packages/volto-slate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "16.30.1",
+  "version": "16.30.3",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/manage/Blocks/Listing/getAsyncData.js

@@ -1,14 +1,29 @@
 import { getQueryStringResults } from '@plone/volto/actions';
 import { resolveBlockExtensions } from '@plone/volto/helpers';
+import qs from 'query-string';
+import { slugify } from '@plone/volto/helpers/Utils/Utils';
+
+const getCurrentPage = (location, id) => {
+  const pageQueryParam = qs.parse(location.search);
+  switch (Object.keys(pageQueryParam).length) {
+    case 0:
+      return 1;
+    case 1:
+      // when there is only one query param, it could be the simple page number or the sluggified block id
+      return pageQueryParam['page'] || pageQueryParam[slugify(`page-${id}`)];
+    default:
+      return pageQueryParam[slugify(`page-${id}`)];
+  }
+};
+
+export default function getListingBlockAsyncData(props) {
+  const { data, path, location, id, dispatch, blocksConfig, content } = props;
 
-export default function getListingBlockAsyncData({
-  dispatch,
-  data,
-  path,
-  blocksConfig,
-}) {
   const { resolvedExtensions } = resolveBlockExtensions(data, blocksConfig);
 
+  const subrequestID = content?.UID ? `${content?.UID}-${id}` : id;
+  const currentPage = getCurrentPage(location, id);
+
   return [
     dispatch(
       getQueryStringResults(
@@ -19,7 +34,8 @@ export default function getListingBlockAsyncData({
             ? { fullobjects: 1 }
             : { metadata_fields: '_all' }),
         },
-        data.block,
+        subrequestID,
+        currentPage,
       ),
     ),
   ];

package/src/components/manage/LinksToItem/LinksToItem.jsx

@@ -5,16 +5,21 @@
 import { useEffect } from 'react';
 import { Helmet } from '@plone/volto/helpers';
 import { Link } from 'react-router-dom';
+import { find } from 'lodash';
 import { Portal } from 'react-portal';
 import { Container, Segment, Table } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { useDispatch, useSelector } from 'react-redux';
-import { getContent, queryRelations } from '@plone/volto/actions';
+import { getContent, queryRelations, listActions } from '@plone/volto/actions';
+import { asyncConnect } from '@plone/volto/helpers';
+
 import {
   Icon as IconNext,
   Toolbar,
   UniversalLink,
+  Unauthorized,
 } from '@plone/volto/components';
+import { compose } from 'redux';
 
 import { getBaseUrl } from '@plone/volto/helpers';
 import backSVG from '@plone/volto/icons/back.svg';
@@ -39,6 +44,8 @@ const LinksToItem = (props) => {
   const dispatch = useDispatch();
   const pathname = props.location.pathname;
   const itempath = getBaseUrl(pathname);
+  const objectActions = useSelector((state) => state.actions.actions.object);
+  const editPermission = find(objectActions, { id: 'edit' });
 
   const title = useSelector((state) => state.content.data?.title || '');
   const myrelations = useSelector(
@@ -71,6 +78,9 @@ const LinksToItem = (props) => {
   });
 
   const relations_found = Object.keys(links_ordered).length > 0;
+  if (!editPermission) {
+    return <Unauthorized />;
+  }
   return (
     <Container id="linkstoitem">
       <Helmet title={intl.formatMessage(messages.linkstoitem)} />
@@ -182,4 +192,15 @@ const LinksToItem = (props) => {
   );
 };
 
-export default LinksToItem;
+export const __test__ = LinksToItem;
+export default compose(
+  asyncConnect([
+    {
+      key: 'actions',
+      // Dispatch async/await to make the operation synchronous, otherwise it returns
+      // before the promise is resolved
+      promise: async ({ location, store: { dispatch } }) =>
+        await dispatch(listActions(getBaseUrl(location.pathname))),
+    },
+  ]),
+)(LinksToItem);

package/src/components/manage/LinksToItem/LinksToItem.test.jsx

@@ -4,7 +4,7 @@ import { Provider } from 'react-intl-redux';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import LinksToItem from './LinksToItem';
+import { __test__ as LinksToItem } from './LinksToItem';
 
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
@@ -17,6 +17,18 @@ jest.mock('../Toolbar/More', () => jest.fn(() => <div className="More" />));
 describe('LinksToItem', () => {
   it('renders "links and references" view', () => {
     const store = mockStore({
+      actions: {
+        actions: {
+          document_actions: [],
+          object: [
+            {
+              icon: '',
+              id: 'edit',
+              title: 'Edit',
+            },
+          ],
+        },
+      },
       relations: {
         subrequests: {
           '/page-1': {

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

@@ -242,6 +242,7 @@ export const fetchContent = async ({ store, location }) => {
         id,
         data,
         blocksConfig,
+        content,
       });
       if (!p?.length) {
         throw new Error(