@strapi/admin 4.9.0-alpha.0 → 4.9.0-beta.2

package/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/index.js

@@ -0,0 +1,52 @@
+import React, { useState } from 'react';
+import { Trash } from '@strapi/icons';
+import { IconButton, Box } from '@strapi/design-system';
+import { useTracking, ConfirmDialog } from '@strapi/helper-plugin';
+import { useIntl } from 'react-intl';
+import PropTypes from 'prop-types';
+
+const DeleteButton = ({ tokenName, onClickDelete, tokenType }) => {
+  const { formatMessage } = useIntl();
+  const { trackUsage } = useTracking();
+  const [showConfirmDialog, setShowConfirmDialog] = useState(false);
+  const handleClickDelete = () => {
+    setShowConfirmDialog(false);
+    trackUsage('willDeleteToken', {
+      tokenType,
+    });
+    onClickDelete();
+  };
+
+  return (
+    <Box paddingLeft={1} onClick={(e) => e.stopPropagation()}>
+      <IconButton
+        onClick={() => {
+          setShowConfirmDialog(true);
+        }}
+        label={formatMessage(
+          {
+            id: 'global.delete-target',
+            defaultMessage: 'Delete {target}',
+          },
+          { target: `${tokenName}` }
+        )}
+        name="delete"
+        noBorder
+        icon={<Trash />}
+      />
+      <ConfirmDialog
+        onToggleDialog={() => setShowConfirmDialog(false)}
+        onConfirm={handleClickDelete}
+        isOpen={showConfirmDialog}
+      />
+    </Box>
+  );
+};
+
+DeleteButton.propTypes = {
+  tokenName: PropTypes.string.isRequired,
+  onClickDelete: PropTypes.func.isRequired,
+  tokenType: PropTypes.string.isRequired,
+};
+
+export default DeleteButton;

package/admin/src/pages/SettingsPage/{pages/ApiTokens/ListView/DynamicTable → components/Tokens/Table}/ReadButton/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import Eye from '@strapi/icons/Eye';
+import { Eye } from '@strapi/icons';
 import PropTypes from 'prop-types';
 import DefaultButton from '../DefaultButton';
 

package/admin/src/pages/SettingsPage/{pages/ApiTokens/ListView/DynamicTable → components/Tokens/Table}/UpdateButton/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import Pencil from '@strapi/icons/Pencil';
+import { Pencil } from '@strapi/icons';
 import PropTypes from 'prop-types';
 import DefaultButton from '../DefaultButton';
 

package/admin/src/pages/SettingsPage/components/Tokens/Table/index.js

