@strapi/admin 4.2.0-beta.0 → 4.2.0-beta.1

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

@@ -142,14 +142,14 @@ const EditPage = ({ canUpdate }) => {
         <HeaderLayout
           primaryAction={
             <Button disabled startIcon={<Check />} type="button" size="L">
-              {formatMessage({ id: 'form.button.save', defaultMessage: 'Save' })}
+              {formatMessage({ id: 'global.save', defaultMessage: 'Save' })}
             </Button>
           }
           title={title}
           navigationAction={
             <Link startIcon={<ArrowLeft />} to="/settings/users?pageSize=10&page=1&sort=firstname">
               {formatMessage({
-                id: 'app.components.go-back',
+                id: 'global.back',
                 defaultMessage: 'Back',
               })}
             </Link>
@@ -183,7 +183,7 @@ const EditPage = ({ canUpdate }) => {
                     type="submit"
                     size="L"
                   >
-                    {formatMessage({ id: 'form.button.save', defaultMessage: 'Save' })}
+                    {formatMessage({ id: 'global.save', defaultMessage: 'Save' })}
                   </Button>
                 }
                 title={title}
@@ -193,7 +193,7 @@ const EditPage = ({ canUpdate }) => {
                     to="/settings/users?pageSize=10&page=1&sort=firstname"
                   >
                     {formatMessage({
-                      id: 'app.components.go-back',
+                      id: 'global.back',
                       defaultMessage: 'Back',
                     })}
                   </Link>
@@ -253,7 +253,7 @@ const EditPage = ({ canUpdate }) => {
                     <Stack spacing={4}>
                       <Typography variant="delta" as="h2">
                         {formatMessage({
-                          id: 'app.components.Users.ModalCreateBody.block-title.login',
+                          id: 'global.roles',
                           defaultMessage: "User's role",
                         })}
                       </Typography>

package/admin/src/pages/SettingsPage/pages/Users/EditPage/utils/layout.js

@@ -72,7 +72,7 @@ const layout = [
   [
     {
       intlLabel: {
-        id: 'Auth.form.password.label',
+        id: 'global.password',
         defaultMessage: 'Password',
       },
       name: 'password',

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

@@ -89,7 +89,7 @@ const TableRows = ({
                       <IconButton
                         onClick={() => onClickDelete(data.id)}
                         label={formatMessage(
-                          { id: 'app.component.table.delete', defaultMessage: 'Delete {target}' },
+                          { id: 'global.delete-target', defaultMessage: 'Delete {target}' },
                           { target: getFullName(data.firstname, data.lastname) }
                         )}
                         noBorder

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

@@ -146,7 +146,7 @@ const ModalForm = ({ queryName, onToggle }) => {
                   <Box>
                     <Typography variant="beta" as="h2">
                       {formatMessage({
-                        id: 'app.components.Users.ModalCreateBody.block-title.login',
+                        id: 'global.roles',
                         defaultMessage: "User's role",
                       })}
                     </Typography>

package/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/stepper.js

@@ -8,7 +8,7 @@ const stepper = {
     next: 'magic-link',
   },
   'magic-link': {
-    buttonSubmitLabel: { id: 'form.button.finish', defaultMessage: 'Finish' },
+    buttonSubmitLabel: { id: 'global.finish', defaultMessage: 'Finish' },
     isDisabled: true,
     next: null,
   },

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

@@ -39,7 +39,7 @@ const ListPage = () => {
   const queryName = ['users', search];
 
   const title = formatMessage({
-    id: 'Settings.permissions.users.listview.header.title',
+    id: 'global.users',
     defaultMessage: 'Users',
   });
 

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

@@ -68,7 +68,7 @@ const WebhookForm = ({
                 </Button>
                 <Button startIcon={<Check />} onClick={handleSubmit} type="submit" size="L">
                   {formatMessage({
-                    id: 'app.components.Button.save',
+                    id: 'global.save',
                     defaultMessage: 'Save',
                   })}
                 </Button>
@@ -85,7 +85,7 @@ const WebhookForm = ({
             navigationAction={
               <Link startIcon={<ArrowLeft />} to="/settings/webhooks">
                 {formatMessage({
-                  id: 'app.components.go-back',
+                  id: 'global.back',
                   defaultMessage: 'Back',
                 })}
               </Link>
@@ -111,7 +111,7 @@ const WebhookForm = ({
                         name="name"
                         error={errors.name && formatMessage({ id: errors.name })}
                         label={formatMessage({
-                          id: 'Settings.webhooks.form.name',
+                          id: 'global.name',
                           defaultMessage: 'Name',
                         })}
                         required

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

@@ -282,7 +282,7 @@ const ListView = () => {
                   variant="danger-light"
                 >
                   {formatMessage({
-                    id: 'Settings.webhooks.events.delete',
+                    id: 'global.delete',
                     defaultMessage: 'Delete',
                   })}
                 </Button>
@@ -318,7 +318,7 @@ const ListView = () => {
                       <Th>
                         <BaseCheckbox
                           aria-label={formatMessage({
-                            id: 'Settings.webhooks.list.all-entries.select',
+                            id: 'global.select-all-entries',
                             defaultMessage: 'Select all entries',
                           })}
                           indeterminate={
@@ -331,7 +331,7 @@ const ListView = () => {
                       <Th width="20%">
                         <Typography variant="sigma" textColor="neutral600">
                           {formatMessage({
-                            id: 'Settings.webhooks.form.name',
+                            id: 'global.name',
                             defaultMessage: 'Name',
                           })}
                         </Typography>
@@ -374,7 +374,7 @@ const ListView = () => {
                         <Td {...stopPropagation}>
                           <BaseCheckbox
                             aria-label={`${formatMessage({
-                              id: 'Settings.webhooks.list.select',
+                              id: 'global.select',
                               defaultMessage: 'Select',
                             })} ${webhook.name}`}
                             value={webhooksToDelete?.includes(webhook.id)}
@@ -395,11 +395,11 @@ const ListView = () => {
                           <Flex {...stopPropagation}>
                             <Switch
                               onLabel={formatMessage({
-                                id: 'Settings.webhooks.enabled',
+                                id: 'global.enabled',
                                 defaultMessage: 'Enabled',
                               })}
                               offLabel={formatMessage({
-                                id: 'Settings.webhooks.disabled',
+                                id: 'global.disabled',
                                 defaultMessage: 'Disabled',
                               })}
                               label={`${webhook.name} ${formatMessage({
@@ -431,7 +431,7 @@ const ListView = () => {
                               <IconButton
                                 onClick={() => handleDeleteClick(webhook.id)}
                                 label={formatMessage({
-                                  id: 'Settings.webhooks.events.delete',
+                                  id: 'global.delete',
                                   defaultMessage: 'Delete',
                                 })}
                                 icon={<Trash />}

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

@@ -41,7 +41,7 @@ export const options = [
   },
   {
     intlLabel: {
-      id: 'Usecase.content-manager',
+      id: 'global.content-manager',
       defaultMessage: 'Content Manager',
     },
     value: 'content_manager',
@@ -150,7 +150,7 @@ const UseCasePage = () => {
                 />
               )}
               <Button type="submit" size="L" fullWidth disabled={!role}>
-                {formatMessage({ id: 'form.button.finish', defaultMessage: 'Finish' })}
+                {formatMessage({ id: 'global.finish', defaultMessage: 'Finish' })}
               </Button>
             </Stack>
           </form>

package/admin/src/reducers.js

@@ -1,12 +1,13 @@
+import appReducer from './pages/App/reducer';
 import rbacProviderReducer from './components/RBACProvider/reducer';
-import appReducer from './content-manager/pages/App/reducer';
+import cmAppReducer from './content-manager/pages/App/reducer';
 import editViewLayoutManagerReducer from './content-manager/pages/EditViewLayoutManager/reducer';
 import listViewReducer from './content-manager/pages/ListView/reducer';
 import rbacManagerReducer from './content-manager/hooks/useSyncRbac/reducer';
 import editViewCrudReducer from './content-manager/sharedReducers/crudReducer/reducer';
 
 const contentManagerReducers = {
-  'content-manager_app': appReducer,
+  'content-manager_app': cmAppReducer,
   'content-manager_listView': listViewReducer,
   'content-manager_rbacManager': rbacManagerReducer,
   'content-manager_editViewLayoutManager': editViewLayoutManagerReducer,
@@ -14,6 +15,7 @@ const contentManagerReducers = {
 };
 
 const reducers = {
+  admin_app: appReducer,
   rbacProvider: rbacProviderReducer,
   ...contentManagerReducers,
 };

package/admin/src/translations/ar.json

@@ -2,7 +2,6 @@
   "Auth.form.button.forgot-password": "إرسال للبريد",
   "Auth.form.button.login": "تسجيل دخول",
   "Auth.form.button.register": "مستعد للبدء",
-  "Auth.form.button.reset-password": "تغيير كلمة السر",
   "Auth.form.email.label": "البريد الإكتروني",
   "Auth.form.email.placeholder": "mysuperemail@example.com",
   "Auth.form.error.code.provide": "الرمز المقدم غير صحيح.",
@@ -19,7 +18,6 @@
   "Auth.form.error.username.taken": "اسم المستخدم مسجل بالفعل",
   "Auth.form.forgot-password.email.label": "ادخل ايميلك",
   "Auth.form.forgot-password.email.label.success": "تم إرسال الرسالة بنجاح الى",
-  "Auth.form.password.label": "كلمة السر",
   "Auth.form.rememberMe.label": "تذكرني",
   "Auth.form.username.label": "اسم المستخدم",
   "Auth.form.username.placeholder": "اكتب اسمك هنا (مثل: خالد سالم)",
@@ -38,7 +36,6 @@
   "Users & Permissions": "المستخدمين والصلاحيات",
   "app.components.BlockLink.code": "امثلة للشفرة",
   "app.components.Button.cancel": "الغاء",
-  "app.components.Button.save": "حفظ",
   "app.components.ComingSoonPage.comingSoon": "قادم قريبًا",
   "app.components.DownloadInfo.download": "التنزيل قيد التقدم...",
   "app.components.DownloadInfo.text": "قد يستغرق هذا دقيقة. شكرا لصبرك.",
@@ -63,13 +60,10 @@
   "app.components.LeftMenuFooter.poweredBy": "مندعوم من ",
   "app.components.LeftMenuLinkContainer.configuration": "التهيئة",
   "app.components.LeftMenuLinkContainer.general": "عام",
-  "app.components.LeftMenuLinkContainer.installNewPlugin": "السوق",
-  "app.components.LeftMenuLinkContainer.listPlugins": "الإضافات",
   "app.components.LeftMenuLinkContainer.noPluginsInstalled": "لا توجد إضافات مثبته بعد",
   "app.components.LeftMenuLinkContainer.plugins": "إضافات",
   "app.components.ListPluginsPage.description": "قائمة الإضافيات المثبتة في المشروع.",
   "app.components.ListPluginsPage.helmet.title": "قائمة الإضافات",
-  "app.components.ListPluginsPage.title": "الإضافات",
   "app.components.Logout.logout": "الخروج",
   "app.components.Logout.profile": "الملف الشخصي",
   "app.components.NotFoundPage.back": "العودة للرئيسية",

package/admin/src/translations/cs.json

@@ -3,7 +3,6 @@
   "Auth.form.button.forgot-password": "Odeslat e-mail",
   "Auth.form.button.login": "Přihlásit se",
   "Auth.form.button.register": "Připraven ke startu",
-  "Auth.form.button.reset-password": "Změnit heslo",
   "Auth.form.email.label": "E-mailová adresa",
   "Auth.form.email.placeholder": "jannovak@gmail.com",
   "Auth.form.error.blocked": "Váš účet byl zablokován správcem.",
@@ -23,7 +22,6 @@
   "Auth.form.error.username.taken": "Uživatelské jméno je již obsazeno.",
   "Auth.form.forgot-password.email.label": "Zadejte svůj e-mail",
   "Auth.form.forgot-password.email.label.success": "E-mail úspěšně odeslán na",
-  "Auth.form.password.label": "Heslo",
   "Auth.form.register.news.label": "Informujte mě o nových funkcích a připravovaných vylepšeních (tím souhlasíte s {terms} a {policy}).",
   "Auth.form.rememberMe.label": "Zapamatovat si mě",
   "Auth.form.username.label": "Uživatelské jméno",
@@ -50,7 +48,6 @@
   "Users & Permissions": "Uživatelé a oprávnění",
   "app.components.BlockLink.code": "Příklady kódu",
   "app.components.Button.cancel": "Zrušit",
-  "app.components.Button.save": "Uložit",
   "app.components.ComingSoonPage.comingSoon": "Již brzy",
   "app.components.DownloadInfo.download": "Probíhá stahování...",
   "app.components.DownloadInfo.text": "Může to chvíli trvat. Díky za trpělivost.",
@@ -74,18 +71,14 @@
   "app.components.InstallPluginPage.Download.description": "Může to trvat několik sekund, než se stáhne a nainstaluje zásuvný modul.",
   "app.components.InstallPluginPage.Download.title": "Stahování...",
   "app.components.InstallPluginPage.description": "Rozšiřte snadno svou aplikaci.",
-  "app.components.LeftMenuFooter.documentation": "Dokumentace",
   "app.components.LeftMenuFooter.help": "Nápověda",
   "app.components.LeftMenuFooter.poweredBy": "Běží na ",
   "app.components.LeftMenuLinkContainer.configuration": "Konfigurace",
   "app.components.LeftMenuLinkContainer.general": "Obecné",
-  "app.components.LeftMenuLinkContainer.installNewPlugin": "Tržiště",
-  "app.components.LeftMenuLinkContainer.listPlugins": "Zásuvné moduly",
   "app.components.LeftMenuLinkContainer.noPluginsInstalled": "Zatím nebyly instalovány žádné zásuvné moduly",
   "app.components.LeftMenuLinkContainer.plugins": "Zásuvné moduly",
   "app.components.ListPluginsPage.description": "Seznam instalovaných zásuvných modulů v projektu.",
   "app.components.ListPluginsPage.helmet.title": "Seznam zásuvných modulů",
-  "app.components.ListPluginsPage.title": "Zásuvné moduly",
   "app.components.Logout.logout": "Odhlásit se",
   "app.components.Logout.profile": "Profil",
   "app.components.NotFoundPage.back": "Zpět na úvodní stránku",
@@ -109,7 +102,6 @@
   "app.links.configure-view": "Upravit vzhled",
   "app.utils.SelectOption.defaultMessage": " ",
   "app.utils.defaultMessage": " ",
-  "app.utils.delete": "Odstranit",
   "app.utils.placeholder.defaultMessage": " ",
   "component.Input.error.validation.integer": "Tato hodnota musí být celé číslo",
   "components.AutoReloadBlocker.description": "Spusťte Strapi jedním z následujících příkazů:",