@strapi/admin 4.5.0-alpha.0 → 4.5.0-beta.0

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

@@ -0,0 +1,63 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import PropTypes from 'prop-types';
+import { Link } from '@strapi/helper-plugin';
+import { useHistory } from 'react-router-dom';
+import styled from 'styled-components';
+
+const MESSAGES_MAP = {
+  edit: {
+    id: 'app.component.table.edit',
+    defaultMessage: 'Edit {target}',
+  },
+  read: {
+    id: 'app.component.table.read',
+    defaultMessage: 'Read {target}',
+  },
+};
+
+const LinkStyled = styled(Link)`
+  svg {
+    path {
+      fill: ${({ theme }) => theme.colors.neutral500};
+    }
+  }
+
+  &:hover,
+  &:focus {
+    svg {
+      path {
+        fill: ${({ theme }) => theme.colors.neutral800};
+      }
+    }
+  }
+`;
+
+const DefaultButton = ({ tokenName, tokenId, buttonType, children }) => {
+  const { formatMessage } = useIntl();
+  const {
+    location: { pathname },
+  } = useHistory();
+
+  return (
+    <LinkStyled
+      to={`${pathname}/${tokenId}`}
+      title={formatMessage(MESSAGES_MAP[buttonType], { target: tokenName })}
+    >
+      {children}
+    </LinkStyled>
+  );
+};
+
+DefaultButton.propTypes = {
+  tokenName: PropTypes.string.isRequired,
+  tokenId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  buttonType: PropTypes.string,
+  children: PropTypes.node.isRequired,
+};
+
+DefaultButton.defaultProps = {
+  buttonType: 'edit',
+};
+
+export default DefaultButton;

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

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

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

@@ -0,0 +1,19 @@
+import React from 'react';
+import Eye from '@strapi/icons/Eye';
+import PropTypes from 'prop-types';
+import DefaultButton from '../DefaultButton';
+
+const ReadButton = ({ tokenName, tokenId }) => {
+  return (
+    <DefaultButton tokenName={tokenName} tokenId={tokenId} buttonType="read">
+      <Eye />
+    </DefaultButton>
+  );
+};
+
+ReadButton.propTypes = {
+  tokenName: PropTypes.string.isRequired,
+  tokenId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+};
+
+export default ReadButton;

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

@@ -1,46 +1,13 @@
 import React from 'react';
 import Pencil from '@strapi/icons/Pencil';
