@plone/volto 19.0.0-alpha.2 → 19.0.0-alpha.4

package/src/components/theme/Navigation/Navigation.Multilingual.test.jsx

@@ -3,14 +3,9 @@ import renderer from 'react-test-renderer';
 import configureStore from 'redux-mock-store';
 import { Provider } from 'react-intl-redux';
 import { MemoryRouter } from 'react-router-dom';
-import config from '@plone/volto/registry';
 
 import Navigation from './Navigation';
 
-beforeAll(() => {
-  config.settings.isMultilingual = true;
-});
-
 const mockStore = configureStore();
 
 describe('Navigation Multilingual', () => {

package/src/components/theme/NotFound/NotFound.jsx

@@ -19,15 +19,18 @@ import config from '@plone/volto/registry';
 const NotFound = () => {
   const dispatch = useDispatch();
   const lang = useSelector((state) => state.intl.locale);
+  const isMultilingual = useSelector(
+    (state) => state.site.data.features?.multilingual,
+  );
 
   useEffect(() => {
     dispatch(
       getNavigation(
-        config.settings.isMultilingual ? `/${toBackendLang(lang)}` : '/',
+        isMultilingual ? `/${toBackendLang(lang)}` : '/',
         config.settings.navDepth,
       ),
     );
-  }, [dispatch, lang]);
+  }, [dispatch, lang, isMultilingual]);
 
   return (
     <Container className="view-wrapper">

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

@@ -13,6 +13,9 @@ const mockStore = configureStore();
 describe('NotFound', () => {
   it('renders a not found component', () => {
     const store = mockStore({
+      site: {
+        data: {},
+      },
       intl: {
         locale: 'en',
         messages: {},

package/src/components/theme/Sitemap/Sitemap.jsx

@@ -36,14 +36,14 @@ function Sitemap(props) {
     location: { pathname },
     lang,
     getNavigation,
+    isMultilingual,
   } = props;
 
   useEffect(() => {
-    const { settings } = config;
-    const language = settings.isMultilingual ? `${toBackendLang(lang)}` : null;
+    const language = isMultilingual ? `${toBackendLang(lang)}` : null;
     const path = getSitemapPath(pathname, language);
     getNavigation(path, 4);
-  }, [pathname, lang, getNavigation]);
+  }, [pathname, lang, getNavigation, isMultilingual]);
 
   const renderItems = (items) => {
     return (
@@ -100,6 +100,7 @@ export default compose(
     (state) => ({
       items: state.navigation.items,
       lang: state.intl.locale,
+      isMultilingual: state.site.data.features?.multilingual,
     }),
     { getNavigation },
   ),
@@ -108,10 +109,10 @@ export default compose(
       key: 'navigation',
       promise: ({ location, store: { dispatch, getState } }) => {
         if (!__SERVER__) return;
-        const { settings } = config;
+        const state = getState();
         const path = getSitemapPath(
           location.pathname,
-          settings.isMultilingual
+          state.site.data.features?.multilingual
             ? toBackendLang(getState().intl.locale)
             : null,
         );

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

@@ -58,7 +58,6 @@ describe('Sitemap', () => {
 
 describe('Sitemap in a multilingual site', () => {
   beforeEach(() => {
-    config.settings.isMultilingual = true;
     config.settings.supportedLanguages = ['en', 'es'];
   });
   it('renders a sitemap component', () => {

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

@@ -7,6 +7,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Container as SemanticContainer } from 'semantic-ui-react';
 import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import { FormattedMessage } from 'react-intl';
 import config from '@plone/volto/registry';
 
 /**
@@ -30,7 +31,14 @@ const FileView = ({ content }) => {
       )}
       {content.file?.download && (
         <a href={flattenToAppURL(content.file.download)}>
-          {content.file.filename}
+          {content.file.filename ? (
+            content.file.filename
+          ) : (
+            <FormattedMessage
+              id="Download file"
+              defaultMessage="Download file"
+            />
+          )}
         </a>
       )}
     </Container>

package/src/config/ControlPanels.js

@@ -77,6 +77,7 @@ export const unwantedControlPanelsFields = {
     'exposeDCMetaTags',
     'enable_sitemap',
     'webstats_js',
+    'webstats_head_js',
   ],
   editing: ['available_editors', 'default_editor', 'ext_editor'],
   imaging: [

package/src/config/index.js

@@ -25,6 +25,8 @@ import { installDefaultBlocks } from './Blocks';
 import { getSiteAsyncPropExtender } from '@plone/volto/helpers/Site';
 import { registerValidators } from './validation';
 
+import languages from '@plone/volto/constants/Languages.cjs';
+
 const host = process.env.HOST || 'localhost';
 const port = process.env.PORT || '3000';
 
@@ -111,9 +113,7 @@ let config = {
     openExternalLinkInNewTab: false,
     notSupportedBrowsers: ['ie'],
     defaultPageSize: 25,
-    isMultilingual: false,
-    supportedLanguages: ['en'],
-    defaultLanguage: process.env.SITE_DEFAULT_LANGUAGE || 'en',
+    supportedLanguages: Object.keys(languages),
     navDepth: 1,
     expressMiddleware: serverConfig.expressMiddleware, // BBB
     defaultBlockType: 'slate',
@@ -141,7 +141,7 @@ let config = {
     serverConfig,
     storeExtenders: [],
     showTags: true,
-    showRelatedItems: false,
+    showRelatedItems: true,
     controlpanels: [],
     controlPanelsIcons,
     filterControlPanels,
@@ -198,7 +198,8 @@ config.settings.apiExpanders = [
   ...config.settings.apiExpanders,
   {
     match: '',
-    GET_CONTENT: ['breadcrumbs', 'actions', 'types', 'navroot'],
+    GET_CONTENT: ['breadcrumbs', 'actions', 'types', 'navroot', 'translations'],
+    // Note: translations is removed in the API middleware if the site is not multilingual.
   },
   {
     match: '',
@@ -232,16 +233,6 @@ Object.entries(slots).forEach(([slotName, components]) => {
   });
 });
 
-// Make sure that process.env.SITE_DEFAULT_LANGUAGE is set in availableLanguages
-if (
-  process.env.SITE_DEFAULT_LANGUAGE &&
-  !config.settings.supportedLanguages.includes(
-    process.env.SITE_DEFAULT_LANGUAGE,
-  )
-) {
-  config.settings.supportedLanguages.push(process.env.SITE_DEFAULT_LANGUAGE);
-}
-
 registerValidators(ConfigRegistry);
 installDefaultComponents(ConfigRegistry);
 installDefaultWidgets(ConfigRegistry);

package/src/express-middleware/devproxy.js

@@ -10,8 +10,13 @@ import querystring from 'querystring';
 import { parse as parseUrl } from 'url';
 
 const filter = function (pathname, req) {
-  // This is the proxy to the API in case the accept header is 'application/json'
-  return config.settings.devProxyToApiPath && pathname.startsWith('/++api++');
+  // Check if pathname is defined, there are some corner cases that pathname is null
+  if (pathname) {
+    // This is the proxy to the API in case the accept header is 'application/json'
+    return config.settings.devProxyToApiPath && pathname.startsWith('/++api++');
+  } else {
+    return false;
+  }
 };
 
 let _env = null;

package/src/helpers/Html/Html.jsx

@@ -11,6 +11,7 @@ import join from 'lodash/join';
 import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
 import { runtimeConfig } from '@plone/volto/runtime_config';
 import config from '@plone/volto/registry';
+import { bulkFlattenToAppURL } from '../Url/bulkFlattenToAppURL';
 
 const CRITICAL_CSS_TEMPLATE = `function alter() {
   document.querySelectorAll("head link[rel='prefetch']").forEach(function(el) { el.rel = 'stylesheet'});
@@ -122,9 +123,6 @@ class Html extends Component {
                 ...(publicURL && {
                   publicURL,
                 }),
-                ...(process.env.SITE_DEFAULT_LANGUAGE && {
-                  defaultLanguage: process.env.SITE_DEFAULT_LANGUAGE,
-                }),
               })};`,
             }}
           />
@@ -192,7 +190,14 @@ class Html extends Component {
           <script
             dangerouslySetInnerHTML={{
               __html: `window.__data=${serialize(
-                loadReducers(store.getState()),
+                loadReducers({
+                  ...store.getState(),
+                  // Flatten the content URLs in initial request in SSR
+                  // it normalizes the URLs in case the INTERNAL_API_PATH is set
+                  // and prevents unwanted leaks of INTERNAL_API_PATH in the client
+                  // (only in the first request)
+                  content: bulkFlattenToAppURL(store.getState().content),
+                }),
               )};`,
             }}
             charSet="UTF-8"