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

package/src/constants/ActionTypes.js

@@ -138,3 +138,6 @@ export const REMOVE_ALIASES = 'REMOVE_ALIASES';
 export const GET_USERSCHEMA = 'GET_USERSCHEMA';
 export const GET_UPGRADE = 'GET_UPGRADE';
 export const POST_UPGRADE = 'POST_UPGRADE';
+export const RESET_LOGIN_REQUEST = 'RESET_LOGIN_REQUEST';
+export const GET_SITE = 'GET_SITE';
+export const GET_NAVROOT = 'GET_NAVROOT';

package/src/express-middleware/images.js

@@ -28,6 +28,7 @@ export default function imagesMiddleware() {
 
   middleware.all(['**/@@images/*'], imageMiddlewareFn);
   middleware.all(['/@portrait/*'], imageMiddlewareFn);
+  middleware.all(['/@@site-logo/*'], imageMiddlewareFn);
   middleware.id = 'imageResourcesProcessor';
   return middleware;
 }

package/src/helpers/MessageLabels/MessageLabels.js

@@ -172,6 +172,28 @@ export const messages = defineMessages({
     id: 'Roles',
     defaultMessage: 'Roles',
   },
+  addUserFormPasswordAndSendPasswordTogetherNotAllowed: {
+    id:
+      'It is not allowed to define both the password and to request sending the password reset message by e-mail. You need to select one of them.',
+    defaultMessage:
+      'It is not allowed to define both the password and to request sending the password reset message by e-mail. You need to select one of them.',
+  },
+  userSearchNoResults: {
+    id: 'There are no users with the searched criteria',
+    defaultMessage: 'There are no users with the searched criteria',
+  },
+  groupSearchNoResults: {
+    id: 'There are no groups with the searched criteria',
+    defaultMessage: 'There are no groups with the searched criteria',
+  },
+  updateUserFormTitle: {
+    id: 'Update User',
+    defaultMessage: 'Update User',
+  },
+  updateUserSuccess: {
+    id: 'User updated successfuly',
+    defaultMessage: 'User updated successfuly',
+  },
   updateRoles: {
     id: 'User roles updated',
     defaultMessage: 'User roles updated',
@@ -234,19 +256,19 @@ export const messages = defineMessages({
   },
   copyBlocks: {
     id: 'Copy blocks',
-    defaultMesages: 'Copy blocks',
+    defaultMessage: 'Copy blocks',
   },
   cutBlocks: {
     id: 'Cut blocks',
-    defaultMesages: 'Cut blocks',
+    defaultMessage: 'Cut blocks',
   },
   pasteBlocks: {
     id: 'Paste blocks',
-    defaultMesages: 'Paste blocks',
+    defaultMessage: 'Paste blocks',
   },
   deleteBlocks: {
     id: 'Delete blocks',
-    defaultMesages: 'Delete blocks',
+    defaultMessage: 'Delete blocks',
   },
   showAllUserButton: {
     id: 'Show All',

package/src/helpers/Site/index.js

@@ -0,0 +1,21 @@
+import { GET_SITE } from '@plone/volto/constants/ActionTypes';
+import { getSite } from '@plone/volto/actions';
+
+const getSiteAsyncPropExtender = {
+  path: '/',
+  extend: (dispatchActions) => {
+    if (
+      dispatchActions.filter((asyncAction) => asyncAction.key === GET_SITE)
+        .length === 0
+    ) {
+      dispatchActions.push({
+        key: GET_SITE,
+        promise: ({ location, store: { dispatch } }) =>
+          __SERVER__ && dispatch(getSite()),
+      });
+    }
+    return dispatchActions;
+  },
+};
+
+export { getSiteAsyncPropExtender };

package/src/helpers/index.js

@@ -121,3 +121,4 @@ export {
   getCurrentStateMapping,
   getWorkflowOptions,
 } from './Workflows/Workflows';
+export { getSiteAsyncPropExtender } from './Site';

package/src/reducers/index.js

@@ -50,6 +50,8 @@ import workingCopy from './workingcopy/workingcopy';
 import transactions from './transactions/transactions';
 import upgrade from './upgrade/upgrade';
 import userschema from './userschema/userschema';
+import site from './site/site';
+import navroot from './navroot/navroot';
 
 /**
  * Root reducer.
@@ -105,6 +107,8 @@ const reducers = {
   workingCopy,
   transactions,
   userschema,
+  site,
+  navroot,
 };
 
 export default reducers;

package/src/reducers/navroot/navroot.js

@@ -0,0 +1,79 @@
+/**
+ * Navroot reducer.
+ * @module reducers/navroot/navroot
+ */
+import {
+  flattenToAppURL,
+  getBaseUrl,
+  hasApiExpander,
+} from '@plone/volto/helpers';
+
+import { GET_NAVROOT, GET_CONTENT } from '@plone/volto/constants/ActionTypes';
+
+const initialState = {
+  error: null,
+  loaded: false,
+  loading: false,
+  data: {},
+};
+
+/**
+ * navroot reducer.
+ * @function navroot
+ * @param {Object} state Current state.
+ * @param {Object} action Action to be handled.
+ * @returns {Object} New state.
+ */
+export default function navroot(state = initialState, action = {}) {
+  let hasExpander;
+  switch (action.type) {
+    case `${GET_NAVROOT}_PENDING`:
+      return {
+        ...state,
+        error: null,
+        loaded: false,
+        loading: true,
+        data: {},
+      };
+    case `${GET_CONTENT}_SUCCESS`:
+      hasExpander = hasApiExpander(
+        'navroot',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (hasExpander && !action.subrequest) {
+        return {
+          ...state,
+          error: null,
+          data: action.result['@components'].navroot,
+          loaded: true,
+          loading: false,
+        };
+      }
+      return state;
+    case `${GET_NAVROOT}_SUCCESS`:
+      hasExpander = hasApiExpander(
+        'navroot',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (!hasExpander) {
+        return {
+          ...state,
+          error: null,
+          loaded: true,
+          loading: false,
+          data: action.result,
+        };
+      }
+      return state;
+    case `${GET_NAVROOT}_FAIL`:
+      return {
+        ...state,
+        error: action.result,
+        loaded: false,
+        loading: false,
+        data: {},
+      };
+    default:
+      return state;
+  }
+}

package/src/reducers/navroot/navroot.test.js

@@ -0,0 +1,110 @@
+import { GET_CONTENT, GET_NAVROOT } from '@plone/volto/constants/ActionTypes';
+import config from '@plone/volto/registry';
+import navroot from './navroot';
+
+const { settings } = config;
+
+describe('Navroot reducer', () => {
+  it('should return the initial state', () => {
+    expect(navroot()).toEqual({
+      error: null,
+      data: {},
+      loaded: false,
+      loading: false,
+    });
+  });
+
+  it('should handle GET_NAVROOT_PENDING', () => {
+    expect(
+      navroot(undefined, {
+        type: `${GET_NAVROOT}_PENDING`,
+      }),
+    ).toEqual({
+      error: null,
+      data: {},
+      loaded: false,
+      loading: true,
+    });
+  });
+
+  it('should handle GET_NAVROOT_SUCCESS', () => {
+    expect(
+      navroot(undefined, {
+        type: `${GET_NAVROOT}_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_NAVROOT_FAIL', () => {
+    expect(
+      navroot(undefined, {
+        type: `${GET_NAVROOT}_FAIL`,
+        error: 'failed',
+      }),
+    ).toEqual({
+      error: undefined,
+      data: {},
+      loaded: false,
+      loading: false,
+    });
+  });
+});
+
+describe('Navroot reducer (NAVROOT)GET_CONTENT', () => {
+  beforeEach(() => {
+    config.settings.apiExpanders = [
+      {
+        match: '',
+        GET_CONTENT: ['navroot'],
+      },
+    ];
+  });
+
+  it('should handle (NAVROOT)GET_CONTENT_SUCCESS', () => {
+    expect(
+      navroot(undefined, {
+        type: `${GET_CONTENT}_SUCCESS`,
+        result: {
+          '@components': {
+            navroot: {
+              navroot: {
+                title: 'Welcome to Plone!',
+                description:
+                  'Congratulations! You have successfully installed Plone.',
+                '@id': `${settings.apiPath}/front-page`,
+              },
+            },
+          },
+        },
+      }),
+    ).toEqual({
+      error: null,
+      data: {
+        navroot: {
+          '@id': `${settings.apiPath}/front-page`,
+          title: 'Welcome to Plone!',
+          description:
+            'Congratulations! You have successfully installed Plone.',
+        },
+      },
+      loaded: true,
+      loading: false,
+    });
+  });
+});

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/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/elements/input.overrides

@@ -8,9 +8,13 @@
 
 /* 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. */
-.ui.grid > .stretched.row > .column > .wrapper {
+.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 {

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,
       },
     },
   },