@strapi/admin 4.9.0 → 4.10.0-beta.0

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

@@ -13,7 +13,6 @@ import {
   useGuidedTour,
   useRBAC,
   useFetchClient,
-  useAPIErrorHandler,
 } from '@strapi/helper-plugin';
 import { ContentLayout, Main, Flex } from '@strapi/design-system';
 import { formatAPIErrors } from '../../../../../utils';
@@ -53,8 +52,6 @@ const TransferTokenCreateView = () => {
 
   const isCreating = id === 'create';
 
-  const { formatAPIError } = useAPIErrorHandler();
-
   useEffect(() => {
     trackUsageRef.current(isCreating ? 'didAddTokenFromList' : 'didEditTokenFromList', {
       tokenType: TRANSFER_TOKEN_TYPE,
@@ -76,22 +73,11 @@ const TransferTokenCreateView = () => {
     },
     {
       enabled: !isCreating && !transferToken,
-      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),
-          });
-        }
+      onError() {
+        toggleNotification({
+          type: 'warning',
+          message: { id: 'notification.error', defaultMessage: 'An error occured' },
+        });
       },
     }
   );
@@ -106,8 +92,6 @@ const TransferTokenCreateView = () => {
         ? parseInt(body.lifespan, 10)
         : null;
 
-    const permissions = body.permissions.split('-');
-
     try {
       const {
         data: { data: response },
@@ -115,12 +99,13 @@ const TransferTokenCreateView = () => {
         ? await post(`/admin/transfer/tokens`, {
             ...body,
             lifespan: lifespanVal,
-            permissions,
+            permissions: ['push'],
           })
         : await put(`/admin/transfer/tokens/${id}`, {
             name: body.name,
             description: body.description,
-            permissions,
+            type: body.type,
+            permissions: ['push'],
           });
 
       unlockApp();
@@ -147,7 +132,7 @@ const TransferTokenCreateView = () => {
       });
 
       trackUsageRef.current(isCreating ? 'didCreateToken' : 'didEditToken', {
-        type: transferToken?.permissions,
+        type: transferToken?.type,
         tokenType: TRANSFER_TOKEN_TYPE,
       });
     } catch (err) {
@@ -159,15 +144,6 @@ 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',
@@ -185,24 +161,6 @@ 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" />
@@ -215,7 +173,6 @@ const TransferTokenCreateView = () => {
           lifespan: transferToken?.lifespan
             ? transferToken.lifespan.toString()
             : transferToken?.lifespan,
-          permissions: transferToken?.permissions.join('-'),
         }}
         enableReinitialize
         onSubmit={(body, actions) => handleSubmit(body, actions)}
@@ -235,7 +192,6 @@ 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,7 +5,6 @@ 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,24 +77,11 @@ const TransferTokenListView = () => {
     },
     {
       enabled: canRead,
-      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' },
-          });
-        }
+      onError() {
+        toggleNotification({
+          type: 'warning',
+          message: { id: 'notification.error', defaultMessage: 'An error occured' },
+        });
       },
     }
   );
@@ -114,15 +101,6 @@ 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/translations/en.json

@@ -251,6 +251,11 @@
   "Settings.profile.form.section.experience.title": "Experience",
   "Settings.profile.form.section.helmet.title": "User profile",
   "Settings.profile.form.section.profile.page.title": "Profile page",
+  "Settings.review-workflows.page.title": "Review Workflows",
+  "Settings.review-workflows.page.subtitle": "{count, plural, one {# stage} other {# stages}}",
+  "Settings.review-workflows.page.isLoading": "Workflow is loading",
+  "Settings.review-workflows.page.delete.confirm.body": "All entries assigned to deleted stages will be moved to the first stage. Are you sure you want to save this?",
+  "Settings.review-workflows.stage.name.label": "Stage name",
   "Settings.roles.create.description": "Define the rights given to the role",
   "Settings.roles.create.title": "Create a role",
   "Settings.roles.created": "Role created",
@@ -802,6 +807,7 @@
   "content-manager.relation.notAvailable": "No relations available",
   "content-manager.relation.publicationState.draft": "Draft",
   "content-manager.relation.publicationState.published": "Published",
+  "content-manager.reviewWorkflows.stage.label": "Review stage",
   "content-manager.select.currently.selected": "{count} currently selected",
   "content-manager.success.record.delete": "Deleted",
   "content-manager.success.record.publish": "Published",
@@ -878,7 +884,6 @@
   "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",