@strapi/admin 4.9.0-exp.90df253ba90fd6879eb56a720a1f80d04ff745b8 → 4.9.0

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

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { useIntl } from 'react-intl';
 import styled from 'styled-components';
-import get from 'lodash/get';
 import omit from 'lodash/omit';
 import { useHistory } from 'react-router-dom';
 import PropTypes from 'prop-types';
@@ -14,6 +13,7 @@ import {
   useTracking,
   getYupInnerErrors,
   Link,
+  useAPIErrorHandler,
 } from '@strapi/helper-plugin';
 import {
   Box,
@@ -27,17 +27,10 @@ import {
   Typography,
 } from '@strapi/design-system';
 import { EyeStriked, Eye } from '@strapi/icons';
-import UnauthenticatedLayout, {
-  Column,
-  LayoutContent,
-} from '../../../../layouts/UnauthenticatedLayout';
+import UnauthenticatedLayout, { LayoutContent } from '../../../../layouts/UnauthenticatedLayout';
 import Logo from '../../../../components/UnauthenticatedLogo';
 import FieldActionWrapper from '../FieldActionWrapper';
 
-const CenteredBox = styled(Box)`
-  text-align: center;
-`;
-
 const A = styled.a`
   color: ${({ theme }) => theme.colors.primary600};
 `;
@@ -58,6 +51,8 @@ const Register = ({ authType, fieldsToDisable, noSignin, onSubmit, schema }) =>
   const { trackUsage } = useTracking();
   const { formatMessage } = useIntl();
   const query = useQuery();
+  const { formatAPIError } = useAPIErrorHandler();
+
   const registrationToken = query.get('registrationToken');
 
   useEffect(() => {
@@ -73,17 +68,17 @@ const Register = ({ authType, fieldsToDisable, noSignin, onSubmit, schema }) =>
           if (data) {
             setUserInfo(data);
           }
-        } catch (err) {
-          const errorMessage = get(err, ['response', 'data', 'message'], 'An error occurred');
+        } catch (error) {
+          const message = formatAPIError(error);
 
           toggleNotification({
             type: 'warning',
-            message: errorMessage,
+            message,
           });
 
           // Redirect to the oops page in case of an invalid token
           // @alexandrebodin @JAB I am not sure it is the wanted behavior
-          push(`/auth/oops?info=${encodeURIComponent(errorMessage)}`);
+          push(`/auth/oops?info=${encodeURIComponent(message)}`);
         }
       };
 
@@ -92,6 +87,20 @@ const Register = ({ authType, fieldsToDisable, noSignin, onSubmit, schema }) =>
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [registrationToken]);
 
