@strapi/admin 4.11.4 → 4.12.0-beta.1

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

@@ -31,21 +31,24 @@ 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')
 );
 
 function App() {
-  const adminPermissions = useEnterprise(ADMIN_PERMISSIONS_CE, async () => (await import('../../../../ee/admin/constants')).ADMIN_PERMISSIONS_EE, {
-    combine(cePermissions, eePermissions) {
-      // the `settings` NS e.g. are deep nested objects, that need a deep merge
-      return merge({}, cePermissions, eePermissions);
-    },
-
-    defaultValue: ADMIN_PERMISSIONS_CE,
-  })
+  const adminPermissions = useEnterprise(
+    ADMIN_PERMISSIONS_CE,
+    async () => (await import('../../../../ee/admin/constants')).ADMIN_PERMISSIONS_EE,
+    {
+      combine(cePermissions, eePermissions) {
+        // the `settings` NS e.g. are deep nested objects, that need a deep merge
+        return merge({}, cePermissions, eePermissions);
+      },
+
+      defaultValue: ADMIN_PERMISSIONS_CE,
+    }
+  );
   const routes = useEnterprise(
     ROUTES_CE,
     async () => (await import('../../../../ee/admin/pages/App/constants')).ROUTES_EE,
@@ -113,8 +116,6 @@ function App() {
           authLogo: prefixFileUrlWithBackendUrl(authLogo),
         });
 
-        const deviceId = await getUID();
-
         if (uuid) {
           const {
             data: { data: properties },
@@ -127,19 +128,23 @@ function App() {
 
           try {
             const event = 'didInitializeAdministration';
-            await post('https://analytics.strapi.io/api/v2/track', {
-              // This event is anonymous
-              event,
-              userId: '',
-              deviceId,
-              eventPropeties: {},
-              userProperties: { environment: appInfo.currentEnvironment },
-              groupProperties: { ...properties, projectId: uuid },
-            }, {
-              headers: {
-                'X-Strapi-Event': event,
+            await post(
+              'https://analytics.strapi.io/api/v2/track',
+              {
+                // This event is anonymous
+                event,
+                userId: '',
+                deviceId,
+                eventPropeties: {},
+                userProperties: { environment: appInfo.currentEnvironment },
+                groupProperties: { ...properties, projectId: uuid },
+              },
+              {
+                headers: {
+                  'X-Strapi-Event': event,
+                },
               }
-            });
+            );
           } catch (e) {
             // Silent.
           }

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>

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

@@ -12,8 +12,6 @@ import {
   useNotification,
   useRBAC,
 } from '@strapi/helper-plugin';
-import useLicenseLimitNotification from 'ee_else_ce/hooks/useLicenseLimitNotification';
-import CreateAction from 'ee_else_ce/pages/SettingsPage/pages/Users/ListPage/CreateAction';
 import qs from 'qs';
 import { useIntl } from 'react-intl';
 import { useMutation, useQueryClient } from 'react-query';
@@ -21,9 +19,11 @@ import { useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 
 import { useAdminUsers } from '../../../../../hooks/useAdminUsers';
+import { useEnterprise } from '../../../../../hooks/useEnterprise';
 import { selectAdminPermissions } from '../../../../App/selectors';
 import Filters from '../../../components/Filters';
 
+import { CreateActionCE } from './CreateAction';
 import TableRows from './DynamicTable/TableRows';
 import ModalForm from './ModalForm';
 import PaginationFooter from './PaginationFooter';
@@ -32,7 +32,7 @@ import tableHeaders from './utils/tableHeaders';
 
 const EE_LICENSE_LIMIT_QUERY_KEY = ['ee', 'license-limit-info'];
 
-const ListPage = () => {
+export const UserListPageCE = () => {
   const { post } = useFetchClient();
   const { formatAPIError } = useAPIErrorHandler();
   const [isModalOpened, setIsModalOpen] = useState(false);
@@ -45,7 +45,6 @@ const ListPage = () => {
   const { formatMessage } = useIntl();
   const { search } = useLocation();
   useFocusWhenNavigate();
-  useLicenseLimitNotification();
   const {
     users,
     pagination,
@@ -55,6 +54,15 @@ const ListPage = () => {
   } = useAdminUsers(qs.parse(search, { ignoreQueryPrefix: true }), {
     enabled: canRead,
   });
+  const CreateAction = useEnterprise(
+    CreateActionCE,
+    async () =>
+      (
+        await import(
+          '../../../../../../../ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction'
+        )
+      ).CreateActionEE
+  );
 
   const headers = tableHeaders.map((header) => ({
     ...header,
@@ -97,6 +105,11 @@ const ListPage = () => {
     }
   );
 
+  // block rendering until the EE component is fully loaded
+  if (!CreateAction) {
+    return null;
+  }
+
   return (
     <Main aria-busy={isLoading}>
       <SettingsPageTitle name="Users" />
@@ -166,4 +179,22 @@ const ListPage = () => {
   );
 };
 
-export default ListPage;
+// component which determines whether this page should render the CE or EE page
+const UsersListPageSwitch = () => {
+  const UsersListPage = useEnterprise(
+    UserListPageCE,
+    async () =>
+      // eslint-disable-next-line import/no-cycle
+      (await import('../../../../../../../ee/admin/pages/SettingsPage/pages/Users/ListPage'))
+        .UserListPageEE
+  );
+
+  // block rendering until the EE component is fully loaded
+  if (!UsersListPage) {
+    return null;
+  }
+
+  return <UsersListPage />;
+};
+
+export default UsersListPageSwitch;

package/admin/src/pages/SettingsPage/pages/Users/components/MagicLink/index.js

@@ -7,7 +7,7 @@ import basename from '../../../../../../core/utils/basename';
 
 import MagicLinkWrapper from './MagicLinkWrapper';
 
-const MagicLink = ({ registrationToken }) => {
+export const MagicLinkCE = ({ registrationToken }) => {
   const { formatMessage } = useIntl();
   const target = `${window.location.origin}${basename}auth/register?registrationToken=${registrationToken}`;
 
@@ -21,12 +21,10 @@ const MagicLink = ({ registrationToken }) => {
   );
 };
 
-MagicLink.defaultProps = {
+MagicLinkCE.defaultProps = {
   registrationToken: '',
 };
 
-MagicLink.propTypes = {
+MagicLinkCE.propTypes = {
   registrationToken: PropTypes.string,
 };
-
-export default MagicLink;

package/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/EventTable/index.js

@@ -1,3 +1 @@
-import { EventTableCE } from './EventTableCE';
-
-export default EventTableCE;
+export * from './EventTableCE';

package/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/index.js

@@ -12,11 +12,12 @@ import {
 } from '@strapi/design-system';
 import { Form, Link } from '@strapi/helper-plugin';
 import { ArrowLeft, Check, Play as Publish } from '@strapi/icons';
-import EventTable from 'ee_else_ce/pages/SettingsPage/pages/Webhooks/EditView/components/EventTable';
 import { Field, FormikProvider, useFormik } from 'formik';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 
+import { useEnterprise } from '../../../../../../../hooks/useEnterprise';
+import { EventTableCE } from '../EventTable';
 import HeadersInput from '../HeadersInput';
 import TriggerContainer from '../TriggerContainer';
 
@@ -32,6 +33,15 @@ const WebhookForm = ({
 }) => {
   const { formatMessage } = useIntl();
   const [showTriggerResponse, setShowTriggerResponse] = useState(false);
+  const EventTable = useEnterprise(
+    EventTableCE,
+    async () =>
+      (
+        await import(
+          '../../../../../../../../../ee/admin/pages/SettingsPage/pages/Webhooks/EditView/components/EventTable'
+        )
+      ).EventTableEE
+  );
 
   /**
    * Map the headers into a form that can be used within the formik form
@@ -64,6 +74,11 @@ const WebhookForm = ({
     validateOnBlur: false,
   });
 
+  // block rendering until the EE component is fully loaded
+  if (!EventTable) {
+    return null;
+  }
+
   return (
     <FormikProvider value={formik}>
       <Form onSubmit={formik.handleSubmit}>

package/admin/src/translations/zh-Hans.json

@@ -799,7 +799,7 @@
     "content-manager.popUpWarning.warning.unpublish-question": "您确定不要发布它吗？",
     "content-manager.popUpWarning.warning.updateAllSettings": "这将修改所有设置",
     "content-manager.popUpwarning.warning.has-draft-relations.button-confirm": "是, 发布",
-    "content-manager.popUpwarning.warning.has-draft-relations.message": "<b>{count, plural, =0 { 个关联的内容} one { 个关联的内容} other { 个关联的内容}}</b> 尚未发布。<br></br>它可能会在你的项目上产生关联失效和错误。",
+    "content-manager.popUpwarning.warning.has-draft-relations.message": "<b>{count, plural, one { 个关联的内容} other { 个关联的内容}}</b> 尚未发布，这可能会导致不可预期的行为。",
     "content-manager.popover.display-relations.label": "显示关联",
     "content-manager.relation.add": "添加关联",
     "content-manager.relation.disconnect": "删除",