@plone/volto 16.22.1 → 16.23.0

package/packages/volto-slate/build/messages/src/blocks/Table/TableBlockEdit.json

@@ -0,0 +1,90 @@
+[
+  {
+    "id": "Insert row before",
+    "defaultMessage": "Insert row before"
+  },
+  {
+    "id": "Insert row after",
+    "defaultMessage": "Insert row after"
+  },
+  {
+    "id": "Delete row",
+    "defaultMessage": "Delete row"
+  },
+  {
+    "id": "Insert col before",
+    "defaultMessage": "Insert col before"
+  },
+  {
+    "id": "Insert col after",
+    "defaultMessage": "Insert col after"
+  },
+  {
+    "id": "Delete col",
+    "defaultMessage": "Delete col"
+  },
+  {
+    "id": "Hide headers",
+    "defaultMessage": "Hide headers"
+  },
+  {
+    "id": "Make the table sortable",
+    "defaultMessage": "Make the table sortable"
+  },
+  {
+    "id": "Visible only in view mode",
+    "defaultMessage": "Visible only in view mode"
+  },
+  {
+    "id": "Fixed width table cells",
+    "defaultMessage": "Fixed width table cells"
+  },
+  {
+    "id": "Make the table compact",
+    "defaultMessage": "Make the table compact"
+  },
+  {
+    "id": "Reduce complexity",
+    "defaultMessage": "Reduce complexity"
+  },
+  {
+    "id": "Divide each row into separate cells",
+    "defaultMessage": "Divide each row into separate cells"
+  },
+  {
+    "id": "Table color inverted",
+    "defaultMessage": "Table color inverted"
+  },
+  {
+    "id": "Stripe alternate rows with color",
+    "defaultMessage": "Stripe alternate rows with color"
+  },
+  {
+    "id": "Left",
+    "defaultMessage": "Left"
+  },
+  {
+    "id": "Center",
+    "defaultMessage": "Center"
+  },
+  {
+    "id": "Right",
+    "defaultMessage": "Right"
+  },
+  {
+    "id": "Bottom",
+    "defaultMessage": "Bottom"
+  },
+  {
+    "id": "Middle",
+    "defaultMessage": "Middle"
+  },
+  {
+    "id": "Top",
+    "defaultMessage": "Top"
+  },
+  {
+    "id": "Table",
+    "defaultMessage": "Table"
+  }
+]

package/packages/volto-slate/build/messages/src/blocks/Text/DefaultTextBlockEditor.json

@@ -0,0 +1,6 @@
+[
+  {
+    "id": "Type text…",
+    "defaultMessage": "Type text…"
+  }
+]

package/packages/volto-slate/build/messages/src/blocks/Text/DetachedTextBlockEditor.json

@@ -0,0 +1,6 @@
+[
+  {
+    "id": "Type text…",
+    "defaultMessage": "Type text…"
+  }
+]

package/packages/volto-slate/build/messages/src/blocks/Text/SlashMenu.json

@@ -0,0 +1,6 @@
+[
+  {
+    "id": "No matching blocks",
+    "defaultMessage": "No matching blocks"
+  }
+]

package/packages/volto-slate/build/messages/src/editor/plugins/AdvancedLink/index.json

@@ -0,0 +1,10 @@
+[
+  {
+    "id": "Edit link",
+    "defaultMessage": "Edit link"
+  },
+  {
+    "id": "Remove link",
+    "defaultMessage": "Remove link"
+  }
+]

package/packages/volto-slate/build/messages/src/editor/plugins/Link/index.json

@@ -0,0 +1,10 @@
+[
+  {
+    "id": "Add link",
+    "defaultMessage": "Add link"
+  },
+  {
+    "id": "Edit link",
+    "defaultMessage": "Edit link"
+  }
+]

package/packages/volto-slate/build/messages/src/editor/plugins/Table/index.json

