@strapi/admin 4.2.0-beta.2 → 4.2.0

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

@@ -1,26 +1,76 @@
-import React from 'react';
+import React, { useRef } from 'react';
+import { useQuery, useMutation, useQueryClient } from 'react-query';
 import { useIntl } from 'react-intl';
-import { useAppInfos, SettingsPageTitle, useFocusWhenNavigate } from '@strapi/helper-plugin';
+import {
+  useAppInfos,
+  SettingsPageTitle,
+  useFocusWhenNavigate,
+  CheckPermissions,
+  useNotification,
+  useTracking,
+} from '@strapi/helper-plugin';
 import { HeaderLayout, Layout, ContentLayout } from '@strapi/design-system/Layout';
 import { Main } from '@strapi/design-system/Main';
 import { Box } from '@strapi/design-system/Box';
 import { Grid, GridItem } from '@strapi/design-system/Grid';
 import { Typography } from '@strapi/design-system/Typography';
-
 import { Stack } from '@strapi/design-system/Stack';
-import { Link } from '@strapi/design-system/Link';
+import { Button } from '@strapi/design-system/Button';
+import { Link } from '@strapi/design-system/v2/Link';
 import ExternalLink from '@strapi/icons/ExternalLink';
+import Check from '@strapi/icons/Check';
+import { useConfigurations } from '../../../../hooks';
+import Form from './components/Form';
+import { fetchProjectSettings, postProjectSettings } from './utils/api';
+import getFormData from './utils/getFormData';
+
+const permissions = [{ action: 'admin::project-settings.update', subject: null }];
 
 const ApplicationInfosPage = () => {
+  const inputsRef = useRef();
+  const toggleNotification = useNotification();
+  const { trackUsage } = useTracking();
   const { formatMessage } = useIntl();
+  const queryClient = useQueryClient();
   useFocusWhenNavigate();
   const appInfos = useAppInfos();
   const { shouldUpdateStrapi, latestStrapiReleaseTag, strapiVersion } = appInfos;
+  const { updateProjectSettings } = useConfigurations();
+
+  const { data } = useQuery('project-settings', fetchProjectSettings);
 
   const currentPlan = appInfos.communityEdition
     ? 'app.components.UpgradePlanModal.text-ce'
     : 'app.components.UpgradePlanModal.text-ee';
 
+  const submitMutation = useMutation(body => postProjectSettings(body), {
+    onSuccess: async ({ menuLogo }) => {
+      await queryClient.invalidateQueries('project-settings', { refetchActive: true });
+      updateProjectSettings({ menuLogo: menuLogo?.url });
+    },
+  });
+
+  const handleSubmit = () => {
+    const inputValues = inputsRef.current.getValues();
+    const formData = getFormData(inputValues);
+
+    submitMutation.mutate(formData, {
+      onSuccess: () => {
+        const { menuLogo } = inputValues;
+
+        if (menuLogo.rawFile) {
+          trackUsage('didChangeLogo');
+        }
+      },
+      onError: () => {
+        toggleNotification({
+          type: 'warning',
+          message: { id: 'notification.error', defaultMessage: 'An error occurred' },
+        });
+      },
+    });
+  };
+
   return (
     <Layout>
       <SettingsPageTitle name="Application" />
@@ -31,101 +81,119 @@ const ApplicationInfosPage = () => {
             id: 'Settings.application.description',
             defaultMessage: 'Administration panel’s global information',
           })}
+          primaryAction={
+            <Button onClick={handleSubmit} startIcon={<Check />}>
+              {formatMessage({ id: 'global.save', defaultMessage: 'Save' })}
+            </Button>
+          }
         />
         <ContentLayout>
