@strapi/admin 4.2.0-beta.3 → 4.2.0-beta.4

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

@@ -0,0 +1,51 @@
+import React, { useReducer, useRef } from 'react';
+import PropTypes from 'prop-types';
+import { ConfigurationsContext } from '../../contexts';
+import reducer, { initialState } from './reducer';
+
+const ConfigurationsProvider = ({
+  children,
+  authLogo,
+  menuLogo: defaultMenuLogo,
+  showReleaseNotification,
+  showTutorials,
+}) => {
+  const [{ menuLogo }, dispatch] = useReducer(reducer, initialState);
+
+  const updateProjectSettings = ({ menuLogo }) => {
+    return dispatch({
+      type: 'UPDATE_PROJECT_SETTINGS',
+      values: {
+        menuLogo: menuLogo || defaultMenuLogo,
+      },
+    });
+  };
+
+  const updateProjectSettingsRef = useRef(updateProjectSettings);
+
+  return (
+    <ConfigurationsContext.Provider
+      value={{
+        logos: {
+          menu: { custom: menuLogo, default: defaultMenuLogo },
+          auth: { custom: null, default: authLogo },
+        },
+        updateProjectSettings: updateProjectSettingsRef.current,
+        showReleaseNotification,
+        showTutorials,
+      }}
+    >
+      {children}
+    </ConfigurationsContext.Provider>
+  );
+};
+
+ConfigurationsProvider.propTypes = {
+  authLogo: PropTypes.string.isRequired,
+  children: PropTypes.element.isRequired,
+  menuLogo: PropTypes.string.isRequired,
+  showReleaseNotification: PropTypes.bool.isRequired,
+  showTutorials: PropTypes.bool.isRequired,
+};
+
+export default ConfigurationsProvider;

package/admin/src/components/ConfigurationsProvider/reducer.js

@@ -0,0 +1,28 @@
+/* eslint-disable consistent-return */
+/*
+ *
+ * ConfigurationsProvider reducer
+ *
+ */
+
+import produce from 'immer';
+
+const initialState = {
+  menuLogo: null,
+};
+
+const reducer = (state = initialState, action) =>
+  produce(state, draftState => {
+    switch (action.type) {
+      case 'UPDATE_PROJECT_SETTINGS': {
+        Object.assign(draftState, action.values);
+        break;
+      }
+      default: {
+        return draftState;
+      }
+    }
+  });
+
+export default reducer;
+export { initialState };

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

