@strapi/admin 4.11.4 → 4.11.6

package/admin/src/content-manager/pages/ListView/utils/buildValidGetParams.js

@@ -0,0 +1,30 @@
+const createPluginsFilter = (obj = {}) =>
+  Object.values(obj).reduce((acc, current) => Object.assign(acc, current), {});
+
+/**
+ * @description
+ * Creates a valid query params object for get requests
+ * ie. plugins[18n][locale]=en becomes locale=en
+ * @param {object} [query={}] - The query params
+ * @returns {object} - The modified query params
+ */
+const buildValidGetParams = (query = {}) => {
+  // Extract pluginOptions from the query, they shouldn't be part of the URL
+  const {
+    plugins: _,
+    _q: searchQuery,
+    ...validQueryParams
+  } = {
+    ...query,
+    ...createPluginsFilter(query.plugins),
+  };
+
+  if (searchQuery) {
+    // Encode the search query here since the paramsSerializer will not
+    validQueryParams._q = encodeURIComponent(searchQuery);
+  }
+
+  return validQueryParams;
+};
+
+export default buildValidGetParams;

package/admin/src/content-manager/pages/ListView/utils/index.js

@@ -1 +1 @@
-export { default as buildQueryString } from './buildQueryString';
+export { default as buildValidGetParams } from './buildValidGetParams';

package/admin/src/hooks/useAdminUsers/useAdminUsers.js

@@ -1,10 +1,8 @@
 import { useFetchClient } from '@strapi/helper-plugin';
