design-comuni-plone-theme 11.20.1 → 11.20.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 
 
+## [11.20.2](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.20.1...v11.20.2) (2024-08-12)
+
+
+### Bug Fixes
+
+* 302 redirects for aliases, removed custom cors error logging ([8348e94](https://github.com/RedTurtle/design-comuni-plone-theme/commit/8348e94940feeddc85c8f3d0364f37daa2145404))
+* icons lazy loading race condition ([4e32354](https://github.com/RedTurtle/design-comuni-plone-theme/commit/4e3235467b886144afcc240aacda9116b729aeb8))
+
+
+### Maintenance
+
+* remove unused performance workflow ([adc31a7](https://github.com/RedTurtle/design-comuni-plone-theme/commit/adc31a718b491075b03d789714354089de09a06e))
+
+
+### Documentation
+
+* updated publiccode and release log ([e9a2e52](https://github.com/RedTurtle/design-comuni-plone-theme/commit/e9a2e52247683876b2599bf6938e65354457f6f4))
+
 ## [11.20.1](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.20.0...v11.20.1) (2024-08-09)
 
 

package/RELEASE.md

@@ -41,6 +41,12 @@
 - ...
 -->
 
+## Versione 11.20.2 (12/08/2024)
+
+### Fix
+
+- Risolto un problema per cui veniva mostrato temporaneamente un messaggio di errore quando si visitava un indirizzo alternativo creato con lo strumento Gestione URL.
+
 ## Versione 11.20.1 (09/08/2024)
 
 ### Fix

package/package.json

@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "11.20.1",
+  "version": "11.20.2",
   "main": "src/index.js",
   "repository": {
     "type": "git",

package/publiccode.yml

@@ -227,9 +227,9 @@ maintenance:
 name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
 platforms:
   - web
-releaseDate: '2024-08-09'
+releaseDate: '2024-08-12'
 softwareType: standalone/web
-softwareVersion: 11.20.1
+softwareVersion: 11.20.2
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

package/src/components/ItaliaTheme/Icons/FontAwesomeIcon.jsx

@@ -36,12 +36,12 @@ const FontAwesomeIcon = (props) => {
       prefixKey === 'fab'
         ? 'brands'
         : prefixKey === 'far'
-        ? 'regular'
-        : prefixKey === 'fas'
-        ? 'solid'
-        : prefixKey != null
-        ? prefixKey
-        : 'solid',
+          ? 'regular'
+          : prefixKey === 'fas'
+            ? 'solid'
+            : prefixKey != null
+              ? prefixKey
+              : 'solid',
       iconName,
     ];
   };

package/src/components/ItaliaTheme/index.js

@@ -24,17 +24,9 @@ export {
 
 /********* ICONS ********* */
 export getItemIcon from 'design-comuni-plone-theme/components/ItaliaTheme/Icons/common/common';
-export const Icon = loadable(() =>
-  import(
-    /* webpackChunkName: "DCPTIcons" */ 'design-comuni-plone-theme/components/ItaliaTheme/Icons/Icon'
-  ),
-);
+export Icon from 'design-comuni-plone-theme/components/ItaliaTheme/Icons/Icon';
 export SectionIcon from 'design-comuni-plone-theme/components/ItaliaTheme/Icons/SectionIcon';
-export const FontAwesomeIcon = loadable(() =>
-  import(
-    /* webpackChunkName: "DCPTIcons" */ 'design-comuni-plone-theme/components/ItaliaTheme/Icons/FontAwesomeIcon'
-  ),
-);
+export FontAwesomeIcon from 'design-comuni-plone-theme/components/ItaliaTheme/Icons/FontAwesomeIcon';
 
 /********* COMMONS ********* */
 export CardCategory from 'design-comuni-plone-theme/components/ItaliaTheme/Cards/CardCategory';
@@ -56,25 +48,29 @@ export SubsiteHeader from 'design-comuni-plone-theme/components/ItaliaTheme/Head
 export ParentSiteMenu from 'design-comuni-plone-theme/components/ItaliaTheme/Header/ParentSiteMenu';
 export HeaderSearch from 'design-comuni-plone-theme/components/ItaliaTheme/Header/HeaderSearch/HeaderSearch';
 export SearchModal from 'design-comuni-plone-theme/components/ItaliaTheme/Header/HeaderSearch/SearchModal';
-export const SearchTopics = loadable(() =>
-  import(
-    /* webpackChunkName: "DCPTSearch" */ 'design-comuni-plone-theme/components/ItaliaTheme/Search/SearchTopics'
-  ),
+export const SearchTopics = loadable(
+  () =>
+    import(
+      /* webpackChunkName: "DCPTSearch" */ 'design-comuni-plone-theme/components/ItaliaTheme/Search/SearchTopics'
+    ),
 );
-export const SearchCTs = loadable(() =>
-  import(
-    /* webpackChunkName: "DCPTSearch" */ 'design-comuni-plone-theme/components/ItaliaTheme/Search/SearchCTs'
-  ),
+export const SearchCTs = loadable(
+  () =>
+    import(
+      /* webpackChunkName: "DCPTSearch" */ 'design-comuni-plone-theme/components/ItaliaTheme/Search/SearchCTs'
+    ),
 );
-export const SearchResultItem = loadable(() =>
-  import(
-    /* webpackChunkName: "DCPTSearch" */ 'design-comuni-plone-theme/components/ItaliaTheme/Search/ResultItem'
-  ),
+export const SearchResultItem = loadable(
+  () =>
+    import(
+      /* webpackChunkName: "DCPTSearch" */ 'design-comuni-plone-theme/components/ItaliaTheme/Search/ResultItem'
+    ),
 );
-export const SearchSections = loadable(() =>
-  import(
-    /* webpackChunkName: "DCPTSearch" */ 'design-comuni-plone-theme/components/ItaliaTheme/Search/SearchSections'
-  ),
+export const SearchSections = loadable(
+  () =>
+    import(
+      /* webpackChunkName: "DCPTSearch" */ 'design-comuni-plone-theme/components/ItaliaTheme/Search/SearchSections'
+    ),
 );
 export MegaMenu from 'design-comuni-plone-theme/components/ItaliaTheme/MegaMenu/MegaMenu';
 export MenuSecondary from 'design-comuni-plone-theme/components/ItaliaTheme/MenuSecondary/MenuSecondary';

package/src/config/loadables.js

@@ -5,10 +5,11 @@ export const loadables = {
   reactSlick: loadable.lib(() => import('react-slick')),
   rrule: loadable.lib(() => import('rrule')),
   htmlDiffLib: loadable.lib(() => import('htmldiff-js')),
-  fontAwesomeAliases: loadable.lib(() =>
-    import(
-      /* webpackChunkName: "DCPTIcons" */ 'design-comuni-plone-theme/helpers/IconWidget/IconAliasHelper'
-    ),
+  fontAwesomeAliases: loadable.lib(
+    () =>
+      import(
+        /* webpackChunkName: "DCPTIcons" */ 'design-comuni-plone-theme/helpers/IconWidget/IconAliasHelper'
+      ),
   ),
   ...subsitesLoadables,
 };

package/.github/workflows/performance.yml

@@ -1,47 +0,0 @@
-name: Docker build for latest performance test version
-on:
-  push:
-    branches: [performance]
-
-jobs:
-  build_develop:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push Docker images
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./dockerfiles/Dockerfile
-          tags: redturtletech/io-comune-base:perf
-          pull: true
-          push: true
-          cache-from: type=registry,ref=redturtletech/io-comune-base:perf
-          cache-to: type=inline
-          build-args: |
-            ADDON_NAME=design-comuni-plone-theme
-            ADDON_PATH=design-comuni-plone-theme
-            VOLTO_VERSION=17.18.2
-
-      - name: Deploy to rancher
-        uses: redturtle/rancher-deploy-action@v0.2.0
-        with:
-          host: ${{ secrets.RANCHER_HOST }}
-          api-username: ${{ secrets.RANCHER_API_USERNAME }}
-          api-password: ${{ secrets.RANCHER_API_PASSWORD }}
-          cluster-id: ${{ secrets.RANCHER_CLUSTER_ID }}
-          project-id: ${{ secrets.RANCHER_PROJECT_ID }}
-          namespace: ${{ secrets.RANCHER_NAMESPACE_DEVELOP }}
-          workload: ${{ secrets.RANCHER_WORKLOAD_PERF }}
-          image: redturtletech/io-comune-base:perf
-          slack-hook-url: ${{ secrets.RANCHER_SLACK_HOOK_URL }}

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

@@ -1,353 +0,0 @@
-/**
- * View container.
- * @module components/theme/View/View
- * Customization:
- * - added logging of errors
- */
-
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
-import { Redirect } from 'react-router-dom';
-import { Portal } from 'react-portal';
-import { injectIntl } from 'react-intl';
-import qs from 'query-string';
-
-import loadable from '@loadable/component';
-
-import {
-  ContentMetadataTags,
-  Comments,
-  Tags,
-  Toolbar,
-} from '@plone/volto/components';
-import { listActions, getContent } from '@plone/volto/actions';
-import {
-  BodyClass,
-  getBaseUrl,
-  flattenToAppURL,
-  getLayoutFieldname,
-  hasApiExpander,
-} from '@plone/volto/helpers';
-
-import config from '@plone/volto/registry';
-
-const sentryLibraries = {
-  Sentry: loadable.lib(
-    () => import(/* webpackChunkName: "s_entry-browser" */ '@sentry/browser'),
-  ),
-};
-
-/**
- * View container class.
- * @class View
- * @extends Component
- */
-class View extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    actions: PropTypes.shape({
-      object: PropTypes.arrayOf(PropTypes.object),
-      object_buttons: PropTypes.arrayOf(PropTypes.object),
-      user: PropTypes.arrayOf(PropTypes.object),
-    }),
-    listActions: PropTypes.func.isRequired,
-    /**
-     * Action to get the content
-     */
-    getContent: PropTypes.func.isRequired,
-    /**
-     * Pathname of the object
-     */
-    pathname: PropTypes.string.isRequired,
-    location: PropTypes.shape({
-      search: PropTypes.string,
-      pathname: PropTypes.string,
-    }).isRequired,
-    /**
-     * Version id of the object
-     */
-    versionId: PropTypes.string,
-    /**
-     * Content of the object
-     */
-    content: PropTypes.shape({
-      /**
-       * Layout of the object
-       */
-      layout: PropTypes.string,
-      /**
-       * Allow discussion of the object
-       */
-      allow_discussion: PropTypes.bool,
-      /**
-       * Title of the object
-       */
-      title: PropTypes.string,
-      /**
-       * Description of the object
-       */
-      description: PropTypes.string,
-      /**
-       * Type of the object
-       */
-      '@type': PropTypes.string,
-      /**
-       * Subjects of the object
-       */
-      subjects: PropTypes.arrayOf(PropTypes.string),
-      is_folderish: PropTypes.bool,
-    }),
-    error: PropTypes.shape({
-      /**
-       * Error type
-       */
-      status: PropTypes.number,
-    }),
-  };
-
-  /**
-   * Default properties.
-   * @property {Object} defaultProps Default properties.
-   * @static
-   */
-  static defaultProps = {
-    actions: null,
-    content: null,
-    versionId: null,
-    error: null,
-  };
-
-  state = {
-    hasObjectButtons: null,
-    isClient: false,
-  };
-
-  componentDidMount() {
-    // Do not trigger the actions action if the expander is present
-    if (!hasApiExpander('actions', getBaseUrl(this.props.pathname))) {
-      this.props.listActions(getBaseUrl(this.props.pathname));
-    }
-
-    this.props.getContent(
-      getBaseUrl(this.props.pathname),
-      this.props.versionId,
-    );
-    this.setState({ isClient: true });
-  }
-
-  /**
-   * Component will receive props
-   * @method componentWillReceiveProps
-   * @param {Object} nextProps Next properties
-   * @returns {undefined}
-   */
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (nextProps.pathname !== this.props.pathname) {
-      // Do not trigger the actions action if the expander is present
-      if (!hasApiExpander('actions', getBaseUrl(nextProps.pathname))) {
-        this.props.listActions(getBaseUrl(nextProps.pathname));
-      }
-
-      this.props.getContent(
-        getBaseUrl(nextProps.pathname),
-        this.props.versionId,
-      );
-    }
-
-    if (nextProps.actions.object_buttons) {
-      const objectButtons = nextProps.actions.object_buttons;
-      this.setState({
-        hasObjectButtons: !!objectButtons.length,
-      });
-    }
-  }
-
-  /**
-   * Default fallback view
-   * @method getViewDefault
-   * @returns {string} Markup for component.
-   */
-  getViewDefault = () => config.views.defaultView;
-
-  /**
-   * Get view by content type
-   * @method getViewByType
-   * @returns {string} Markup for component.
-   */
-  getViewByType = () =>
-    config.views.contentTypesViews[this.props.content['@type']] || null;
-
-  /**
-   * Get view by content layout property
-   * @method getViewByLayout
-   * @returns {string} Markup for component.
-   */
-  getViewByLayout = () =>
-    config.views.layoutViews[
-      this.props.content[getLayoutFieldname(this.props.content)]
-    ] || null;
-
-  /**
-   * Cleans the component displayName (specially for connected components)
-   * which have the Connect(componentDisplayName)
-   * @method cleanViewName
-   * @param  {string} dirtyDisplayName The displayName
-   * @returns {string} Clean displayName (no Connect(...)).
-   */
-  cleanViewName = (dirtyDisplayName) =>
-    dirtyDisplayName
-      .replace('Connect(', '')
-      .replace('injectIntl(', '')
-      .replace(')', '')
-      .replace('connect(', '')
-      .toLowerCase();
-
-  // CUSTOMIZATION: added logging of errors
-  notifySentry = (message) => {
-    const loaders = Object.entries(sentryLibraries).map(
-      ([name, Lib]) =>
-        new Promise((resolve) =>
-          Lib.load().then((mod) => resolve([name, mod])),
-        ),
-    );
-    Promise.all(loaders).then((libs) => {
-      const libraries = Object.assign(
-        {},
-        ...libs.map(([name, lib]) => ({ [name]: lib })),
-      );
-      class MaybeCorsError extends Error {
-        constructor(...args) {
-          super(...args);
-          this.name = 'MaybeCorsError';
-        }
-      }
-      libraries.Sentry.captureException(new MaybeCorsError(message), {
-        contexts: {
-          props: {
-            isAnonymous: !this.props.token,
-            ...this.props,
-          },
-        },
-      });
-    });
-  };
-
-  /**
-   * Render method.
-   * @method render
-   * @returns {string} Markup for the component.
-   */
-  render() {
-    const { views } = config;
-    if (this.props.error && this.props.error.code === 301) {
-      const redirect = flattenToAppURL(this.props.error.url).split('?')[0];
-      return <Redirect to={`${redirect}${this.props.location.search}`} />;
-    } else if (this.props.error && !this.props.connectionRefused) {
-      let FoundView;
-      if (this.props.error.status === undefined) {
-        // For some reason, while development and if CORS is in place and the
-        // requested resource is 404, it returns undefined as status, then the
-        // next statement will fail
-        // eslint-disable-next-line no-console
-        console.error(
-          'DEV MODE CORS ERROR in View component: ',
-          JSON.stringify(this.props, null, 2),
-        );
-        this.notifySentry('DEV MODE CORS ERROR in View component');
-        FoundView = views.errorViews.corsError;
-      } else {
-        if (this.props.error.status.toString() === 'corsError') {
-          // eslint-disable-next-line no-console
-          console.error(
-            'CORS ERROR in View component: ',
-            JSON.stringify(this.props, null, 2),
-          );
-          this.notifySentry('CORS ERROR in View component');
-        }
-        FoundView = views.errorViews[this.props.error.status.toString()];
-      }
-      if (!FoundView) {
-        FoundView = views.errorViews['404']; // default to 404
-      }
-      return (
-        <div id="view">
-          <FoundView {...this.props} />
-        </div>
-      );
-    }
-    if (!this.props.content) {
-      return <span />;
-    }
-    const RenderedView =
-      this.getViewByLayout() || this.getViewByType() || this.getViewDefault();
-
-    return (
-      <div id="view">
-        <ContentMetadataTags content={this.props.content} />
-        {/* Body class if displayName in component is set */}
-        <BodyClass
-          className={
-            RenderedView.displayName
-              ? `view-${this.cleanViewName(RenderedView.displayName)}`
-              : null
-          }
-        />
-        <RenderedView
-          key={this.props.content['@id']}
-          content={this.props.content}
-          location={this.props.location}
-          token={this.props.token}
-          history={this.props.history}
-        />
-        {config.settings.showTags &&
-          this.props.content.subjects &&
-          this.props.content.subjects.length > 0 && (
-            <Tags tags={this.props.content.subjects} />
-          )}
-        {/* Add opt-in social sharing if required, disabled by default */}
-        {/* In the future this might be parameterized from the app config */}
-        {/* <SocialSharing
-          url={typeof window === 'undefined' ? '' : window.location.href}
-          title={this.props.content.title}
-          description={this.props.content.description || ''}
-        /> */}
-        {this.props.content.allow_discussion && (
-          <Comments pathname={this.props.pathname} />
-        )}
-        {this.state.isClient && (
-          <Portal node={document.getElementById('toolbar')}>
-            <Toolbar pathname={this.props.pathname} inner={<span />} />
-          </Portal>
-        )}
-      </div>
-    );
-  }
-}
-
-export default compose(
-  injectIntl,
-  connect(
-    (state, props) => ({
-      actions: state.actions.actions,
-      token: state.userSession.token,
-      content: state.content.data,
-      error: state.content.get.error,
-      apiError: state.apierror.error,
-      connectionRefused: state.apierror.connectionRefused,
-      pathname: props.location.pathname,
-      versionId:
-        qs.parse(props.location.search) &&
-        qs.parse(props.location.search).version,
-    }),
-    {
-      listActions,
-      getContent,
-    },
-  ),
-)(View);

package/src/customizations/volto/components/theme/View/disabled_View.jsx

@@ -1,308 +0,0 @@
-/**
- * backport https://github.com/plone/volto/pull/4854
- *
- * View container.
- * @module components/theme/View/View
- */
-
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
-import { Redirect } from 'react-router-dom';
-import { Portal } from 'react-portal';
-import { injectIntl } from 'react-intl';
-import qs from 'query-string';
-
-import {
-  ContentMetadataTags,
-  Comments,
-  Tags,
-  Toolbar,
-} from '@plone/volto/components';
-import { listActions, getContent } from '@plone/volto/actions';
-import {
-  BodyClass,
-  getBaseUrl,
-  flattenToAppURL,
-  getLayoutFieldname,
-  hasApiExpander,
-} from '@plone/volto/helpers';
-
-import config from '@plone/volto/registry';
-
-/**
- * View container class.
- * @class View
- * @extends Component
- */
-class View extends Component {
-  /**
-   * Property types.
-   * @property {Object} propTypes Property types.
-   * @static
-   */
-  static propTypes = {
-    actions: PropTypes.shape({
-      object: PropTypes.arrayOf(PropTypes.object),
-      object_buttons: PropTypes.arrayOf(PropTypes.object),
-      user: PropTypes.arrayOf(PropTypes.object),
-    }),
-    listActions: PropTypes.func.isRequired,
-    /**
-     * Action to get the content
-     */
-    getContent: PropTypes.func.isRequired,
-    /**
-     * Pathname of the object
-     */
-    pathname: PropTypes.string.isRequired,
-    location: PropTypes.shape({
-      search: PropTypes.string,
-      pathname: PropTypes.string,
-    }).isRequired,
-    /**
-     * Version id of the object
-     */
-    versionId: PropTypes.string,
-    /**
-     * Content of the object
-     */
-    content: PropTypes.shape({
-      /**
-       * Layout of the object
-       */
-      layout: PropTypes.string,
-      /**
-       * Allow discussion of the object
-       */
-      allow_discussion: PropTypes.bool,
-      /**
-       * Title of the object
-       */
-      title: PropTypes.string,
-      /**
-       * Description of the object
-       */
-      description: PropTypes.string,
-      /**
-       * Type of the object
-       */
-      '@type': PropTypes.string,
-      /**
-       * Subjects of the object
-       */
-      subjects: PropTypes.arrayOf(PropTypes.string),
-      is_folderish: PropTypes.bool,
-    }),
-    error: PropTypes.shape({
-      /**
-       * Error type
-       */
-      status: PropTypes.number,
-    }),
-  };
-
-  /**
-   * Default properties.
-   * @property {Object} defaultProps Default properties.
-   * @static
-   */
-  static defaultProps = {
-    actions: null,
-    content: null,
-    versionId: null,
-    error: null,
-  };
-
-  state = {
-    hasObjectButtons: null,
-    isClient: false,
-  };
-
-  componentDidMount() {
-    // Do not trigger the actions action if the expander is present
-    if (!hasApiExpander('actions', getBaseUrl(this.props.pathname))) {
-      this.props.listActions(getBaseUrl(this.props.pathname));
-    }
-    this.props.getContent(
-      getBaseUrl(this.props.pathname),
-      this.props.versionId,
-    );
-    this.setState({ isClient: true });
-  }
-
-  /**
-   * Component will receive props
-   * @method componentWillReceiveProps
-   * @param {Object} nextProps Next properties
-   * @returns {undefined}
-   */
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (nextProps.pathname !== this.props.pathname) {
-      // Do not trigger the actions action if the expander is present
-      if (!hasApiExpander('actions', getBaseUrl(nextProps.pathname))) {
-        this.props.listActions(getBaseUrl(nextProps.pathname));
-      }
-      this.props.getContent(
-        getBaseUrl(nextProps.pathname),
-        this.props.versionId,
-      );
-    }
-
-    if (nextProps.actions.object_buttons) {
-      const objectButtons = nextProps.actions.object_buttons;
-      this.setState({
-        hasObjectButtons: !!objectButtons.length,
-      });
-    }
-  }
-
-  /**
-   * Default fallback view
-   * @method getViewDefault
-   * @returns {string} Markup for component.
-   */
-  getViewDefault = () => config.views.defaultView;
-
-  /**
-   * Get view by content type
-   * @method getViewByType
-   * @returns {string} Markup for component.
-   */
-  getViewByType = () =>
-    config.views.contentTypesViews[this.props.content['@type']] || null;
-
-  /**
-   * Get view by content layout property
-   * @method getViewByLayout
-   * @returns {string} Markup for component.
-   */
-  getViewByLayout = () =>
-    config.views.layoutViews[
-      this.props.content[getLayoutFieldname(this.props.content)]
-    ] || null;
-
-  /**
-   * Cleans the component displayName (specially for connected components)
-   * which have the Connect(componentDisplayName)
-   * @method cleanViewName
-   * @param  {string} dirtyDisplayName The displayName
-   * @returns {string} Clean displayName (no Connect(...)).
-   */
-  cleanViewName = (dirtyDisplayName) =>
-    dirtyDisplayName
-      .replace('Connect(', '')
-      .replace('injectIntl(', '')
-      .replace(')', '')
-      .replace('connect(', '')
-      .toLowerCase();
-
-  /**
-   * Render method.
-   * @method render
-   * @returns {string} Markup for the component.
-   */
-  render() {
-    const { views } = config;
-    const status = __SERVER__
-      ? this.props.error?.status
-      : this.props.error?.code;
-    // Checking to see if it's a 3XX HTTP status code. error.status only works on the server
-    if (['301', '302', '307', '308'].includes(status?.toString())) {
-      const redirectUrl = __SERVER__
-        ? this.props.error.response.headers.location
-        : this.props.error.url;
-      let redirect = flattenToAppURL(redirectUrl);
-      // We can hit situations where we end up being redirected to an api route. We don't want that so lets remove ++api++.
-      redirect = redirect.replace('/++api++', '');
-      return <Redirect to={`${redirect}${this.props.location.search}`} />;
-    } else if (this.props.error && !this.props.connectionRefused) {
-      let FoundView;
-      if (this.props.error.status === undefined) {
-        // For some reason, while development and if CORS is in place and the
-        // requested resource is 404, it returns undefined as status, then the
-        // next statement will fail
-        FoundView = views.errorViews.corsError;
-      } else {
-        FoundView = views.errorViews[this.props.error.status.toString()];
-      }
-      if (!FoundView) {
-        FoundView = views.errorViews['404']; // default to 404
-      }
-      return (
-        <div id="view">
-          <FoundView {...this.props} />
-        </div>
-      );
-    }
-    if (!this.props.content) {
-      return <span />;
-    }
-    const RenderedView =
-      this.getViewByLayout() || this.getViewByType() || this.getViewDefault();
-
-    return (
-      <div id="view">
-        <ContentMetadataTags content={this.props.content} />
-        {/* Body class if displayName in component is set */}
-        <BodyClass
-          className={
-            RenderedView.displayName
-              ? `view-${this.cleanViewName(RenderedView.displayName)}`
-              : null
-          }
-        />
-        <RenderedView
-          key={this.props.content['@id']}
-          content={this.props.content}
-          location={this.props.location}
-          token={this.props.token}
-          history={this.props.history}
-        />
-        {config.settings.showTags &&
-          this.props.content.subjects &&
-          this.props.content.subjects.length > 0 && (
-            <Tags tags={this.props.content.subjects} />
-          )}
-        {/* Add opt-in social sharing if required, disabled by default */}
-        {/* In the future this might be parameterized from the app config */}
-        {/* <SocialSharing
-          url={typeof window === 'undefined' ? '' : window.location.href}
-          title={this.props.content.title}
-          description={this.props.content.description || ''}
-        /> */}
-        {this.props.content.allow_discussion && (
-          <Comments pathname={this.props.pathname} />
-        )}
-        {this.state.isClient && (
-          <Portal node={document.getElementById('toolbar')}>
-            <Toolbar pathname={this.props.pathname} inner={<span />} />
-          </Portal>
-        )}
-      </div>
-    );
-  }
-}
-
-export default compose(
-  injectIntl,
-  connect(
-    (state, props) => ({
-      actions: state.actions.actions,
-      token: state.userSession.token,
-      content: state.content.data,
-      error: state.content.get.error,
-      apiError: state.apierror.error,
-      connectionRefused: state.apierror.connectionRefused,
-      pathname: props.location.pathname,
-      versionId:
-        qs.parse(props.location.search) &&
-        qs.parse(props.location.search).version,
-    }),
-    {
-      listActions,
-      getContent,
-    },
-  ),
-)(View);

package/src/customizations/volto/helpers/Api/disabled_Api.js

@@ -1,131 +0,0 @@
-/**
- * backport https://github.com/plone/volto/pull/4854
- *
- * Api helper.
- * @module helpers/Api
- */
-
-import superagent from 'superagent';
-import Cookies from 'universal-cookie';
-import config from '@plone/volto/registry';
-import { addHeadersFactory } from '@plone/volto/helpers/Proxy/Proxy';
-import { stripQuerystring } from '@plone/volto/helpers';
-
-const methods = ['get', 'post', 'put', 'patch', 'del'];
-
-/**
- * Format the url.
- * @function formatUrl
- * @param {string} path Path (or URL) to be formatted.
- * @returns {string} Formatted path.
- */
-function formatUrl(path) {
-  const { settings } = config;
-  const APISUFIX = settings.legacyTraverse ? '' : '/++api++';
-
-  if (path.startsWith('http://') || path.startsWith('https://')) return path;
-
-  const adjustedPath = path[0] !== '/' ? `/${path}` : path;
-  let apiPath = '';
-  if (settings.internalApiPath && __SERVER__) {
-    apiPath = settings.internalApiPath;
-  } else if (settings.apiPath) {
-    apiPath = settings.apiPath;
-  }
-
-  return `${apiPath}${APISUFIX}${adjustedPath}`;
-}
-
-/**
- * Api class.
- * @class Api
- */
-class Api {
-  /**
-   * Constructor
-   * @method constructor
-   * @constructs Api
-   */
-  constructor(req) {
-    const cookies = new Cookies();
-
-    methods.forEach((method) => {
-      this[method] = (
-        path,
-        { params, data, type, headers = {}, checkUrl = false } = {},
-      ) => {
-        let request;
-        let promise = new Promise((resolve, reject) => {
-          request = superagent[method](formatUrl(path));
-
-          if (params) {
-            request.query(params);
-          }
-
-          let authToken;
-          if (req) {
-            // We are in SSR
-            authToken = req.universalCookies.get('auth_token');
-            request.use(addHeadersFactory(req));
-          } else {
-            authToken = cookies.get('auth_token');
-          }
-          if (authToken) {
-            request.set('Authorization', `Bearer ${authToken}`);
-          }
-
-          request.set('Accept', 'application/json');
-
-          if (type) {
-            request.type(type);
-          }
-
-          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);
-          }
-
-          request.end((err, response) => {
-            if (
-              checkUrl &&
-              request.url &&
-              request.xhr &&
-              encodeURI(stripQuerystring(request.url)) !==
-                stripQuerystring(request.xhr.responseURL)
-            ) {
-              if (request.xhr.responseURL?.length === 0) {
-                return reject({
-                  code: 408,
-                  status: 408,
-                  url: request.xhr.responseURL,
-                });
-              }
-              return reject({
-                code: 301,
-                url: request.xhr.responseURL,
-              });
-            }
-
-            if (['301', '302', '307', '308'].includes(err?.status)) {
-              return reject({
-                code: err.status,
-                url: err.response.headers.location,
-              });
-            }
-
-            return err ? reject(err) : resolve(response.body || response.text);
-          });
-        });
-        promise.request = request;
-        return promise;
-      };
-    });
-  }
-}
-
-export default Api;