@plone/volto 15.1.0 → 15.2.0

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "15.1.0",
+  "version": "15.2.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -296,6 +296,7 @@
     "cypress-axe": "0.12.2",
     "cypress-file-upload": "5.0.7",
     "debug": "4.3.2",
+    "deep-freeze": "0.0.1",
     "dependency-graph": "0.10.0",
     "detect-browser": "5.1.0",
     "diff": "3.5.0",

package/razzle.config.js

@@ -5,6 +5,7 @@ const nodeExternals = require('webpack-node-externals');
 const LoadablePlugin = require('@loadable/webpack-plugin');
 const LodashModuleReplacementPlugin = require('lodash-webpack-plugin');
 const fs = require('fs');
+const { pickBy } = require('lodash');
 const RootResolverPlugin = require('./webpack-plugins/webpack-root-resolver');
 const RelativeResolverPlugin = require('./webpack-plugins/webpack-relative-resolver');
 const createAddonsLoader = require('./create-addons-loader');
@@ -188,7 +189,7 @@ const defaultModify = ({
 
   const addonsLoaderPath = createAddonsLoader(
     registry.getAddonDependencies(),
-    registry.packages,
+    registry.getAddons(),
   );
 
   config.resolve.plugins = [
@@ -230,15 +231,17 @@ const defaultModify = ({
   if (packageJson.name !== '@plone/volto') {
     include.push(fs.realpathSync(`${registry.voltoPath}/src`));
   }
+
   // Add babel support external (ie. node_modules npm published packages)
-  if (registry.addonNames && registry.addonNames.length > 0) {
-    registry.addonNames.forEach((addon) => {
+  const packagesNames = Object.keys(registry.packages);
+  if (registry.packages && packagesNames.length > 0) {
+    packagesNames.forEach((addon) => {
       const p = fs.realpathSync(registry.packages[addon].modulePath);
       if (include.indexOf(p) === -1) {
         include.push(p);
       }
     });
-    addonsAsExternals = registry.addonNames.map((addon) => new RegExp(addon));
+    addonsAsExternals = packagesNames.map((addon) => new RegExp(addon));
   }
 
   if (process.env.ADDONS) {
@@ -250,9 +253,12 @@ const defaultModify = ({
       if (include.indexOf(p) === -1) {
         include.push(p);
       }
-      addonsAsExternals = registry.addonNames.map(
-        (normalizedAddonName) => new RegExp(normalizedAddonName),
-      );
+      addonsAsExternals = [
+        ...addonsAsExternals,
+        ...packagesNames.map(
+          (normalizedAddonName) => new RegExp(normalizedAddonName),
+        ),
+      ];
     });
   }
 

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

@@ -25,7 +25,7 @@ const SummaryTemplate = ({ items, linkTitle, linkHref, isEditMode }) => {
         {items.map((item) => (
           <div className="listing-item" key={item['@id']}>
             <ConditionalLink item={item} condition={!isEditMode}>
-              <Component componentName="PreviewImage" item={item} />
+              <Component componentName="PreviewImage" item={item} alt="" />
               <div className="listing-body">
                 <h3>{item.title ? item.title : item.id}</h3>
                 <p>{item.description}</p>

package/src/components/manage/Controlpanels/VersionOverview.jsx

@@ -53,8 +53,8 @@ const VersionOverview = ({
         <p>{intl.formatMessage(messages.no_addons)}</p>
       ) : (
         <ul style={{ fontSize: '16px', fontFamily: 'Monospace' }}>
-          {Object.keys(addonsInfo).map((addon) => (
-            <li>{`${addon} ${addonsInfo[addon].version || ''}`}</li>
+          {addonsInfo.map((addon) => (
+            <li>{`${addon.name} ${addon.version || ''}`}</li>
           ))}
         </ul>
       )}

package/src/components/theme/PreviewImage/PreviewImage.jsx

@@ -10,12 +10,12 @@ import DefaultImageSVG from '@plone/volto/components/manage/Blocks/Listing/defau
  *
  */
 function PreviewImage(props) {
-  const { item, size = 'preview', ...rest } = props;
+  const { item, size = 'preview', alt, ...rest } = props;
   const src = item.image_field
     ? flattenToAppURL(`${item['@id']}/@@images/${item.image_field}/${size}`)
     : DefaultImageSVG;
 
-  return <img src={src} alt={item.title} {...rest} />;
+  return <img src={src} alt={alt ?? item.title} {...rest} />;
 }
 
 PreviewImage.propTypes = {

package/src/components/theme/PreviewImage/PreviewImage.test.js

@@ -62,4 +62,28 @@ describe('PreviewImage', () => {
     const json = component.toJSON();
     expect(json).toMatchSnapshot();
   });
+
+  it('renders a fallback image with alt prop empty', () => {
+    const item = {
+      title: 'Item title',
+      '@id': 'http://localhost:3000/something',
+    };
+    const component = renderer.create(
+      <PreviewImage item={item} className="extra" alt="" />,
+    );
+    const json = component.toJSON();
+    expect(json).toMatchSnapshot();
+  });
+
+  it('renders a fallback image with alt prop', () => {
+    const item = {
+      title: 'Item title',
+      '@id': 'http://localhost:3000/something',
+    };
+    const component = renderer.create(
+      <PreviewImage item={item} className="extra" alt="Alt prop" />,
+    );
+    const json = component.toJSON();
+    expect(json).toMatchSnapshot();
+  });
 });

package/src/helpers/LanguageMap/LanguageMap.js

@@ -80,6 +80,10 @@ const langmap = new Proxy(
       nativeName: 'Brezhoneg',
       englishName: 'Breton',
     },
+    bs: {
+      nativeName: 'Bosanski',
+      englishName: 'Bosnian',
+    },
     'bs-BA': {
       nativeName: 'Bosanski',
       englishName: 'Bosnian',

package/src/helpers/Utils/Utils.js

@@ -109,6 +109,7 @@ const safeColors = [
   'Teal',
 ];
 const namedColors = {};
+
 /**
  * Will generate initials from string
  * @param {string} name
@@ -198,3 +199,53 @@ export const hasApiExpander = (expander, path = '', type = 'GET_CONTENT') => {
       .map((expand) => expand[type]),
   ).includes(expander);
 };
+
+/**
+ * Insert element into array at a give index
+ * @param {Array} array Array with data
+ * @param {*} element Element to be inserted
+ * @param {number} index Index of item to be inserted at
+ * @returns {Array} Array with inserted element
+ */
+export const insertInArray = (array, element, index) => [
+  ...array.slice(0, index),
+  element,
+  ...array.slice(index),
+];
+
+/**
+ * Replace element in array at a give index
+ * @param {Array} array Array with data
+ * @param {*} element Element to be replaced
+ * @param {number} index Index of item to be replaced at
+ * @returns {Array} Array with replaced element
+ */
+export const replaceItemOfArray = (array, index, value) =>
+  Object.assign([...array], { [index]: value });
+
+/**
+ * Remove item from array at given index
+ * @param {Array} array Array with data
+ * @param {number} index Index of item to be removed
+ * @returns {Array} Array without deleted element
+ */
+export const removeFromArray = (array, index) => {
+  let newArray = array.slice();
+  newArray.splice(index, 1);
+  return newArray;
+};
+
+/**
+ * Reorder array
+ * @param {Array} array Array with data
+ * @param {number} origin Index of item to be reordered
+ * @param {number} target Index of item to be reordered to
+ * @returns {Array} Array with reordered elements
+ */
+export const reorderArray = (array, origin, target) => {
+  const result = Array.from(array);
+  const [removed] = result.splice(origin, 1);
+  result.splice(target, 0, removed);
+
+  return result;
+};

package/src/helpers/Utils/Utils.test.js

@@ -4,12 +4,16 @@ import {
   difference,
   getColor,
   getInitials,
-  safeWrapper,
-  normalizeLanguageName,
   hasApiExpander,
+  normalizeLanguageName,
   parseDateTime,
+  removeFromArray,
+  reorderArray,
+  replaceItemOfArray,
+  safeWrapper,
 } from './Utils';
 import moment from 'moment';
+import deepFreeze from 'deep-freeze';
 
 describe('Utils tests', () => {
   describe('difference', () => {
@@ -345,4 +349,31 @@ describe('Utils tests', () => {
       ).toBe(`${isoDate}Z`);
     });
   });
+
+  describe('replaceItemOfArray', () => {
+    it('replaces the position of an element into an array immutable-ish', () => {
+      const array = ['a', 'b', 'c'];
+      deepFreeze(array);
+      const result = replaceItemOfArray(array, 2, 'v');
+      expect(result).toEqual(['a', 'b', 'v']);
+    });
+  });
+
+  describe('removeFromArray', () => {
+    it('removes an element from the array immutable-ish', () => {
+      const array = ['a', 'b', 'c'];
+      deepFreeze(array);
+      const result = removeFromArray(array, 2);
+      expect(result).toEqual(['a', 'b']);
+    });
+  });
+
+  describe('reorderArray', () => {
+    it('reorders an array immutable-ish', () => {
+      const array = ['a', 'b', 'c'];
+      deepFreeze(array);
+      const result = reorderArray(array, 2, 0);
+      expect(result).toEqual(['c', 'a', 'b']);
+    });
+  });
 });