-          <Box
-            hasRadius
-            background="neutral0"
-            shadow="tableShadow"
-            paddingTop={7}
-            paddingBottom={7}
-            paddingRight={6}
-            paddingLeft={6}
-          >
-            <Stack spacing={5}>
-              <Typography variant="delta" as="h3">
-                {formatMessage({
-                  id: 'global.details',
-                  defaultMessage: 'Details',
-                })}
-              </Typography>
+          <Stack spacing={6}>
+            <Box
+              hasRadius
+              background="neutral0"
+              shadow="tableShadow"
+              paddingTop={6}
+              paddingBottom={6}
+              paddingRight={7}
+              paddingLeft={7}
+            >
+              <Stack spacing={5}>
+                <Typography variant="delta" as="h3">
+                  {formatMessage({
+                    id: 'global.details',
+                    defaultMessage: 'Details',
+                  })}
+                </Typography>
 
-              <Grid paddingTop={1}>
-                <GridItem col={6} s={12}>
-                  <Typography variant="sigma" textColor="neutral600">
-                    {formatMessage({
-                      id: 'Settings.application.strapiVersion',
-                      defaultMessage: 'strapi version',
-                    })}
-                  </Typography>
-                  <Typography as="p">v{strapiVersion}</Typography>
-                  <Link
-                    href={
-                      appInfos.communityEdition
-                        ? 'https://discord.strapi.io'
-                        : 'https://support.strapi.io/support/home'
-                    }
-                    endIcon={<ExternalLink />}
-                  >
-                    {formatMessage({
-                      id: 'Settings.application.get-help',
-                      defaultMessage: 'Get help',
-                    })}
-                  </Link>
-                </GridItem>
-                <GridItem col={6} s={12}>
-                  <Typography variant="sigma" textColor="neutral600">
-                    {formatMessage({
-                      id: 'Settings.application.edition-title',
-                      defaultMessage: 'current plan',
-                    })}
-                  </Typography>
-                  <Typography as="p">
-                    {formatMessage({
-                      id: currentPlan,
-                      defaultMessage: `${
-                        appInfos.communityEdition ? 'Community Edition' : 'Enterprise Edition'
-                      }`,
-                    })}
-                  </Typography>
-                </GridItem>
-              </Grid>
+                <Grid paddingTop={1}>
+                  <GridItem col={6} s={12}>
+                    <Typography variant="sigma" textColor="neutral600">
+                      {formatMessage({
+                        id: 'Settings.application.strapiVersion',
+                        defaultMessage: 'strapi version',
+                      })}
+                    </Typography>
+                    <Typography as="p">v{strapiVersion}</Typography>
+                    <Link
+                      href={
+                        appInfos.communityEdition
+                          ? 'https://discord.strapi.io'
+                          : 'https://support.strapi.io/support/home'
+                      }
+                      isExternal
+                      endIcon={<ExternalLink />}
+                    >
+                      {formatMessage({
+                        id: 'Settings.application.get-help',
+                        defaultMessage: 'Get help',
+                      })}
+                    </Link>
+                  </GridItem>
+                  <GridItem col={6} s={12}>
+                    <Typography variant="sigma" textColor="neutral600">
+                      {formatMessage({
+                        id: 'Settings.application.edition-title',
+                        defaultMessage: 'current plan',
+                      })}
+                    </Typography>
+                    <Typography as="p">
+                      {formatMessage({
+                        id: currentPlan,
+                        defaultMessage: `${
+                          appInfos.communityEdition ? 'Community Edition' : 'Enterprise Edition'
+                        }`,
+                      })}
+                    </Typography>
+                  </GridItem>
+                </Grid>
 