@@ -0,0 +1,30 @@
+[
+  {
+    "id": "Delete table",
+    "defaultMessage": "Delete table"
+  },
+  {
+    "id": "Insert row before",
+    "defaultMessage": "Insert row before"
+  },
+  {
+    "id": "Insert row after",
+    "defaultMessage": "Insert row after"
+  },
+  {
+    "id": "Delete row",
+    "defaultMessage": "Delete row"
+  },
+  {
+    "id": "Insert col before",
+    "defaultMessage": "Insert col before"
+  },
+  {
+    "id": "Insert col after",
+    "defaultMessage": "Insert col after"
+  },
+  {
+    "id": "Delete col",
+    "defaultMessage": "Delete col"
+  }
+]

package/packages/volto-slate/build/messages/src/elementEditor/messages.json

@@ -0,0 +1,10 @@
+[
+  {
+    "id": "Edit element",
+    "defaultMessage": "Edit element"
+  },
+  {
+    "id": "Remove element",
+    "defaultMessage": "Remove element"
+  }
+]

package/packages/volto-slate/build/messages/src/widgets/HtmlSlateWidget.json

@@ -0,0 +1,6 @@
+[
+  {
+    "id": "An error has occurred while editing \"{name}\" field. We have been notified and we are looking into it. Please save your work and retry. If the issue persists please contact the site administrator.",
+    "defaultMessage": "An error has occurred while editing \"{name}\" field. We have been notified and we are looking into it. Please save your work and retry. If the issue persists please contact the site administrator."
+  }
+]

package/packages/volto-slate/build/messages/src/widgets/RichTextWidgetView.json

@@ -0,0 +1,6 @@
+[
+  {
+    "id": "An error has occurred while rendering \"{name}\" field. We have been notified and we are looking into it. If the issue persists please contact the site administrator.",
+    "defaultMessage": "An error has occurred while rendering \"{name}\" field. We have been notified and we are looking into it. If the issue persists please contact the site administrator."
+  }
+]

package/packages/volto-slate/package.json

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

package/pyvenv.cfg

@@ -0,0 +1,3 @@
+home = /opt/homebrew/opt/python@3.9/bin
+include-system-site-packages = false
+version = 3.9.16

package/share/man/man1/ttx.1

