@plone/volto 17.0.0-alpha.24 → 17.0.0-alpha.26

package/src/reducers/relations/relations.js

@@ -7,23 +7,29 @@ import {
   CREATE_RELATIONS,
   DELETE_RELATIONS,
   LIST_RELATIONS,
+  STATS_RELATIONS,
   REBUILD_RELATIONS,
 } from '@plone/volto/constants/ActionTypes';
 
 const initialState = {
-  relations: null,
-  stats: null,
-  create: {
+  relations: {
     error: null,
     loaded: false,
     loading: false,
+    data: null,
   },
-  delete: {
+  stats: {
+    error: null,
+    loaded: false,
+    loading: false,
+    data: null,
+  },
+  create: {
     error: null,
     loaded: false,
     loading: false,
   },
-  list: {
+  delete: {
     error: null,
     loaded: false,
     loading: false,
@@ -55,17 +61,6 @@ function getRequestKey(actionType) {
  */
 export default function relations(state = initialState, action = {}) {
   switch (action.type) {
-    case `${CREATE_RELATIONS}_PENDING`:
-    case `${DELETE_RELATIONS}_PENDING`:
-    case `${REBUILD_RELATIONS}_PENDING`:
-      return {
-        ...state,
-        [getRequestKey(action.type)]: {
-          loading: true,
-          loaded: false,
-          error: null,
-        },
-      };
     case `${LIST_RELATIONS}_PENDING`:
       return action.subrequest
         ? {
@@ -73,10 +68,7 @@ export default function relations(state = initialState, action = {}) {
             subrequests: {
               ...state.subrequests,
               [action.subrequest]: {
-                ...(state.subrequests[action.subrequest] || {
-                  relations: null,
-                  stats: null,
-                }),
+                data: null,
                 loaded: false,
                 loading: true,
                 error: null,
@@ -85,7 +77,8 @@ export default function relations(state = initialState, action = {}) {
           }
         : {
             ...state,
-            [getRequestKey(action.type)]: {
+            relations: {
+              data: null,
               loading: true,
               loaded: false,
               error: null,
@@ -98,39 +91,22 @@ export default function relations(state = initialState, action = {}) {
             subrequests: {
               ...state.subrequests,
               [action.subrequest]: {
+                data: action.result.relations,
                 loading: false,
                 loaded: true,
                 error: null,
-                relations: action.result.relations
-                  ? action.result.relations
-                  : [],
-                stats: null,
               },
             },
           }
         : {
             ...state,
-            relations: action.result.relations
-              ? action.result.relations
-              : state.relations,
-            stats: action.result.stats ? action.result : state.stats,
-            [getRequestKey(action.type)]: {
+            relations: {
+              data: action.result.relations,
               loading: false,
               loaded: true,
               error: null,
             },
           };
-    case `${CREATE_RELATIONS}_SUCCESS`:
-    case `${DELETE_RELATIONS}_SUCCESS`:
-    case `${REBUILD_RELATIONS}_SUCCESS`:
-      return {
-        ...state,
-        [getRequestKey(action.type)]: {
-          loading: false,
-          loaded: true,
-          error: null,
-        },
-      };
     case `${LIST_RELATIONS}_FAIL`:
       return action.subrequest
         ? {
@@ -138,8 +114,7 @@ export default function relations(state = initialState, action = {}) {
             subrequests: {
               ...state.subrequests,
               [action.subrequest]: {
-                relations: null,
-                stats: null,
+                data: null,
                 loading: false,
                 loaded: false,
                 error: action.error,
@@ -148,14 +123,67 @@ export default function relations(state = initialState, action = {}) {
           }
         : {
             ...state,
-            relations: null,
-            stats: null,
-            [getRequestKey(action.type)]: {
+            relations: {
+              data: null,
               loading: false,
               loaded: false,
               error: action.error,
             },
           };
+
+    case `${STATS_RELATIONS}_PENDING`:
+      return {
+        ...state,
+        [getRequestKey(action.type)]: {
+          loading: true,
+          loaded: false,
+          error: null,
+          data: null,
+        },
+      };
+    case `${STATS_RELATIONS}_SUCCESS`:
+      return {
+        ...state,
+        [getRequestKey(action.type)]: {
+          loading: false,
+          loaded: true,
+          error: null,
+          data: action.result,
+        },
+      };
+    case `${STATS_RELATIONS}_FAIL`:
+      return {
+        ...state,
+        [getRequestKey(action.type)]: {
+          loading: false,
+          loaded: false,
+          error: action.error,
+          data: null,
+        },
+      };
+
+    case `${CREATE_RELATIONS}_PENDING`:
+    case `${DELETE_RELATIONS}_PENDING`:
+    case `${REBUILD_RELATIONS}_PENDING`:
+      return {
+        ...state,
+        [getRequestKey(action.type)]: {
+          loading: true,
+          loaded: false,
+          error: null,
+        },
+      };
+    case `${CREATE_RELATIONS}_SUCCESS`:
+    case `${DELETE_RELATIONS}_SUCCESS`:
+    case `${REBUILD_RELATIONS}_SUCCESS`:
+      return {
+        ...state,
+        [getRequestKey(action.type)]: {
+          loading: false,
+          loaded: true,
+          error: null,
+        },
+      };
     case `${CREATE_RELATIONS}_FAIL`:
     case `${DELETE_RELATIONS}_FAIL`:
     case `${REBUILD_RELATIONS}_FAIL`:

package/src/reducers/site/site.js

@@ -0,0 +1,51 @@
+/**
+ * Site reducer.
+ * @module reducers/site/site
+ */
+
+import { GET_SITE } from '@plone/volto/constants/ActionTypes';
+
+const initialState = {
+  error: null,
+  loaded: false,
+  loading: false,
+  data: {},
+};
+
+/**
+ * Site reducer.
+ * @function site
+ * @param {Object} state Current state.
+ * @param {Object} action Action to be handled.
+ * @returns {Object} New state.
+ */
+export default function site(state = initialState, action = {}) {
+  switch (action.type) {
+    case `${GET_SITE}_PENDING`:
+      return {
+        ...state,
+        error: null,
+        loaded: false,
+        loading: true,
+        data: {},
+      };
+    case `${GET_SITE}_SUCCESS`:
+      return {
+        ...state,
+        error: null,
+        loaded: true,
+        loading: false,
+        data: action.result,
+      };
+    case `${GET_SITE}_FAIL`:
+      return {
+        ...state,
+        error: action.result,
+        loaded: false,
+        loading: false,
+        data: {},
+      };
+    default:
+      return state;
+  }
+}

package/src/reducers/site/site.test.js

@@ -0,0 +1,67 @@
+import { GET_SITE } from '@plone/volto/constants/ActionTypes';
+import config from '@plone/volto/registry';
+import site from './site';
+
+const { settings } = config;
+
+describe('Site reducer', () => {
+  it('should return the initial state', () => {
+    expect(site()).toEqual({
+      error: null,
+      data: {},
+      loaded: false,
+      loading: false,
+    });
+  });
+
+  it('should handle GET_SITE_PENDING', () => {
+    expect(
+      site(undefined, {
+        type: `${GET_SITE}_PENDING`,
+      }),
+    ).toEqual({
+      error: null,
+      data: {},
+      loaded: false,
+      loading: true,
+    });
+  });
+
+  it('should handle GET_SITE_SUCCESS', () => {
+    expect(
+      site(undefined, {
+        type: `${GET_SITE}_SUCCESS`,
+        result: {
+          title: 'Welcome to Plone!',
+          description:
+            'Congratulations! You have successfully installed Plone.',
+          '@id': `${settings.apiPath}/front-page`,
+        },
+      }),
+    ).toEqual({
+      error: null,
+      data: {
+        '@id': `${settings.apiPath}/front-page`,
+        title: 'Welcome to Plone!',
+        description: 'Congratulations! You have successfully installed Plone.',
+      },
+
+      loaded: true,
+      loading: false,
+    });
+  });
+
+  it('should handle GET_SITE_FAIL', () => {
+    expect(
+      site(undefined, {
+        type: `${GET_SITE}_FAIL`,
+        error: 'failed',
+      }),
+    ).toEqual({
+      error: undefined,
+      data: {},
+      loaded: false,
+      loading: false,
+    });
+  });
+});

package/src/reducers/userSession/userSession.js

@@ -3,7 +3,12 @@
  * @module reducers/userSession/userSession
  */
 
-import { LOGIN, LOGIN_RENEW, LOGOUT } from '@plone/volto/constants/ActionTypes';
+import {
+  LOGIN,
+  LOGIN_RENEW,
+  LOGOUT,
+  RESET_LOGIN_REQUEST,
+} from '@plone/volto/constants/ActionTypes';
 
 const initialState = {
   token: null,
@@ -61,6 +66,15 @@ export default function userSession(state = initialState, action = {}) {
         ...state,
         token: null,
       };
+    case `${RESET_LOGIN_REQUEST}`:
+      return {
+        ...state,
+        login: {
+          loading: false,
+          loaded: false,
+          error: null,
+        },
+      };
     default:
       return state;
   }

package/src/server.jsx

@@ -263,6 +263,15 @@ server.get('/*', (req, res) => {
       const readCriticalCss =
         config.settings.serverConfig.readCriticalCss || defaultReadCriticalCss;
 
+      // If we are showing an "old browser" warning,
+      // make sure it doesn't get cached in a shared cache
+      const browserdetect = store.getState().browserdetect;
+      if (config.settings.notSupportedBrowsers.includes(browserdetect?.name)) {
+        res.set({
+          'Cache-Control': 'private',
+        });
+      }
+
       if (context.url) {
         res.redirect(flattenToAppURL(context.url));
       } else if (context.error_code) {

package/test-setup-config.js

@@ -54,6 +54,7 @@ const richtextViewSettings = {
 
 config.set('settings', {
   apiPath: 'http://localhost:8080/Plone',
+  publicURL: 'http://localhost:3000',
   defaultLanguage: 'en',
   supportedLanguages: ['en'],
   defaultPageSize: 25,

package/theme/themes/pastanaga/collections/form.overrides

@@ -49,6 +49,52 @@
   }
 }
 
+.ui.form .fields.error .field textarea,
+.ui.form .fields.error .field select,
+.ui.form .fields.error .field input:not([type]),
+.ui.form .fields.error .field input[type='date'],
+.ui.form .fields.error .field input[type='datetime-local'],
+.ui.form .fields.error .field input[type='email'],
+.ui.form .fields.error .field input[type='number'],
+.ui.form .fields.error .field input[type='password'],
+.ui.form .fields.error .field input[type='search'],
+.ui.form .fields.error .field input[type='tel'],
+.ui.form .fields.error .field input[type='time'],
+.ui.form .fields.error .field input[type='text'],
+.ui.form .fields.error .field input[type='file'],
+.ui.form .fields.error .field input[type='url'],
+.ui.form .field.error textarea,
+.ui.form .field.error select,
+.ui.form .field.error input:not([type]),
+.ui.form .field.error input[type='date'],
+.ui.form .field.error input[type='datetime-local'],
+.ui.form .field.error input[type='email'],
+.ui.form .field.error input[type='number'],
+.ui.form .field.error input[type='password'],
+.ui.form .field.error input[type='search'],
+.ui.form .field.error input[type='tel'],
+.ui.form .field.error input[type='time'],
+.ui.form .field.error input[type='text'],
+.ui.form .field.error input[type='file'],
+.ui.form .field.error input[type='url'],
+.ui.form .field.error textarea:focus,
+.ui.form .field.error select:focus,
+.ui.form .field.error input:not([type]):focus,
+.ui.form .field.error input[type='date']:focus,
+.ui.form .field.error input[type='datetime-local']:focus,
+.ui.form .field.error input[type='email']:focus,
+.ui.form .field.error input[type='number']:focus,
+.ui.form .field.error input[type='password']:focus,
+.ui.form .field.error input[type='search']:focus,
+.ui.form .field.error input[type='tel']:focus,
+.ui.form .field.error input[type='time']:focus,
+.ui.form .field.error input[type='text']:focus,
+.ui.form .field.error input[type='file']:focus,
+.ui.form .field.error input[type='url']:focus {
+  border-color: #d01157;
+  background: none;
+}
+
 .ui.form .field > .selection.dropdown {
   height: 60px;
 }

package/theme/themes/pastanaga/elements/input.overrides

@@ -6,6 +6,16 @@
   font-weight: @inputFontWeight;
 }
 
+/* This aligns the height of the field name label to the other side in case
+of an error is present, it overrides a default from SemanticUI grid definitions. */
+.inline.field .ui.grid > .stretched.row > .column > .wrapper {
+  flex-grow: 0;
+}
+/* Exception - Toolbar */
+#toolbar .inline.field .ui.grid > .stretched.row > .column > .wrapper {
+  flex-grow: 1;
+}
+
 .inline.field {
   .wrapper {
     display: flex;

package/theme/themes/pastanaga/elements/label.overrides

@@ -6,3 +6,13 @@
     margin: 0em 0em 0em 0.75em;
   }
 }
+
+.ui.form {
+  .ui.basic.red.label.form-error-label {
+    padding-left: 0;
+    border: none;
+    margin-top: 0;
+    color: #d01157 !important;
+    font-weight: normal;
+  }
+}

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

@@ -1,4 +1,7 @@
 #page-login {
+  display: flex;
+  justify-content: center;
+
   .help {
     a {
       &:hover,

package/webpack-plugins/webpack-less-plugin.js

@@ -4,6 +4,24 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const PostCssFlexBugFixes = require('postcss-flexbugs-fixes');
 const postcssLoadConfig = require('postcss-load-config');
 
+const interpolateName = require('loader-utils').interpolateName;
+
+function normalizePath(file) {
+  return path.sep === '\\' ? file.replace(/\\/g, '/') : file;
+}
+
+// Custom function to not use 'loaderContext._module.matchResource' in hashing CSS class name.
+function getLocalIdent(loaderContext, localIdentName, localName, options) {
+  const relativeResourcePath = normalizePath(
+    path.relative(options.context, loaderContext.resourcePath),
+  );
+
+  // eslint-disable-next-line no-param-reassign
+  options.content = `${options.hashPrefix}${relativeResourcePath}\x00${localName}`;
+
+  return interpolateName(loaderContext, localIdentName, options);
+}
+
 const hasPostCssConfig = () => {
   try {
     return !!postcssLoadConfig.sync();
@@ -52,6 +70,7 @@ const defaultOptions = {
       modules: {
         auto: true,
         localIdentName: '[name]__[local]___[hash:base64:5]',
+        getLocalIdent: getLocalIdent,
       },
     },
   },

package/.gitignore~

@@ -1,71 +0,0 @@
-# Node
-node_modules
-coverage
-jsdoc
-webpack-assets.json
-webpack-stats.json
-npm-debug.log
-junit.xml
-eslint.xml
-yarn-error.log
-build
-
-# Other
-.DS_Store
-.idea
-lighthouse-report.html
-.vscode/
-.#*
-*~
-
-# Python
-/api/.installed.cfg
-/api/.mr.developer.cfg
-/api/bin/
-/api/develop-eggs/
-/api/eggs/
-/api/include/
-/api/lib/
-/api/lib64/
-/api/notebook/env/
-/api/parts/
-/api/share/python-wheels/
-/api/src/
-/api/test/
-/api/var/
-/api/venv/
-/bin/
-/lib/
-.Python
-include
-pip-selfcheck.json
-pyvenv.cfg
-share
-/api/lib64
-lib64
-
-# locales
-locales/*.json
-
-# Tests
-/tests/bin
-/tests/develop-eggs
-/tests/parts
-/tests/.installed.cfg
-*.pyc
-geckodriver.log
-log.html
-output.xml
-report.html
-selenium-screenshot-*.png
-/selenium/
-cypress/videos/
-cypress/screenshots
-
-# Local environment setup
-.env
-public/critical.css
-
-# Sphinx and MyST
-docs/_build/
-/.python-version

package/news/4547.breaking~

@@ -1 +0,0 @@
-Update parse-url and release-it libraries. @davisagli