@plone/volto 18.0.0-alpha.30 → 18.0.0-alpha.32

package/src/config/config.test.js

@@ -0,0 +1,232 @@
+import config from '@plone/volto/registry';
+
+const navigation_controlpanel = {
+  '@id': '/@controlpanels/navigation',
+  data: {
+    displayed_types: [
+      {
+        title: 'Link',
+        token: 'Link',
+      },
+      {
+        title: 'News Item',
+        token: 'News Item',
+      },
+      {
+        title: 'Folder',
+        token: 'Folder',
+      },
+      {
+        title: 'Page',
+        token: 'Document',
+      },
+      {
+        title: 'Event',
+        token: 'Event',
+      },
+      {
+        title: 'Collection',
+        token: 'Collection',
+      },
+    ],
+    filter_on_workflow: false,
+    generate_tabs: true,
+    navigation_depth: 3,
+    nonfolderish_tabs: true,
+    parent_types_not_to_query: ['TempFolder'],
+    root: '/',
+    show_excluded_items: false,
+    sitemap_depth: 3,
+    sort_tabs_on: {
+      title: 'Position in Parent',
+      token: 'getObjPositionInParent',
+    },
+    sort_tabs_reversed: false,
+    workflow_states_to_show: [],
+  },
+  group: 'General',
+  schema: {
+    fieldsets: [
+      {
+        behavior: 'plone',
+        fields: [
+          'navigation_depth',
+          'generate_tabs',
+          'nonfolderish_tabs',
+          'sort_tabs_on',
+          'sort_tabs_reversed',
+          'displayed_types',
+          'filter_on_workflow',
+          'workflow_states_to_show',
+          'show_excluded_items',
+          'root',
+          'sitemap_depth',
+          'parent_types_not_to_query',
+        ],
+        id: 'default',
+        title: 'Default',
+      },
+    ],
+    properties: {
+      displayed_types: {
+        additionalItems: true,
+        default: [
+          'Link',
+          'News Item',
+          'Folder',
+          'Document',
+          'Event',
+          'Collection',
+        ],
+        description:
+          'The content types that should be shown in the navigation and site map.',
+        factory: 'Tuple',
+        items: {
+          description: '',
+          factory: 'Choice',
+          title: '',
+          type: 'string',
+          vocabulary: {
+            '@id':
+              'http://localhost:3000/@vocabularies/plone.app.vocabularies.ReallyUserFriendlyTypes',
+          },
+        },
+        title: 'Displayed content types',
+        type: 'array',
+        uniqueItems: true,
+      },
+      filter_on_workflow: {
+        default: false,
+        description:
+          'The workflow states that should be shown in the navigation and the site map.',
+        factory: 'Yes/No',
+        title: 'Filter on workflow state',
+        type: 'boolean',
+      },
+      generate_tabs: {
+        default: true,
+        description:
+          'By default, all items created at the root level will appear as tabs. You can turn this off if you prefer manually constructing this part of the navigation.',
+        factory: 'Yes/No',
+        title: 'Automatically generate tabs',
+        type: 'boolean',
+      },
+      navigation_depth: {
+        default: 3,
+        description: 'Number of folder levels to show in the navigation.',
+        factory: 'Integer',
+        title: 'Navigation depth',
+        type: 'integer',
+      },
+      nonfolderish_tabs: {
+        default: true,
+        description:
+          "By default, any content item in the root of the portal will appear as a tab. If you turn this option off, only folders will be shown. This only has an effect if 'automatically generate tabs' is enabled.",
+        factory: 'Yes/No',
+        title: 'Generate tabs for items other than folders.',
+        type: 'boolean',
+      },
+      parent_types_not_to_query: {
+        additionalItems: true,
+        default: ['TempFolder'],
+        description: 'Hide content inside the following types in Navigation.',
+        factory: 'List',
+        items: {
+          description: '',
+          factory: 'Text line (String)',
+          title: '',
+          type: 'string',
+        },
+        title: 'Hide children of these types',
+        type: 'array',
+        uniqueItems: false,
+      },
+      root: {
+        default: '/',
+        description:
+          "Path to be used as navigation root, relative to Plone site root.Starts with '/'",
+        factory: 'Text line (String)',
+        title: 'Root',
+        type: 'string',
+      },
+      show_excluded_items: {
+        default: false,
+        description:
+          'If an item has been excluded from navigation should it be shown in navigation when viewing content contained within it or within a subfolder.',
+        factory: 'Yes/No',
+        title:
+          'Show items normally excluded from navigation if viewing their children.',
+        type: 'boolean',
+      },
+      sitemap_depth: {
+        default: 3,
+        description: 'Number of folder levels to show in the site map.',
+        factory: 'Integer',
+        title: 'Sitemap depth',
+        type: 'integer',
+      },
+      sort_tabs_on: {
+        choices: [
+          ['getObjPositionInParent', 'Position in Parent'],
+          ['sortable_title', 'Title'],
+          ['getId', 'Short Name (ID)'],
+        ],
+        default: 'getObjPositionInParent',
+        description: 'Index used to sort the tabs',
+        enum: ['getObjPositionInParent', 'sortable_title', 'getId'],
+        enumNames: ['Position in Parent', 'Title', 'Short Name (ID)'],
+        factory: 'Choice',
+        title: 'Sort tabs on',
+        type: 'string',
+        vocabulary: {
+          '@id': 'http://localhost:3000/@sources/sort_tabs_on',
+        },
+      },
+      sort_tabs_reversed: {
+        default: false,
+        description: 'Sort tabs in descending.',
+        factory: 'Yes/No',
+        title: 'Reversed sort order for tabs.',
+        type: 'boolean',
+      },
+      workflow_states_to_show: {
+        additionalItems: true,
+        default: [],
+        description: '',
+        factory: 'Tuple',
+        items: {
+          description: '',
+          factory: 'Choice',
+          title: '',
+          type: 'string',
+          vocabulary: {
+            '@id':
+              'http://localhost:3000/@vocabularies/plone.app.vocabularies.WorkflowStates',
+          },
+        },
+        title: '',
+        type: 'array',
+        uniqueItems: true,
+      },
+    },
+    required: ['navigation_depth', 'sort_tabs_on', 'root', 'sitemap_depth'],
+    type: 'object',
+  },
+  title: 'Navigation',
+};
+
+test('test navigation controlpanel fields', () => {
+  const { filterControlPanelsSchema } = config.settings;
+  const result = filterControlPanelsSchema(navigation_controlpanel);
+  const not_in_navigation = [
+    'generate_tabs',
+    'navigation_depth',
+    'sort_tabs_on',
+    'sort_tabs_reversed',
+    'sitemap_depth',
+  ];
+  const hasField = result['fieldsets'][0]['fields'].some((field) =>
+    not_in_navigation.includes(field),
+  );
+  expect(hasField).toBe(false);
+});