@@ -0,0 +1,225 @@
+.Dd May 18, 2004
+.\" ttx is not specific to any OS, but contrary to what groff_mdoc(7)
+.\" seems to imply, entirely omitting the .Os macro causes 'BSD' to
+.\" be used, so I give a zero-width space as its argument.
+.Os \&
+.\" The "FontTools Manual" argument apparently has no effect in
+.\" groff 1.18.1. I think it is a bug in the -mdoc groff package.
+.Dt TTX 1 "FontTools Manual"
+.Sh NAME
+.Nm ttx
+.Nd tool for manipulating TrueType and OpenType fonts
+.Sh SYNOPSIS
+.Nm
+.Bk
+.Op Ar option ...
+.Ek
+.Bk
+.Ar file ...
+.Ek
+.Sh DESCRIPTION
+.Nm
+is a tool for manipulating TrueType and OpenType fonts.  It can convert
+TrueType and OpenType fonts to and from an
+.Tn XML Ns -based format called
+.Tn TTX .
+.Tn TTX
+files have a
+.Ql .ttx
+extension.
+.Pp
+For each
+.Ar file
+argument it is given,
+.Nm
+detects whether it is a
+.Ql .ttf ,
+.Ql .otf
+or
+.Ql .ttx
+file and acts accordingly: if it is a
+.Ql .ttf
+or
+.Ql .otf
+file, it generates a
+.Ql .ttx
+file; if it is a
+.Ql .ttx
+file, it generates a
+.Ql .ttf
+or
+.Ql .otf
+file.
+.Pp
+By default, every output file is created in the same directory as the
+corresponding input file and with the same name except for the
+extension, which is substituted appropriately.
+.Nm
+never overwrites existing files; if necessary, it appends a suffix to
+the output file name before the extension, as in
+.Pa Arial#1.ttf .
+.Ss "General options"
+.Bl -tag -width ".Fl t Ar table"
+.It Fl h
+Display usage information.
+.It Fl d Ar dir
+Write the output files to directory
+.Ar dir
+instead of writing every output file to the same directory as the
+corresponding input file.
+.It Fl o Ar file
+Write the output to
+.Ar file
+instead of writing it to the same directory as the
+corresponding input file.
+.It Fl v
+Be verbose.  Write more messages to the standard output describing what
+is being done.
+.It Fl a
+Allow virtual glyphs ID's on compile or decompile.
+.El
+.Ss "Dump options"
+The following options control the process of dumping font files
+(TrueType or OpenType) to
+.Tn TTX
+files.
+.Bl -tag -width ".Fl t Ar table"
+.It Fl l
+List table information.  Instead of dumping the font to a
+.Tn TTX
+file, display minimal information about each table.
+.It Fl t Ar table
+Dump table
+.Ar table .
+This option may be given multiple times to dump several tables at
+once.  When not specified, all tables are dumped.
+.It Fl x Ar table
+Exclude table
+.Ar table
+from the list of tables to dump.  This option may be given multiple
+times to exclude several tables from the dump.  The
+.Fl t
+and
+.Fl x
+options are mutually exclusive.
+.It Fl s
+Split tables.  Dump each table to a separate
+.Tn TTX
+file and write (under the name that would have been used for the output
+file if the
+.Fl s
+option had not been given) one small
+.Tn TTX
+file containing references to the individual table dump files.  This
+file can be used as input to
+.Nm
+as long as the referenced files can be found in the same directory.
+.It Fl i
+.\" XXX: I suppose OpenType programs (exist and) are also affected.
+Don't disassemble TrueType instructions.  When this option is specified,
+all TrueType programs (glyph programs, the font program and the
+pre-program) are written to the
+.Tn TTX
+file as hexadecimal data instead of
+assembly.  This saves some time and results in smaller
+.Tn TTX
+files.
+.It Fl y Ar n
+When decompiling a TrueType Collection (TTC) file,
+decompile font number
+.Ar n ,
+starting from 0.
+.El
+.Ss "Compilation options"
+The following options control the process of compiling
+.Tn TTX
+files into font files (TrueType or OpenType):
+.Bl -tag -width ".Fl t Ar table"
+.It Fl m Ar fontfile
+Merge the input
+.Tn TTX
+file
+.Ar file
+with
+.Ar fontfile .
+No more than one
+.Ar file
+argument can be specified when this option is used.
+.It Fl b
+Don't recalculate glyph bounding boxes.  Use the values in the
+.Tn TTX
+file as is.
+.El
+.Sh "THE TTX FILE FORMAT"
+You can find some information about the
+.Tn TTX
+file format in
+.Pa documentation.html .
+In particular, you will find in that file the list of tables understood by
+.Nm
+and the relations between TrueType GlyphIDs and the glyph names used in
+.Tn TTX
+files.
+.Sh EXAMPLES
+In the following examples, all files are read from and written to the
+current directory.  Additionally, the name given for the output file
+assumes in every case that it did not exist before
+.Nm
+was invoked.
+.Pp
+Dump the TrueType font contained in
+.Pa FreeSans.ttf
+to
+.Pa FreeSans.ttx :
+.Pp
+.Dl ttx FreeSans.ttf
+.Pp
+Compile
+.Pa MyFont.ttx
+into a TrueType or OpenType font file:
+.Pp
+.Dl ttx MyFont.ttx
+.Pp
+List the tables in
+.Pa FreeSans.ttf
+along with some information:
+.Pp
+.Dl ttx -l FreeSans.ttf
+.Pp
+Dump the
+.Sq cmap
+table from
+.Pa FreeSans.ttf
+to
+.Pa FreeSans.ttx :
+.Pp
+.Dl ttx -t cmap FreeSans.ttf
+.Sh NOTES
+On MS\-Windows and MacOS,
+.Nm
+is available as a graphical application to which files can be dropped.
+.Sh SEE ALSO
+.Pa documentation.html
+.Pp
+.Xr fontforge 1 ,
+.Xr ftinfo 1 ,
+.Xr gfontview 1 ,
+.Xr xmbdfed 1 ,
+.Xr Font::TTF 3pm
+.Sh AUTHORS
+.Nm
+was written by
+.An -nosplit
+.An "Just van Rossum" Aq just@letterror.com .
+.Pp
+This manual page was written by
+.An "Florent Rougon" Aq f.rougon@free.fr
+for the Debian GNU/Linux system based on the existing FontTools
+documentation.  It may be freely used, modified and distributed without
+restrictions.
+.\" For Emacs:
+.\" Local Variables:
+.\" fill-column: 72
+.\" sentence-end: "[.?!][]\"')}]*\\($\\| $\\|   \\|  \\)[   \n]*"
+.\" sentence-end-double-space: t
+.\" End:

