@strapi/admin 4.6.2 → 4.7.0-exp.3d6a31eb083e9d44afcf98f68c107fb7567e5720

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(); // TODO: Track different types of tokens
+
+  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>
+                <Typography textColor="neutral800" fontWeight="bold">
+                  {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

@@ -6,26 +6,28 @@ import { Duplicate, Key } from '@strapi/icons';
 import PropTypes from 'prop-types';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 
-const HeaderContentBox = ({ apiToken }) => {
+const TokenBox = ({ token, tokenType }) => {
   const { formatMessage } = useIntl();
   const toggleNotification = useNotification();
-  const { trackUsage } = useTracking();
+  const { trackUsage } = useTracking(); // TODO: Track different types of tokens
   const trackUsageRef = useRef(trackUsage);
 
   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({
@@ -41,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.',
             })
       }
@@ -64,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,69 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+
+import { Select, Option } from '@strapi/design-system';
+
+const TokenTypeSelect = ({ errors, values, onChange, canEditInputs, options, label }) => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <Select
+      name="type"
+      label={formatMessage({
+        id: label.id,
+        defaultMessage: label.defaultMessage,
+      })}
+      value={values?.type}
+      error={
+        errors.type
+          ? formatMessage(
+              errors.type?.id ? errors.type : { id: errors.type, defaultMessage: errors.type }
+            )
+          : null
+      }
+      onChange={onChange}
+      placeholder="Select"
+      required
+      disabled={!canEditInputs}
+    >
+      {options &&
+        options.map(({ value, label }) => (
+          <Option key={value} value={value}>
+            {formatMessage(label)}
+          </Option>
+        ))}
+    </Select>
+  );
+};
+
+TokenTypeSelect.propTypes = {
+  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 = {
+  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/pages/ApiTokens/EditView/components/CollapsableContentType/index.js

@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { capitalize } from 'lodash';
+import { useIntl } from 'react-intl';
 import {
   Accordion,
   AccordionToggle,
@@ -35,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);
@@ -88,7 +90,7 @@ const CollapsableContentType = ({
                     }}
                     disabled={disabled}
                   >
-                    Select all
+                    {formatMessage({ id: 'app.utils.select-all', defaultMessage: 'Select all' })}
                   </Checkbox>
                 </Box>
               </Flex>

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

@@ -1,19 +1,11 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { usePersistentState } from '@strapi/helper-plugin';
 import PropTypes from 'prop-types';
-import {
-  Box,
-  Grid,
-  GridItem,
-  Select,
-  Option,
-  Stack,
-  Textarea,
-  TextInput,
-  Typography,
-} from '@strapi/design-system';
-import { getDateOfExpiration } from '../../utils';
+import { Box, Grid, GridItem, Stack, Typography } from '@strapi/design-system';
+import LifeSpanInput from '../../../../../components/Tokens/LifeSpanInput';
+import TokenName from '../../../../../components/Tokens/TokenName';
+import TokenDescription from '../../../../../components/Tokens/TokenDescription';
+import TokenTypeSelect from '../../../../../components/Tokens/TokenTypeSelect';
 
 const FormApiTokenContainer = ({
   errors,
@@ -26,7 +18,6 @@ const FormApiTokenContainer = ({
   setHasChangedPermissions,
 }) => {
   const { formatMessage } = useIntl();
-  const [lang] = usePersistentState('strapi-admin-language', 'en');
 
   const handleChangeSelectApiTokenType = ({ target: { value } }) => {
     setHasChangedPermissions(false);
@@ -43,6 +34,30 @@ const FormApiTokenContainer = ({
     }
   };
 
+  const typeOptions = [
+    {
+      value: 'read-only',
+      label: {
+        id: 'Settings.apiTokens.types.read-only',
+        defaultMessage: 'Read-only',
+      },
+    },
+    {
+      value: 'full-access',
+      label: {
+        id: 'Settings.apiTokens.types.full-access',
+        defaultMessage: 'Full access',
+      },
+    },
+    {
+      value: 'custom',
+      label: {
+        id: 'Settings.apiTokens.types.custom',
+        defaultMessage: 'Custom',
+      },
+    },
+  ];
+
   return (
     <Box
       background="neutral0"
@@ -62,158 +77,46 @@ const FormApiTokenContainer = ({
         </Typography>
         <Grid gap={5}>
           <GridItem key="name" col={6} xs={12}>
-            <TextInput
-              name="name"
-              error={
-                errors.name
-                  ? formatMessage(
-                      errors.name?.id
-                        ? errors.name
-                        : { id: errors.name, defaultMessage: errors.name }
-                    )
-                  : null
-              }
-              label={formatMessage({
-                id: 'Settings.apiTokens.form.name',
-                defaultMessage: 'Name',
-              })}
+            <TokenName
+              errors={errors}
+              values={values}
+              canEditInputs={canEditInputs}
               onChange={onChange}
-              value={values.name}
-              disabled={!canEditInputs}
-              required
             />
           </GridItem>
           <GridItem key="description" col={6} xs={12}>
-            <Textarea
-              label={formatMessage({
-                id: 'Settings.apiTokens.form.description',
-                defaultMessage: 'Description',
-              })}
-              name="description"
-              error={
-                errors.description
-                  ? formatMessage(
-                      errors.description?.id
-                        ? errors.description
-                        : {
-                            id: errors.description,
-                            defaultMessage: errors.description,
-                          }
-                    )
-                  : null
-              }
+            <TokenDescription
+              errors={errors}
+              values={values}
+              canEditInputs={canEditInputs}
               onChange={onChange}
-              disabled={!canEditInputs}
-            >
-              {values.description}
-            </Textarea>
+            />
           </GridItem>
           <GridItem key="lifespan" col={6} xs={12}>
-            <Select
-              name="lifespan"
-              label={formatMessage({
-                id: 'Settings.apiTokens.form.duration',
-                defaultMessage: 'Token duration',
-              })}
-              value={values.lifespan !== null ? values.lifespan : '0'}
-              error={
-                errors.lifespan
-                  ? formatMessage(
-                      errors.lifespan?.id
-                        ? errors.lifespan
-                        : { id: errors.lifespan, defaultMessage: errors.lifespan }
-                    )
-                  : null
-              }
-              onChange={(value) => {
-                onChange({ target: { name: 'lifespan', value } });
-              }}
-              required
-              disabled={!isCreating}
-              placeholder="Select"
-            >
-              <Option value="604800000">
-                {formatMessage({
-                  id: 'Settings.apiTokens.duration.7-days',
-                  defaultMessage: '7 days',
-                })}
-              </Option>
-              <Option value="2592000000">
-                {formatMessage({
-                  id: 'Settings.apiTokens.duration.30-days',
-                  defaultMessage: '30 days',
-                })}
-              </Option>
-              <Option value="7776000000">
-                {formatMessage({
-                  id: 'Settings.apiTokens.duration.90-days',
-                  defaultMessage: '90 days',
-                })}
-              </Option>
-              <Option value="0">
-                {formatMessage({
-                  id: 'Settings.apiTokens.duration.unlimited',
-                  defaultMessage: 'Unlimited',
-                })}
-              </Option>
-            </Select>
-            <Typography variant="pi" textColor="neutral600">
-              {!isCreating &&
-                `${formatMessage({
-                  id: 'Settings.apiTokens.duration.expiration-date',
-                  defaultMessage: 'Expiration date',
-                })}: ${getDateOfExpiration(
-                  apiToken?.createdAt,
-                  parseInt(values.lifespan, 10),
-                  lang
-                )}`}
-            </Typography>
+            <LifeSpanInput
+              isCreating={isCreating}
+              errors={errors}
+              values={values}
+              onChange={onChange}
+              token={apiToken}
+            />
           </GridItem>
 
           <GridItem key="type" col={6} xs={12}>
-            <Select
-              name="type"
-              label={formatMessage({
+            <TokenTypeSelect
+              values={values}
+              errors={errors}
+              label={{
                 id: 'Settings.apiTokens.form.type',
                 defaultMessage: 'Token type',
-              })}
-              value={values?.type}
-              error={
-                errors.type
-                  ? formatMessage(
-                      errors.type?.id
-                        ? errors.type
-                        : { id: errors.type, defaultMessage: errors.type }
-                    )
-                  : null
-              }
+              }}
               onChange={(value) => {
                 handleChangeSelectApiTokenType({ target: { value } });
                 onChange({ target: { name: 'type', value } });
               }}
-              placeholder="Select"
-              required
-              disabled={!canEditInputs}
-            >
-              <Option value="read-only">
-                {formatMessage({
-                  id: 'Settings.apiTokens.types.read-only',
-                  defaultMessage: 'Read-only',
-                })}
-              </Option>
-              <Option value="full-access">
-                {formatMessage({
-                  id: 'Settings.apiTokens.types.full-access',
-                  defaultMessage: 'Full access',
-                })}
-              </Option>
-              <Option value="custom">
-                {formatMessage({
-                  id: 'Settings.apiTokens.types.custom',
-                  defaultMessage: 'Custom',
-                })}
-              </Option>
-            </Select>
+              options={typeOptions}
+              canEditInputs={canEditInputs}
+            />
           </GridItem>
         </Grid>
       </Stack>

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

@@ -9,7 +9,11 @@ import { useRegenerate } from '../../../../../../../hooks';
 export const Regenerate = ({ onRegenerate, idToRegenerate }) => {
   const { formatMessage } = useIntl();
   const [showConfirmDialog, setShowConfirmDialog] = useState(false);
-  const { regenerateData, isLoadingConfirmation } = useRegenerate(idToRegenerate, onRegenerate);
+  const { regenerateData, isLoadingConfirmation } = useRegenerate(
+    '/admin/api-tokens/',
+    idToRegenerate,
+    onRegenerate
+  );
   const handleConfirmRegeneration = async () => {
     regenerateData();
     setShowConfirmDialog(false);