@strapi/admin 4.1.7 → 4.1.10-beta.0

package/admin/src/assets/images/icon_offline-cloud.svg

@@ -0,0 +1,5 @@
+<svg width="88" height="88" viewBox="0 0 88 88" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="87" height="87" rx="43.5" fill="#F0F0FF"/>
+<path d="M34.0469 39.2969H30C27.4479 39.2969 25.2604 40.2448 23.4375 42.1406C21.6146 43.9635 20.7031 46.151 20.7031 48.7031C20.7031 51.2552 21.6146 53.4427 23.4375 55.2656C25.2604 57.0885 27.4479 58 30 58H52.75L34.0469 39.2969ZM23 28.25L25.9531 25.2969L65 64.3438L62.0469 67.2969L57.3438 62.7031H30C26.1354 62.7031 22.8177 61.3542 20.0469 58.6562C17.349 55.8854 16 52.5677 16 48.7031C16 44.9115 17.3125 41.6667 19.9375 38.9688C22.5625 36.2708 25.7344 34.849 29.4531 34.7031L23 28.25ZM61.1719 39.4062C64.1615 39.625 66.7135 40.8646 68.8281 43.125C70.9427 45.3125 72 47.9375 72 51C72 55.0104 70.3594 58.1823 67.0781 60.5156L63.6875 57.125C66.0938 55.8125 67.2969 53.7708 67.2969 51C67.2969 49.1042 66.6042 47.4635 65.2188 46.0781C63.8333 44.6927 62.1927 44 60.2969 44H56.7969V42.7969C56.7969 39.224 55.5573 36.1979 53.0781 33.7188C50.599 31.2396 47.5729 30 44 30C41.9583 30 39.9896 30.474 38.0938 31.4219L34.5938 28.0312C37.4375 26.2083 40.5729 25.2969 44 25.2969C47.9375 25.2969 51.5833 26.6823 54.9375 29.4531C58.3646 32.224 60.4427 35.5417 61.1719 39.4062Z" fill="#4945FF"/>
+<rect x="0.5" y="0.5" width="87" height="87" rx="43.5" stroke="#D9D8FF"/>
+</svg>

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(Link)`
 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();
@@ -93,7 +95,7 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
           defaultMessage: 'Workplace',
         })}
         title={menuTitle}
-        icon={<img src={menuLogo} alt={menuTitle} />}
+        icon={<img src={menu.custom || menu.default} alt={menuTitle} />}
       />
 
       <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/content-manager/components/DynamicTable/CellContent/utils/hasContent.js

@@ -56,5 +56,9 @@ export default function hasContent(type, content, metadatas, fieldSchema) {
     return isNumber(content);
   }
 
+  if (type === 'boolean') {
+    return content !== null;
+  }
+
   return !isEmpty(content);
 }

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

@@ -269,7 +269,7 @@ const EditViewDataManagerProvider = ({
   );
 
   const createFormData = useCallback(
-    (data) => {
+    data => {
       // First we need to remove the added keys needed for the dnd
       const preparedData = removeKeyInObject(cloneDeep(data), '__temp_key__');
       // Then we need to apply our helper
@@ -293,7 +293,7 @@ const EditViewDataManagerProvider = ({
   }, [hasDraftAndPublish, shouldNotRunValidations]);
 
   const handleSubmit = useCallback(
-    async (e) => {
+    async e => {
       e.preventDefault();
       let errors = {};
 
@@ -363,8 +363,8 @@ const EditViewDataManagerProvider = ({
   }, [allLayoutData, currentContentTypeLayout, isCreatingEntry, modifiedData, onPublish]);
 
   const shouldCheckDZErrors = useCallback(
-    (dzName) => {
-      const doesDZHaveError = Object.keys(formErrors).some((key) => key.split('.')[0] === dzName);
+    dzName => {
+      const doesDZHaveError = Object.keys(formErrors).some(key => key.split('.')[0] === dzName);
       const shouldCheckErrors = !isEmpty(formErrors) && doesDZHaveError;
 
       return shouldCheckErrors;
@@ -418,7 +418,7 @@ const EditViewDataManagerProvider = ({
     });
   }, []);
 
-  const onRemoveRelation = useCallback((keys) => {
+  const onRemoveRelation = useCallback(keys => {
     dispatch({
       type: 'REMOVE_RELATION',
       keys,

package/admin/src/content-manager/components/EditViewDataManagerProvider/utils/schema.js

@@ -10,11 +10,11 @@ import { translatedErrors as errorsTrads } from '@strapi/helper-plugin';
 import isFieldTypeNumber from '../../../utils/isFieldTypeNumber';
 
 yup.addMethod(yup.mixed, 'defined', function() {
-  return this.test('defined', errorsTrads.required, (value) => value !== undefined);
+  return this.test('defined', errorsTrads.required, value => value !== undefined);
 });
 
 yup.addMethod(yup.array, 'notEmptyMin', function(min) {
-  return this.test('notEmptyMin', errorsTrads.min, (value) => {
+  return this.test('notEmptyMin', errorsTrads.min, value => {
     if (isEmpty(value)) {
       return true;
     }
@@ -51,7 +51,7 @@ yup.addMethod(yup.string, 'isSuperior', function(message, min) {
   });
 });
 
-const getAttributes = (data) => get(data, ['attributes'], {});
+const getAttributes = data => get(data, ['attributes'], {});
 
 const createYupSchema = (
   model,
@@ -97,7 +97,7 @@ const createYupSchema = (
         if (attribute.repeatable === true) {
           const { min, max, required } = attribute;
 
-          let componentSchema = yup.lazy((value) => {
+          let componentSchema = yup.lazy(value => {
             let baseSchema = yup.array().of(componentFieldSchema);
 
             if (min) {
@@ -123,7 +123,7 @@ const createYupSchema = (
 
           return acc;
         }
-        const componentSchema = yup.lazy((obj) => {
+        const componentSchema = yup.lazy(obj => {
           if (obj !== undefined) {
             return attribute.required === true && !options.isDraft
               ? componentFieldSchema.defined()
@@ -154,7 +154,7 @@ const createYupSchema = (
         if (min) {
           if (attribute.required) {
             dynamicZoneSchema = dynamicZoneSchema
-              .test('min', errorsTrads.min, (value) => {
+              .test('min', errorsTrads.min, value => {
                 if (options.isCreatingEntry) {
                   return value && value.length >= min;
                 }
@@ -165,7 +165,7 @@ const createYupSchema = (
 
                 return value !== null && value.length >= min;
               })
-              .test('required', errorsTrads.required, (value) => {
+              .test('required', errorsTrads.required, value => {
                 if (options.isCreatingEntry) {
                   return value !== null || value !== undefined;
                 }
@@ -180,7 +180,7 @@ const createYupSchema = (
             dynamicZoneSchema = dynamicZoneSchema.notEmptyMin(min);
           }
         } else if (attribute.required && !options.isDraft) {
-          dynamicZoneSchema = dynamicZoneSchema.test('required', errorsTrads.required, (value) => {
+          dynamicZoneSchema = dynamicZoneSchema.test('required', errorsTrads.required, value => {
             if (options.isCreatingEntry) {
               return value !== null || value !== undefined;
             }
@@ -215,7 +215,7 @@ const createYupSchemaAttribute = (type, validations, options) => {
   if (type === 'json') {
     schema = yup
       .mixed(errorsTrads.json)
-      .test('isJSON', errorsTrads.json, (value) => {
+      .test('isJSON', errorsTrads.json, value => {
         if (value === undefined) {
           return true;
         }
@@ -238,7 +238,7 @@ const createYupSchemaAttribute = (type, validations, options) => {
   if (['number', 'integer', 'float', 'decimal'].includes(type)) {
     schema = yup
       .number()
-      .transform((cv) => (isNaN(cv) ? undefined : cv))
+      .transform(cv => (isNaN(cv) ? undefined : cv))
       .typeError();
   }
 
@@ -250,7 +250,7 @@ const createYupSchemaAttribute = (type, validations, options) => {
     schema = yup.date();
   }
 
-  Object.keys(validations).forEach((validation) => {
+  Object.keys(validations).forEach(validation => {
     const validationValue = validations[validation];
 
     if (
@@ -269,7 +269,7 @@ const createYupSchemaAttribute = (type, validations, options) => {
               if (options.isCreatingEntry) {
                 schema = schema.required(errorsTrads.required);
               } else {
-                schema = schema.test('required', errorsTrads.required, (value) => {
+                schema = schema.test('required', errorsTrads.required, value => {
                   // Field is not touched and the user is editing the entry
                   if (value === undefined && !options.isFromComponent) {
                     return true;

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

@@ -106,7 +106,6 @@ const FieldComponent = ({
             componentValue={componentValue}
             componentValueLength={componentValueLength}
             componentUid={componentUid}
-            isNested={isNested}
             isReadOnly={isReadOnly}
             max={max}
             min={min}

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

@@ -157,10 +157,10 @@ function Inputs({
     return disabled;
   }, [disabled, isCreatingEntry, isUserAllowedToEditField, isUserAllowedToReadField]);
 
-  const options = useMemo(
-    () => generateOptions(fieldSchema.enum || [], isRequired),
-    [fieldSchema, isRequired]
-  );
+  const options = useMemo(() => generateOptions(fieldSchema.enum || [], isRequired), [
+    fieldSchema,
+    isRequired,
+  ]);
 
   const { label, description, placeholder, visible } = metadatas;
 

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

@@ -5,7 +5,6 @@ import { useIntl } from 'react-intl';
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
 import get from 'lodash/get';
-import take from 'lodash/take';
 import { useNotification } from '@strapi/helper-plugin';
 import { Box } from '@strapi/design-system/Box';
 import { Flex } from '@strapi/design-system/Flex';
@@ -17,6 +16,7 @@ import ItemTypes from '../../utils/ItemTypes';
 import ComponentInitializer from '../ComponentInitializer';
 import connect from './utils/connect';
 import select from './utils/select';
+import getComponentErrorKeys from './utils/getComponentErrorKeys';
 import DraggedItem from './DraggedItem';
 import AccordionGroupCustom from './AccordionGroupCustom';
 
@@ -38,7 +38,6 @@ const RepeatableComponent = ({
   componentUid,
   componentValue,
   componentValueLength,
-  isNested,
   isReadOnly,
   max,
   min,
@@ -59,16 +58,7 @@ const RepeatableComponent = ({
     return getMaxTempKey(componentValue || []) + 1;
   }, [componentValue]);
 
-  const componentErrorKeys = Object.keys(formErrors)
-    .filter(errorKey => {
-      return take(errorKey.split('.'), isNested ? 3 : 1).join('.') === name;
-    })
-    .map(errorKey => {
-      return errorKey
-        .split('.')
-        .slice(0, name.split('.').length + 1)
-        .join('.');
-    });
+  const componentErrorKeys = getComponentErrorKeys(name, formErrors);
 
   const toggleCollapses = () => {
     setCollapseToOpen('');
@@ -187,7 +177,6 @@ RepeatableComponent.defaultProps = {
   componentValue: null,
   componentValueLength: 0,
   formErrors: {},
-  isNested: false,
   max: Infinity,
   min: 0,
 };
@@ -198,7 +187,6 @@ RepeatableComponent.propTypes = {
   componentValue: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
   componentValueLength: PropTypes.number,
   formErrors: PropTypes.object,
-  isNested: PropTypes.bool,
   isReadOnly: PropTypes.bool.isRequired,
   max: PropTypes.number,
   min: PropTypes.number,

package/admin/src/content-manager/components/RepeatableComponent/utils/getComponentErrorKeys.js

@@ -0,0 +1,10 @@
+export default function getComponentErrorKeys(name, formErrors) {
+  return Object.keys(formErrors)
+    .filter(errorKey => errorKey.startsWith(name))
+    .map(errorKey =>
+      errorKey
+        .split('.')
+        .slice(0, name.split('.').length + 1)
+        .join('.')
+    );
+}

package/admin/src/content-manager/pages/EditSettingsView/index.js

@@ -59,8 +59,8 @@ const EditSettingsView = ({ mainLayout, components, isContentTypeView, slug, upd
         'relation',
         'component',
         'boolean',
-        'date',
         'media',
+        'password',
         'richtext',
         'timestamp',
       ].includes(type) && !!type

package/admin/src/hooks/useNavigatorOnLine/index.js

@@ -0,0 +1,31 @@
+import { useEffect, useState } from 'react';
+
+/**
+ * For more details about this hook see:
+ * https://www.30secondsofcode.org/react/s/use-navigator-on-line
+ */
+const useNavigatorOnLine = () => {
+  const onlineStatus =
+    typeof navigator !== 'undefined' && typeof navigator.onLine === 'boolean'
+      ? navigator.onLine
+      : true;
+
+  const [isOnline, setIsOnline] = useState(onlineStatus);
+
+  const setOnline = () => setIsOnline(true);
+  const setOffline = () => setIsOnline(false);
+
+  useEffect(() => {
+    window.addEventListener('online', setOnline);
+    window.addEventListener('offline', setOffline);
+
+    return () => {
+      window.removeEventListener('online', setOnline);
+      window.removeEventListener('offline', setOffline);
+    };
+  }, []);
+
+  return isOnline;
+};
+
+export default useNavigatorOnLine;

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

@@ -12,6 +12,7 @@ import {
   request,
   useNotification,
   TrackingContext,
+  prefixFileUrlWithBackendUrl,
 } from '@strapi/helper-plugin';
 import { SkipToContent } from '@strapi/design-system/Main';
 import { useIntl } from 'react-intl';
@@ -22,6 +23,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')
@@ -29,6 +31,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 });
 
@@ -66,9 +69,11 @@ function App() {
     const getData = async () => {
       try {
         const {
-          data: { hasAdmin, uuid },
+          data: { hasAdmin, uuid, menuLogo },
         } = await request('/admin/init', { method: 'GET' });
 
+        updateProjectSettings({ menuLogo: prefixFileUrlWithBackendUrl(menuLogo) });
+
         if (uuid) {
           try {
             const deviceId = await getUID();
@@ -99,7 +104,7 @@ function App() {
     };
 
     getData();
-  }, [toggleNotification]);
+  }, [toggleNotification, updateProjectSettings]);
 
   const setHasAdmin = hasAdmin => setState(prev => ({ ...prev, hasAdmin }));
 

package/admin/src/pages/MarketplacePage/components/MissingPluginBanner/index.js

@@ -0,0 +1,40 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { ContentBox, useTracking } from '@strapi/helper-plugin';
+import GlassesSquare from '@strapi/icons/GlassesSquare';
+import ExternalLink from '@strapi/icons/ExternalLink';
+import { Icon } from '@strapi/design-system/Icon';
+
+const MissingPluginBanner = () => {
+  const { formatMessage } = useIntl();
+  const { trackUsage } = useTracking();
+
+  return (
+    <a
+      href="https://strapi.canny.io/plugin-requests"
+      target="_blank"
+      rel="noopener noreferrer nofollow"
+      style={{ textDecoration: 'none' }}
+      onClick={() => trackUsage('didMissMarketplacePlugin')}
+    >
+      <ContentBox
+        title={formatMessage({
+          id: 'admin.pages.MarketPlacePage.missingPlugin.title',
+          defaultMessage: 'Documentation',
+        })}
+        subtitle={formatMessage({
+          id: 'admin.pages.MarketPlacePage.missingPlugin.description',
+          defaultMessage:
+            "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!",
+        })}
+        icon={<GlassesSquare />}
+        iconBackground="alternative100"
+        endAction={
+          <Icon as={ExternalLink} color="neutral600" width={3} height={3} marginLeft={2} />
+        }
+      />
+    </a>
+  );
+};
+
+export default MissingPluginBanner;

package/admin/src/pages/MarketplacePage/components/PageHeader/index.js

@@ -0,0 +1,46 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+import { HeaderLayout } from '@strapi/design-system/Layout';
+import { LinkButton } from '@strapi/design-system/LinkButton';
+import Upload from '@strapi/icons/Upload';
+import { useTracking } from '@strapi/helper-plugin';
+
+const PageHeader = ({ isOnline }) => {
+  const { formatMessage } = useIntl();
+  const { trackUsage } = useTracking();
+
+  return (
+    <HeaderLayout
+      title={formatMessage({
+        id: 'global.marketplace',
+        defaultMessage: 'Marketplace',
+      })}
+      subtitle={formatMessage({
+        id: 'admin.pages.MarketPlacePage.subtitle',
+        defaultMessage: 'Get more out of Strapi',
+      })}
+      primaryAction={
+        isOnline && (
+          <LinkButton
+            startIcon={<Upload />}
+            variant="tertiary"
+            href="https://market.strapi.io/submit-plugin"
+            onClick={() => trackUsage('didSubmitPlugin')}
+          >
+            {formatMessage({
+              id: 'admin.pages.MarketPlacePage.submit.plugin.link',
+              defaultMessage: 'Submit your plugin',
+            })}
+          </LinkButton>
+        )
+      }
+    />
+  );
+};
+
+export default PageHeader;
+
+PageHeader.propTypes = {
+  isOnline: PropTypes.bool.isRequired,
+};