package/src/constants/ActionTypes.js

@@ -145,3 +145,4 @@ export const RESET_LOGIN_REQUEST = 'RESET_LOGIN_REQUEST';
 export const GET_SITE = 'GET_SITE';
 export const GET_NAVROOT = 'GET_NAVROOT';
 export const SET_FORM_DATA = 'SET_FORM_DATA';
+export const UPDATE_UPLOADED_FILES = 'UPDATE_UPLOADED_FILES';

package/src/constants/Languages.js

@@ -11,6 +11,7 @@ module.exports = {
   eu: 'Euskara',
   fi: 'Suomi',
   fr: 'Français',
+  hi: 'Hindi',
   it: 'Italiano',
   nl: 'Nederlands',
   ro: 'Română',

package/src/express-middleware/files.js

@@ -9,6 +9,7 @@ const HEADERS = [
   'content-type',
   'x-sendfile',
   'x-accel-redirect',
+  'x-robots-tag',
 ];
 
 function filesMiddlewareFn(req, res, next) {

package/src/express-middleware/images.js

@@ -7,6 +7,7 @@ const HEADERS = [
   'cache-control',
   'x-sendfile',
   'x-accel-redirect',
+  'x-robots-tag',
 ];
 
 function imageMiddlewareFn(req, res, next) {

package/src/helpers/Api/Api.js

@@ -80,6 +80,10 @@ class Api {
 
           Object.keys(headers).forEach((key) => request.set(key, headers[key]));
 
+          if (__SERVER__ && checkUrl && ['get', 'head'].includes(method)) {
+            request.redirects(0);
+          }
+
           if (data) {
             request.send(data);
           }
@@ -104,6 +108,14 @@ class Api {
                 url: request.xhr.responseURL,
               });
             }
+
+            if ([301, 302].includes(err?.status)) {
+              return reject({
+                code: err.status,
+                url: err.response.headers.location,
+              });
+            }
+
             return err ? reject(err) : resolve(response.body || response.text);
           });
         });

package/src/helpers/Api/Api.plone.rest.test.js

