@strapi/admin 4.5.4 → 4.6.0-beta.0

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

@@ -25,7 +25,7 @@ import NotFoundPage from '../NotFoundPage';
 import UseCasePage from '../UseCasePage';
 import { getUID } from './utils';
 import routes from './utils/routes';
-import { useConfigurations, useFetchClient } from '../../hooks';
+import { useConfigurations } from '../../hooks';
 
 const AuthenticatedApp = lazy(() =>
   import(/* webpackChunkName: "Admin-authenticatedApp" */ '../../components/AuthenticatedApp')
@@ -35,12 +35,8 @@ function App() {
   const toggleNotification = useNotification();
   const { updateProjectSettings } = useConfigurations();
   const { formatMessage } = useIntl();
-  const [{ isLoading, hasAdmin, uuid, deviceId }, setState] = useState({
-    isLoading: true,
-    hasAdmin: false,
-  });
+  const [{ isLoading, hasAdmin, uuid }, setState] = useState({ isLoading: true, hasAdmin: false });
   const appInfo = useAppInfos();
-  const { get } = useFetchClient();
 
   const authRoutes = useMemo(() => {
     return makeUniqueRoutes(
@@ -84,29 +80,27 @@ function App() {
         } = await axios.get(`${strapi.backendURL}/admin/init`);
 
         updateProjectSettings({ menuLogo: prefixFileUrlWithBackendUrl(menuLogo) });
-        const deviceId = await getUID();
 
         if (uuid) {
           const {
             data: { data: properties },
-          } = await get(`/admin/telemetry-properties`, {
-            // NOTE: needed because the interceptors of the fetchClient redirect to /login when receive a 401 and it would end up in an infinite loop when the user doesn't have a session.
-            validateStatus: (status) => status < 500,
-          });
+          } = await axios.get(`${strapi.backendURL}/admin/telemetry-properties`);
 
           setTelemetryProperties(properties);
 
           try {
-            await fetch('https://analytics.strapi.io/api/v2/track', {
+            const deviceId = await getUID();
+
+            await fetch('https://analytics.strapi.io/track', {
               method: 'POST',
               body: JSON.stringify({
-                // This event is anonymous
                 event: 'didInitializeAdministration',
-                userId: '',
+                uuid,
                 deviceId,
-                eventPropeties: {},
-                userProperties: { environment: appInfo.currentEnvironment },
-                groupProperties: { ...properties, projectId: uuid },
+                properties: {
+                  ...properties,
+                  environment: appInfo.currentEnvironment,
+                },
               }),
               headers: {
                 'Content-Type': 'application/json',
@@ -117,7 +111,7 @@ function App() {
           }
         }
 
-        setState({ isLoading: false, hasAdmin, uuid, deviceId });
+        setState({ isLoading: false, hasAdmin, uuid });
       } catch (err) {
         toggleNotification({
           type: 'warning',
@@ -136,9 +130,8 @@ function App() {
     () => ({
       uuid,
       telemetryProperties,
-      deviceId,
     }),
-    [uuid, telemetryProperties, deviceId]
+    [uuid, telemetryProperties]
   );
 
   if (isLoading) {

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

@@ -12,6 +12,7 @@ import {
 } from '@strapi/helper-plugin';
 import { Main } from '@strapi/design-system/Main';
 import { Formik } from 'formik';
+import { get } from 'lodash';
 import { useRouteMatch, useHistory } from 'react-router-dom';
 import { useQuery } from 'react-query';
 import { formatAPIErrors } from '../../../../../utils';
@@ -204,12 +205,12 @@ const ApiTokenCreateView = () => {
       if (err?.response?.data?.error?.message === MSG_ERROR_NAME_TAKEN) {
         toggleNotification({
           type: 'warning',
-          message: err.response.data.message || 'notification.error.tokennamenotunique',
+          message: get(err, 'response.data.message', 'notification.error.tokennamenotunique'),
         });
       } else {
         toggleNotification({
           type: 'warning',
-          message: err?.response?.data?.message || 'notification.error',
+          message: get(err, 'response.data.message', 'notification.error'),
         });
       }
       unlockApp();

package/admin/src/translations/en.json

@@ -570,6 +570,7 @@
   "content-manager.components.LeftMenu.single-types": "Single Types",
   "content-manager.components.LimitSelect.itemsPerPage": "Items per page",
   "content-manager.components.NotAllowedInput.text": "No permissions to see this field",
+  "content-manager.components.RelationInput.icon-button-aria-label": "Drag",
   "content-manager.components.RepeatableComponent.error-message": "The component(s) contain error(s)",
   "content-manager.components.Search.placeholder": "Search for an entry...",
   "content-manager.components.Select.draft-info-title": "State: Draft",
@@ -647,6 +648,11 @@
   "content-manager.containers.SettingsPage.pluginHeaderDescription": "Configure the settings for all your Collection types and Groups",
   "content-manager.containers.SettingsView.list.subtitle": "Configure the layout and display of your Collection types and groups",
   "content-manager.containers.SettingsView.list.title": "Display configurations",
+  "content-manager.dnd.instructions": "Press spacebar to grab and re-order",
+  "content-manager.dnd.reorder": "{item}, moved. New position in list: {position}.",
+  "content-manager.dnd.grab-item": "{item}, grabbed. Current position in list: {position}. Press up and down arrow to change position, Spacebar to drop, Escape to cancel.",
+  "content-manager.dnd.drop-item": "{item}, dropped. Final position in list: {position}.",
+  "content-manager.dnd.cancel-item": "{item}, dropped. Re-order cancelled.",
   "content-manager.edit-settings-view.link-to-ctb.components": "Edit the component",
   "content-manager.edit-settings-view.link-to-ctb.content-types": "Edit the content type",
   "content-manager.emptyAttributes.button": "Go to collection type builder",