@plone/volto 18.0.0-alpha.31 → 18.0.0-alpha.33

package/src/components/theme/View/View.jsx

@@ -206,8 +206,10 @@ class View extends Component {
    */
   render() {
     const { views } = config;
-    if (this.props.error && this.props.error.code === 301) {
-      const redirect = flattenToAppURL(this.props.error.url).split('?')[0];
+    if ([301, 302].includes(this.props.error?.code)) {
+      const redirect = flattenToAppURL(this.props.error.url)
+        .split('?')[0]
+        .replace('/++api++', '');
       return <Redirect to={`${redirect}${this.props.location.search}`} />;
     } else if (this.props.error && !this.props.connectionRefused) {
       let FoundView;
@@ -235,7 +237,7 @@ class View extends Component {
       this.getViewByLayout() || this.getViewByType() || this.getViewDefault();
 
     return (
-      <div id="view">
+      <div id="view" tabIndex="-1">
         <ContentMetadataTags content={this.props.content} />
         {/* Body class if displayName in component is set */}
         <BodyClass

package/src/components/theme/View/View.test.jsx

@@ -22,6 +22,7 @@ beforeAll(() => {
   });
   config.settings.publicURL = 'https://plone.org';
 });
+global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
 
 const mockStore = configureStore();
 

package/src/config/ControlPanels.js

@@ -90,6 +90,13 @@ export const filterControlPanelsSchema = (controlpanel) => {
       'picture_variants',
       'image_captioning',
     ],
+    navigation: [
+      'generate_tabs',
+      'navigation_depth',
+      'sort_tabs_on',
+      'sort_tabs_reversed',
+      'sitemap_depth',
+    ],
   };
 
   // Creates modified version of properties object

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/config/server.js

@@ -18,7 +18,6 @@ const settings = {
   ],
   criticalCssPath: 'public/critical.css',
   readCriticalCss: null, // so it will be defaultReadCriticalCss
-  extractScripts: { errorPages: false },
   staticFiles: [
     {
       id: 'root_static',

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/express-middleware/static.js

@@ -1,28 +1,46 @@
 import express from 'express';
 import path from 'path';
+import AddonConfigurationRegistry from '@plone/registry/src/addon-registry';
 import config from '@plone/volto/registry';
 
-const staticMiddlewareFn = express.static(
-  process.env.BUILD_DIR
-    ? path.join(process.env.BUILD_DIR, 'public')
-    : process.env.RAZZLE_PUBLIC_DIR,
-  {
-    setHeaders: function (res, path) {
-      const pathLib = require('path');
-      const base = pathLib.resolve(process.env.RAZZLE_PUBLIC_DIR);
-      const relpath = path.substr(base.length);
-      config.settings.serverConfig.staticFiles.some((elem) => {
-        if (relpath.match(elem.match)) {
-          for (const name in elem.headers) {
-            res.setHeader(name, elem.headers[name] || 'undefined');
-          }
-          return true;
+const projectRootPath = path.resolve('.');
+const registry = new AddonConfigurationRegistry(projectRootPath);
+
+const staticDirectory = () => {
+  if (process.env.BUILD_DIR) {
+    return path.join(process.env.BUILD_DIR, 'public');
+  }
+  // Only for development, when Volto detects that it's working on itself (not an
+  // old fashioned Volto project), there are add-ons (so it's the new setup) then
+  // point to the public folder in the root of the setup, instead of the inner Volto
+  // public folder.
+  if (
+    process.env.NODE_ENV !== 'production' &&
+    !registry.isVoltoProject &&
+    registry.addonNames.length > 0
+  ) {
+    return path.join(projectRootPath, '../../../public');
+  }
+  // Is always set (Razzle does it)
+  return process.env.RAZZLE_PUBLIC_DIR;
+};
+
+const staticMiddlewareFn = express.static(staticDirectory(), {
+  setHeaders: function (res, path) {
+    const pathLib = require('path');
+    const base = pathLib.resolve(process.env.RAZZLE_PUBLIC_DIR);
+    const relpath = path.substr(base.length);
+    config.settings.serverConfig.staticFiles.some((elem) => {
+      if (relpath.match(elem.match)) {
+        for (const name in elem.headers) {
+          res.setHeader(name, elem.headers[name] || 'undefined');
         }
-        return false;
-      });
-    },
+        return true;
+      }
+      return false;
+    });
   },
-);
+});
 
 export default function staticsMiddleware() {
   const middleware = express.Router();

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/Html/Html.jsx

@@ -187,14 +187,12 @@ class Html extends Component {
             charSet="UTF-8"
           />
           {/* Add the crossorigin while in development */}
-          {this.props.extractScripts !== false
-            ? extractor.getScriptElements().map((elem) =>
-                React.cloneElement(elem, {
-                  crossOrigin:
-                    process.env.NODE_ENV === 'production' ? undefined : 'true',
-                }),
-              )
-            : ''}
+          {extractor.getScriptElements().map((elem) =>
+            React.cloneElement(elem, {
+              crossOrigin:
+                process.env.NODE_ENV === 'production' ? undefined : 'true',
+            }),
+          )}
         </body>
       </html>
     );

package/src/helpers/Slots/index.tsx

@@ -1,12 +1,19 @@
-import type { Content } from '@plone/types';
 import { matchPath } from 'react-router-dom';
+import type { Content } from '@plone/types';
+import type { Location } from 'history';
 
 export function RouteCondition(path: string, exact?: boolean) {
-  return ({ pathname }: { pathname: string }) =>
-    Boolean(matchPath(pathname, { path, exact }));
+  return ({ location }: { location: Location }) =>
+    Boolean(matchPath(location.pathname, { path, exact }));
 }
 
 export function ContentTypeCondition(contentType: string[]) {
-  return ({ content }: { content: Content }) =>
-    contentType.includes(content?.['@type']);
+  return ({ content, location }: { content: Content; location: Location }) => {
+    return (
+      contentType.includes(content?.['@type']) ||
+      contentType.some((type) => {
+        return location.search.includes(`type=${encodeURIComponent(type)}`);
+      })
+    );
+  };
 }

package/src/server.jsx

@@ -272,50 +272,48 @@ server.get('/*', (req, res) => {
         });
       }
 
+      const sendHtmlResponse = (
+        res,
+        statusCode,
+        extractor,
+        markup,
+        store,
+        req,
+        config,
+      ) => {
+        res.status(statusCode).send(
+          `<!doctype html>
+        ${renderToString(
+          <Html
+            extractor={extractor}
+            markup={markup}
+            store={store}
+            criticalCss={readCriticalCss(req)}
+            apiPath={res.locals.detectedHost || config.settings.apiPath}
+            publicURL={res.locals.detectedHost || config.settings.publicURL}
+          />,
+        )}
+      `,
+        );
+      };
+
       if (context.url) {
         res.redirect(flattenToAppURL(context.url));
       } else if (context.error_code) {
         res.set({
           'Cache-Control': 'no-cache',
         });
-
-        res.status(context.error_code).send(
-          `<!doctype html>
-              ${renderToString(
-                <Html
-                  extractor={extractor}
-                  markup={markup}
-                  store={store}
-                  extractScripts={
-                    config.settings.serverConfig.extractScripts?.errorPages ||
-                    process.env.NODE_ENV !== 'production'
-                  }
-                  criticalCss={readCriticalCss(req)}
-                  apiPath={res.locals.detectedHost || config.settings.apiPath}
-                  publicURL={
-                    res.locals.detectedHost || config.settings.publicURL
-                  }
-                />,
-              )}
-            `,
+        sendHtmlResponse(
+          res,
+          context.error_code,
+          extractor,
+          markup,
+          store,
+          req,
+          config,
         );
       } else {
-        res.status(200).send(
-          `<!doctype html>
-              ${renderToString(
-                <Html
-                  extractor={extractor}
-                  markup={markup}
-                  store={store}
-                  criticalCss={readCriticalCss(req)}
-                  apiPath={res.locals.detectedHost || config.settings.apiPath}
-                  publicURL={
-                    res.locals.detectedHost || config.settings.publicURL
-                  }
-                />,
-              )}
-            `,
-        );
+        sendHtmlResponse(res, 200, extractor, markup, store, req, config);
       }
     }, errorHandler)
     .catch(errorHandler);

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/objectbrowser-widget.less

@@ -41,3 +41,86 @@
     border: none !important;
   }
 }
+
+.object-browser {
+  .mode-switch {
+    margin-right: 8px;
+    cursor: pointer;
+    float: right;
+  }
+
+  header h2 {
+    margin: 2px 0 !important;
+  }
+
+  .searchResults {
+    margin-left: 20px;
+    font-size: 14px;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    line-height: 1.5;
+    text-rendering: optimizeLegibility;
+    text-size-adjust: 100%;
+  }
+
+  ul.object-listing {
+    padding: 0;
+  }
+
+  .image-wrapper {
+    display: block;
+    margin: 16px;
+    float: left;
+
+    img,
+    .icon-wrapper {
+      background-color: #edf1f2;
+      cursor: pointer;
+      outline: 0;
+    }
+
+    .selected {
+      outline: solid 3px #517776 !important;
+    }
+
+    img:hover,
+    .icon-wrapper:hover {
+      outline: solid 3px rgb(187, 198, 200);
+    }
+
+    .image-preview,
+    .image-preview:hover {
+      display: flex;
+      border: 0;
+      border-radius: 0;
+      box-shadow: none;
+
+      img {
+        width: 200px;
+        height: 200px;
+        object-fit: contain;
+      }
+    }
+
+    .image-preview,
+    .image-title {
+      cursor: pointer;
+      text-align: center;
+    }
+
+    .image-title {
+      margin-top: 5px;
+    }
+
+    .image-title-content {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    .icon-wrapper {
+      display: flex;
+      padding: 46px;
+    }
+  }
+}