package/src/components/manage/Blocks/Block/Settings.jsx

@@ -14,7 +14,9 @@ const Settings = ({ data, block, onChangeBlock, schema }) => {
           [id]: value,
         });
       }}
+      onChangeBlock={onChangeBlock}
       formData={data}
+      applySchemaEnhancers={false}
     />
   );
 };

package/src/components/manage/Blocks/Block/Settings.test.jsx

@@ -0,0 +1,90 @@
+import React from 'react';
+import Settings from './Settings';
+import { render } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import configureStore from 'redux-mock-store';
+import config from '@plone/volto/registry';
+import { Provider } from 'react-intl-redux';
+
+const mockStore = configureStore();
+
+const withStateManagement = (Component) => ({ ...props }) => {
+  const [formData, onChangeFormData] = React.useState(props.formData || {});
+  const onChangeField = (id, value) => {
+    onChangeFormData({ ...formData, [id]: value });
+  };
+
+  // NOTE: onChangeBlock here is not "really" implemented
+
+  return (
+    <Component
+      {...props}
+      onChangeField={onChangeField}
+      onChangeBlock={(block, data) => onChangeFormData(data)}
+      formData={formData}
+    />
+  );
+};
+
+beforeAll(() => {
+  config.widgets = {
+    id: {},
+    widget: {},
+    vocabulary: {},
+    choices: (props) => (
+      <div className="SelectWidget">{JSON.stringify(props.choices)}</div>
+    ),
+    type: {},
+    default: () => <div className="TextWidget" />,
+  };
+
+  config.blocks.blocksConfig = {
+    ...config.blocks.blocksConfig,
+
+    testBlock: {
+      id: 'testBlock',
+      variations: [
+        {
+          id: 'default',
+          title: 'Default',
+          isDefault: true,
+        },
+        {
+          id: 'extra',
+          title: 'Extra',
+        },
+      ],
+    },
+  };
+});
+
+describe('Settings', () => {
+  it('renders block settings form without schema enhancers', () => {
+    const WrappedSettings = withStateManagement(Settings);
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+    const testSchema = {
+      fieldsets: [{ title: 'Default', id: 'default', fields: [] }],
+      properties: {},
+      required: [],
+    };
+    const data = {
+      '@type': 'testBlock',
+    };
+    const { container } = render(
+      <Provider store={store}>
+        <WrappedSettings
+          data={data}
+          block="test"
+          schema={testSchema}
+          onChangeBlock={(block, value) => {}}
+        />
+      </Provider>,
+    );
+    expect(container).toMatchSnapshot();
+  });
+});

package/src/components/manage/Blocks/Image/View.jsx

@@ -15,7 +15,7 @@ import { flattenToAppURL, isInternalURL } from '@plone/volto/helpers';
  * @class View
  * @extends Component
  */