-import { stringify } from 'qs';
 import { useQuery } from 'react-query';
 
 export function useAdminUsers(params = {}, queryOptions = {}) {
   const { id = '', ...queryParams } = params;
-  const queryString = stringify(queryParams, { encode: false });
 
   const { get } = useFetchClient();
 
@@ -13,7 +11,9 @@ export function useAdminUsers(params = {}, queryOptions = {}) {
     async () => {
       const {
         data: { data },
-      } = await get(`/admin/users/${id}${queryString ? `?${queryString}` : ''}`);
+      } = await get(`/admin/users/${id}`, {
+        params: queryParams,
+      });
 
       return data;
     },

package/admin/src/hooks/useEnterprise/useEnterprise.js

@@ -9,7 +9,7 @@ function isEnterprise() {
 export function useEnterprise(
   ceData,
   eeCallback,
-  { defaultValue = null, combine = (ceData, eeData) => eeData } = {}
+  { defaultValue = null, combine = (ceData, eeData) => eeData, enabled = true } = {}
 ) {
   const eeCallbackRef = useCallbackRef(eeCallback);
   const combineCallbackRef = useCallbackRef(combine);
@@ -17,7 +17,7 @@ export function useEnterprise(
   // We have to use a nested object here, because functions (e.g. Components)
   // can not be stored as value directly
   const [{ data }, setData] = React.useState({
-    data: isEnterprise() ? defaultValue : ceData,
+    data: isEnterprise() && enabled ? defaultValue : ceData,
   });
 
   React.useEffect(() => {
@@ -27,10 +27,10 @@ export function useEnterprise(
       setData({ data: combineCallbackRef(ceData, eeData) });
     }
 
-    if (isEnterprise()) {
+    if (isEnterprise() && enabled) {
       importEE();
     }
-  }, [ceData, eeCallbackRef, combineCallbackRef]);
+  }, [ceData, eeCallbackRef, combineCallbackRef, enabled]);
 
   return data;
 }

package/admin/src/hooks/useSettingsMenu/index.js

@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 
 import { hasPermissions, useRBACProvider, useStrapiApp, useAppInfo } from '@strapi/helper-plugin';
 import { useSelector } from 'react-redux';
@@ -19,25 +19,15 @@ const useSettingsMenu = () => {
   const { shouldUpdateStrapi } = useAppInfo();
   const { settings } = useStrapiApp();
   const permissions = useSelector(selectAdminPermissions);
+
   const { global: globalLinks, admin: adminLinks } = useEnterprise(
     LINKS_CE,
     async () => (await import('../../../../ee/admin/hooks/useSettingsMenu/constants')).LINKS_EE,
     {
       combine(ceLinks, eeLinks) {
-        function addPermissions(link) {
-          if (!link.id) {
-            throw new Error('The settings menu item must have an id attribute.');
-          }
-
-          return {
-            ...link,
-            permissions: permissions.settings?.[link.id]?.main,
-          };
-        }
-
         return {
-          admin: [...eeLinks.admin, ...ceLinks.admin].map(addPermissions),
-          global: [...ceLinks.global, ...eeLinks.global].map(addPermissions),
+          admin: [...eeLinks.admin, ...ceLinks.admin],
+          global: [...ceLinks.global, ...eeLinks.global],
         };
       },
       defaultValue: {
@@ -47,6 +37,20 @@ const useSettingsMenu = () => {
     }
   );
 
+  const addPermissions = useCallback(
+    (link) => {
+      if (!link.id) {
+        throw new Error('The settings menu item must have an id attribute.');
+      }
+
+      return {
+        ...link,
+        permissions: permissions.settings?.[link.id]?.main,
+      };
+    },
+    [permissions.settings]
+  );
+
   useEffect(() => {
     const getData = async () => {
       const buildMenuPermissions = (sections) =>
@@ -86,26 +90,36 @@ const useSettingsMenu = () => {
     };
 
     const { global, ...otherSections } = settings;
+
     const sections = formatLinks([
       {
         ...settings.global,
-        links: sortLinks([...settings.global.links, ...globalLinks]).map((link) => ({
-          ...link,
-          hasNotification: link.id === '000-application-infos' && shouldUpdateStrapi,
-        })),
+        links: sortLinks([...settings.global.links, ...globalLinks.map(addPermissions)]).map(
+          (link) => ({
+            ...link,
+            hasNotification: link.id === '000-application-infos' && shouldUpdateStrapi,
+          })
+        ),
       },
       {
         id: 'permissions',
         intlLabel: { id: 'Settings.permissions', defaultMessage: 'Administration Panel' },
-        links: adminLinks,
+        links: adminLinks.map(addPermissions),
       },
       ...Object.values(otherSections),
     ]);
 
     getData();
-  }, [adminLinks, globalLinks, userPermissions, settings, shouldUpdateStrapi]);
+  }, [adminLinks, globalLinks, userPermissions, settings, shouldUpdateStrapi, addPermissions]);
+
+  const filterMenu = (menuItem) => {
+    return {
+      ...menuItem,
+      links: menuItem.links.filter((link) => link.isDisplayed),
+    };
+  };
 
-  return { isLoading, menu };
+  return { isLoading, menu: menu.map(filterMenu) };
 };
 
 export default useSettingsMenu;

package/admin/src/layouts/UnauthenticatedLayout/LocaleToggle/index.js

@@ -6,7 +6,7 @@
 
 import React from 'react';
 
-import { MenuItem, SimpleMenu } from '@strapi/design-system';
+import { SingleSelect, SingleSelectOption } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
 
 import useLocalesProvider from '../../../components/LocalesProvider/useLocalesProvider';
@@ -16,13 +16,13 @@ const LocaleToggle = () => {
   const { locale } = useIntl();
 
   return (
-    <SimpleMenu label={localeNames[locale]}>
-      {Object.keys(localeNames).map((lang) => (
-        <MenuItem onClick={() => changeLocale(lang)} key={lang}>
-          {localeNames[lang]}
-        </MenuItem>
+    <SingleSelect value={locale} onChange={(language) => changeLocale(language)}>
+      {Object.entries(localeNames).map(([language, name]) => (
+        <SingleSelectOption key={language} value={language}>
+          {name}
+        </SingleSelectOption>
       ))}
-    </SimpleMenu>
+    </SingleSelect>
   );
 };
 

package/admin/src/pages/App/index.js

@@ -31,7 +31,6 @@ import NotFoundPage from '../NotFoundPage';
 import UseCasePage from '../UseCasePage';
 
 import { ROUTES_CE, SET_ADMIN_PERMISSIONS } from './constants';
-import { getUID } from './utils';
 
 const AuthenticatedApp = lazy(() =>
   import(/* webpackChunkName: "Admin-authenticatedApp" */ '../../components/AuthenticatedApp')
@@ -113,8 +112,6 @@ function App() {
           authLogo: prefixFileUrlWithBackendUrl(authLogo),
         });
 
-        const deviceId = await getUID();
-
         if (uuid) {
           const {
             data: { data: properties },

package/admin/src/pages/AuthPage/components/Login/index.js

@@ -6,7 +6,7 @@ import UnauthenticatedLayout from '../../../../layouts/UnauthenticatedLayout';
 
 import BaseLogin from './BaseLogin';
 
-const Login = (loginProps) => {
+export const LoginCE = (loginProps) => {
   return (
     <UnauthenticatedLayout>
       <BaseLogin {...loginProps} />
@@ -14,12 +14,10 @@ const Login = (loginProps) => {
   );
 };
 
-Login.defaultProps = {
+LoginCE.defaultProps = {
   onSubmit: (e) => e.preventDefault(),
 };
 
-Login.propTypes = {
+LoginCE.propTypes = {
   onSubmit: PropTypes.func,
 };
-
-export default Login;

package/admin/src/pages/AuthPage/components/Register/index.js

@@ -64,7 +64,11 @@ const Register = ({ authType, fieldsToDisable, noSignin, onSubmit, schema }) =>
         try {
           const {
             data: { data },
-          } = await get(`/admin/registration-info?registrationToken=${registrationToken}`);
+          } = await get(`/admin/registration-info`, {
+            params: {
+              registrationToken,
+            },
+          });
 
           if (data) {
             setUserInfo(data);

package/admin/src/pages/AuthPage/constants.js

@@ -1,5 +1,4 @@
 import { translatedErrors } from '@strapi/helper-plugin';
-import Login from 'ee_else_ce/pages/AuthPage/components/Login';
 import * as yup from 'yup';
 
 import ForgotPassword from './components/ForgotPassword';
@@ -27,8 +26,10 @@ export const FORMS = {
     schema: null,
     inputsPrefix: '',
   },
+
+  // the `Component` attribute is set after all forms and CE/EE components are loaded, but since we
+  // are here outside of a React component we can not use the hook directly
   login: {
-    Component: Login,
     endPoint: 'login',
     fieldsToDisable: [],
     fieldsToOmit: ['rememberMe'],

package/admin/src/pages/AuthPage/index.js

@@ -13,6 +13,7 @@ import useLocalesProvider from '../../components/LocalesProvider/useLocalesProvi
 import { useEnterprise } from '../../hooks/useEnterprise';
 import formatAPIErrors from '../../utils/formatAPIErrors';
 
+import { LoginCE } from './components/Login';
 import { FORMS } from './constants';
 import init from './init';
 import { initialState, reducer } from './reducer';
@@ -29,6 +30,10 @@ const AuthPage = ({ hasAdmin, setHasAdmin }) => {
     params: { authType },
   } = useRouteMatch('/auth/:authType');
   const query = useQuery();
+  const Login = useEnterprise(
+    LoginCE,
+    async () => (await import('../../../../ee/admin/pages/AuthPage/components/Login')).LoginEE
+  );
   const forms = useEnterprise(
     FORMS,
     async () => (await import('../../../../ee/admin/pages/AuthPage/constants')).FORMS,
@@ -50,7 +55,7 @@ const AuthPage = ({ hasAdmin, setHasAdmin }) => {
   );
   const CancelToken = axios.CancelToken;
   const source = CancelToken.source();
-  const { Component, endPoint, fieldsToDisable, fieldsToOmit, inputsPrefix, schema, ...rest } =
+  const { endPoint, fieldsToDisable, fieldsToOmit, inputsPrefix, schema, ...rest } =
     forms?.[authType] ?? {};
 
   useEffect(() => {
@@ -274,6 +279,18 @@ const AuthPage = ({ hasAdmin, setHasAdmin }) => {
     );
   }
 
+  if (Login) {
+    // Assign the component to render for the login form
+    forms.login.Component = Login;
+  }
+
+  // block rendering until the Login EE component is fully loaded
+  if (!Login) {
+    return null;
+  }
+
+  const { Component } = forms?.[authType] ?? {};
+
   return (
     <Component
       {...rest}

package/admin/src/pages/HomePage/index.js

@@ -3,11 +3,10 @@
  *
  */
 
-import React, { memo, useMemo } from 'react';
+import React, { useMemo } from 'react';
 
 import { Box, Grid, GridItem, Layout, Main } from '@strapi/design-system';
 import { LoadingIndicatorPage, useGuidedTour } from '@strapi/helper-plugin';
-import useLicenseLimitNotification from 'ee_else_ce/hooks/useLicenseLimitNotification';
 import { Helmet } from 'react-helmet';
 import { FormattedMessage } from 'react-intl';
 import { useHistory } from 'react-router-dom';
@@ -16,6 +15,7 @@ import styled from 'styled-components';
 import GuidedTourHomepage from '../../components/GuidedTour/Homepage';
 import isGuidedTourCompleted from '../../components/GuidedTour/utils/isGuidedTourCompleted';
 import { useContentTypes } from '../../hooks/useContentTypes';
+import { useEnterprise } from '../../hooks/useEnterprise';
 
 import cornerOrnamentPath from './assets/corner-ornament.svg';
 import ContentBlocks from './ContentBlocks';
@@ -32,15 +32,12 @@ const LogoContainer = styled(Box)`
   }
 `;
 
-const HomePage = () => {
+export const HomePageCE = () => {
   // Temporary until we develop the menu API
   const { collectionTypes, singleTypes, isLoading: isLoadingForModels } = useContentTypes();
   const { guidedTourState, isGuidedTourVisible, isSkipped } = useGuidedTour();
-  useLicenseLimitNotification();
-
   const showGuidedTour =
     !isGuidedTourCompleted(guidedTourState) && isGuidedTourVisible && !isSkipped;
-
   const { push } = useHistory();
   const handleClick = (e) => {
     e.preventDefault();
@@ -92,4 +89,19 @@ const HomePage = () => {
   );
 };
 
-export default memo(HomePage);
+function HomePageSwitch() {
+  const HomePage = useEnterprise(
+    HomePageCE,
+    // eslint-disable-next-line import/no-cycle
+    async () => (await import('../../../../ee/admin/pages/HomePage')).HomePageEE
+  );
+
+  // block rendering until the EE component is fully loaded
+  if (!HomePage) {
+    return null;
+  }
+
+  return <HomePage />;
+}
+
+export default HomePageSwitch;

package/admin/src/pages/ProfilePage/index.js

@@ -77,19 +77,14 @@ const ProfilePage = () => {
   const { isLoading: isLoadingSSO, data: dataSSO } = useQuery(
     ['providers', 'isSSOLocked'],
     async () => {
-      if (window.strapi.isEE) {
-        const {
-          data: { data },
-        } = await get('/admin/providers/isSSOLocked');
+      const {
+        data: { data },
+      } = await get('/admin/providers/isSSOLocked');
 
-        return data;
-      }
-
-      return {
-        isSSOLocked: false,
-      };
+      return data;
     },
     {
+      enabled: window.strapi.isEE && window.strapi.features.isEnabled('sso'),
       onError() {
         toggleNotification({
           type: 'warning',
@@ -178,7 +173,7 @@ const ProfilePage = () => {
     );
   }
 
-  const hasLockedRole = dataSSO?.isSSOLocked;
+  const hasLockedRole = dataSSO?.isSSOLocked ?? false;
   const { email, firstname, lastname, username, preferedLanguage } = data;
   const initialData = { email, firstname, lastname, username, preferedLanguage, currentTheme };
 
@@ -203,7 +198,12 @@ const ProfilePage = () => {
               <HeaderLayout
                 title={data.username || getFullName(data.firstname, data.lastname)}
                 primaryAction={
-                  <Button startIcon={<Check />} loading={isSubmitting} type="submit" disabled={!dirty}>
+                  <Button
+                    startIcon={<Check />}
+                    loading={isSubmitting}
+                    type="submit"
+                    disabled={!dirty}
+                  >
                     {formatMessage({ id: 'global.save', defaultMessage: 'Save' })}
                   </Button>
                 }

package/admin/src/pages/SettingsPage/components/SettingsNav/index.js

@@ -50,17 +50,19 @@ const SettingsNav = ({ menu }) => {
       <SubNavSections>
         {sections.map((section) => (
           <SubNavSection key={section.id} label={formatMessage(section.intlLabel)}>
-            {section.links.map((link) => (
-              <SubNavLink
-                as={NavLink}
-                withBullet={link.hasNotification}
-                to={link.to}
-                onClick={() => handleClickOnLink(link.to)}
-                key={link.id}
-              >
-                {formatMessage(link.intlLabel)}
-              </SubNavLink>
-            ))}
+            {section.links.map((link) => {
+              return (
+                <SubNavLink
+                  as={NavLink}
+                  withBullet={link.hasNotification}
+                  to={link.to}
+                  onClick={() => handleClickOnLink(link.to)}
+                  key={link.id}
+                >
+                  {formatMessage(link.intlLabel)}
+                </SubNavLink>
+              );
+            })}
           </SubNavSection>
         ))}
       </SubNavSections>

package/admin/src/pages/SettingsPage/components/Tokens/TokenBox/index.js

@@ -17,7 +17,7 @@ const TokenBox = ({ token, tokenType }) => {
     const didCopy = await copy(token);
 
     if (didCopy) {
-      trackUsage.current('didCopyTokenKey', {
+      trackUsage('didCopyTokenKey', {
         tokenType,
       });
       toggleNotification({

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js

@@ -22,18 +22,20 @@ import {
   useTracking,
 } from '@strapi/helper-plugin';
 import { Check, ExternalLink } from '@strapi/icons';
-import AdminSeatInfo from 'ee_else_ce/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo';
 import { useIntl } from 'react-intl';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
 import { useSelector } from 'react-redux';
 
 import { useConfigurations } from '../../../../hooks';
+import { useEnterprise } from '../../../../hooks/useEnterprise';
 import { selectAdminPermissions } from '../../../App/selectors';
 
 import CustomizationInfos from './components/CustomizationInfos';
 import { fetchProjectSettings, postProjectSettings } from './utils/api';
 import getFormData from './utils/getFormData';
 
+const AdminSeatInfoCE = () => null;
+
 const ApplicationInfosPage = () => {
   const inputsRef = useRef();
   const toggleNotification = useNotification();
@@ -50,6 +52,15 @@ const ApplicationInfosPage = () => {
   } = useAppInfo();
   const { updateProjectSettings } = useConfigurations();
   const permissions = useSelector(selectAdminPermissions);
+  const AdminSeatInfo = useEnterprise(
+    AdminSeatInfoCE,
+    async () =>
+      (
+        await import(
+          '../../../../../../ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo'
+        )
+      ).AdminSeatInfoEE
+  );
 
   const {
     allowedActions: { canRead, canUpdate },
@@ -105,6 +116,11 @@ const ApplicationInfosPage = () => {
     });
   };
 
+  // block rendering until the EE component is fully loaded
+  if (!AdminSeatInfo) {
+    return null;
+  }
+
   return (
     <Layout>
       {/* TODO: Add missing translation */}

package/admin/src/pages/SettingsPage/pages/Users/EditPage/index.js

@@ -24,7 +24,6 @@ import {
   useOverlayBlocker,
 } from '@strapi/helper-plugin';
 import { ArrowLeft, Check } from '@strapi/icons';
-import MagicLink from 'ee_else_ce/pages/SettingsPage/pages/Users/components/MagicLink';
 import { Formik } from 'formik';
 import get from 'lodash/get';
 import omit from 'lodash/omit';
@@ -34,7 +33,9 @@ import { useIntl } from 'react-intl';
 import { useHistory, useRouteMatch } from 'react-router-dom';
 
 import { useAdminUsers } from '../../../../../hooks/useAdminUsers';
+import { useEnterprise } from '../../../../../hooks/useEnterprise';
 import { formatAPIErrors, getFullName } from '../../../../../utils';
+import { MagicLinkCE } from '../components/MagicLink';
 import SelectRoles from '../components/SelectRoles';
 import { editValidation } from '../utils/validations/users';
 
@@ -52,11 +53,21 @@ const EditPage = ({ canUpdate }) => {
   const { setUserDisplayName } = useAppInfo();
   const toggleNotification = useNotification();
   const { lockApp, unlockApp } = useOverlayBlocker();
+  const MagicLink = useEnterprise(
+    MagicLinkCE,
+    async () =>
+      (
+        await import(
+          '../../../../../../../ee/admin/pages/SettingsPage/pages/Users/components/MagicLink'
+        )
+      ).MagicLinkEE
+  );
+
   useFocusWhenNavigate();
 
   const {
     users: [user],
-    isLoading,
+    isLoading: isLoadingAdminUsers,
   } = useAdminUsers(
     { id },
     {
@@ -125,6 +136,8 @@ const EditPage = ({ canUpdate }) => {
     unlockApp();
   };
 
+  const isLoading = isLoadingAdminUsers || !MagicLink;
+
   const headerLabel = isLoading
     ? { id: 'app.containers.Users.EditPage.header.label-loading', defaultMessage: 'Edit user' }
     : { id: 'app.containers.Users.EditPage.header.label', defaultMessage: 'Edit {name}' };
@@ -189,7 +202,7 @@ const EditPage = ({ canUpdate }) => {
               <HeaderLayout
                 primaryAction={
                   <Button
-                    disabled={(isSubmitting || !canUpdate) ? true : !dirty}
+                    disabled={isSubmitting || !canUpdate ? true : !dirty}
                     startIcon={<Check />}
                     loading={isSubmitting}
                     type="submit"

package/admin/src/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js

@@ -5,7 +5,7 @@ import { Envelop } from '@strapi/icons';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 
-const CreateAction = ({ onClick }) => {
+export const CreateActionCE = ({ onClick }) => {
   const { formatMessage } = useIntl();
 
   return (
@@ -18,8 +18,6 @@ const CreateAction = ({ onClick }) => {
   );
 };
 
-CreateAction.propTypes = {
+CreateActionCE.propTypes = {
   onClick: PropTypes.func.isRequired,
 };
-
-export default CreateAction;

package/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/index.js

@@ -20,13 +20,13 @@ import {
   useNotification,
   useOverlayBlocker,
 } from '@strapi/helper-plugin';
-import MagicLink from 'ee_else_ce/pages/SettingsPage/pages/Users/components/MagicLink';
 import { Formik } from 'formik';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import { useMutation } from 'react-query';
 
 import { useEnterprise } from '../../../../../../hooks/useEnterprise';
+import { MagicLinkCE } from '../../components/MagicLink';
 import SelectRoles from '../../components/SelectRoles';
 
 import { FORM_LAYOUT, FORM_SCHEMA, FORM_INITIAL_VALUES, ROLE_LAYOUT, STEPPER } from './constants';
@@ -74,6 +74,15 @@ const ModalForm = ({ onSuccess, onToggle }) => {
       defaultValue: FORM_INITIAL_VALUES,
     }
   );
+  const MagicLink = useEnterprise(
+    MagicLinkCE,
+    async () =>
+      (
+        await import(
+          '../../../../../../../../ee/admin/pages/SettingsPage/pages/Users/components/MagicLink'
+        )
+      ).MagicLinkEE
+  );
   const postMutation = useMutation(
     (body) => {
       return post('/admin/users', body);
@@ -142,6 +151,11 @@ const ModalForm = ({ onSuccess, onToggle }) => {
       </Button>
     );
 
+  // block rendering until the EE component is fully loaded
+  if (!MagicLink) {
+    return null;
+  }
+
   return (
     <ModalLayout onClose={onToggle} labelledBy="title">
       <ModalHeader>