-              <Grid paddingTop={1}>
-                <GridItem col={6} s={12}>
-                  {shouldUpdateStrapi && (
+                <Grid paddingTop={1}>
+                  <GridItem col={6} s={12}>
+                    {shouldUpdateStrapi && (
+                      <Link
+                        href={`https://github.com/strapi/strapi/releases/tag/${latestStrapiReleaseTag}`}
+                        isExternal
+                        endIcon={<ExternalLink />}
+                      >
+                        {formatMessage({
+                          id: 'Settings.application.link-upgrade',
+                          defaultMessage: 'Upgrade your admin panel',
+                        })}
+                      </Link>
+                    )}
+                  </GridItem>
+                  <GridItem col={6} s={12}>
                     <Link
-                      href={`https://github.com/strapi/strapi/releases/tag/${latestStrapiReleaseTag}`}
+                      href="https://strapi.io/pricing-self-hosted"
+                      isExternal
                       endIcon={<ExternalLink />}
                     >
                       {formatMessage({
-                        id: 'Settings.application.link-upgrade',
-                        defaultMessage: 'Upgrade your admin panel',
+                        id: 'Settings.application.link-pricing',
+                        defaultMessage: 'See all pricing plans',
                       })}
                     </Link>
-                  )}
-                </GridItem>
-                <GridItem col={6} s={12}>
-                  <Link href="https://strapi.io/pricing-self-hosted" endIcon={<ExternalLink />}>
+                  </GridItem>
+                </Grid>
+
+                <Box paddingTop={1}>
+                  <Typography variant="sigma" textColor="neutral600">
                     {formatMessage({
-                      id: 'Settings.application.link-pricing',
-                      defaultMessage: 'See all pricing plans',
+                      id: 'Settings.application.node-version',
+                      defaultMessage: 'node version',
                     })}
-                  </Link>
-                </GridItem>
-              </Grid>
-
-              <Box paddingTop={1}>
-                <Typography variant="sigma" textColor="neutral600">
-                  {formatMessage({
-                    id: 'Settings.application.node-version',
-                    defaultMessage: 'node version',
-                  })}
-                </Typography>
-                <Typography as="p">{appInfos.nodeVersion}</Typography>
-              </Box>
-            </Stack>
-          </Box>
+                  </Typography>
+                  <Typography as="p">{appInfos.nodeVersion}</Typography>
+                </Box>
+              </Stack>
+            </Box>
+            {data && (
+              <CheckPermissions permissions={permissions}>
+                <Form ref={inputsRef} projectSettingsStored={data} />
+              </CheckPermissions>
+            )}
+          </Stack>
         </ContentLayout>
       </Main>
     </Layout>

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/api.js

@@ -0,0 +1,16 @@
+import { axiosInstance } from '../../../../../core/utils';
+import prefixAllUrls from './prefixAllUrls';
+
+const fetchProjectSettings = async () => {
+  const { data } = await axiosInstance.get('/admin/project-settings');
+
+  return prefixAllUrls(data);
+};
+
+const postProjectSettings = async body => {
+  const { data } = await axiosInstance.post('/admin/project-settings', body);
+
+  return prefixAllUrls(data);
+};
+
+export { fetchProjectSettings, postProjectSettings };

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/constants.js

@@ -0,0 +1,3 @@
+export const DIMENSION = 750;
+export const SIZE = 100;
+export const ACCEPTED_FORMAT = ['image/jpeg', 'image/png', 'image/svg+xml'];

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/getFormData.js

@@ -0,0 +1,17 @@
+const getFormData = data => {
+  const formData = new FormData();
+
+  Object.entries(data).forEach(([key, value]) => {
+    if (value && value.rawFile instanceof File) {
+      formData.append(key, value.rawFile);
+    }
+
+    if (value && value.isReset) {
+      formData.append(key, null);
+    }
+  });
+
+  return formData;
+};
+
+export default getFormData;

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/parseFileMetadatas.js

