@strapi/admin 4.4.0-beta.4 → 4.4.0-rc.0

package/admin/src/StrapiApp.js

@@ -22,6 +22,7 @@ import {
 } from './exposedHooks';
 import injectionZones from './injectionZones';
 import favicon from './favicon.ico';
+import localStorageKey from './components/LanguageProvider/utils/localStorageKey';
 
 class StrapiApp {
   constructor({ adminConfig, appPlugins, library, middlewares, reducers }) {
@@ -449,6 +450,7 @@ class StrapiApp {
                 href: this.configurations.head.favicon,
               },
             ]}
+            htmlAttributes={{ lang: localStorage.getItem(localStorageKey) || 'en' }}
           />
           <BrowserRouter basename={basename}>
             <App store={store} />

package/admin/src/components/AuthenticatedApp/index.js

@@ -65,11 +65,11 @@ const AuthenticatedApp = () => {
     if (userRoles) {
       const isUserSuperAdmin = userRoles.find(({ code }) => code === 'strapi-super-admin');
 
-      if (isUserSuperAdmin) {
+      if (isUserSuperAdmin && appInfos?.autoReload) {
         setGuidedTourVisibilityRef.current(true);
       }
     }
-  }, [userRoles]);
+  }, [userRoles, appInfos]);
 
   // We don't need to wait for the release query to be fetched before rendering the plugins
   // however, we need the appInfos and the permissions

package/admin/src/components/LanguageProvider/index.js

