@plone/volto 19.0.0-alpha.26 → 19.0.0-alpha.28

package/src/helpers/FormValidation/FormValidation.test.js

@@ -8,6 +8,12 @@ const schema = {
     username: { title: 'Username', type: 'string', description: '' },
     email: { title: 'Email', type: 'string', widget: 'email', description: '' },
     url: { title: 'url', type: 'string', widget: 'url', description: '' },
+    file: {
+      title: 'file',
+      type: 'object',
+      description: '',
+      size: 5,
+    },
   },
   fieldsets: [
     { id: 'default', title: 'FIXME: User Data', fields: ['username'] },
@@ -181,6 +187,31 @@ describe('FormValidation', () => {
       ).toEqual({});
     });
 
+    it('file - validates invalid size', () => {
+      const validationErrorMessages = [messages.maxSize.defaultMessage];
+      validationErrorMessages.title = 'file';
+
+      expect(
+        FormValidation.validateFieldsPerFieldset({
+          schema,
+          formData: { ...formData, file: { size: 10 } },
+          formatMessage,
+        }),
+      ).toEqual({
+        file: validationErrorMessages,
+      });
+    });
+
+    it('file - validates size', () => {
+      expect(
+        FormValidation.validateFieldsPerFieldset({
+          schema,
+          formData: { ...formData, file: { size: 1 } },
+          formatMessage,
+        }),
+      ).toEqual({});
+    });
+
     it('widget - validator from block - Fails', () => {
       let newSchema = {
         properties: {

package/src/helpers/FormValidation/validators.ts

@@ -1,5 +1,6 @@
 import { validationMessage } from '@plone/volto/helpers/FormValidation/FormValidation';
 import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+import config from '@plone/volto/registry';
 
 type MinMaxValidator = {
   value: string | number;
@@ -26,6 +27,13 @@ type ChoiceValidator = {
   formatMessage: Function;
 };
 
+type FileValidator = {
+  value: Record<string, any>;
+  field: Record<string, any>;
+  formData: any;
+  formatMessage: Function;
+};
+
 export const isMaxPropertyValid = ({
   value,
   fieldSpec,
@@ -232,3 +240,16 @@ export const defaultLanguageControlPanelValidator = ({
       formData.available_languages.includes(token));
   return !isValid ? formatMessage(messages.defaultLanguage) : null;
 };
+
+export const sizeValidator = ({
+  value,
+  field,
+  formatMessage,
+}: FileValidator) => {
+  const maxSize = field.size
+    ? parseInt(field.size, 10)
+    : config.settings.maxFileUploadSize;
+  return maxSize && value.size > maxSize
+    ? formatMessage(messages.maxSize, { maxSize, size: value.size })
+    : null;
+};

package/src/helpers/MessageLabels/MessageLabels.js

@@ -25,6 +25,11 @@ export const messages = defineMessages({
     id: 'Maximum value is {len}.',
     defaultMessage: 'Maximum value is {len}.',
   },
+  maxSize: {
+    id: 'Maximum file size is {maxSize} bytes, but the uploaded file is {size} bytes.',
+    defaultMessage:
+      'Maximum file size is {maxSize} bytes, but the uploaded file is {size} bytes.',
+  },
   uniqueItems: {
     id: 'Items must be unique.',
     defaultMessage: 'Items must be unique.',

package/src/helpers/Utils/Utils.jsx

@@ -37,6 +37,23 @@ export const safeWrapper = (func) => (config) => {
   return res;
 };
 
+/**
+ * Extract a readable error message from several possible error shapes
+ * @param {object} error
+ * @returns {string} message
+ */
+export const getErrorMessage = (error) => {
+  const respBody = error?.response?.body;
+  if (respBody?.error?.message) return respBody.error.message;
+  if (respBody?.message) return respBody.message;
+  if (error?.message) return error.message;
+  try {
+    return JSON.stringify(error);
+  } catch (e) {
+    return String(error);
+  }
+};
+
 /**
  * A helper to pipe a configuration object through configuration loaders
  *

package/src/helpers/Utils/Utils.test.jsx

@@ -3,6 +3,7 @@ import config from '@plone/volto/registry';
 import {
   applyConfig,
   difference,
+  getErrorMessage,
   getColor,
   getInitials,
   hasApiExpander,
@@ -246,6 +247,44 @@ describe('Utils tests', () => {
     });
   });
 
+  describe('getErrorMessage', () => {
+    it('returns nested backend error message', () => {
+      const error = {
+        response: {
+          body: {
+            error: {
+              message: 'Backend nested message',
+            },
+          },
+        },
+      };
+
+      expect(getErrorMessage(error)).toEqual('Backend nested message');
+    });
+
+    it('returns body message when present', () => {
+      const error = {
+        response: {
+          body: {
+            message: 'Backend body message',
+          },
+        },
+      };
+
+      expect(getErrorMessage(error)).toEqual('Backend body message');
+    });
+
+    it('returns generic error.message fallback', () => {
+      expect(getErrorMessage(new Error('Generic message'))).toEqual(
+        'Generic message',
+      );
+    });
+
+    it('returns stringified object as final fallback', () => {
+      expect(getErrorMessage({ foo: 'bar' })).toEqual('{"foo":"bar"}');
+    });
+  });
+
   describe('safeWrapper', () => {
     it('calls the function with config', () => {
       expect(

package/src/middleware/api.js

@@ -287,9 +287,13 @@ const apiMiddlewareFactory =
               const langFileName = toGettextLang(lang);
               import(
                 /* @vite-ignore */ '@root/../locales/' + langFileName + '.json'
-              ).then((locale) => {
-                dispatch(changeLanguage(lang, locale.default));
-              });
+              )
+                .then((locale) => {
+                  dispatch(changeLanguage(lang, locale.default));
+                })
+                .catch(() => {
+                  dispatch(changeLanguage(lang, {}));
+                });
             }
           }
 

package/src/reducers/blockTypes/blockTypes.js

@@ -0,0 +1,38 @@
+import { GET_BLOCKTYPES_INDEX } from '@plone/volto/constants/ActionTypes';
+
+const initialState = {
+  error: null,
+  items: {},
+  loaded: false,
+  loading: false,
+};
+
+export default function blockTypes(state = initialState, action = {}) {
+  switch (action.type) {
+    case `${GET_BLOCKTYPES_INDEX}_PENDING`:
+      return {
+        ...state,
+        error: null,
+        loaded: false,
+        loading: true,
+      };
+    case `${GET_BLOCKTYPES_INDEX}_SUCCESS`:
+      return {
+        ...state,
+        error: null,
+        items: action.result,
+        loaded: true,
+        loading: false,
+      };
+    case `${GET_BLOCKTYPES_INDEX}_FAIL`:
+      return {
+        ...state,
+        error: action.error,
+        items: {},
+        loaded: false,
+        loading: false,
+      };
+    default:
+      return state;
+  }
+}

package/src/reducers/index.js

@@ -53,6 +53,7 @@ import upgrade from './upgrade/upgrade';
 import userschema from './userschema/userschema';
 import site from './site/site';
 import navroot from './navroot/navroot';
+import blockTypes from './blockTypes/blockTypes';
 
 /**
  * Root reducer.
@@ -111,6 +112,7 @@ const reducers = {
   userschema,
   site,
   navroot,
+  blockTypes,
 };
 
 export default reducers;

package/src/reducers/users/users.js

@@ -117,7 +117,7 @@ export default function users(state = initialState, action = {}) {
     case `${LIST_USERS}_SUCCESS`:
       return {
         ...state,
-        users: action.result,
+        users: action.result.items ? action.result.items : action.result,
         [getRequestKey(action.type)]: {
           loading: false,
           loaded: true,

package/src/routes.js

@@ -51,6 +51,8 @@ import {
   UndoControlpanel,
   UpgradeControlPanel,
 } from '@plone/volto/components/manage/Controlpanels';
+import BlockTypesControlpanel from './components/manage/Controlpanels/BlockTypes';
+import BlockTypeControlpanel from './components/manage/Controlpanels/BlockType';
 
 import withClientSideContent from '@plone/volto/helpers/Content/withClientSideContent';
 
@@ -232,6 +234,14 @@ export const defaultRoutes = [
     path: '/controlpanel/relations',
     component: RelationsControlpanel,
   },
+  {
+    path: '/controlpanel/block-types/:id',
+    component: BlockTypeControlpanel,
+  },
+  {
+    path: '/controlpanel/block-types',
+    component: BlockTypesControlpanel,
+  },
   {
     path: '/controlpanel/:id',
     component: Controlpanel,

package/src/server.jsx

@@ -51,11 +51,13 @@ let locales = {};
 if (config.settings) {
   config.settings.supportedLanguages.forEach((lang) => {
     const langFileName = toGettextLang(lang);
-    import(
-      /* @vite-ignore */ '@root/../locales/' + langFileName + '.json'
-    ).then((locale) => {
-      locales = { ...locales, [toReactIntlLang(lang)]: locale.default };
-    });
+    import(/* @vite-ignore */ '@root/../locales/' + langFileName + '.json')
+      .then((locale) => {
+        locales = { ...locales, [toReactIntlLang(lang)]: locale.default };
+      })
+      .catch((error) => {
+        // Error loading locale file
+      });
   });
 }
 

package/test-setup-globals.js

@@ -1,3 +1,4 @@
+import { vi } from 'vitest';
 import '@testing-library/jest-dom';
 
 global.__CLIENT__ = true;
@@ -38,3 +39,28 @@ vi.stubGlobal('sessionStorage', {
   removeItem: vi.fn(),
   clear: vi.fn(),
 });
+
+global.jest = {
+  fn: vi.fn.bind(vi),
+};
+
+// Mock IntersectionObserver for Vitest
+const IntersectionObserverMock = vi.fn((callback, options = {}) => {
+  const instance = {
+    thresholds: Array.isArray(options.threshold)
+      ? options.threshold
+      : [options.threshold ?? 0],
+    root: options.root ?? null,
+    rootMargin: options.rootMargin ?? '',
+    observe: vi.fn(),
+    unobserve: vi.fn(),
+    disconnect: vi.fn(),
+    takeRecords: vi.fn(() => []),
+  };
+
+  return instance;
+});
+
+vi.stubGlobal('IntersectionObserver', IntersectionObserverMock);
+global.IntersectionObserver = IntersectionObserverMock;
+window.IntersectionObserver = IntersectionObserverMock;

package/theme/themes/pastanaga/extras/block-types.less

@@ -0,0 +1,17 @@
+.react-aria-Table.cmsui-table {
+  --plone-table-cell-border-bottom: 1px solid var(--quanta-smoke);
+  --plone-table-header-border-bottom: 2px solid var(--quanta-silver);
+  width: 100%;
+  border-radius: 0;
+
+  .react-aria-Row {
+    --radius-top: 0px;
+    --radius-bottom: 0px;
+    border-bottom: none;
+  }
+
+  .react-aria-Column[data-key$='occurrences'],
+  .react-aria-Cell[data-key$=':occurrences'] {
+    text-align: right;
+  }
+}

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

@@ -394,8 +394,6 @@ button {
 }
 
 .users-control-panel .table {
-  overflow-x: scroll;
-
   &::-webkit-scrollbar {
     width: 3px;
     height: 3px; /* scrollbar height */
@@ -713,5 +711,6 @@ img.responsive {
 @import 'views';
 @import 'toc';
 @import 'grid.less';
+@import 'block-types.less';
 @import 'videoembed.less';
 .loadUIOverrides();

package/types/actions/blockTypes/blockTypes.d.ts

@@ -0,0 +1,7 @@
+export declare function getBlockTypes(id?: string | null, path?: string | null): {
+    type: string;
+    request: {
+        op: string;
+        path: string;
+    };
+};

package/types/components/index.d.ts

@@ -54,7 +54,7 @@ export { default as Actions } from "@plone/volto/components/manage/Actions/Actio
 export { default as Add } from "@plone/volto/components/manage/Add/Add";
 export { default as Circle } from "@plone/volto/components/manage/Contents/circle";
 export { default as Delete } from "@plone/volto/components/manage/Delete/Delete";
-export const Diff: import("@loadable/component").LoadableClassComponent<any>;
+export const Diff: import("@loadable/component").LoadableComponent<any>;
 export const DiffField: import("@loadable/component").LoadableClassComponent<any>;
 export { default as Display } from "@plone/volto/components/manage/Display/Display";
 export { default as Edit } from "@plone/volto/components/manage/Edit/Edit";

package/types/components/manage/Blocks/Block/Order/utilities.d.ts

@@ -1,8 +1,9 @@
 export function getProjection(items: any, activeId: any, overId: any, dragOffset: any, indentationWidth: any, arrayMove: any): {
+    parentId: any;
+    parentType: any;
     depth: any;
     maxDepth: any;
     minDepth: any;
-    parentId: any;
 };
 export function flattenTree(items: any): any;
 export function findItem(items: any, itemId: any): any;

package/types/components/manage/Controlpanels/BlockType.d.ts

@@ -0,0 +1,7 @@
+import type { Location } from 'history';
+type RouteProps = {
+    history: History;
+    location: Location;
+};
+declare const BlockTypeControlpanel: (props: RouteProps) => import("react/jsx-runtime").JSX.Element;
+export default BlockTypeControlpanel;

package/types/components/manage/Controlpanels/BlockTypes.d.ts

@@ -0,0 +1,7 @@
+import type { Location } from 'history';
+type RouteProps = {
+    history: History;
+    location: Location;
+};
+declare const BlockTypesControlpanel: (props: RouteProps) => import("react/jsx-runtime").JSX.Element;
+export default BlockTypesControlpanel;

package/types/components/manage/Diff/Diff.d.ts

@@ -1,2 +1,7 @@
-declare const _default: any;
-export default _default;
+export default Diff;
+/**
+ * Diff component.
+ * @function Diff
+ * @returns {JSX.Element}
+ */
+declare function Diff(): JSX.Element;

package/types/components/manage/Toolbar/Types.crash.test.d.ts

@@ -0,0 +1 @@
+export {};

package/types/components/theme/PasswordReset/PasswordReset.d.ts

@@ -1,2 +1,6 @@
-declare const _default: any;
-export default _default;
+export default PasswordReset;
+/**
+ * @function PasswordReset
+ * @returns {JSX.Element}
+ */
+declare function PasswordReset(): JSX.Element;

package/types/config/ControlPanels.d.ts

@@ -20,6 +20,7 @@ export const controlPanelsIcons: {
     undo: string;
     aliases: string;
     relations: string;
+    'block-types': string;
 };
 export function filterControlPanels(controlpanels?: any[]): any[];
 export namespace unwantedControlPanelsFields {

package/types/constants/ActionTypes.d.ts

@@ -144,3 +144,4 @@ export const GET_NAVROOT: "GET_NAVROOT";
 export const SET_FORM_DATA: "SET_FORM_DATA";
 export const SET_UI_STATE: "SET_UI_STATE";
 export const UPDATE_UPLOADED_FILES: "UPDATE_UPLOADED_FILES";
+export const GET_BLOCKTYPES_INDEX: "GET_BLOCKTYPES_INDEX";

package/types/helpers/Blocks/Blocks.d.ts

@@ -194,3 +194,6 @@ export function getBlocksHierarchy(properties: any): any;
 export function findContainer(formData: object, { containerId }: {
     containerId: string;
 }): object | undefined;
+export function findParent(formData: object, { blockId }: {
+    blockId: string;
+}): object | undefined;

package/types/helpers/FormValidation/validators.d.ts

@@ -20,6 +20,12 @@ type ChoiceValidator = {
     formData: any;
     formatMessage: Function;
 };
+type FileValidator = {
+    value: Record<string, any>;
+    field: Record<string, any>;
+    formData: any;
+    formatMessage: Function;
+};
 export declare const isMaxPropertyValid: ({ value, fieldSpec, criterion, formatMessage, }: MinMaxValidator) => any;
 export declare const isMinPropertyValid: ({ value, fieldSpec, criterion, formatMessage, }: MinMaxValidator) => any;
 export declare const minLengthValidator: ({ value, field, formatMessage, }: Validator) => any;
@@ -37,4 +43,5 @@ export declare const patternValidator: ({ value, field, formatMessage, }: Valida
 export declare const maxItemsValidator: ({ value, field, formatMessage, }: Validator) => any;
 export declare const minItemsValidator: ({ value, field, formatMessage, }: Validator) => any;
 export declare const defaultLanguageControlPanelValidator: ({ value, formData, formatMessage, }: ChoiceValidator) => any;
+export declare const sizeValidator: ({ value, field, formatMessage, }: FileValidator) => any;
 export {};