@strapi/admin 4.4.0-beta.1 → 4.4.0-beta.3

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/schema.js

@@ -5,10 +5,9 @@ const schema = yup.object().shape({
   name: yup.string(translatedErrors.string).required(translatedErrors.required),
   type: yup
     .string(translatedErrors.string)
-    .oneOf(['read-only', 'full-access', 'custom'])
+    .oneOf(['read-only', 'full-access'])
     .required(translatedErrors.required),
   description: yup.string().nullable(),
-  lifespan: yup.number().integer().min(1).nullable().defined(translatedErrors.required),
 });
 
 export default schema;

package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/DeleteButton/index.js

@@ -24,7 +24,6 @@ const DeleteButton = ({ tokenName, onClickDelete }) => {
           },
           { target: `${tokenName}` }
         )}
-        name="delete"
         noBorder
         icon={<Trash />}
       />

package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/UpdateButton/index.js

@@ -1,13 +1,46 @@
 import React from 'react';
 import Pencil from '@strapi/icons/Pencil';
+import { useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
-import DefaultButton from '../DefaultButton';
+import { Link } from '@strapi/helper-plugin';
+import { useHistory } from 'react-router-dom';
+import styled from 'styled-components';
+
+const LinkUpdate = styled(Link)`
+  svg {
+    path {
+      fill: ${({ theme }) => theme.colors.neutral500};
+    }
+  }
+
+  &:hover {
+    svg {
+      path {
+        fill: ${({ theme }) => theme.colors.neutral800};
+      }
+    }
+  }
+`;
 
 const UpdateButton = ({ tokenName, tokenId }) => {
+  const { formatMessage } = useIntl();
+  const {
+    location: { pathname },
+  } = useHistory();
+
   return (
-    <DefaultButton tokenName={tokenName} tokenId={tokenId}>
+    <LinkUpdate
+      to={`${pathname}/${tokenId}`}
+      title={formatMessage(
+        {
+          id: 'app.component.table.edit',
+          defaultMessage: 'Edit {target}',
+        },
+        { target: `${tokenName}` }
+      )}
+    >
       <Pencil />
-    </DefaultButton>
+    </LinkUpdate>
   );
 };
 

package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';
 
@@ -12,11 +13,12 @@ import {
   pxToRem,
   useTracking,
 } from '@strapi/helper-plugin';
+
 import DeleteButton from './DeleteButton';
 import UpdateButton from './UpdateButton';
-import ReadButton from './ReadButton';
 
-const TableRows = ({ canDelete, canUpdate, canRead, onClickDelete, withBulkActions, rows }) => {
+const TableRows = ({ canDelete, canUpdate, onClickDelete, withBulkActions, rows }) => {
+  const { formatMessage } = useIntl();
   const [{ query }] = useQueryParams();
   const [, sortOrder] = query.sort.split(':');
   const {
@@ -57,24 +59,22 @@ const TableRows = ({ canDelete, canUpdate, canRead, onClickDelete, withBulkActio
             </Td>
             <Td>
               <Typography textColor="neutral800">
-                <RelativeTime timestamp={new Date(apiToken.createdAt)} />
+                {formatMessage({
+                  id: `Settings.apiTokens.types.${apiToken.type}`,
+                  defaultMessage: 'Type unknown',
+                })}
               </Typography>
             </Td>
             <Td>
-              {apiToken.lastUsedAt && (
-                <Typography textColor="neutral800">
-                  <RelativeTime timestamp={new Date(apiToken.lastUsedAt)} />
-                </Typography>
-              )}
+              <Typography textColor="neutral800">
+                <RelativeTime timestamp={new Date(apiToken.createdAt)} />
+              </Typography>
             </Td>
 
             {withBulkActions && (
               <Td>
                 <Flex justifyContent="end">
                   {canUpdate && <UpdateButton tokenName={apiToken.name} tokenId={apiToken.id} />}
-                  {!canUpdate && canRead && (
-                    <ReadButton tokenName={apiToken.name} tokenId={apiToken.id} />
-                  )}
                   {canDelete && (
                     <DeleteButton
                       tokenName={apiToken.name}
@@ -94,7 +94,6 @@ const TableRows = ({ canDelete, canUpdate, canRead, onClickDelete, withBulkActio
 TableRows.defaultProps = {
   canDelete: false,
   canUpdate: false,
-  canRead: false,
   onClickDelete() {},
   rows: [],
   withBulkActions: false,
@@ -103,7 +102,6 @@ TableRows.defaultProps = {
 TableRows.propTypes = {
   canDelete: PropTypes.bool,
   canUpdate: PropTypes.bool,
-  canRead: PropTypes.bool,
   onClickDelete: PropTypes.func,
   rows: PropTypes.array,
   withBulkActions: PropTypes.bool,

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

@@ -147,16 +147,15 @@ const ApiTokenListView = () => {
             headers={headers}
             contentType="api-tokens"
             rows={apiTokens}
-            withBulkActions={canDelete || canUpdate || canRead}
+            withBulkActions={canDelete || canUpdate}
             isLoading={isLoading}
             onConfirmDelete={(id) => deleteMutation.mutateAsync(id)}
           >
             <TableRows
-              canRead={canRead}
               canDelete={canDelete}
               canUpdate={canUpdate}
               rows={apiTokens}
-              withBulkActions={canDelete || canUpdate || canRead}
+              withBulkActions={canDelete || canUpdate}
             />
           </DynamicTable>
         )}

package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/utils/tableHeaders.js

@@ -22,23 +22,23 @@ const tableHeaders = [
     },
   },
   {
-    name: 'createdAt',
-    key: 'createdAt',
+    name: 'type',
+    key: 'type',
     metadatas: {
       label: {
-        id: 'Settings.apiTokens.ListView.headers.createdAt',
-        defaultMessage: 'Created at',
+        id: 'Settings.apiTokens.ListView.headers.type',
+        defaultMessage: 'Token type',
       },
       sortable: false,
     },
   },
   {
-    name: 'lastUsedAt',
-    key: 'lastUsedAt',
+    name: 'createdAt',
+    key: 'createdAt',
     metadatas: {
       label: {
-        id: 'Settings.apiTokens.ListView.headers.lastUsedAt',
-        defaultMessage: 'Last used',
+        id: 'Settings.apiTokens.ListView.headers.createdAt',
+        defaultMessage: 'Created at',
       },
       sortable: false,
     },

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

@@ -5,7 +5,7 @@ import EditView from '../EditView';
 
 const ProtectedApiTokenCreateView = () => {
   return (
-    <CheckPagePermissions permissions={adminPermissions.settings['api-tokens'].read}>
+    <CheckPagePermissions permissions={adminPermissions.settings['api-tokens'].update}>
       <EditView />
     </CheckPagePermissions>
   );

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

@@ -2,7 +2,7 @@ import * as yup from 'yup';
 import { translatedErrors } from '@strapi/helper-plugin';
 
 const schema = yup.object().shape({
-  firstname: yup.string().required(translatedErrors.required),
+  firstname: yup.string().trim().required(translatedErrors.required),
   lastname: yup.string(),
   email: yup.string().email(translatedErrors.email).required(translatedErrors.required),
   roles: yup.array().min(1, translatedErrors.required).required(translatedErrors.required),

package/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/profile.js

@@ -2,8 +2,8 @@ import * as yup from 'yup';
 import { translatedErrors } from '@strapi/helper-plugin';
 
 export const commonUserSchema = {
-  firstname: yup.mixed().required(translatedErrors.required),
-  lastname: yup.mixed(),
+  firstname: yup.string().trim().required(translatedErrors.required),
+  lastname: yup.string(),
   email: yup.string().email(translatedErrors.email).lowercase().required(translatedErrors.required),
   username: yup.string().nullable(),
   password: yup

package/admin/src/permissions/defaultPermissions.js

@@ -76,12 +76,16 @@ const permissions = {
       update: [{ action: 'admin::webhooks.update', subject: null }],
     },
     'api-tokens': {
-      main: [{ action: 'admin::api-tokens.access', subject: null }],
+      main: [
+        { action: 'admin::api-tokens.create', subject: null },
+        { action: 'admin::api-tokens.read', subject: null },
+        { action: 'admin::api-tokens.update', subject: null },
+        { action: 'admin::api-tokens.delete', subject: null },
+      ],
       create: [{ action: 'admin::api-tokens.create', subject: null }],
       delete: [{ action: 'admin::api-tokens.delete', subject: null }],
       read: [{ action: 'admin::api-tokens.read', subject: null }],
       update: [{ action: 'admin::api-tokens.update', subject: null }],
-      regenerate: [{ action: 'admin::api-tokens.regenerate', subject: null }],
     },
   },
 };

package/admin/src/translations/en.json

@@ -91,24 +91,10 @@
   "Settings.apiTokens.ListView.headers.description": "Description",
   "Settings.apiTokens.ListView.headers.type": "Token type",
   "Settings.apiTokens.ListView.headers.createdAt": "Created at",
-  "Settings.apiTokens.ListView.headers.lastUsedAt": "Last used",
   "Settings.apiTokens.notification.copied": "Token copied to clipboard.",
   "Settings.apiTokens.title": "API Tokens",
   "Settings.apiTokens.types.full-access": "Full access",
   "Settings.apiTokens.types.read-only": "Read-only",
-  "Settings.apiTokens.duration.7-days": "7 days",
-  "Settings.apiTokens.duration.30-days": "30 days",
-  "Settings.apiTokens.duration.90-days": "90 days",
-  "Settings.apiTokens.duration.unlimited": "Unlimited",
-  "Settings.apiTokens.form.duration":"Token duration",
-  "Settings.apiTokens.form.type":"Token type",
-  "Settings.apiTokens.duration.expiration-date":"Expiration date",
-  "Settings.apiTokens.createPage.permissions.title":"Permissions",
-  "Settings.apiTokens.createPage.permissions.description":"Only actions bound by a route are listed below.",
-  "Settings.apiTokens.RegenerateDialog.title": "Regenerate token",
-  "Settings.apiTokens.popUpWarning.message": "Are you sure you want to regenerate this token?",
-  "Settings.apiTokens.Button.cancel": "Cancel",
-  "Settings.apiTokens.Button.regenerate": "Regenerate",
   "Settings.application.description": "Administration panel’s global information",
   "Settings.application.edition-title": "current plan",
   "Settings.application.get-help": "Get help",
@@ -772,9 +758,6 @@
   "notification.success.delete": "The item has been deleted",
   "notification.success.saved": "Saved",
   "notification.success.title": "Success:",
-  "notification.success.tokencreated": "API Token successfully created",
-  "notification.success.tokenedited": "API Token successfully edited",
-  "notification.error.tokennamenotunique": "Name already assigned to another token",
   "notification.version.update.message": "A new version of Strapi is available!",
   "notification.warning.title": "Warning:",
   "notification.warning.404": "404 - Not found",