+  function normalizeData(data) {
+    return Object.entries(data).reduce((acc, [key, value]) => {
+      let normalizedvalue = value;
+
+      if (!['password', 'confirmPassword'].includes(key) && typeof value === 'string') {
+        normalizedvalue = normalizedvalue.trim();
+      }
+
+      acc[key] = normalizedvalue;
+
+      return acc;
+    }, {});
+  }
+
   return (
     <UnauthenticatedLayout>
       <LayoutContent>
@@ -107,8 +116,10 @@ const Register = ({ authType, fieldsToDisable, noSignin, onSubmit, schema }) =>
             news: false,
           }}
           onSubmit={async (data, formik) => {
+            const normalizedData = normalizeData(data);
+
             try {
-              await schema.validate(data, { abortEarly: false });
+              await schema.validate(normalizedData, { abortEarly: false });
 
               if (submitCount > 0 && authType === 'register-admin') {
                 trackUsage('didSubmitWithErrorsFirstAdmin', { count: submitCount.toString() });
@@ -117,11 +128,11 @@ const Register = ({ authType, fieldsToDisable, noSignin, onSubmit, schema }) =>
               if (registrationToken) {
                 // We need to pass the registration token in the url param to the api in order to submit another admin user
                 onSubmit(
-                  { userInfo: omit(data, ['registrationToken']), registrationToken },
+                  { userInfo: omit(normalizedData, ['registrationToken']), registrationToken },
                   formik
                 );
               } else {
-                onSubmit(data, formik);
+                onSubmit(normalizedData, formik);
               }
             } catch (err) {
               const errors = getYupInnerErrors(err);
@@ -138,27 +149,26 @@ const Register = ({ authType, fieldsToDisable, noSignin, onSubmit, schema }) =>
             return (
               <Form noValidate>
                 <Main>
-                  <Column>
+                  <Flex direction="column" alignItems="stretch" gap={3}>
                     <Logo />
-                    <Box paddingTop={6} paddingBottom={1}>
-                      <Typography as="h1" variant="alpha">
-                        {formatMessage({
-                          id: 'Auth.form.welcome.title',
-                          defaultMessage: 'Welcome to Strapi!',
-                        })}
-                      </Typography>
-                    </Box>
-                    <CenteredBox paddingBottom={7}>
-                      <Typography variant="epsilon" textColor="neutral600">
-                        {formatMessage({
-                          id: 'Auth.form.register.subtitle',
-                          defaultMessage:
-                            'Credentials are only used to authenticate in Strapi. All saved data will be stored in your database.',
-                        })}
-                      </Typography>
-                    </CenteredBox>
-                  </Column>
-                  <Flex direction="column" alignItems="stretch" gap={6}>
+
+                    <Typography as="h1" variant="alpha" textAlign="center">
+                      {formatMessage({
+                        id: 'Auth.form.welcome.title',
+                        defaultMessage: 'Welcome to Strapi!',
+                      })}
+                    </Typography>
+
+                    <Typography variant="epsilon" textColor="neutral600" textAlign="center">
+                      {formatMessage({
+                        id: 'Auth.form.register.subtitle',
+                        defaultMessage:
+                          'Credentials are only used to authenticate in Strapi. All saved data will be stored in your database.',
+                      })}
+                    </Typography>
+                  </Flex>
+
+                  <Flex direction="column" alignItems="stretch" gap={6} marginTop={7}>
                     <Grid gap={4}>
                       <GridItem col={6}>
                         <TextInput
@@ -204,7 +214,6 @@ const Register = ({ authType, fieldsToDisable, noSignin, onSubmit, schema }) =>
                       value={values.password}
                       error={errors.password ? formatMessage(errors.password) : undefined}
                       endAction={
-                        // eslint-disable-next-line react/jsx-wrap-multilines
                         <FieldActionWrapper
                           onClick={(e) => {
                             e.preventDefault();
@@ -245,7 +254,6 @@ const Register = ({ authType, fieldsToDisable, noSignin, onSubmit, schema }) =>
                         errors.confirmPassword ? formatMessage(errors.confirmPassword) : undefined
                       }
                       endAction={
-                        // eslint-disable-next-line react/jsx-wrap-multilines
                         <FieldActionWrapper
                           onClick={(e) => {
                             e.preventDefault();

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

@@ -1,5 +1,5 @@
 import produce from 'immer';
-import { set } from 'lodash';
+import set from 'lodash/set';
 /* eslint-disable consistent-return */
 
 const initialState = {

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

@@ -15,6 +15,7 @@ const FormHead = ({
   isSubmitting,
   backUrl,
   regenerateUrl,
+  onErrorRegenerate,
 }) => {
   const { formatMessage } = useIntl();
   const handleRegenerate = (newKey) => {
@@ -35,6 +36,7 @@ const FormHead = ({
                 backUrl={regenerateUrl}
                 onRegenerate={handleRegenerate}
                 idToRegenerate={token?.id}
+                onError={onErrorRegenerate}
               />
             )}
             <Button
@@ -95,10 +97,12 @@ FormHead.propTypes = {
     label: PropTypes.string,
   }).isRequired,
   regenerateUrl: PropTypes.string.isRequired,
+  onErrorRegenerate: PropTypes.func,
 };
 
 FormHead.defaultProps = {
   token: undefined,
+  onErrorRegenerate: undefined,
 };
 
 export default FormHead;

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

@@ -6,13 +6,14 @@ import { Refresh } from '@strapi/icons';
 import { ConfirmDialog } from '@strapi/helper-plugin';
 import { useRegenerate } from '../../../../../hooks';
 
-export const Regenerate = ({ onRegenerate, idToRegenerate, backUrl }) => {
+export const Regenerate = ({ onRegenerate, idToRegenerate, backUrl, onError }) => {
   const { formatMessage } = useIntl();
   const [showConfirmDialog, setShowConfirmDialog] = useState(false);
   const { regenerateData, isLoadingConfirmation } = useRegenerate(
     backUrl,
     idToRegenerate,
-    onRegenerate
+    onRegenerate,
+    onError
   );
   const handleConfirmRegeneration = async () => {
     regenerateData();
@@ -62,12 +63,13 @@ export const Regenerate = ({ onRegenerate, idToRegenerate, backUrl }) => {
   );
 };
 
-Regenerate.defaultProps = { onRegenerate() {} };
+Regenerate.defaultProps = { onRegenerate() {}, onError: undefined };
 
 Regenerate.propTypes = {
   onRegenerate: PropTypes.func,
   idToRegenerate: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
   backUrl: PropTypes.string.isRequired,
+  onError: PropTypes.func,
 };
 
 export default Regenerate;

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/index.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { capitalize } from 'lodash';
+import capitalize from 'lodash/capitalize';
 import { useIntl } from 'react-intl';
 import {
   Accordion,

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/reducer.js

@@ -1,6 +1,6 @@
 /* eslint-disable consistent-return */
 import produce from 'immer';
-import { pull } from 'lodash';
+import pull from 'lodash/pull';
 import { transformPermissionsData } from './utils';
 
 export const initialState = {

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/transformPermissionsData.js

@@ -1,5 +1,3 @@
-import { flatten } from 'lodash';
-
 const transformPermissionsData = (data) => {
   const layout = {
     allActionsIds: [],
@@ -9,11 +7,11 @@ const transformPermissionsData = (data) => {
   layout.permissions = Object.keys(data).map((apiId) => ({
     apiId,
     label: apiId.split('::')[1],
-    controllers: flatten(
-      Object.keys(data[apiId].controllers).map((controller) => ({
+    controllers: Object.keys(data[apiId].controllers)
+      .map((controller) => ({
         controller,
-        actions: flatten(
-          data[apiId].controllers[controller].map((action) => {
+        actions: data[apiId].controllers[controller]
+          .map((action) => {
             const actionId = `${apiId}.${controller}.${action}`;
 
             if (apiId.includes('api::')) {
@@ -25,9 +23,9 @@ const transformPermissionsData = (data) => {
               actionId,
             };
           })
-        ),
+          .flat(),
       }))
-    ),
+      .flat(),
   }));
 
   return layout;

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/utils/createDefaultConditionsForm.js

@@ -1,4 +1,4 @@
-import { get } from 'lodash';
+import get from 'lodash/get';
 
 const createConditionsForm = (conditions, valueObject) => {
   return conditions.reduce((acc, current) => {

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/generateCheckboxesActions.js

@@ -1,4 +1,5 @@
-import { get, isEmpty } from 'lodash';
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
 import { createArrayOfValues, getCheckboxState } from '../../../utils';
 
 const generateCheckboxesActions = (availableActions, modifiedData, pathToData) => {

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/utils/getRowLabelCheckboxeState.js

@@ -1,4 +1,5 @@
-import { get } from 'lodash';
+import get from 'lodash/get';
+
 import { getCheckboxState } from '../../../../utils';
 
 /**

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/utils/getRowLabelCheckboxesState.js

@@ -1,4 +1,4 @@
-import { get } from 'lodash';
+import get from 'lodash/get';
 import { getCheckboxState, removeConditionKeyFromData } from '../../utils';
 
 const getActionsIds = (array) => array.map(({ actionId }) => actionId);

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/reducer.js

@@ -1,5 +1,10 @@
 import produce from 'immer';
-import { cloneDeep, has, isObject, get, set } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
+import has from 'lodash/has';
+import isObject from 'lodash/isObject';
+import get from 'lodash/get';
+import set from 'lodash/set';
+
 import updateConditionsToFalse from './utils/updateConditionsToFalse';
 import updateValues from './utils/updateValues';
 

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/createDefaultCTFormFromLayout.js

@@ -1,4 +1,8 @@
-import { merge, get, isEmpty, set } from 'lodash';
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import merge from 'lodash/merge';
+import set from 'lodash/set';
+
 import findMatchingPermission from './findMatchingPermissions';
 /**
  * Creates the default condition form: { [conditionId]: false }

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/createDefaultPluginsFormFromLayout.js

@@ -1,4 +1,3 @@
-import { get } from 'lodash';
 import { createDefaultConditionsForm } from './createDefaultCTFormFromLayout';
 import findMatchingPermission from './findMatchingPermissions';
 
@@ -12,7 +11,7 @@ const createSubCategoryForm = (actions, conditions, permissions) => {
       },
       conditions: createDefaultConditionsForm(
         conditions,
-        get(foundMatchingPermission, 'conditions', [])
+        foundMatchingPermission?.conditions ?? []
       ),
     };
 

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/formatContentTypesPermissionToAPI.js

@@ -1,4 +1,4 @@
-import { has, isObject } from 'lodash';
+import isObject from 'lodash/isObject';
 import { createArrayOfValues } from '../../utils';
 import { createConditionsArray } from './formatSettingsPermissionsToAPI';
 
@@ -77,7 +77,7 @@ const createSubjectPermissions = (subject, actions) => {
       return acc;
     }
 
-    if (!has(permissions, 'properties.enabled')) {
+    if (!permissions?.properties?.enabled) {
       const createdPermissionsArray = createPermissionWithProperties(
         actionName,
         subject,

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/updateConditionsToFalse.js

@@ -1,4 +1,7 @@
-import { isObject, has, omit } from 'lodash';
+import isObject from 'lodash/isObject';
+import has from 'lodash/has';
+import omit from 'lodash/omit';
+
 import { createArrayOfValues } from '../../utils';
 
 /**

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/updateValues.js

@@ -1,4 +1,4 @@
-import { isObject } from 'lodash';
+import isObject from 'lodash/isObject';
 
 /**
  * Sets all the none object values of an object to the given one

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/formatActions.js

@@ -1,4 +1,4 @@
-import { get } from 'lodash';
+import get from 'lodash/get';
 import { createArrayOfValues } from '../../../utils';
 
 /**

package/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/utils/createArrayOfValues.js

@@ -1,4 +1,5 @@
-import { flattenDeep, isObject } from 'lodash';
+import flattenDeep from 'lodash/flattenDeep';
+import isObject from 'lodash/isObject';
 
 const createArrayOfValues = (obj) => {
   if (!isObject(obj)) {

package/admin/src/pages/SettingsPage/pages/Roles/ListPage/index.js

@@ -26,7 +26,7 @@ import {
   Typography,
   VisuallyHidden,
 } from '@strapi/design-system';
-import { get } from 'lodash';
+import get from 'lodash/get';
 import matchSorter from 'match-sorter';
 import { useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';

package/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/index.js

@@ -13,6 +13,7 @@ import {
   useGuidedTour,
   useRBAC,
   useFetchClient,
+  useAPIErrorHandler,
 } from '@strapi/helper-plugin';
 import { ContentLayout, Main, Flex } from '@strapi/design-system';
 import { formatAPIErrors } from '../../../../../utils';
@@ -52,6 +53,8 @@ const TransferTokenCreateView = () => {
 
   const isCreating = id === 'create';
 
+  const { formatAPIError } = useAPIErrorHandler();
+
   useEffect(() => {
     trackUsageRef.current(isCreating ? 'didAddTokenFromList' : 'didEditTokenFromList', {
       tokenType: TRANSFER_TOKEN_TYPE,
@@ -73,11 +76,22 @@ const TransferTokenCreateView = () => {
     },
     {
       enabled: !isCreating && !transferToken,
-      onError() {
-        toggleNotification({
-          type: 'warning',
-          message: { id: 'notification.error', defaultMessage: 'An error occured' },
-        });
+      onError(err) {
+        if (err.response.data.error.details?.code === 'INVALID_TOKEN_SALT') {
+          toggleNotification({
+            type: 'warning',
+            message: {
+              id: 'notification.error.invalid.configuration',
+              defaultMessage:
+                'You have an invalid configuration, check your server log for more information.',
+            },
+          });
+        } else {
+          toggleNotification({
+            type: 'warning',
+            message: formatAPIError(err),
+          });
+        }
       },
     }
   );
@@ -145,6 +159,15 @@ const TransferTokenCreateView = () => {
           type: 'warning',
           message: err.response.data.message || 'notification.error.tokennamenotunique',
         });
+      } else if (err?.response?.data?.error?.details?.code === 'INVALID_TOKEN_SALT') {
+        toggleNotification({
+          type: 'warning',
+          message: {
+            id: 'notification.error.invalid.configuration',
+            defaultMessage:
+              'You have an invalid configuration, check your server log for more information.',
+          },
+        });
       } else {
         toggleNotification({
           type: 'warning',
@@ -162,6 +185,24 @@ const TransferTokenCreateView = () => {
     return <LoadingView transferTokenName={transferToken?.name} />;
   }
 
+  const handleErrorRegenerate = (err) => {
+    if (err?.response?.data?.error?.details?.code === 'INVALID_TOKEN_SALT') {
+      toggleNotification({
+        type: 'warning',
+        message: {
+          id: 'notification.error.invalid.configuration',
+          defaultMessage:
+            'You have an invalid configuration, check your server log for more information.',
+        },
+      });
+    } else {
+      toggleNotification({
+        type: 'warning',
+        message: formatAPIError(err),
+      });
+    }
+  };
+
   return (
     <Main>
       <SettingsPageTitle name="Transfer Tokens" />
@@ -194,6 +235,7 @@ const TransferTokenCreateView = () => {
                 canRegenerate={canRegenerate}
                 isSubmitting={isSubmitting}
                 regenerateUrl="/admin/transfer/tokens/"
+                onErrorRegenerate={handleErrorRegenerate}
               />
               <ContentLayout>
                 <Flex direction="column" alignItems="stretch" gap={6}>

package/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/index.js

@@ -77,11 +77,24 @@ const TransferTokenListView = () => {
     },
     {
       enabled: canRead,
-      onError() {
-        toggleNotification({
-          type: 'warning',
-          message: { id: 'notification.error', defaultMessage: 'An error occured' },
-        });
+      onError(err) {
+        console.log('error', err);
+
+        if (err?.response?.data?.error?.details?.code === 'INVALID_TOKEN_SALT') {
+          toggleNotification({
+            type: 'warning',
+            message: {
+              id: 'notification.error.invalid.configuration',
+              defaultMessage:
+                'You have an invalid configuration, check your server log for more information.',
+            },
+          });
+        } else {
+          toggleNotification({
+            type: 'warning',
+            message: { id: 'notification.error', defaultMessage: 'An error occured' },
+          });
+        }
       },
     }
   );
@@ -101,6 +114,15 @@ const TransferTokenListView = () => {
       onError(err) {
         if (err?.response?.data?.data) {
           toggleNotification({ type: 'warning', message: err.response.data.data });
+        } else if (err?.response?.data?.error?.details?.code === 'INVALID_TOKEN_SALT') {
+          toggleNotification({
+            type: 'warning',
+            message: {
+              id: 'notification.error.invalid.configuration',
+              defaultMessage:
+                'You have an invalid configuration, check your server log for more information.',
+            },
+          });
         } else {
           toggleNotification({
             type: 'warning',

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

@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo } from 'react';
 import { useRBAC, LoadingIndicatorPage, useNotification } from '@strapi/helper-plugin';
 import { Redirect, useLocation } from 'react-router-dom';
-import { get } from 'lodash';
+
 import adminPermissions from '../../../../../permissions';
 import EditPage from '../EditPage';
 
@@ -19,7 +19,7 @@ const ProtectedEditPage = () => {
     allowedActions: { canRead, canUpdate },
   } = useRBAC(permissions);
   const { state } = useLocation();
-  const from = get(state, 'from', '/');
+  const from = state?.from ?? '/';
 
   useEffect(() => {
     if (!isLoading) {

package/admin/src/pages/SettingsPage/pages/Webhooks/EditView/utils/formatData.js

@@ -1,11 +1,5 @@
-import { set } from 'lodash';
-
 const cleanData = (data) => {
-  const webhooks = { ...data };
-
-  set(webhooks, 'headers', unformatHeaders(data.headers));
-
-  return webhooks;
+  return { ...data, headers: unformatHeaders(data.headers) };
 };
 
 const unformatHeaders = (headers) => {

package/admin/src/permissions/index.js

@@ -1,4 +1,4 @@
-import { merge } from 'lodash';
+import merge from 'lodash/merge';
 import customPermissions from 'ee_else_ce/permissions/customPermissions';
 import defaultPermissions from './defaultPermissions';
 

package/admin/src/translations/en.json

@@ -878,6 +878,7 @@
   "notification.success.transfertokencreated": "Transfer Token successfully created",
   "notification.success.transfertokenedited": "Transfer Token successfully edited",
   "notification.error.tokennamenotunique": "Name already assigned to another token",
+  "notification.error.invalid.configuration": "You have an invalid configuration, check your server log for more information.",
   "notification.version.update.message": "A new version of Strapi is available!",
   "notification.warning.title": "Warning:",
   "notification.warning.404": "404 - Not found",

package/admin/src/utils/getAttributesToDisplay.js

@@ -1,13 +1,11 @@
-import { get } from 'lodash';
-
 const getAttributesToDisplay = (contentType) => {
-  const timestamps = get(contentType, ['options', 'timestamps']);
+  const timestamps = contentType?.options?.timestamps;
 
   // Sometimes timestamps is false
   let timestampsArray = Array.isArray(timestamps) ? timestamps : [];
   const idsAttributes = ['id', '_id']; // For both SQL and mongo
   const unwritableAttributes = [...idsAttributes, ...timestampsArray, 'publishedAt'];
-  const schemaAttributes = get(contentType, ['attributes'], {});
+  const schemaAttributes = contentType?.attributes ?? {};
 
   return Object.keys(schemaAttributes).reduce((acc, current) => {
     if (!unwritableAttributes.includes(current)) {

package/admin/src/utils/getExistingActions.js

@@ -1,5 +1,3 @@
-import { get } from 'lodash';
-
 const getExistingActions = (permissions) => {
   return Array.from(
     new Set(
@@ -23,7 +21,7 @@ const getExistingActions = (permissions) => {
           ...acc,
           ...getActionsPermission([
             ...Object.values(current[1].attributes || {}),
-            get(current[1], 'contentTypeActions', {}),
+            current[1]?.contentTypeActions ?? {},
           ]),
         ];
       }, [])

package/admin/src/utils/sortLinks.js

@@ -1,4 +1,4 @@
-import { sortBy } from 'lodash';
+import sortBy from 'lodash/sortBy';
 
 const sortLinks = (links) => sortBy(links, (object) => object.name);