@strapi/admin 4.6.0 → 4.7.0-beta.0

package/admin/src/pages/ProfilePage/utils/api.js

@@ -1,15 +1,17 @@
 import omit from 'lodash/omit';
-import { axiosInstance } from '../../../core/utils';
+import { getFetchClient } from '@strapi/helper-plugin';
 
 const fetchUser = async () => {
-  const { data } = await axiosInstance.get('/admin/users/me');
+  const { get } = getFetchClient();
+  const { data } = await get('/admin/users/me');
 
   return data.data;
 };
 
 const putUser = async (body) => {
   const dataToSend = omit(body, ['confirmPassword', 'currentTheme']);
-  const { data } = await axiosInstance.put('/admin/users/me', dataToSend);
+  const { put } = getFetchClient();
+  const { data } = await put('/admin/users/me', dataToSend);
 
   return { ...data.data, currentTheme: body.currentTheme };
 };

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { Link } from '@strapi/helper-plugin';
 import PropTypes from 'prop-types';
+import { Link } from '@strapi/helper-plugin';
 import ArrowLeft from '@strapi/icons/ArrowLeft';
 import Check from '@strapi/icons/Check';
 import { Button } from '@strapi/design-system/Button';
@@ -9,29 +9,36 @@ import { HeaderLayout } from '@strapi/design-system/Layout';
 import { Stack } from '@strapi/design-system/Stack';
 import Regenerate from '../Regenerate';
 