@@ -18,6 +18,7 @@ beforeAll(() => {
 
 const api = new Api();
 const { settings } = config;
+global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
 
 test('get request', () => {});
 

package/src/helpers/Api/Api.test.js

@@ -24,6 +24,7 @@ beforeAll(() => {
 
 const api = new Api();
 const { settings } = config;
+global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
 
 test('get request', () => {});
 

package/src/helpers/Blocks/Blocks.js

@@ -414,7 +414,7 @@ export function emptyBlocksForm() {
  * (could be empty, if not type given) and the number of blocks
  * @function blocksFormGenerator
  * @param {number} number How many blocks to generate of the type (could be "empty", if no type provided)
- * @param {number} type The type of the blocks
+ * @param {string} type The type of the blocks
  * @return {Object} blocks/blocks_layout pair filled with the generated blocks
  */
 export function blocksFormGenerator(number, type) {

package/src/middleware/api.js

@@ -17,7 +17,7 @@ import {
   RESET_APIERROR,
   SET_APIERROR,
 } from '@plone/volto/constants/ActionTypes';
-import { changeLanguage } from '@plone/volto/actions';
+import { changeLanguage, updateUploadedFiles } from '@plone/volto/actions';
 import {
   toGettextLang,
   toReactIntlLang,
@@ -133,6 +133,7 @@ const apiMiddlewareFactory =
     const { settings } = config;
 
     const token = getState().userSession.token;
+    let uploadedFiles = getState().content.uploadedFiles;
     let isAnonymous = true;
     if (token) {
       const tokenExpiration = jwtDecode(token).exp;
@@ -154,7 +155,6 @@ const apiMiddlewareFactory =
     }
 
     next({ ...rest, type: `${type}_PENDING` });
-
     if (socket) {
       actionPromise = Array.isArray(request)
         ? Promise.all(
@@ -188,6 +188,9 @@ const apiMiddlewareFactory =
                     ),
                   },
                 ).then((reqres) => {
+                  if (action.subrequest === 'batch-upload') {
+                    dispatch(updateUploadedFiles(++uploadedFiles));
+                  }
                   return [...acc, reqres];
                 });
               });
@@ -214,6 +217,10 @@ const apiMiddlewareFactory =
           });
       actionPromise.then(
         (result) => {
+          if (uploadedFiles !== 0) {
+            dispatch(updateUploadedFiles(0));
+          }
+
           const { settings } = config;
           if (getState().apierror.connectionRefused) {
             next({

package/src/reducers/content/content.js

@@ -17,6 +17,7 @@ import {
   RESET_CONTENT,
   UPDATE_CONTENT,
   UPDATECOLUMNS_CONTENT,
+  UPDATE_UPLOADED_FILES,
 } from '@plone/volto/constants/ActionTypes';
 
 const initialState = {
@@ -62,6 +63,7 @@ const initialState = {
   },
   data: null,
   subrequests: {},
+  uploadedFiles: 0,
 };
 
 /**
@@ -350,6 +352,11 @@ export default function content(state = initialState, action = {}) {
             },
             data: null,
           };
+    case UPDATE_UPLOADED_FILES:
+      return {
+        ...state,
+        uploadedFiles: action.uploadedFiles,
+      };
     default:
       return state;
   }

package/src/reducers/content/content.test.js

@@ -8,6 +8,7 @@ import {
   UPDATE_CONTENT,
   LOCK_CONTENT,
   UNLOCK_CONTENT,
+  UPDATE_UPLOADED_FILES,
 } from '@plone/volto/constants/ActionTypes';
 
 const { settings } = config;
@@ -57,6 +58,7 @@ describe('Content reducer', () => {
         loading: false,
         error: null,
       },
+      uploadedFiles: 0,
     });
   });
 
@@ -579,4 +581,15 @@ describe('Content reducer', () => {
       },
     });
   });
+
+  it('should handle UPDATE_UPLOADED_FILES', () => {
+    expect(
+      content(undefined, {
+        type: UPDATE_UPLOADED_FILES,
+        uploadedFiles: 5,
+      }),
+    ).toMatchObject({
+      uploadedFiles: 5,
+    });
+  });
 });

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

@@ -318,6 +318,16 @@ body.has-toolbar.has-sidebar-collapsed .ui.wrapper > .ui.inner.block.full {
       0 2px 4px rgba(0, 0, 0, 0.05);
     transform: translate(-50%, 0);
 
+    .separator {
+      position: relative;
+      top: 5px;
+      display: inline-block;
+      height: 24px;
+      border-right: 1px solid #ddd;
+      margin: 0 0 4px 4px;
+      vertical-align: bottom;
+    }
+
     form {
       display: flex;
     }
@@ -591,16 +601,6 @@ body.has-toolbar.has-sidebar-collapsed .ui.wrapper > .ui.inner.block.full {
   height: 100%;
 }
 
-.separator {
-  position: relative;
-  top: 5px;
-  display: inline-block;
-  height: 24px;
-  border-right: 1px solid #ddd;
-  margin: 0 0 4px 4px;
-  vertical-align: bottom;
-}
-
 // HTML block
 .html-editor {
   z-index: 1;

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

@@ -212,4 +212,46 @@
       padding: 0.67857143em 1em;
     }
   }
+
+  .ui.progress:first-child {
+    margin: 0 0 2.5em;
+  }
+
+  .progress-container {
+    padding: 35px;
+    background: white;
+    box-shadow: 0px 0px 12px 4px rgba(0, 0, 0, 0.43);
+  }
+
+  .progress-bar {
+    width: 300px;
+    height: 15px;
+    border-radius: 0;
+
+    .bar {
+      height: 15px;
+      border-radius: 0;
+      background: #0074a3;
+    }
+
+    .label {
+      position: relative;
+      margin: 0;
+      background: white;
+      color: grey;
+      font-size: small;
+      font-weight: normal;
+      line-height: 18px;
+      text-align: left;
+
+      .uploaded-files {
+        color: #0074a3;
+      }
+    }
+  }
+}
+
+.contents-upload-modal > .content {
+  overflow: auto;
+  max-height: 75vh;
 }

package/types/actions/content/content.d.ts

@@ -1,3 +1,10 @@
+/**
+ * update uploaded files count function
+ * @function updateUploadedFiles
+ * @param {number} number of files uploaded
+ * @returns {Object} update uploaded files action
+ */
+export function updateUploadedFiles(uploadedFiles: any): any;
 /**
  * Create content function.
  * @function createContent

package/types/actions/index.d.ts

@@ -21,7 +21,7 @@ export { getNavroot } from "./navroot/navroot";
 export { copy, cut, copyContent, moveContent } from "@plone/volto/actions/clipboard/clipboard";
 export { installAddon, listAddons, uninstallAddon, upgradeAddon } from "./addons/addons";
 export { addComment, deleteComment, listComments, listMoreComments, updateComment } from "@plone/volto/actions/comments/comments";
-export { createContent, deleteContent, updateContent, getContent, orderContent, sortContent, resetContent, updateColumnsContent, lockContent, unlockContent, linkIntegrityCheck } from "@plone/volto/actions/content/content";
+export { createContent, deleteContent, updateContent, getContent, orderContent, sortContent, resetContent, updateColumnsContent, lockContent, unlockContent, linkIntegrityCheck, updateUploadedFiles } from "@plone/volto/actions/content/content";
 export { getControlpanel, postControlpanel, deleteControlpanel, listControlpanels, updateControlpanel, getSystemInformation, getDatabaseInformation } from "@plone/volto/actions/controlpanels/controlpanels";
 export { createGroup, deleteGroup, getGroup, listGroups, updateGroup } from "@plone/volto/actions/groups/groups";
 export { getHistory, revertHistory } from "@plone/volto/actions/history/history";

package/types/config/config.test.d.ts

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

package/types/constants/ActionTypes.d.ts

@@ -141,3 +141,4 @@ export const RESET_LOGIN_REQUEST: "RESET_LOGIN_REQUEST";
 export const GET_SITE: "GET_SITE";
 export const GET_NAVROOT: "GET_NAVROOT";
 export const SET_FORM_DATA: "SET_FORM_DATA";
+export const UPDATE_UPLOADED_FILES: "UPDATE_UPLOADED_FILES";

package/types/constants/Languages.d.ts

@@ -5,6 +5,7 @@ export let es: string;
 export let eu: string;
 export let fi: string;
 export let fr: string;
+export let hi: string;
 export let it: string;
 export let nl: string;
 export let ro: string;

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

@@ -107,10 +107,10 @@ export function emptyBlocksForm(): any;
  * (could be empty, if not type given) and the number of blocks
  * @function blocksFormGenerator
  * @param {number} number How many blocks to generate of the type (could be "empty", if no type provided)
- * @param {number} type The type of the blocks
+ * @param {string} type The type of the blocks
  * @return {Object} blocks/blocks_layout pair filled with the generated blocks
  */
-export function blocksFormGenerator(number: number, type: number): any;
+export function blocksFormGenerator(number: number, type: string): any;
 /**
  * Recursively discover blocks in data and call the provided callback
  * @function visitBlocks