@@ -0,0 +1,76 @@
+import { DIMENSION, SIZE, ACCEPTED_FORMAT } from './constants';
+
+const FILE_FORMAT_ERROR_MESSAGE = {
+  id: 'Settings.application.customization.modal.upload.error-format',
+  defaultMessage: 'Wrong format uploaded (accepted formats only: jpeg, jpg, png, svg).',
+};
+
+const FILE_SIZING_ERROR_MESSAGE = {
+  id: 'Settings.application.customization.modal.upload.error-size',
+  defaultMessage:
+    'The file uploaded is too large (max dimension: {dimension}x{dimension}, max file size: {size}KB)',
+};
+
+const getFileDimensions = file => {
+  return new Promise(resolve => {
+    const reader = new FileReader();
+    reader.onload = () => {
+      const img = new Image();
+      img.onload = function() {
+        resolve({ width: img.width, height: img.height });
+      };
+      img.src = reader.result;
+    };
+    reader.readAsDataURL(file);
+  });
+};
+
+const rawFileToAsset = (rawFile, fileDimensions) => {
+  return {
+    ext: rawFile.name.split('.').pop(),
+    size: rawFile.size / 1000,
+    name: rawFile.name,
+    url: URL.createObjectURL(rawFile),
+    rawFile,
+    width: fileDimensions.width,
+    height: fileDimensions.height,
+  };
+};
+
+export const parseFileMetadatas = async file => {
+  let error;
+
+  const isFormatAuthorized = ACCEPTED_FORMAT.includes(file.type);
+
+  if (!isFormatAuthorized) {
+    error = new Error('File format');
+    error.displayMessage = FILE_FORMAT_ERROR_MESSAGE;
+
+    throw error;
+  }
+
+  const fileDimensions = await getFileDimensions(file);
+
+  const areDimensionsAuthorized =
+    fileDimensions.width <= DIMENSION && fileDimensions.height <= DIMENSION;
+
+  if (!areDimensionsAuthorized) {
+    error = new Error('File sizing');
+    error.displayMessage = FILE_SIZING_ERROR_MESSAGE;
+
+    throw error;
+  }
+
+  const asset = rawFileToAsset(file, fileDimensions);
+
+  const isSizeAuthorized = asset.size <= SIZE;
+
+  if (!isSizeAuthorized) {
+    error = new Error('File sizing');
+    error.displayMessage = FILE_SIZING_ERROR_MESSAGE;
+
+    throw error;
+  }
+
+  return asset;
+};

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/prefixAllUrls.js

@@ -0,0 +1,17 @@
+import transform from 'lodash/transform';
+import { prefixFileUrlWithBackendUrl } from '@strapi/helper-plugin';
+
+const prefixAllUrls = data =>
+  transform(
+    data,
+    (result, value, key) => {
+      if (value && value.url) {
+        result[key] = { ...value, url: prefixFileUrlWithBackendUrl(value.url) };
+      } else {
+        result[key] = value;
+      }
+    },
+    {}
+  );
+
+export default prefixAllUrls;

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/urlToFile.js

@@ -0,0 +1,21 @@
+import axios from 'axios';
+
+const urlToFile = async url => {
+  try {
+    const res = await axios.get(url, { responseType: 'blob', timeout: 8000 });
+    const loadedFile = new File([res.data], res.config.url, {
+      type: res.headers['content-type'],
+    });
+
+    return loadedFile;
+  } catch (err) {
+    err.displayMessage = {
+      id: 'Settings.application.customization.modal.upload.error-network',
+      defaultMessage: 'Network error',
+    };
+
+    throw err;
+  }
+};
+
+export default urlToFile;

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

@@ -6,6 +6,7 @@ import {
   useTracking,
   LoadingIndicatorPage,
   SettingsPageTitle,
+  Link,
 } from '@strapi/helper-plugin';
 import { Box } from '@strapi/design-system/Box';
 import { Button } from '@strapi/design-system/Button';