@@ -21,6 +21,7 @@ const LanguageProvider = ({ children, localeNames, messages }) => {
   useEffect(() => {
     // Set user language in local storage.
     window.localStorage.setItem(localStorageKey, locale);
+    document.documentElement.setAttribute('lang', locale);
   }, [locale]);
 
   const changeLocale = (locale) => {

package/admin/src/components/ThemeToggleProvider/index.js

@@ -4,7 +4,7 @@
  *
  */
 
-import React, { useState } from 'react';
+import React, { useState, useMemo, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { ThemeToggleContext } from '../../contexts';
 
@@ -14,22 +14,33 @@ const getDefaultTheme = () => {
   const browserTheme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
   const persistedTheme = localStorage.getItem(THEME_KEY);
 
+  if (!persistedTheme) {
+    localStorage.setItem(THEME_KEY, browserTheme);
+  }
+
   return persistedTheme || browserTheme;
 };
 
 const ThemeToggleProvider = ({ children, themes }) => {
   const [currentTheme, setCurrentTheme] = useState(getDefaultTheme());
 
-  const handleChangeTheme = (nextTheme) => {
-    setCurrentTheme(nextTheme);
-    localStorage.setItem(THEME_KEY, nextTheme);
-  };
-
-  return (
-    <ThemeToggleContext.Provider value={{ currentTheme, onChangeTheme: handleChangeTheme, themes }}>
-      {children}
-    </ThemeToggleContext.Provider>
+  const handleChangeTheme = useCallback(
+    (nextTheme) => {
+      setCurrentTheme(nextTheme);
+      localStorage.setItem(THEME_KEY, nextTheme);
+    },
+    [setCurrentTheme]
   );
+
+  const themeValues = useMemo(() => {
+    return {
+      currentTheme,
+      onChangeTheme: handleChangeTheme,
+      themes,
+    };
+  }, [currentTheme, handleChangeTheme, themes]);
+
+  return <ThemeToggleContext.Provider value={themeValues}>{children}</ThemeToggleContext.Provider>;
 };
 
 ThemeToggleProvider.propTypes = {

package/admin/src/content-manager/components/InputJSON/index.js

@@ -79,6 +79,8 @@ class InputJSON extends React.Component {
     try {
       if (value === null) return this.codeMirror.setValue('');
 
+      if (value === 0) return this.codeMirror.setValue('0');
+
       return this.codeMirror.setValue(value);
     } catch (err) {
       return this.setState({ error: true });

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

@@ -0,0 +1,254 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { usePersistentState } from '@strapi/helper-plugin';
+import PropTypes from 'prop-types';
+import { Box } from '@strapi/design-system/Box';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
+import { Select, Option } from '@strapi/design-system/Select';
+import { Stack } from '@strapi/design-system/Stack';
+import { Textarea } from '@strapi/design-system/Textarea';
+import { TextInput } from '@strapi/design-system/TextInput';
+import { Typography } from '@strapi/design-system/Typography';
+import { getDateOfExpiration } from '../../utils';
+
+const FormApiTokenContainer = ({
+  errors,
+  onChange,
+  canEditInputs,
+  isCreating,
+  values,
+  apiToken,
+  onDispatch,
+  setHasChangedPermissions,
+}) => {
+  const { formatMessage } = useIntl();
+  const [lang] = usePersistentState('strapi-admin-language', 'en');
+
+  const handleChangeSelectApiTokenType = ({ target: { value } }) => {
+    setHasChangedPermissions(false);
+
+    if (value === 'full-access') {
+      onDispatch({
+        type: 'SELECT_ALL_ACTIONS',
+      });
+    }
+    if (value === 'read-only') {
+      onDispatch({
+        type: 'ON_CHANGE_READ_ONLY',
+      });
+    }
+  };
+
+  return (
+    <Box
+      background="neutral0"
+      hasRadius
+      shadow="filterShadow"
+      paddingTop={6}
+      paddingBottom={6}
+      paddingLeft={7}
+      paddingRight={7}
+    >
+      <Stack spacing={4}>
+        <Typography variant="delta" as="h2">
+          {formatMessage({
+            id: 'global.details',
+            defaultMessage: 'Details',
+          })}
+        </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',
+              })}
+              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
+              }
+              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}
+              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={null}>
+                {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>
+          </GridItem>
+
+          <GridItem key="type" col={6} xs={12}>
+            <Select
+              name="type"
+              label={formatMessage({
+                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>
+          </GridItem>
+        </Grid>
+      </Stack>
+    </Box>
+  );
+};
+
+FormApiTokenContainer.propTypes = {
+  errors: PropTypes.shape({
+    name: PropTypes.string,
+    description: PropTypes.string,
+    lifespan: PropTypes.string,
+    type: PropTypes.string,
+  }),
+  onChange: PropTypes.func.isRequired,
+  canEditInputs: PropTypes.bool.isRequired,
+  values: PropTypes.shape({
+    name: PropTypes.string,
+    description: PropTypes.string,
+    lifespan: PropTypes.string,
+    type: PropTypes.string,
+  }).isRequired,
+  isCreating: PropTypes.bool.isRequired,
+  apiToken: PropTypes.shape({
+    id: PropTypes.string,
+    type: PropTypes.string,
+    lifespan: PropTypes.number,
+    name: PropTypes.string,
+    accessKey: PropTypes.string,
+    permissions: PropTypes.array,
+    description: PropTypes.string,
+    createdAt: PropTypes.string,
+  }).isRequired,
+  onDispatch: PropTypes.func.isRequired,
+  setHasChangedPermissions: PropTypes.func.isRequired,
+};
+
+FormApiTokenContainer.defaultProps = {
+  errors: {},
+};
+
+export default FormApiTokenContainer;

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

@@ -0,0 +1,77 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { ContentLayout } from '@strapi/design-system/Layout';
+import { Stack } from '@strapi/design-system/Stack';
+import HeaderContentBox from '../ContentBox';
+import FormApiTokenContainer from '../FormApiTokenContainer';
+import Permissions from '../Permissions';
+
+const FormBody = ({
+  apiToken,
+  errors,
+  onChange,
+  canEditInputs,
+  isCreating,
+  values,
+  onDispatch,
+  setHasChangedPermissions,
+}) => {
+  return (
+    <ContentLayout>
+      <Stack spacing={6}>
+        {Boolean(apiToken?.name) && <HeaderContentBox apiToken={apiToken.accessKey} />}
+        <FormApiTokenContainer
+          errors={errors}
+          onChange={onChange}
+          canEditInputs={canEditInputs}
+          isCreating={isCreating}
+          values={values}
+          apiToken={apiToken}
+          onDispatch={onDispatch}
+          setHasChangedPermissions={setHasChangedPermissions}
+        />
+        <Permissions
+          disabled={
+            !canEditInputs || values?.type === 'read-only' || values?.type === 'full-access'
+          }
+        />
+      </Stack>
+    </ContentLayout>
+  );
+};
+
+FormBody.propTypes = {
+  errors: PropTypes.shape({
+    name: PropTypes.string,
+    description: PropTypes.string,
+    lifespan: PropTypes.string,
+    type: PropTypes.string,
+  }),
+  apiToken: PropTypes.shape({
+    id: PropTypes.string,
+    type: PropTypes.string,
+    lifespan: PropTypes.number,
+    name: PropTypes.string,
+    accessKey: PropTypes.string,
+    permissions: PropTypes.array,
+    description: PropTypes.string,
+    createdAt: PropTypes.string,
+  }).isRequired,
+  onChange: PropTypes.func.isRequired,
+  canEditInputs: PropTypes.bool.isRequired,
+  isCreating: PropTypes.bool.isRequired,
+  values: PropTypes.shape({
+    name: PropTypes.string,
+    description: PropTypes.string,
+    lifespan: PropTypes.string,
+    type: PropTypes.string,
+  }).isRequired,
+  onDispatch: PropTypes.func.isRequired,
+  setHasChangedPermissions: PropTypes.func.isRequired,
+};
+
+FormBody.defaultProps = {
+  errors: {},
+};
+
+export default FormBody;

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

@@ -0,0 +1,85 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { Link } from '@strapi/helper-plugin';
+import PropTypes from 'prop-types';
+import ArrowLeft from '@strapi/icons/ArrowLeft';
+import Check from '@strapi/icons/Check';
+import { Button } from '@strapi/design-system/Button';
+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 { formatMessage } = useIntl();
+  const handleRegenerate = (newKey) => {
+    setApiToken({
+      ...apiToken,
+      accessKey: newKey,
+    });
+  };
+
+  return (
+    <HeaderLayout
+      title={
+        apiToken?.name ||
+        formatMessage({
+          id: 'Settings.apiTokens.createPage.title',
+          defaultMessage: 'Create API Token',
+        })
+      }
+      primaryAction={
+        canEditInputs ? (
+          <Stack horizontal spacing={2}>
+            {canRegenerate && apiToken?.id && (
+              <Regenerate onRegenerate={handleRegenerate} idToRegenerate={apiToken?.id} />
+            )}
+            <Button
+              disabled={isSubmitting}
+              loading={isSubmitting}
+              startIcon={<Check />}
+              type="submit"
+              size="S"
+            >
+              {formatMessage({
+                id: 'global.save',
+                defaultMessage: 'Save',
+              })}
+            </Button>
+          </Stack>
+        ) : (
+          canRegenerate &&
+          apiToken?.id && (
+            <Regenerate onRegenerate={handleRegenerate} idToRegenerate={apiToken?.id} />
+          )
+        )
+      }
+      navigationAction={
+        <Link startIcon={<ArrowLeft />} to="/settings/api-tokens">
+          {formatMessage({
+            id: 'global.back',
+            defaultMessage: 'Back',
+          })}
+        </Link>
+      }
+    />
+  );
+};
+
+FormHead.propTypes = {
+  apiToken: PropTypes.shape({
+    id: PropTypes.string,
+    type: PropTypes.string,
+    lifespan: PropTypes.number,
+    name: PropTypes.string,
+    accessKey: PropTypes.string,
+    permissions: PropTypes.array,
+    description: PropTypes.string,
+    createdAt: PropTypes.string,
+  }).isRequired,
+  canEditInputs: PropTypes.bool.isRequired,
+  canRegenerate: PropTypes.bool.isRequired,
+  setApiToken: PropTypes.func.isRequired,
+  isSubmitting: PropTypes.bool.isRequired,
+};
+
+export default FormHead;