@strapi/admin 4.8.2 → 4.9.0-beta.1

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),
+          });
+        }
       },
     }
   );
@@ -92,6 +106,8 @@ const TransferTokenCreateView = () => {
         ? parseInt(body.lifespan, 10)
         : null;
 
+    const permissions = body.permissions.split('-');
+
     try {
       const {
         data: { data: response },
@@ -99,13 +115,12 @@ const TransferTokenCreateView = () => {
         ? await post(`/admin/transfer/tokens`, {
             ...body,
             lifespan: lifespanVal,
-            permissions: ['push'],
+            permissions,
           })
         : await put(`/admin/transfer/tokens/${id}`, {
             name: body.name,
             description: body.description,
-            type: body.type,
-            permissions: ['push'],
+            permissions,
           });
 
       unlockApp();
@@ -132,7 +147,7 @@ const TransferTokenCreateView = () => {
       });
 
       trackUsageRef.current(isCreating ? 'didCreateToken' : 'didEditToken', {
-        type: transferToken?.type,
+        type: transferToken?.permissions,
         tokenType: TRANSFER_TOKEN_TYPE,
       });
     } catch (err) {
@@ -144,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',
@@ -161,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" />
@@ -173,6 +215,7 @@ const TransferTokenCreateView = () => {
           lifespan: transferToken?.lifespan
             ? transferToken.lifespan.toString()
             : transferToken?.lifespan,
+          permissions: transferToken?.permissions.join('-'),
         }}
         enableReinitialize
         onSubmit={(body, actions) => handleSubmit(body, actions)}
@@ -192,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/EditView/utils/schema.js

@@ -5,6 +5,7 @@ const schema = yup.object().shape({
   name: yup.string(translatedErrors.string).max(100).required(translatedErrors.required),
   description: yup.string().nullable(),
   lifespan: yup.number().integer().min(0).nullable().defined(translatedErrors.required),
+  permissions: yup.string(translatedErrors.string).required(translatedErrors.required),
 });
 
 export default schema;

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);