@@ -0,0 +1,145 @@
+import React from 'react';
+import { useHistory } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import { Typography, Flex, Tbody, Tr, Td } from '@strapi/design-system';
+import {
+  RelativeTime,
+  onRowClick,
+  pxToRem,
+  DynamicTable,
+  useQueryParams,
+  useTracking,
+} from '@strapi/helper-plugin';
+import DeleteButton from './DeleteButton';
+import UpdateButton from './UpdateButton';
+import ReadButton from './ReadButton';
+
+const Table = ({
+  permissions,
+  headers,
+  contentType,
+  isLoading,
+  tokens,
+  onConfirmDelete,
+  tokenType,
+}) => {
+  const { canDelete, canUpdate, canRead } = permissions;
+  const withBulkActions = canDelete || canUpdate || canRead;
+  const [{ query }] = useQueryParams();
+  const [, sortOrder] = query ? query.sort.split(':') : 'ASC';
+  const {
+    push,
+    location: { pathname },
+  } = useHistory();
+  const { trackUsage } = useTracking();
+
+  const sortedTokens = tokens.sort((a, b) => {
+    const comparison = a.name.localeCompare(b.name);
+
+    return sortOrder === 'DESC' ? -comparison : comparison;
+  });
+
+  return (
+    <DynamicTable
+      headers={headers}
+      contentType={contentType}
+      rows={tokens}
+      withBulkActions={withBulkActions}
+      isLoading={isLoading}
+      onConfirmDelete={onConfirmDelete}
+    >
+      <Tbody>
+        {sortedTokens.map((token) => {
+          return (
+            <Tr
+              key={token.id}
+              {...onRowClick({
+                fn() {
+                  trackUsage('willEditTokenFromList', {
+                    tokenType,
+                  });
+                  push(`${pathname}/${token.id}`);
+                },
+                condition: canUpdate,
+              })}
+            >
+              <Td maxWidth={pxToRem(250)}>
+                <Typography textColor="neutral800" fontWeight="bold" ellipsis>
+                  {token.name}
+                </Typography>
+              </Td>
+              <Td maxWidth={pxToRem(250)}>
+                <Typography textColor="neutral800" ellipsis>
+                  {token.description}
+                </Typography>
+              </Td>
+              <Td>
+                <Typography textColor="neutral800">
+                  <RelativeTime timestamp={new Date(token.createdAt)} />
+                </Typography>
+              </Td>
+              <Td>
+                {token.lastUsedAt && (
+                  <Typography textColor="neutral800">
+                    <RelativeTime timestamp={new Date(token.lastUsedAt)} />
+                  </Typography>
+                )}
+              </Td>
+
+              {withBulkActions && (
+                <Td>
+                  <Flex justifyContent="end">
+                    {canUpdate && <UpdateButton tokenName={token.name} tokenId={token.id} />}
+                    {!canUpdate && canRead && (
+                      <ReadButton tokenName={token.name} tokenId={token.id} />
+                    )}
+                    {canDelete && (
+                      <DeleteButton
+                        tokenName={token.name}
+                        onClickDelete={() => onConfirmDelete(token.id)}
+                        tokenType={tokenType}
+                      />
+                    )}
+                  </Flex>
+                </Td>
+              )}
+            </Tr>
+          );
+        })}
+      </Tbody>
+    </DynamicTable>
+  );
+};
+
+Table.propTypes = {
+  tokens: PropTypes.array,
+  permissions: PropTypes.shape({
+    canRead: PropTypes.bool,
+    canDelete: PropTypes.bool,
+    canUpdate: PropTypes.bool,
+  }).isRequired,
+  headers: PropTypes.arrayOf(
+    PropTypes.shape({
+      cellFormatter: PropTypes.func,
+      key: PropTypes.string.isRequired,
+      metadatas: PropTypes.shape({
+        label: PropTypes.string.isRequired,
+        sortable: PropTypes.bool,
+      }).isRequired,
+      name: PropTypes.string.isRequired,
+    })
+  ),
+  contentType: PropTypes.string.isRequired,
+  isLoading: PropTypes.bool,
+  onConfirmDelete: PropTypes.func,
+  tokenType: PropTypes.string.isRequired,
+};
+
+Table.defaultProps = {
+  tokens: [],
+  headers: [],
+  isLoading: false,
+  onConfirmDelete() {},
+};
+
+export default Table;

package/admin/src/pages/SettingsPage/{pages/ApiTokens/EditView/components/ContentBox → components/Tokens/TokenBox}/index.js

@@ -1,13 +1,12 @@
 import React, { useRef } from 'react';
 import { useIntl } from 'react-intl';
 import { ContentBox, useNotification, useTracking } from '@strapi/helper-plugin';
-import { IconButton } from '@strapi/design-system/IconButton';
-import Duplicate from '@strapi/icons/Duplicate';
+import { IconButton } from '@strapi/design-system';
+import { Duplicate, Key } from '@strapi/icons';
 import PropTypes from 'prop-types';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import Key from '@strapi/icons/Key';
 