@@ -53,7 +53,9 @@ const LinkUser = styled(RouterNavLink)`
 const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
   const buttonRef = useRef();
   const [userLinksVisible, setUserLinksVisible] = useState(false);
-  const { menuLogo } = useConfigurations();
+  const {
+    logos: { menu },
+  } = useConfigurations();
   const [condensed, setCondensed] = usePersistentState('navbar-condensed', false);
   const { userDisplayName } = useAppInfos();
   const { formatMessage } = useIntl();
@@ -94,7 +96,15 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
           defaultMessage: 'Workplace',
         })}
         title={menuTitle}
-        icon={<img src={menuLogo} alt={menuTitle} />}
+        icon={
+          <img
+            src={menu.custom || menu.default}
+            alt={formatMessage({
+              id: 'app.components.LeftMenu.logo.alt',
+              defaultMessage: 'Application logo',
+            })}
+          />
+        }
       />
 
       <Divider />

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

@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import { QueryClientProvider, QueryClient } from 'react-query';
 import { LibraryProvider, StrapiAppProvider } from '@strapi/helper-plugin';
 import { Provider } from 'react-redux';
-import { AdminContext, ConfigurationsContext } from '../../contexts';
+import { AdminContext } from '../../contexts';
+import ConfigurationsProvider from '../ConfigurationsProvider';
 import LanguageProvider from '../LanguageProvider';
 import GuidedTour from '../GuidedTour';
 import AutoReloadOverlayBlockerProvider from '../AutoReloadOverlayBlockerProvider';
@@ -47,8 +48,11 @@ const Providers = ({
         <QueryClientProvider client={queryClient}>
           <Provider store={store}>
             <AdminContext.Provider value={{ getAdminInjectedComponents }}>
-              <ConfigurationsContext.Provider
-                value={{ authLogo, menuLogo, showReleaseNotification, showTutorials }}
+              <ConfigurationsProvider
+                authLogo={authLogo}
+                menuLogo={menuLogo}
+                showReleaseNotification={showReleaseNotification}
+                showTutorials={showTutorials}
               >
                 <StrapiAppProvider
                   getPlugin={getPlugin}
@@ -71,7 +75,7 @@ const Providers = ({
                     </LanguageProvider>
                   </LibraryProvider>
                 </StrapiAppProvider>
-              </ConfigurationsContext.Provider>
+              </ConfigurationsProvider>
             </AdminContext.Provider>
           </Provider>
         </QueryClientProvider>

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

@@ -7,9 +7,11 @@ const Img = styled.img`
 `;
 
 const Logo = () => {
-  const { authLogo } = useConfigurations();
+  const {
+    logos: { auth },
+  } = useConfigurations();
 
-  return <Img src={authLogo} aria-hidden alt="" />;
+  return <Img src={auth.default} aria-hidden alt="" />;
 };
 
 export default Logo;

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

@@ -12,6 +12,7 @@ import {
   request,
   useNotification,
   TrackingContext,
+  prefixFileUrlWithBackendUrl,
 } from '@strapi/helper-plugin';
 import axios from 'axios';
 import { SkipToContent } from '@strapi/design-system/Main';
@@ -23,6 +24,7 @@ import NotFoundPage from '../NotFoundPage';
 import UseCasePage from '../UseCasePage';
 import { getUID } from './utils';
 import routes from './utils/routes';
+import { useConfigurations } from '../../hooks';
 
 const AuthenticatedApp = lazy(() =>
   import(/* webpackChunkName: "Admin-authenticatedApp" */ '../../components/AuthenticatedApp')
@@ -30,6 +32,7 @@ const AuthenticatedApp = lazy(() =>
 
 function App() {
   const toggleNotification = useNotification();
+  const { updateProjectSettings } = useConfigurations();
   const { formatMessage } = useIntl();
   const [{ isLoading, hasAdmin, uuid }, setState] = useState({ isLoading: true, hasAdmin: false });
 
@@ -70,10 +73,12 @@ function App() {
       try {
         const {
           data: {
-            data: { hasAdmin, uuid },
+            data: { hasAdmin, uuid, menuLogo },
           },
         } = await axios.get(`${strapi.backendURL}/admin/init`);
 
+        updateProjectSettings({ menuLogo: prefixFileUrlWithBackendUrl(menuLogo) });
+
         if (uuid) {
           const {
             data: { data: properties },
@@ -113,7 +118,7 @@ function App() {
     };
 
     getData();
-  }, [toggleNotification]);
+  }, [toggleNotification, updateProjectSettings]);
 
   const setHasAdmin = hasAdmin => setState(prev => ({ ...prev, hasAdmin }));
 

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

@@ -0,0 +1,85 @@
+import React, { useReducer, forwardRef, useImperativeHandle } from 'react';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+import { useTracking } from '@strapi/helper-plugin';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
+import { Box } from '@strapi/design-system/Box';
+import { Typography } from '@strapi/design-system/Typography';
+import LogoInput from '../LogoInput';
+import { useConfigurations } from '../../../../../../hooks';
+import reducer, { initialState } from './reducer';
+import init from './init';
+
+const Form = forwardRef(({ projectSettingsStored }, ref) => {
+  const { formatMessage } = useIntl();
+  const { trackUsage } = useTracking();
+  const {
+    logos: { menu },
+  } = useConfigurations();
+  const [{ menuLogo }, dispatch] = useReducer(reducer, initialState, () =>
+    init(initialState, projectSettingsStored)
+  );
+
+  const handleChangeMenuLogo = asset => {
+    dispatch({
+      type: 'SET_CUSTOM_MENU_LOGO',
+      value: asset,
+    });
+  };
+
+  const handleResetMenuLogo = () => {
+    trackUsage('didClickResetLogo');
+
+    dispatch({
+      type: 'RESET_CUSTOM_MENU_LOGO',
+    });
+  };
+
+  useImperativeHandle(ref, () => ({
+    getValues: () => ({ menuLogo: menuLogo.submit }),
+  }));
+
+  return (
+    <Box
+      hasRadius
+      background="neutral0"
+      shadow="tableShadow"
+      paddingTop={6}
+      paddingBottom={6}
+      paddingRight={7}
+      paddingLeft={7}
+    >
+      <Typography variant="delta" as="h3">
+        {formatMessage({
+          id: 'Settings.application.customization',
+          defaultMessage: 'Customization',
+        })}
+      </Typography>
+      <Grid paddingTop={4}>
+        <GridItem col={6} s={12}>
+          <LogoInput
+            onChangeLogo={handleChangeMenuLogo}
+            customLogo={menuLogo.display}
+            defaultLogo={menu.default}
+            onResetMenuLogo={handleResetMenuLogo}
+          />
+        </GridItem>
+      </Grid>
+    </Box>
+  );
+});
+
+Form.defaultProps = {
+  projectSettingsStored: null,
+};
+
+Form.propTypes = {
+  projectSettingsStored: PropTypes.shape({
+    menuLogo: PropTypes.shape({
+      url: PropTypes.string,
+      name: PropTypes.string,
+    }),
+  }),
+};
+
+export default Form;

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/Form/init.js

@@ -0,0 +1,13 @@
+import merge from 'lodash/merge';
+
+const init = (initialState, projectSettingsStored) => {
+  const copyInitialState = merge(initialState, {
+    menuLogo: {
+      display: projectSettingsStored.menuLogo,
+    },
+  });
+
+  return copyInitialState;
+};
+
+export default init;

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/Form/reducer.js

@@ -0,0 +1,43 @@
+/* eslint-disable consistent-return */
+/*
+ *
+ * ApplicationInfosPage Form reducer
+ *
+ */
+
+import produce from 'immer';
+
+const initialState = {
+  menuLogo: {
+    display: null,
+    submit: {
+      rawFile: null,
+      isReset: false,
+    },
+  },
+};
+
+const reducer = (state = initialState, action) =>
+  produce(state, draftState => {
+    switch (action.type) {
+      case 'SET_CUSTOM_MENU_LOGO': {
+        draftState.menuLogo.display = action.value;
+        draftState.menuLogo.submit.rawFile = action.value.rawFile;
+        break;
+      }
+      case 'RESET_CUSTOM_MENU_LOGO': {
+        draftState.menuLogo.display = null;
+        draftState.menuLogo.submit = {
+          rawFile: null,
+          isReset: true,
+        };
+        break;
+      }
+      default: {
+        return draftState;
+      }
+    }
+  });
+
+export default reducer;
+export { initialState };

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

@@ -0,0 +1,118 @@
+import React, { useReducer } from 'react';
+import { useIntl } from 'react-intl';
+import PropTypes from 'prop-types';
+import { CarouselInput, CarouselSlide, CarouselActions } from '@strapi/design-system/CarouselInput';
+import { IconButton } from '@strapi/design-system/IconButton';
+import { Box } from '@strapi/design-system/Box';
+import Plus from '@strapi/icons/Plus';
+import Refresh from '@strapi/icons/Refresh';
+import reducer, { initialState } from './reducer';
+import LogoModalStepper from '../LogoModalStepper';
+import { SIZE, DIMENSION } from '../../utils/constants';
+import stepper from './stepper';
+
+const LogoInput = ({ customLogo, defaultLogo, onChangeLogo, onResetMenuLogo }) => {
+  const [{ currentStep }, dispatch] = useReducer(reducer, initialState);
+  const { Component, next, prev, modalTitle } = stepper[currentStep] || {};
+  const { formatMessage } = useIntl();
+
+  const goTo = to => {
+    dispatch({
+      type: 'GO_TO',
+      to,
+    });
+  };
+
+  return (
+    <>
+      <CarouselInput
+        label={formatMessage({
+          id: 'Settings.application.customization.carousel.title',
+          defaultMessage: 'Logo',
+        })}
+        selectedSlide={0}
+        hint={formatMessage(
+          {
+            id: 'Settings.application.customization.carousel-hint',
+            defaultMessage:
+              'Change the admin panel logo (Max dimension: {dimension}x{dimension}, Max file size: {size}KB)',
+          },
+          { size: SIZE, dimension: DIMENSION }
+        )}
+        // Carousel is used here for a single media,
+        // we don't need previous and next labels but these props are required
+        previousLabel=""
+        nextLabel=""
+        onNext={() => {}}
+        onPrevious={() => {}}
+        secondaryLabel={customLogo?.name || 'logo.png'}
+        actions={
+          <CarouselActions>
+            <IconButton
+              onClick={() => goTo(customLogo ? 'pending' : 'upload')}
+              label={formatMessage({
+                id: 'Settings.application.customization.carousel.change-action',
+                defaultMessage: 'Change logo',
+              })}
+              icon={<Plus />}
+            />
+            {customLogo && (
+              <IconButton
+                onClick={onResetMenuLogo}
+                label={formatMessage({
+                  id: 'Settings.application.customization.carousel.reset-action',
+                  defaultMessage: 'Reset logo',
+                })}
+                icon={<Refresh />}
+              />
+            )}
+          </CarouselActions>
+        }
+      >
+        <CarouselSlide
+          label={formatMessage({
+            id: 'Settings.application.customization.carousel-slide.label',
+            defaultMessage: 'Logo slide',
+          })}
+        >
+          <Box
+            maxHeight="40%"
+            maxWidth="40%"
+            as="img"
+            src={customLogo?.url || defaultLogo}
+            alt={formatMessage({
+              id: 'Settings.application.customization.carousel.title',
+              defaultMessage: 'Logo',
+            })}
+          />
+        </CarouselSlide>
+      </CarouselInput>
+      <LogoModalStepper
+        Component={Component}
+        currentStep={currentStep}
+        onChangeLogo={onChangeLogo}
+        customLogo={customLogo}
+        goTo={goTo}
+        next={next}
+        prev={prev}
+        modalTitle={modalTitle}
+      />
+    </>
+  );
+};
+
+LogoInput.defaultProps = {
+  customLogo: null,
+};
+
+LogoInput.propTypes = {
+  customLogo: PropTypes.shape({
+    url: PropTypes.string,
+    name: PropTypes.string,
+  }),
+  defaultLogo: PropTypes.string.isRequired,
+  onChangeLogo: PropTypes.func.isRequired,
+  onResetMenuLogo: PropTypes.func.isRequired,
+};
+
+export default LogoInput;

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/reducer.js

@@ -0,0 +1,28 @@
+/* eslint-disable consistent-return */
+/*
+ *
+ * LogoInput reducer
+ *
+ */
+
+import produce from 'immer';
+
+const initialState = {
+  currentStep: undefined,
+};
+
+const reducer = (state = initialState, action) =>
+  produce(state, draftState => {
+    switch (action.type) {
+      case 'GO_TO': {
+        draftState.currentStep = action.to;
+        break;
+      }
+      default: {
+        return draftState;
+      }
+    }
+  });
+
+export default reducer;
+export { initialState };

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/stepper.js

@@ -0,0 +1,25 @@
+import AddLogoDialog from '../LogoModalStepper/AddLogoDialog';
+import PendingLogoDialog from '../LogoModalStepper/PendingLogoDialog';
+
+const stepper = {
+  upload: {
+    Component: AddLogoDialog,
+    modalTitle: {
+      id: 'Settings.application.customization.modal.upload',
+      defaultMessage: 'Upload logo',
+    },
+    next: 'pending',
+    prev: null,
+  },
+  pending: {
+    Component: PendingLogoDialog,
+    modalTitle: {
+      id: 'Settings.application.customization.modal.pending',
+      defaultMessage: 'Pending logo',
+    },
+    next: null,
+    prev: 'upload',
+  },
+};
+
+export default stepper;

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/AddLogoDialog.js

@@ -0,0 +1,67 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import PropTypes from 'prop-types';
+import { Tabs, Tab, TabGroup, TabPanels, TabPanel } from '@strapi/design-system/Tabs';
+import { Box } from '@strapi/design-system/Box';
+import { Divider } from '@strapi/design-system/Divider';
+import FromComputerForm from './FromComputerForm';
+import FromUrlForm from './FromUrlForm';
+
+const AddLogoDialog = ({ setLocalImage, goTo, next, onClose }) => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <TabGroup
+      label={formatMessage({
+        id: 'Settings.application.customization.modal.tab.label',
+        defaultMessage: 'How do you want to upload your assets?',
+      })}
+      variant="simple"
+    >
+      <Box paddingLeft={8} paddingRight={8}>
+        <Tabs>
+          <Tab>
+            {formatMessage({
+              id: 'Settings.application.customization.modal.upload.from-computer',
+              defaultMessage: 'From computer',
+            })}
+          </Tab>
+          <Tab>
+            {formatMessage({
+              id: 'Settings.application.customization.modal.upload.from-url',
+              defaultMessage: 'From url',
+            })}
+          </Tab>
+        </Tabs>
+
+        <Divider />
+      </Box>
+      <TabPanels>
+        <TabPanel>
+          <FromComputerForm
+            onClose={onClose}
+            setLocalImage={setLocalImage}
+            goTo={goTo}
+            next={next}
+          />
+        </TabPanel>
+        <TabPanel>
+          <FromUrlForm onClose={onClose} setLocalImage={setLocalImage} goTo={goTo} next={next} />
+        </TabPanel>
+      </TabPanels>
+    </TabGroup>
+  );
+};
+
+AddLogoDialog.defaultProps = {
+  next: null,
+};
+
+AddLogoDialog.propTypes = {
+  goTo: PropTypes.func.isRequired,
+  next: PropTypes.string,
+  onClose: PropTypes.func.isRequired,
+  setLocalImage: PropTypes.func.isRequired,
+};
+
+export default AddLogoDialog;