-export const View = ({ data, detached }) => {
+export const View = ({ data, detached, className }) => {
   const href = data?.href?.[0]?.['@id'] || '';
   return (
     <p
@@ -26,6 +26,7 @@ export const View = ({ data, detached }) => {
           detached,
         },
         data.align,
+        className,
       )}
     >
       {data.url && (

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

@@ -23,7 +23,7 @@ export default function withQuerystringResults(WrappedComponent) {
     } = props;
     const { settings } = config;
     const querystring = data.querystring || data; // For backwards compat with data saved before Blocks schema. Note, this is also how the Search block passes data to ListingBody
-
+    const subrequestID = content?.UID + '-' + id;
     const { b_size = settings.defaultPageSize } = querystring; // batchsize
 
     // save the path so it won't trigger dispatch on eager router location change
@@ -52,31 +52,33 @@ export default function withQuerystringResults(WrappedComponent) {
 
     const folderItems = content?.is_folderish ? content.items : [];
     const hasQuery = querystring?.query?.length > 0;
-    const hasLoaded = hasQuery ? querystringResults?.[id]?.loaded : true;
+    const hasLoaded = hasQuery
+      ? querystringResults?.[subrequestID]?.loaded
+      : true;
 
     const listingItems = hasQuery
-      ? querystringResults?.[id]?.items || []
+      ? querystringResults?.[subrequestID]?.items || []
       : folderItems;
 
     const showAsFolderListing = !hasQuery && content?.items_total > b_size;
     const showAsQueryListing =
-      hasQuery && querystringResults?.[id]?.total > b_size;
+      hasQuery && querystringResults?.[subrequestID]?.total > b_size;
 
     const totalPages = showAsFolderListing
       ? Math.ceil(content.items_total / b_size)
       : showAsQueryListing
-      ? Math.ceil(querystringResults[id].total / b_size)
+      ? Math.ceil(querystringResults[subrequestID].total / b_size)
       : 0;
 
     const prevBatch = showAsFolderListing
       ? content.batching?.prev
       : showAsQueryListing
-      ? querystringResults[id].batching?.prev
+      ? querystringResults[subrequestID].batching?.prev
       : null;
     const nextBatch = showAsFolderListing
       ? content.batching?.next
       : showAsQueryListing
-      ? querystringResults[id].batching?.next
+      ? querystringResults[subrequestID].batching?.next
       : null;
 
     const isImageGallery =
@@ -86,7 +88,12 @@ export default function withQuerystringResults(WrappedComponent) {
     useDeepCompareEffect(() => {
       if (hasQuery) {
         dispatch(
-          getQueryStringResults(initialPath, adaptedQuery, id, currentPage),
+          getQueryStringResults(
+            initialPath,
+            adaptedQuery,
+            subrequestID,
+            currentPage,
+          ),
         );
       } else if (isImageGallery && !hasQuery) {
         // when used as image gallery, it doesn't need a query to list children
@@ -104,7 +111,7 @@ export default function withQuerystringResults(WrappedComponent) {
                 },
               ],
             },
-            id,
+            subrequestID,
           ),
         );
       } else {
@@ -113,7 +120,7 @@ export default function withQuerystringResults(WrappedComponent) {
       adaptedQueryRef.current = adaptedQuery;
       currentPageRef.current = currentPage;
     }, [
-      id,
+      subrequestID,
       isImageGallery,
       adaptedQuery,
       hasQuery,
@@ -126,7 +133,7 @@ export default function withQuerystringResults(WrappedComponent) {
       <WrappedComponent
         {...props}
         onPaginationChange={(e, { activePage }) => setCurrentPage(activePage)}
-        total={querystringResults?.[id]?.total}
+        total={querystringResults?.[subrequestID]?.total}
         batch_size={b_size}
         currentPage={currentPage}
         totalPages={totalPages}