@@ -13,7 +14,6 @@ import { ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
 import { Main } from '@strapi/design-system/Main';
 import { Stack } from '@strapi/design-system/Stack';
 import { Formik } from 'formik';
-import { Link } from '@strapi/design-system/Link';
 import ArrowLeft from '@strapi/icons/ArrowLeft';
 import get from 'lodash/get';
 import { useIntl } from 'react-intl';

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

@@ -15,6 +15,7 @@ import {
   useNotification,
   useOverlayBlocker,
   LoadingIndicatorPage,
+  Link,
 } from '@strapi/helper-plugin';
 import { useQuery } from 'react-query';
 import { Formik } from 'formik';
@@ -22,7 +23,6 @@ import { Box } from '@strapi/design-system/Box';
 import { Button } from '@strapi/design-system/Button';
 import { Grid, GridItem } from '@strapi/design-system/Grid';
 import { HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
-import { Link } from '@strapi/design-system/Link';
 import { Typography } from '@strapi/design-system/Typography';
 import { Main } from '@strapi/design-system/Main';
 import { Stack } from '@strapi/design-system/Stack';

package/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/index.js

@@ -1,13 +1,12 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { Form } from '@strapi/helper-plugin';
+import { Form, Link } from '@strapi/helper-plugin';
 import ArrowLeft from '@strapi/icons/ArrowLeft';
 import Check from '@strapi/icons/Check';
 import Publish from '@strapi/icons/Play';
 import { ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
 import { Box } from '@strapi/design-system/Box';
 import { Button } from '@strapi/design-system/Button';
-import { Link } from '@strapi/design-system/Link';
 import { Stack } from '@strapi/design-system/Stack';
 import { TextInput } from '@strapi/design-system/TextInput';
 import { Grid, GridItem } from '@strapi/design-system/Grid';

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

@@ -17,6 +17,7 @@ import {
   ConfirmDialog,
   onRowClick,
   stopPropagation,
+  LinkButton,
 } from '@strapi/helper-plugin';
 import { HeaderLayout, Layout, ContentLayout, ActionLayout } from '@strapi/design-system/Layout';
 import { EmptyStateLayout } from '@strapi/design-system/EmptyStateLayout';
@@ -30,7 +31,6 @@ import { Button } from '@strapi/design-system/Button';
 import { VisuallyHidden } from '@strapi/design-system/VisuallyHidden';
 import { Switch } from '@strapi/design-system/Switch';
 import { Main } from '@strapi/design-system/Main';
-import { LinkButton } from '@strapi/design-system/LinkButton';
 import { useNotifyAT } from '@strapi/design-system/LiveRegions';
 import { Box } from '@strapi/design-system/Box';
 import Plus from '@strapi/icons/Plus';

package/admin/src/reducers.js

@@ -1,13 +1,12 @@
-import appReducer from './pages/App/reducer';
 import rbacProviderReducer from './components/RBACProvider/reducer';
-import cmAppReducer from './content-manager/pages/App/reducer';
+import appReducer from './content-manager/pages/App/reducer';
 import editViewLayoutManagerReducer from './content-manager/pages/EditViewLayoutManager/reducer';
 import listViewReducer from './content-manager/pages/ListView/reducer';
 import rbacManagerReducer from './content-manager/hooks/useSyncRbac/reducer';
 import editViewCrudReducer from './content-manager/sharedReducers/crudReducer/reducer';
 
 const contentManagerReducers = {
-  'content-manager_app': cmAppReducer,
+  'content-manager_app': appReducer,
   'content-manager_listView': listViewReducer,
   'content-manager_rbacManager': rbacManagerReducer,
   'content-manager_editViewLayoutManager': editViewLayoutManagerReducer,
@@ -15,7 +14,6 @@ const contentManagerReducers = {
 };
 
 const reducers = {
-  admin_app: appReducer,
   rbacProvider: rbacProviderReducer,
   ...contentManagerReducers,
 };

package/admin/src/translations/en.json

@@ -99,6 +99,31 @@
   "Settings.application.strapi-version": "strapi version",
   "Settings.application.strapiVersion": "strapi version",
   "Settings.application.title": "Overview",
+  "Settings.application.customization": "Customization",
+  "Settings.application.customization.carousel.title": "Logo",
+  "Settings.application.customization.carousel.change-action": "Change logo",
+  "Settings.application.customization.carousel.reset-action": "Reset logo",
+  "Settings.application.customization.carousel-slide.label": "Logo slide",
+  "Settings.application.customization.carousel-hint": "Change the admin panel logo (Max dimension: {dimension}x{dimension}, Max file size: {size}KB)",
+  "Settings.application.customization.modal.cancel": "Cancel",
+  "Settings.application.customization.modal.upload": "Upload logo",
+  "Settings.application.customization.modal.tab.label": "How do you want to upload your assets?",
+  "Settings.application.customization.modal.upload.from-computer": "From computer",
+  "Settings.application.customization.modal.upload.file-validation": "Max dimension: {dimension}x{dimension}, Max size: {size}KB",
+  "Settings.application.customization.modal.upload.error-format": "Wrong format uploaded (accepted formats only: jpeg, jpg, png, svg).",
+  "Settings.application.customization.modal.upload.error-size": "The file uploaded is too large (max dimension: {dimension}x{dimension}, max file size: {size}KB)",
+  "Settings.application.customization.modal.upload.error-network": "Network error",
+  "Settings.application.customization.modal.upload.cta.browse": "Browse files",
+  "Settings.application.customization.modal.upload.drag-drop": "Drag and Drop here or",
+  "Settings.application.customization.modal.upload.from-url": "From url",
+  "Settings.application.customization.modal.upload.from-url.input-label": "URL",
+  "Settings.application.customization.modal.upload.next": "Next",
+  "Settings.application.customization.modal.pending": "Pending logo",
+  "Settings.application.customization.modal.pending.choose-another": "Choose another logo",
+  "Settings.application.customization.modal.pending.title": "Logo ready to upload",
+  "Settings.application.customization.modal.pending.subtitle": "Manage the chosen logo before uploading it",
+  "Settings.application.customization.modal.pending.upload": "Upload logo",
+  "Settings.application.customization.modal.pending.card-badge": "image",
   "Settings.error": "Error",
   "Settings.global": "Global Settings",
   "Settings.permissions": "Administration panel",
@@ -207,6 +232,7 @@
   "admin.pages.MarketPlacePage.helmet": "Marketplace - Plugins",
   "admin.pages.MarketPlacePage.offline.title": "You are offline",
   "admin.pages.MarketPlacePage.offline.subtitle": "You need to be connected to the Internet to access Strapi Market.",
+  "admin.pages.MarketPlacePage.plugins": "Plugins",
   "admin.pages.MarketPlacePage.plugin.copy": "Copy install command",
   "admin.pages.MarketPlacePage.plugin.copy.success": "Install command ready to be pasted in your terminal",
   "admin.pages.MarketPlacePage.plugin.info": "Learn more",
@@ -215,11 +241,14 @@
   "admin.pages.MarketPlacePage.plugin.installed": "Installed",
   "admin.pages.MarketPlacePage.plugin.tooltip.madeByStrapi": "Made by Strapi",
   "admin.pages.MarketPlacePage.plugin.tooltip.verified": "Plugin verified by Strapi",
-  "admin.pages.MarketPlacePage.search.clear": "Clear the plugin search",
+  "admin.pages.MarketPlacePage.providers": "Providers",
+  "admin.pages.MarketPlacePage.search.clear": "Clear the search",
   "admin.pages.MarketPlacePage.search.empty": "No result for \"{target}\"",
-  "admin.pages.MarketPlacePage.search.placeholder": "Search for a plugin",
-  "admin.pages.MarketPlacePage.submit.plugin.link": "Submit your plugin",
+  "admin.pages.MarketPlacePage.search.placeholder": "Search",
+  "admin.pages.MarketPlacePage.submit.plugin.link": "Submit plugin",
+  "admin.pages.MarketPlacePage.submit.provider.link": "Submit provider",
   "admin.pages.MarketPlacePage.subtitle": "Get more out of Strapi",
+  "admin.pages.MarketPlacePage.tab-group.label": "Plugins and Providers for Strapi",
   "admin.pages.MarketPlacePage.missingPlugin.title": "Missing a plugin?",
   "admin.pages.MarketPlacePage.missingPlugin.description": "Tell us what plugin you are looking for and we'll let our community plugin developers know in case they are in search for inspiration!",
   "anErrorOccurred": "Woops! Something went wrong. Please, try again.",
@@ -292,6 +321,7 @@
   "app.components.LeftMenu.collapse": "Collapse the navbar",
   "app.components.LeftMenu.expand": "Expand the navbar",
   "app.components.LeftMenu.logout": "Logout",
+  "app.components.LeftMenu.logo.alt": "Application logo",
   "app.components.LeftMenu.navbrand.title": "Strapi Dashboard",
   "app.components.LeftMenu.navbrand.workplace": "Workplace",
   "app.components.LeftMenuFooter.help": "Help",