@plone/volto 19.0.0-alpha.1 → 19.0.0-alpha.3

package/src/components/theme/MultilingualRedirector/MultilingualRedirector.jsx

@@ -1,28 +1,24 @@
 import React from 'react';
 import { Redirect } from 'react-router-dom';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { useCookies } from 'react-cookie';
-import config from '@plone/volto/registry';
 import { changeLanguage } from '@plone/volto/actions/language/language';
 import { toGettextLang } from '@plone/volto/helpers/Utils/Utils';
 
 const MultilingualRedirector = (props) => {
-  const { settings } = config;
   const { pathname, children } = props;
   const [cookies] = useCookies();
-  const currentLanguage = cookies['I18N_LANGUAGE'] || settings.defaultLanguage;
-  const redirectToLanguage = settings.supportedLanguages.includes(
-    currentLanguage,
-  )
-    ? currentLanguage
-    : settings.defaultLanguage;
+  const site = useSelector((state) => state.site.data);
+  const isMultilingual = site.features?.multilingual;
+  const redirectToLanguage =
+    cookies['I18N_LANGUAGE'] || site['plone.default_language'];
   const dispatch = useDispatch();
 
   React.useEffect(() => {
     // ToDo: Add means to support language negotiation (with config)
     // const detectedLang = (navigator.language || navigator.userLanguage).substring(0, 2);
     let mounted = true;
-    if (settings.isMultilingual && pathname === '/') {
+    if (isMultilingual && pathname === '/') {
       const langFileName = toGettextLang(redirectToLanguage);
       import(
         /* @vite-ignore */ '@root/../locales/' + langFileName + '.json'
@@ -35,9 +31,9 @@ const MultilingualRedirector = (props) => {
     return () => {
       mounted = false;
     };
-  }, [pathname, dispatch, redirectToLanguage, settings.isMultilingual]);
+  }, [pathname, dispatch, redirectToLanguage, isMultilingual]);
 
-  return pathname === '/' && settings.isMultilingual ? (
+  return pathname === '/' && isMultilingual ? (
     <Redirect to={`/${redirectToLanguage}`} />
   ) : (
     <>{children}</>

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

@@ -3,19 +3,17 @@ 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 MultilingualRedirector from './MultilingualRedirector';
 
-beforeAll(() => {
-  config.settings.isMultilingual = true;
-});
-
 const mockStore = configureStore();
 
 describe('MultilingualRedirector', () => {
   it('renders a MultilingualRedirector component', () => {
     const store = mockStore({
+      site: {
+        data: {},
+      },
       intl: {
         locale: 'en',
         messages: {},

package/src/components/theme/Navigation/NavItem.jsx

@@ -15,11 +15,7 @@ const NavItem = ({ item, lang }) => {
         key={item.url}
         className="item"
         activeClassName="active"
-        exact={
-          settings.isMultilingual
-            ? item.url === `/${toBackendLang(lang)}`
-            : item.url === ''
-        }
+        exact={item.url === '' || item.url === `/${toBackendLang(lang)}`}
       >
         {item.title}
       </NavLink>

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/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',
@@ -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/helpers/Html/Html.jsx

@@ -122,9 +122,6 @@ class Html extends Component {
                 ...(publicURL && {
                   publicURL,
                 }),
-                ...(process.env.SITE_DEFAULT_LANGUAGE && {
-                  defaultLanguage: process.env.SITE_DEFAULT_LANGUAGE,
-                }),
               })};`,
             }}
           />