-const FormHead = ({ apiToken, setApiToken, canEditInputs, canRegenerate, isSubmitting }) => {
+const FormHead = ({
+  title,
+  token,
+  setToken,
+  canEditInputs,
+  canRegenerate,
+  isSubmitting,
+  backUrl,
+  regenerateUrl,
+}) => {
   const { formatMessage } = useIntl();
   const handleRegenerate = (newKey) => {
-    setApiToken({
-      ...apiToken,
+    setToken({
+      ...token,
       accessKey: newKey,
     });
   };
 
   return (
     <HeaderLayout
-      title={
-        apiToken?.name ||
-        formatMessage({
-          id: 'Settings.apiTokens.createPage.title',
-          defaultMessage: 'Create API Token',
-        })
-      }
+      title={token?.name || formatMessage(title)}
       primaryAction={
         canEditInputs ? (
           <Stack horizontal spacing={2}>
-            {canRegenerate && apiToken?.id && (
-              <Regenerate onRegenerate={handleRegenerate} idToRegenerate={apiToken?.id} />
+            {canRegenerate && token?.id && (
+              <Regenerate
+                backUrl={regenerateUrl}
+                onRegenerate={handleRegenerate}
+                idToRegenerate={token?.id}
+              />
             )}
             <Button
               disabled={isSubmitting}
@@ -48,13 +55,17 @@ const FormHead = ({ apiToken, setApiToken, canEditInputs, canRegenerate, isSubmi
           </Stack>
         ) : (
           canRegenerate &&
-          apiToken?.id && (
-            <Regenerate onRegenerate={handleRegenerate} idToRegenerate={apiToken?.id} />
+          token?.id && (
+            <Regenerate
+              onRegenerate={handleRegenerate}
+              idToRegenerate={token?.id}
+              backUrl={regenerateUrl}
+            />
           )
         )
       }
       navigationAction={
-        <Link startIcon={<ArrowLeft />} to="/settings/api-tokens">
+        <Link startIcon={<ArrowLeft />} to={backUrl}>
           {formatMessage({
             id: 'global.back',
             defaultMessage: 'Back',
@@ -66,7 +77,7 @@ const FormHead = ({ apiToken, setApiToken, canEditInputs, canRegenerate, isSubmi
 };
 
 FormHead.propTypes = {
-  apiToken: PropTypes.shape({
+  token: PropTypes.shape({
     id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     type: PropTypes.string,
     lifespan: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
@@ -78,12 +89,18 @@ FormHead.propTypes = {
   }),
   canEditInputs: PropTypes.bool.isRequired,
   canRegenerate: PropTypes.bool.isRequired,
-  setApiToken: PropTypes.func.isRequired,
+  setToken: PropTypes.func.isRequired,
   isSubmitting: PropTypes.bool.isRequired,
+  backUrl: PropTypes.string.isRequired,
+  title: PropTypes.shape({
+    id: PropTypes.string,
+    label: PropTypes.string,
+  }).isRequired,
+  regenerateUrl: PropTypes.string.isRequired,
 };
 
 FormHead.defaultProps = {
-  apiToken: undefined,
+  token: undefined,
 };
 
 export default FormHead;

package/admin/src/pages/SettingsPage/components/Tokens/FormiTokenContainer/LifeSpanInput.js

@@ -0,0 +1,96 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+import { usePersistentState } from '@strapi/helper-plugin';
+import { Select, Option } from '@strapi/design-system/Select';
+import { Typography } from '@strapi/design-system/Typography';
+import { getDateOfExpiration } from '../../../pages/ApiTokens/EditView/utils';
+
+const LifeSpanInput = ({ token, errors, values, onChange, disabled }) => {
+  const { formatMessage } = useIntl();
+  const [lang] = usePersistentState('strapi-admin-language', 'en');
+
+  return (
+    <>
+      <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={disabled}
+        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">
+        {disabled &&
+          `${formatMessage({
+            id: 'Settings.apiTokens.duration.expiration-date',
+            defaultMessage: 'Expiration date',
+          })}: ${getDateOfExpiration(token?.createdAt, parseInt(values.lifespan, 10, lang))}`}
+      </Typography>
+    </>
+  );
+};
+
+LifeSpanInput.propTypes = {
+  errors: PropTypes.string,
+  onChange: PropTypes.func.isRequired,
+  values: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
+  disabled: PropTypes.bool.isRequired,
+  token: PropTypes.shape({
+    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+    type: PropTypes.string,
+    lifespan: PropTypes.string,
+    name: PropTypes.string,
+    accessKey: PropTypes.string,
+    permissions: PropTypes.array,
+    description: PropTypes.string,
+    createdAt: PropTypes.string,
+  }),
+};
+
+LifeSpanInput.defaultProps = {
+  errors: {},
+  token: {},
+};
+
+export default LifeSpanInput;

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

@@ -0,0 +1,98 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+import { Select, Option } from '@strapi/design-system/Select';
+import { Typography } from '@strapi/design-system/Typography';
+import { getDateOfExpiration } from '../../../pages/ApiTokens/EditView/utils';
+
+const LifeSpanInput = ({ token, errors, values, onChange, isCreating }) => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <>
+      <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.tokens.duration.7-days',
+            defaultMessage: '7 days',
+          })}
+        </Option>
+        <Option value="2592000000">
+          {formatMessage({
+            id: 'Settings.tokens.duration.30-days',
+            defaultMessage: '30 days',
+          })}
+        </Option>
+        <Option value="7776000000">
+          {formatMessage({
+            id: 'Settings.tokens.duration.90-days',
+            defaultMessage: '90 days',
+          })}
+        </Option>
+        <Option value="0">
+          {formatMessage({
+            id: 'Settings.tokens.duration.unlimited',
+            defaultMessage: 'Unlimited',
+          })}
+        </Option>
+      </Select>
+      <Typography variant="pi" textColor="neutral600">
+        {!isCreating &&
+          `${formatMessage({
+            id: 'Settings.tokens.duration.expiration-date',
+            defaultMessage: 'Expiration date',
+          })}: ${getDateOfExpiration(token?.createdAt, parseInt(values.lifespan, 10))}`}
+      </Typography>
+    </>
+  );
+};
+
+LifeSpanInput.propTypes = {
+  errors: PropTypes.shape({
+    lifespan: PropTypes.string,
+  }),
+  onChange: PropTypes.func.isRequired,
+  values: PropTypes.shape({
+    lifespan: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  }).isRequired,
+  isCreating: PropTypes.bool.isRequired,
+  token: PropTypes.shape({
+    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+    type: PropTypes.string,
+    lifespan: PropTypes.string,
+    name: PropTypes.string,
+    accessKey: PropTypes.string,
+    permissions: PropTypes.array,
+    description: PropTypes.string,
+    createdAt: PropTypes.string,
+  }),
+};
+
+LifeSpanInput.defaultProps = {
+  errors: {},
+  token: {},
+};
+
+export default LifeSpanInput;

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

@@ -0,0 +1,73 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+import { Button } from '@strapi/design-system/Button';
+import Refresh from '@strapi/icons/Refresh';
+import { ConfirmDialog } from '@strapi/helper-plugin';
+import { useRegenerate } from '../../../../../hooks';
+
+export const Regenerate = ({ onRegenerate, idToRegenerate, backUrl }) => {
+  const { formatMessage } = useIntl();
+  const [showConfirmDialog, setShowConfirmDialog] = useState(false);
+  const { regenerateData, isLoadingConfirmation } = useRegenerate(
+    backUrl,
+    idToRegenerate,
+    onRegenerate
+  );
+  const handleConfirmRegeneration = async () => {
+    regenerateData();
+    setShowConfirmDialog(false);
+  };
+
+  return (
+    <>
+      <Button
+        startIcon={<Refresh />}
+        type="button"
+        size="S"
+        variant="tertiary"
+        onClick={() => setShowConfirmDialog(true)}
+        name="regenerate"
+      >
+        {formatMessage({
+          id: 'Settings.apiTokens.regenerate',
+          defaultMessage: 'Regenerate',
+        })}
+      </Button>
+
+      <ConfirmDialog
+        bodyText={{
+          id: 'Settings.apiTokens.popUpWarning.message',
+          defaultMessage: 'Are you sure you want to regenerate this token?',
+        }}
+        iconRightButton={<Refresh />}
+        isConfirmButtonLoading={isLoadingConfirmation}
+        isOpen={showConfirmDialog}
+        onToggleDialog={() => setShowConfirmDialog(false)}
+        onConfirm={handleConfirmRegeneration}
+        leftButtonText={{
+          id: 'Settings.apiTokens.Button.cancel',
+          defaultMessage: 'Cancel',
+        }}
+        rightButtonText={{
+          id: 'Settings.apiTokens.Button.regenerate',
+          defaultMessage: 'Regenerate',
+        }}
+        title={{
+          id: 'Settings.apiTokens.RegenerateDialog.title',
+          defaultMessage: 'Regenerate token',
+        }}
+      />
+    </>
+  );
+};
+
+Regenerate.defaultProps = { onRegenerate() {} };
+
+Regenerate.propTypes = {
+  onRegenerate: PropTypes.func,
+  idToRegenerate: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
+  backUrl: PropTypes.string.isRequired,
+};
+
+export default Regenerate;

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

@@ -1,9 +1,9 @@
 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';
+import { Link } from '@strapi/helper-plugin';
 
 const MESSAGES_MAP = {
   edit: {

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

@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 
 const DeleteButton = ({ tokenName, onClickDelete }) => {
   const { formatMessage } = useIntl();
-  const { trackUsage } = useTracking();
+  const { trackUsage } = useTracking(); // TODO: Track different types of tokens
 
   return (
     <Box paddingLeft={1} {...stopPropagation}>

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

@@ -0,0 +1,135 @@
+import React from 'react';
+import { useHistory } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import { Typography } from '@strapi/design-system/Typography';
+import { Tbody, Tr, Td } from '@strapi/design-system/Table';
+import { Flex } from '@strapi/design-system/Flex';
+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 }) => {
+  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');
+                  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)}
+                      />
+                    )}
+                  </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,
+};
+
+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,32 +1,32 @@
 import React, { useRef } from 'react';
 import { useIntl } from 'react-intl';
+import PropTypes from 'prop-types';
+import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { ContentBox, useNotification, useTracking } from '@strapi/helper-plugin';
 import { IconButton } from '@strapi/design-system/IconButton';
 import Duplicate from '@strapi/icons/Duplicate';
-import PropTypes from 'prop-types';
-import { CopyToClipboard } from 'react-copy-to-clipboard';
 import Key from '@strapi/icons/Key';
 
-const HeaderContentBox = ({ apiToken }) => {
+const TokenBox = ({ token }) => {
   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');
                 toggleNotification({
                   type: 'success',
-                  message: { id: 'Settings.apiTokens.notification.copied' },
+                  message: { id: 'Settings.tokens.notification.copied' },
                 });
               }}
-              text={apiToken}
+              text={token}
             >
               <IconButton
                 label={formatMessage({
@@ -42,20 +42,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 +65,12 @@ const HeaderContentBox = ({ apiToken }) => {
   );
 };
 
-HeaderContentBox.defaultProps = {
-  apiToken: null,
+TokenBox.defaultProps = {
+  token: null,
 };
 
-HeaderContentBox.propTypes = {
-  apiToken: PropTypes.string,
+TokenBox.propTypes = {
+  token: PropTypes.string,
 };
 
-export default HeaderContentBox;
+export default TokenBox;