-const HeaderContentBox = ({ apiToken }) => {
+const TokenBox = ({ token, tokenType }) => {
   const { formatMessage } = useIntl();
   const toggleNotification = useNotification();
   const { trackUsage } = useTracking();
@@ -16,17 +15,19 @@ const HeaderContentBox = ({ apiToken }) => {
   return (
     <ContentBox
       endAction={
-        apiToken && (
+        token && (
           <span style={{ alignSelf: 'start' }}>
             <CopyToClipboard
               onCopy={() => {
-                trackUsageRef.current('didCopyTokenKey');
+                trackUsageRef.current('didCopyTokenKey', {
+                  tokenType,
+                });
                 toggleNotification({
                   type: 'success',
-                  message: { id: 'Settings.apiTokens.notification.copied' },
+                  message: { id: 'Settings.tokens.notification.copied' },
                 });
               }}
-              text={apiToken}
+              text={token}
             >
               <IconButton
                 label={formatMessage({
@@ -42,20 +43,20 @@ const HeaderContentBox = ({ apiToken }) => {
         )
       }
       title={
-        apiToken ||
+        token ||
         formatMessage({
-          id: 'Settings.apiTokens.copy.editTitle',
+          id: 'Settings.tokens.copy.editTitle',
           defaultMessage: 'This token isn’t accessible anymore.',
         })
       }
       subtitle={
-        apiToken
+        token
           ? formatMessage({
-              id: 'Settings.apiTokens.copy.lastWarning',
+              id: 'Settings.tokens.copy.lastWarning',
               defaultMessage: 'Make sure to copy this token, you won’t be able to see it again!',
             })
           : formatMessage({
-              id: 'Settings.apiTokens.copy.editMessage',
+              id: 'Settings.tokens.copy.editMessage',
               defaultMessage: 'For security reasons, you can only see your token once.',
             })
       }
@@ -65,12 +66,13 @@ const HeaderContentBox = ({ apiToken }) => {
   );
 };
 
-HeaderContentBox.defaultProps = {
-  apiToken: null,
+TokenBox.defaultProps = {
+  token: null,
 };
 
-HeaderContentBox.propTypes = {
-  apiToken: PropTypes.string,
+TokenBox.propTypes = {
+  token: PropTypes.string,
+  tokenType: PropTypes.string.isRequired,
 };
 
-export default HeaderContentBox;
+export default TokenBox;

package/admin/src/pages/SettingsPage/components/Tokens/TokenDescription/index.js

@@ -0,0 +1,51 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+import { Textarea } from '@strapi/design-system';
+
+const TokenDescription = ({ errors, values, onChange, canEditInputs }) => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <Textarea
+      label={formatMessage({
+        id: 'Settings.tokens.form.description',
+        defaultMessage: 'Description',
+      })}
+      name="description"
+      error={
+        errors.description
+          ? formatMessage(
+              errors.description?.id
+                ? errors.description
+                : {
+                    id: errors.description,
+                    defaultMessage: errors.description,
+                  }
+            )
+          : null
+      }
+      onChange={onChange}
+      disabled={!canEditInputs}
+    >
+      {values.description}
+    </Textarea>
+  );
+};
+
+TokenDescription.propTypes = {
+  errors: PropTypes.shape({
+    description: PropTypes.string,
+  }),
+  onChange: PropTypes.func.isRequired,
+  canEditInputs: PropTypes.bool.isRequired,
+  values: PropTypes.shape({
+    description: PropTypes.string,
+  }).isRequired,
+};
+
+TokenDescription.defaultProps = {
+  errors: {},
+};
+
+export default TokenDescription;

package/admin/src/pages/SettingsPage/components/Tokens/TokenName/index.js

@@ -0,0 +1,46 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+import { TextInput } from '@strapi/design-system';
+
+const TokenName = ({ errors, values, onChange, canEditInputs }) => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <TextInput
+      name="name"
+      error={
+        errors.name
+          ? formatMessage(
+              errors.name?.id ? errors.name : { id: errors.name, defaultMessage: errors.name }
+            )
+          : null
+      }
+      label={formatMessage({
+        id: 'Settings.tokens.form.name',
+        defaultMessage: 'Name',
+      })}
+      onChange={onChange}
+      value={values.name}
+      disabled={!canEditInputs}
+      required
+    />
+  );
+};
+
+TokenName.propTypes = {
+  errors: PropTypes.shape({
+    name: PropTypes.string,
+  }),
+  onChange: PropTypes.func.isRequired,
+  canEditInputs: PropTypes.bool.isRequired,
+  values: PropTypes.shape({
+    name: PropTypes.string,
+  }).isRequired,
+};
+
+TokenName.defaultProps = {
+  errors: {},
+};
+
+export default TokenName;

package/admin/src/pages/SettingsPage/components/Tokens/TokenTypeSelect/index.js

@@ -0,0 +1,71 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+
+import { Select, Option } from '@strapi/design-system';
+
+const TokenTypeSelect = ({ name, errors, values, onChange, canEditInputs, options, label }) => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <Select
+      name={name}
+      label={formatMessage({
+        id: label.id,
+        defaultMessage: label.defaultMessage,
+      })}
+      value={values && values[name]}
+      error={
+        errors[name]
+          ? formatMessage(
+              errors[name]?.id ? errors[name] : { id: errors[name], defaultMessage: errors[name] }
+            )
+          : null
+      }
+      onChange={onChange}
+      placeholder="Select"
+      required
+      disabled={!canEditInputs}
+    >
+      {options &&
+        options.map(({ value, label }) => (
+          <Option key={value} value={value}>
+            {formatMessage(label)}
+          </Option>
+        ))}
+    </Select>
+  );
+};
+
+TokenTypeSelect.propTypes = {
+  name: PropTypes.string,
+  options: PropTypes.arrayOf(
+    PropTypes.shape({
+      label: PropTypes.shape({
+        id: PropTypes.string,
+        defaultMessage: PropTypes.string,
+      }),
+      value: PropTypes.string,
+    })
+  ),
+  errors: PropTypes.shape({
+    type: PropTypes.string,
+  }),
+  onChange: PropTypes.func.isRequired,
+  canEditInputs: PropTypes.bool.isRequired,
+  values: PropTypes.shape({
+    type: PropTypes.string,
+  }).isRequired,
+  label: PropTypes.shape({
+    id: PropTypes.string,
+    defaultMessage: PropTypes.string,
+  }).isRequired,
+};
+
+TokenTypeSelect.defaultProps = {
+  name: 'type',
+  errors: {},
+  options: [],
+};
+
+export default TokenTypeSelect;

package/admin/src/pages/SettingsPage/components/Tokens/constants.js

@@ -0,0 +1,2 @@
+export const API_TOKEN_TYPE = 'api-token';
+export const TRANSFER_TOKEN_TYPE = 'transfer-token';

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

@@ -12,7 +12,7 @@
 import React, { memo, useMemo } from 'react';
 import { LoadingIndicatorPage, useStrapiApp } from '@strapi/helper-plugin';
 import { Switch, Redirect, Route, useParams } from 'react-router-dom';
-import { Layout } from '@strapi/design-system/Layout';
+import { Layout } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
 import { Helmet } from 'react-helmet';
 import { useSettingsMenu } from '../../hooks';

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

@@ -1,8 +1,6 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { Typography } from '@strapi/design-system/Typography';
-import { Stack } from '@strapi/design-system/Stack';
-import { GridItem } from '@strapi/design-system/Grid';
+import { Typography, Flex, GridItem } from '@strapi/design-system';
 import BoundRoute from '../BoundRoute';
 import { useApiTokenPermissionsContext } from '../../../../../../../contexts/ApiTokenPermissions';
 
@@ -24,16 +22,16 @@ const ActionBoundRoutes = () => {
       style={{ minHeight: '100%' }}
     >
       {selectedAction ? (
-        <Stack spacing={2}>
+        <Flex direction="column" alignItems="stretch" gap={2}>
           {routes[actionSection]?.map((route) => {
             return route.config.auth?.scope?.includes(selectedAction) ||
               route.handler === selectedAction ? (
               <BoundRoute key={route.handler} route={route} />
             ) : null;
           })}
-        </Stack>
+        </Flex>
       ) : (
-        <Stack spacing={2}>
+        <Flex direction="column" alignItems="stretch" gap={2}>
           <Typography variant="delta" as="h3">
             {formatMessage({
               id: 'Settings.apiTokens.createPage.permissions.header.title',
@@ -47,7 +45,7 @@ const ActionBoundRoutes = () => {
                 "Select the application's actions or the plugin's actions and click on the cog icon to display the bound route",
             })}
           </Typography>
-        </Stack>
+        </Flex>
       )}
     </GridItem>
   );

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

@@ -1,8 +1,6 @@
 import React from 'react';
 import styled from 'styled-components';
-import { Stack } from '@strapi/design-system/Stack';
-import { Box } from '@strapi/design-system/Box';
-import { Typography } from '@strapi/design-system/Typography';
+import { Flex, Box, Typography } from '@strapi/design-system';
 import map from 'lodash/map';
 import tail from 'lodash/tail';
 import { useIntl } from 'react-intl';
@@ -23,7 +21,7 @@ function BoundRoute({ route }) {
   const colors = getMethodColor(route.method);
 
   return (
-    <Stack spacing={2}>
+    <Flex direction="column" alignItems="stretch" gap={2}>
       <Typography variant="delta" as="h3">
         {formatMessage({
           id: 'Settings.apiTokens.createPage.BoundRoute.title',
@@ -35,7 +33,7 @@ function BoundRoute({ route }) {
           .{action}
         </Typography>
       </Typography>
-      <Stack horizontal hasRadius background="neutral0" borderColor="neutral200" spacing={0}>
+      <Flex hasRadius background="neutral0" borderColor="neutral200" gap={0}>
         <MethodBox background={colors.background} borderColor={colors.border} padding={2}>
           <Typography fontWeight="bold" textColor={colors.text}>
             {method}
@@ -48,8 +46,8 @@ function BoundRoute({ route }) {
             </Typography>
           ))}
         </Box>
-      </Stack>
-    </Stack>
+      </Flex>
+    </Flex>
   );
 }
 

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/CheckBoxWrapper.js

@@ -1,5 +1,5 @@
 import styled, { css } from 'styled-components';
-import { Box } from '@strapi/design-system/Box';
+import { Box } from '@strapi/design-system';
 
 const activeCheckboxWrapperStyles = css`
   background: ${(props) => props.theme.colors.primary100};

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

@@ -1,12 +1,18 @@
 import React, { useState, useEffect } from 'react';
-import { capitalize } from 'lodash';
-import { Accordion, AccordionToggle, AccordionContent } from '@strapi/design-system/Accordion';
-import { Checkbox } from '@strapi/design-system/Checkbox';
-import { Grid, GridItem } from '@strapi/design-system/Grid';
-import { Typography } from '@strapi/design-system/Typography';
-import { Box } from '@strapi/design-system/Box';
-import { Flex } from '@strapi/design-system/Flex';
-import CogIcon from '@strapi/icons/Cog';
+import capitalize from 'lodash/capitalize';
+import { useIntl } from 'react-intl';
+import {
+  Accordion,
+  AccordionToggle,
+  AccordionContent,
+  Checkbox,
+  Grid,
+  GridItem,
+  Typography,
+  Box,
+  Flex,
+} from '@strapi/design-system';
+import { Cog } from '@strapi/icons';
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
 import { useApiTokenPermissionsContext } from '../../../../../../../contexts/ApiTokenPermissions';
@@ -30,6 +36,7 @@ const CollapsableContentType = ({
     value: { onChangeSelectAll, onChange, selectedActions, setSelectedAction, selectedAction },
   } = useApiTokenPermissionsContext();
   const [expanded, setExpanded] = useState(false);
+  const { formatMessage } = useIntl();
 
   const handleExpandedAccordion = () => {
     setExpanded((s) => !s);
@@ -83,7 +90,7 @@ const CollapsableContentType = ({
                     }}
                     disabled={disabled}
                   >
-                    Select all
+                    {formatMessage({ id: 'app.utils.select-all', defaultMessage: 'Select all' })}
                   </Checkbox>
                 </Box>
               </Flex>
@@ -115,7 +122,7 @@ const CollapsableContentType = ({
                             }
                             style={{ display: 'inline-flex', alignItems: 'center' }}
                           >
-                            <CogIcon />
+                            <Cog />
                           </button>
                         </CheckboxWrapper>
                       </GridItem>

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

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { Box } from '@strapi/design-system/Box';
+import { Box } from '@strapi/design-system';
 import CollapsableContentType from '../CollapsableContentType';
 
 const ContentTypesSection = ({ section, ...props }) => {