-import { useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
-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};
-      }
-    }
-  }
-`;
+import DefaultButton from '../DefaultButton';
 
 const UpdateButton = ({ tokenName, tokenId }) => {
-  const { formatMessage } = useIntl();
-  const {
-    location: { pathname },
-  } = useHistory();
-
   return (
-    <LinkUpdate
-      to={`${pathname}/${tokenId}`}
-      title={formatMessage(
-        {
-          id: 'app.component.table.edit',
-          defaultMessage: 'Edit {target}',
-        },
-        { target: `${tokenName}` }
-      )}
-    >
+    <DefaultButton tokenName={tokenName} tokenId={tokenId}>
       <Pencil />
-    </LinkUpdate>
+    </DefaultButton>
   );
 };
 

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

@@ -1,5 +1,4 @@
 import React from 'react';
-import { useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';
 
@@ -13,12 +12,11 @@ import {
   pxToRem,
   useTracking,
 } from '@strapi/helper-plugin';
-
 import DeleteButton from './DeleteButton';
 import UpdateButton from './UpdateButton';
+import ReadButton from './ReadButton';
 
-const TableRows = ({ canDelete, canUpdate, onClickDelete, withBulkActions, rows }) => {
-  const { formatMessage } = useIntl();
+const TableRows = ({ canDelete, canUpdate, canRead, onClickDelete, withBulkActions, rows }) => {
   const [{ query }] = useQueryParams();
   const [, sortOrder] = query.sort.split(':');
   const {
@@ -59,22 +57,24 @@ const TableRows = ({ canDelete, canUpdate, onClickDelete, withBulkActions, rows
             </Td>
             <Td>
               <Typography textColor="neutral800">
-                {formatMessage({
-                  id: `Settings.apiTokens.types.${apiToken.type}`,
-                  defaultMessage: 'Type unknown',
-                })}
+                <RelativeTime timestamp={new Date(apiToken.createdAt)} />
               </Typography>
             </Td>
             <Td>
-              <Typography textColor="neutral800">
-                <RelativeTime timestamp={new Date(apiToken.createdAt)} />
-              </Typography>
+              {apiToken.lastUsedAt && (
+                <Typography textColor="neutral800">
+                  <RelativeTime timestamp={new Date(apiToken.lastUsedAt)} />
+                </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,6 +94,7 @@ const TableRows = ({ canDelete, canUpdate, onClickDelete, withBulkActions, rows
 TableRows.defaultProps = {
   canDelete: false,
   canUpdate: false,
+  canRead: false,
   onClickDelete() {},
   rows: [],
   withBulkActions: false,
@@ -102,6 +103,7 @@ 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,15 +147,16 @@ const ApiTokenListView = () => {
             headers={headers}
             contentType="api-tokens"
             rows={apiTokens}
-            withBulkActions={canDelete || canUpdate}
+            withBulkActions={canDelete || canUpdate || canRead}
             isLoading={isLoading}
             onConfirmDelete={(id) => deleteMutation.mutateAsync(id)}
           >
             <TableRows
+              canRead={canRead}
               canDelete={canDelete}
               canUpdate={canUpdate}
               rows={apiTokens}
-              withBulkActions={canDelete || canUpdate}
+              withBulkActions={canDelete || canUpdate || canRead}
             />
           </DynamicTable>
         )}

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

@@ -22,23 +22,23 @@ const tableHeaders = [
     },
   },
   {
-    name: 'type',
-    key: 'type',
+    name: 'createdAt',
+    key: 'createdAt',
     metadatas: {
       label: {
-        id: 'Settings.apiTokens.ListView.headers.type',
-        defaultMessage: 'Token type',
+        id: 'Settings.apiTokens.ListView.headers.createdAt',
+        defaultMessage: 'Created at',
       },
       sortable: false,
     },
   },
   {
-    name: 'createdAt',
-    key: 'createdAt',
+    name: 'lastUsedAt',
+    key: 'lastUsedAt',
     metadatas: {
       label: {
-        id: 'Settings.apiTokens.ListView.headers.createdAt',
-        defaultMessage: 'Created at',
+        id: 'Settings.apiTokens.ListView.headers.lastUsedAt',
+        defaultMessage: 'Last used',
       },
       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'].update}>
+    <CheckPagePermissions permissions={adminPermissions.settings['api-tokens'].read}>
       <EditView />
     </CheckPagePermissions>
   );

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

@@ -69,8 +69,8 @@ const ModalForm = ({ queryName, onToggle }) => {
     } catch (err) {
       unlockApp();
 
-      if (err?.response?.data.message === 'Email already taken') {
-        setErrors({ email: err.response.data.message });
+      if (err?.response?.data?.error.message === 'Email already taken') {
+        setErrors({ email: err.response.data.error.message });
       }
     }
   };

package/admin/src/permissions/defaultPermissions.js

@@ -76,16 +76,12 @@ const permissions = {
       update: [{ action: 'admin::webhooks.update', subject: null }],
     },
     'api-tokens': {
-      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 },
-      ],
+      main: [{ action: 'admin::api-tokens.access', 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/ca.json

@@ -633,6 +633,8 @@
   "content-manager.plugin.description.short": "Veure, editar i eliminar informació de la base de dades de manera ràpida.",
   "content-manager.popUpWarning.bodyMessage.contentType.delete": "Esteu segur de voler eliminar aquest registre?",
   "content-manager.popUpWarning.bodyMessage.contentType.delete.all": "Esteu segur de voler eliminar aquests registres?",
+  "content-manager.popUpWarning.warning.publish-question": "Encara vols publicar-ho?",
+  "content-manager.popUpwarning.warning.has-draft-relations.button-confirm": "Sí, publicar",
   "content-manager.popover.display-relations.label": "Mostrar relacions",
   "content-manager.success.record.delete": "Eliminat",
   "content-manager.success.record.publish": "Publicat",
@@ -687,4 +689,4 @@
   "request.error.model.unknown": "Aquest model no existeix",
   "skipToContent": "Saltar al contingut",
   "submit": "Enviar"
-}
+}

package/admin/src/translations/de.json

@@ -127,7 +127,7 @@
   "Settings.profile.form.section.experience.clear.select": "Ausgewählte Sprache der Oberfläche zurücksetzen",
   "Settings.profile.form.section.experience.here": "hier",
   "Settings.profile.form.section.experience.interfaceLanguage": "Sprache der Oberfläche",
-  "Settings.profile.form.section.experience.interfaceLanguage.hint": "Dies wird die Oberfläche für dich in der ausgewählten Sprache darstellen.", 
+  "Settings.profile.form.section.experience.interfaceLanguage.hint": "Dies wird die Oberfläche für dich in der ausgewählten Sprache darstellen.",
   "Settings.profile.form.section.experience.interfaceLanguageHelp": "Diese Einstellungen werden nur für dich angewandt. Mehr Informationen dazu {here}.",
   "Settings.profile.form.section.experience.mode.label": "Modus der Oberfläche",
   "Settings.profile.form.section.experience.mode.hint": "Zeigt die Oberfläche im gewählten Modus.",
@@ -631,6 +631,9 @@
   "content-manager.success.record.save": "Gespeichert",
   "content-manager.success.record.unpublish": "Veröffentlichung zurückgenommen",
   "content-manager.utils.data-loaded": "{number, plural, =1 {Der Eintrag wurde} other {Die Einträge wurden}} erfolgreich geladen",
+  "content-manager.popUpWarning.warning.publish-question": "Wollst du diesen Eintrag trotzdem veröffentlichen?",
+  "content-manager.popUpwarning.warning.has-draft-relations.button-confirm": "Ja, veröffentlichen",
+  "content-manager.popUpwarning.warning.has-draft-relations.message": "<b>{count, plural, =0 { von deinen Inhalts-Beziehungen sind} one { von deinen Inhalts-Beziehungen ist} other { von deinen Inhalts-Beziehungen sind}}</b> noch nicht veröffentlicht.<br></br>Das kann zu kaputten Links und Fehlern in deinem Projekt führen.",
   "form.button.done": "Fertig",
   "global.actions": "Aktionen",
   "global.back": "Zurück",

package/admin/src/translations/dk.json

@@ -577,6 +577,9 @@
   "content-manager.success.record.save": "Gemt",
   "content-manager.success.record.unpublish": "Offentliggørelse fjernet",
   "content-manager.utils.data-loaded": "The {number, plural, =1 {element er} other {elementer er}} blevet hentet succesfuldt",
+  "content-manager.popUpWarning.warning.publish-question": "Vil du stadig offentliggøre det?",
+  "content-manager.popUpwarning.warning.has-draft-relations.button-confirm": "Ja, offentliggør",
+  "content-manager.popUpwarning.warning.has-draft-relations.message": "<b>{count, plural, =0 { af dine indholdsrelationer er} one { af dine indholdsrelationer er} other { af dine indholdsrelationer er}}</b> endnu ikke offentliggjort.<br></br>Det kan muligvis føre til links der ikke virker, samt andre fejl i dit projekt.",
   "form.button.done": "Færdig",
   "global.prompt.unsaved": "Er du sikker på at du vil forlade denne side? Alle dine ændringer vil gå tabt",
   "notification.contentType.relations.conflict": "Der er en eller flere konflikter med indholdstypens relationer",

package/admin/src/translations/en.json

@@ -91,10 +91,24 @@
   "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",
@@ -408,7 +422,7 @@
   "app.containers.Users.EditPage.roles-bloc-title": "Attributed roles",
   "app.containers.Users.ModalForm.footer.button-success": "Invite user",
   "app.links.configure-view": "Configure the view",
-  "app.page.not.found": "Oops! We can't seem to find the page you're looging for...",
+  "app.page.not.found": "Oops! We can't seem to find the page you're looking for...",
   "app.static.links.cheatsheet": "CheatSheet",
   "app.utils.SelectOption.defaultMessage": " ",
   "app.utils.add-filter": "Add filter",
@@ -685,6 +699,10 @@
   "content-manager.success.record.unpublish": "Unpublished",
   "content-manager.utils.data-loaded": "The {number, plural, =1 {entry has} other {entries have}} successfully been loaded",
   "content-manager.apiError.This attribute must be unique": "{field} must be unique",
+  "content-manager.popUpWarning.warning.has-draft-relations.title": "Confirmation",
+  "content-manager.popUpWarning.warning.publish-question": "Do you still want to publish?",
+  "content-manager.popUpwarning.warning.has-draft-relations.button-confirm": "Yes, publish",
+  "content-manager.popUpwarning.warning.has-draft-relations.message": "<b>{count, plural, one { relation is } other { relations are } }</b> not published yet and might lead to unexpected behavior.",
   "form.button.continue": "Continue",
   "form.button.done": "Done",
   "global.search": "Search",
@@ -747,6 +765,9 @@
   "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",