@strapi/admin 4.1.1 → 4.1.4-alpha.0

package/admin/src/pages/InstalledPluginsPage/Plugins.js

@@ -1,26 +1,24 @@
 import React from 'react';
-import { useQuery } from 'react-query';
 import { useIntl } from 'react-intl';
-import { LoadingIndicatorPage, useNotification, useFocusWhenNavigate } from '@strapi/helper-plugin';
+import { LoadingIndicatorPage, useFocusWhenNavigate } from '@strapi/helper-plugin';
+import { useNotifyAT } from '@strapi/design-system/LiveRegions';
 import { Layout, HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
 import { Main } from '@strapi/design-system/Main';
-import { useNotifyAT } from '@strapi/design-system/LiveRegions';
 import { Typography } from '@strapi/design-system/Typography';
 import { Table, Thead, Tbody, Tr, Td, Th } from '@strapi/design-system/Table';
-import { fetchPlugins } from './utils/api';
+import useFetchInstalledPlugins from '../../hooks/useFetchInstalledPlugins';
 
 const Plugins = () => {
   const { formatMessage } = useIntl();
-  useFocusWhenNavigate();
   const { notifyStatus } = useNotifyAT();
-  const toggleNotification = useNotification();
+  useFocusWhenNavigate();
 
   const title = formatMessage({
     id: 'app.components.ListPluginsPage.title',
     defaultMessage: 'Plugins',
   });
 
-  const notifyLoad = () => {
+  const notifyPluginPageLoad = () => {
     notifyStatus(
       formatMessage(
         {
@@ -32,14 +30,7 @@ const Plugins = () => {
     );
   };
 
-  const { status, data } = useQuery('list-plugins', () => fetchPlugins(notifyLoad), {
-    onError: () => {
-      toggleNotification({
-        type: 'warning',
-        message: { id: 'notification.error', defaultMessage: 'An error occured' },
-      });
-    },
-  });
+  const { status, data } = useFetchInstalledPlugins(notifyPluginPageLoad);
 
   const isLoading = status !== 'success' && status !== 'error';
 

package/admin/src/pages/MarketplacePage/components/EmptyPluginSearch/EmptyPluginGrid.js

@@ -0,0 +1,27 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Box } from '@strapi/design-system/Box';
+import { GridLayout } from '@strapi/design-system/Layout';
+
+const EmptyPluginCard = styled(Box)`
+  background: ${({ theme }) =>
+    `linear-gradient(180deg, rgba(234, 234, 239, 0) 0%, ${theme.colors.neutral150} 100%)`};
+  opacity: 0.33;
+`;
+
+export const EmptyPluginGrid = () => {
+  return (
+    <GridLayout>
+      {Array(12)
+        .fill(null)
+        .map((_, idx) => (
+          <EmptyPluginCard
+            // eslint-disable-next-line react/no-array-index-key
+            key={`empty-plugin-card-${idx}`}
+            height="234px"
+            hasRadius
+          />
+        ))}
+    </GridLayout>
+  );
+};

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

@@ -0,0 +1,30 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Typography } from '@strapi/design-system/Typography';
+import { Box } from '@strapi/design-system/Box';
+import { Flex } from '@strapi/design-system/Flex';
+import { Icon } from '@strapi/design-system/Icon';
+import EmptyStateDocument from '@strapi/icons/EmptyDocuments';
+import { EmptyPluginGrid } from './EmptyPluginGrid';
+
+export const EmptyPluginSearch = ({ content }) => {
+  return (
+    <Box position="relative">
+      <EmptyPluginGrid />
+      <Box position="absolute" top={11} width="100%">
+        <Flex alignItems="center" justifyContent="center" direction="column">
+          <Icon as={EmptyStateDocument} color="" width="160px" height="88px" />
+          <Box paddingTop={6}>
+            <Typography variant="delta" as="p" textColor="neutral600">
+              {content}
+            </Typography>
+          </Box>
+        </Flex>
+      </Box>
+    </Box>
+  );
+};
+
+EmptyPluginSearch.propTypes = {
+  content: PropTypes.string.isRequired,
+};

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

@@ -0,0 +1,186 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+import styled from 'styled-components';
+import { Box } from '@strapi/design-system/Box';
+import { Stack } from '@strapi/design-system/Stack';
+import { Typography } from '@strapi/design-system/Typography';
+import { Button } from '@strapi/design-system/Button';
+import { LinkButton } from '@strapi/design-system/LinkButton';
+import { Flex } from '@strapi/design-system/Flex';
+import { Icon } from '@strapi/design-system/Icon';
+import { Tooltip } from '@strapi/design-system/Tooltip';
+import ExternalLink from '@strapi/icons/ExternalLink';
+import Duplicate from '@strapi/icons/Duplicate';
+import Check from '@strapi/icons/Check';
+import CheckCircle from '@strapi/icons/CheckCircle';
+import { useNotification, useTracking } from '@strapi/helper-plugin';
+import { CopyToClipboard } from 'react-copy-to-clipboard';
+import madeByStrapiIcon from '../../../../assets/images/icon_made-by-strapi.svg';
+
+// Custom component to have an ellipsis after the 2nd line
+const EllipsisText = styled(Typography)`
+  /* stylelint-disable value-no-vendor-prefix, property-no-vendor-prefix */
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  /* stylelint-enable value-no-vendor-prefix, property-no-vendor-prefix */
+  overflow: hidden;
+`;
+
+const PluginCard = ({ plugin, installedPluginNames, useYarn }) => {
+  const { attributes } = plugin;
+  const { formatMessage } = useIntl();
+  const toggleNotification = useNotification();
+  const { trackUsage } = useTracking();
+
+  const isInstalled = installedPluginNames.includes(attributes.npmPackageName);
+
+  const commandToCopy = useYarn
+    ? `yarn add ${attributes.npmPackageName}`
+    : `npm install ${attributes.npmPackageName}`;
+
+  const madeByStrapiMessage = formatMessage({
+    id: 'admin.pages.MarketPlacePage.plugin.tooltip.madeByStrapi',
+    defaultMessage: 'Made by Strapi',
+  });
+
+  return (
+    <Flex
+      direction="column"
+      justifyContent="space-between"
+      paddingTop={4}
+      paddingRight={6}
+      paddingBottom={4}
+      paddingLeft={6}
+      hasRadius
+      background="neutral0"
+      shadow="tableShadow"
+      height="100%"
+      alignItems="normal"
+    >
+      <Box>
+        <Box
+          as="img"
+          src={attributes.logo.url}
+          alt={`${attributes.name} logo`}
+          hasRadius
+          width={11}
+          height={11}
+        />
+        <Box paddingTop={5}>
+          <Typography as="h3" variant="delta">
+            <Flex alignItems="center">
+              {attributes.name}
+              {attributes.validated && !attributes.madeByStrapi && (
+                <Tooltip
+                  description={formatMessage({
+                    id: 'admin.pages.MarketPlacePage.plugin.tooltip.verified',
+                    defaultMessage: 'Plugin verified by Strapi',
+                  })}
+                >
+                  <Flex>
+                    <Icon as={CheckCircle} marginLeft={2} color="success600" />
+                  </Flex>
+                </Tooltip>
+              )}
+              {attributes.madeByStrapi && (
+                <Tooltip description={madeByStrapiMessage}>
+                  <Flex>
+                    <Box
+                      as="img"
+                      src={madeByStrapiIcon}
+                      alt={madeByStrapiMessage}
+                      marginLeft={1}
+                      width={6}
+                      height="auto"
+                    />
+                  </Flex>
+                </Tooltip>
+              )}
+            </Flex>
+          </Typography>
+        </Box>
+        <Box paddingTop={2}>
+          <EllipsisText as="p" variant="omega" textColor="neutral600">
+            {attributes.description}
+          </EllipsisText>
+        </Box>
+      </Box>
+
+      <Stack horizontal size={2} style={{ alignSelf: 'flex-end' }} paddingTop={3}>
+        <LinkButton
+          size="S"
+          href={`https://market.strapi.io/plugins/${attributes.slug}`}
+          endIcon={<ExternalLink />}
+          aria-label={formatMessage(
+            {
+              id: 'admin.pages.MarketPlacePage.plugin.info.label',
+              defaultMessage: 'Learn more about {pluginName}',
+            },
+            { pluginName: attributes.name }
+          )}
+          variant="tertiary"
+          onClick={() => trackUsage('didPluginLearnMore')}
+        >
+          {formatMessage({
+            id: 'admin.pages.MarketPlacePage.plugin.info.text',
+            defaultMessage: 'Learn more',
+          })}
+        </LinkButton>
+        {isInstalled ? (
+          <Box paddingLeft={4}>
+            <Icon as={Check} marginRight={2} width={12} height={12} color="success600" />
+            <Typography variant="omega" textColor="success600" fontWeight="bold">
+              {formatMessage({
+                id: 'admin.pages.MarketPlacePage.plugin.installed',
+                defaultMessage: 'Installed',
+              })}
+            </Typography>
+          </Box>
+        ) : (
+          <CopyToClipboard
+            onCopy={() => {
+              trackUsage('willInstallPlugin');
+              toggleNotification({
+                type: 'success',
+                message: { id: 'admin.pages.MarketPlacePage.plugin.copy.success' },
+              });
+            }}
+            text={commandToCopy}
+          >
+            <Button size="S" startIcon={<Duplicate />} variant="secondary">
+              {formatMessage({
+                id: 'admin.pages.MarketPlacePage.plugin.copy',
+                defaultMessage: 'Copy install command',
+              })}
+            </Button>
+          </CopyToClipboard>
+        )}
+      </Stack>
+    </Flex>
+  );
+};
+
+PluginCard.propTypes = {
+  plugin: PropTypes.shape({
+    id: PropTypes.string.isRequired,
+    attributes: PropTypes.shape({
+      name: PropTypes.string.isRequired,
+      description: PropTypes.string.isRequired,
+      slug: PropTypes.string.isRequired,
+      npmPackageName: PropTypes.string.isRequired,
+      npmPackageUrl: PropTypes.string.isRequired,
+      repositoryUrl: PropTypes.string.isRequired,
+      logo: PropTypes.object.isRequired,
+      developerName: PropTypes.string.isRequired,
+      validated: PropTypes.bool.isRequired,
+      madeByStrapi: PropTypes.bool.isRequired,
+      strapiCompatibility: PropTypes.oneOf(['v3', 'v4']).isRequired,
+    }).isRequired,
+  }).isRequired,
+  installedPluginNames: PropTypes.arrayOf(PropTypes.string).isRequired,
+  useYarn: PropTypes.bool.isRequired,
+};
+
+export default PluginCard;

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

@@ -1,118 +1,216 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
-import styled from 'styled-components';
 import { Helmet } from 'react-helmet';
-import { pxToRem, CheckPagePermissions, useTracking } from '@strapi/helper-plugin';
-import { Layout, HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
-import { Flex } from '@strapi/design-system/Flex';
-import { Box } from '@strapi/design-system/Box';
-import { Stack } from '@strapi/design-system/Stack';
-import { LinkButton } from '@strapi/design-system/LinkButton';
+import { useQuery } from 'react-query';
+import matchSorter from 'match-sorter';
+import {
+  AnErrorOccurred,
+  CheckPagePermissions,
+  useFocusWhenNavigate,
+  useTracking,
+  LoadingIndicatorPage,
+  useNotification,
+} from '@strapi/helper-plugin';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
+import { Layout, HeaderLayout, ContentLayout, ActionLayout } from '@strapi/design-system/Layout';
 import { Main } from '@strapi/design-system/Main';
-import { Typography } from '@strapi/design-system/Typography';
-import ExternalLink from '@strapi/icons/ExternalLink';
-import adminPermissions from '../../permissions';
-import MarketplacePicture from './assets/marketplace-coming-soon.png';
-
-const CenterTypography = styled(Typography)`
-  text-align: center;
-`;
+import { Searchbar } from '@strapi/design-system/Searchbar';
+import { LinkButton } from '@strapi/design-system/LinkButton';
+import { useNotifyAT } from '@strapi/design-system/LiveRegions';
+import Plus from '@strapi/icons/Plus';
 
-const Img = styled.img`
-  width: ${190 / 16}rem;
-`;
+import PluginCard from './components/PluginCard';
+import { EmptyPluginSearch } from './components/EmptyPluginSearch';
+import { fetchAppInformation } from './utils/api';
+import useFetchInstalledPlugins from '../../hooks/useFetchInstalledPlugins';
+import useFetchMarketplacePlugins from '../../hooks/useFetchMarketplacePlugins';
+import adminPermissions from '../../permissions';
 
-const StackCentered = styled(Stack)`
-  align-items: center;
-`;
+const matchSearch = (plugins, search) => {
+  return matchSorter(plugins, search, {
+    keys: [
+      {
+        threshold: matchSorter.rankings.WORD_STARTS_WITH,
+        key: 'attributes.name',
+      },
+      { threshold: matchSorter.rankings.WORD_STARTS_WITH, key: 'attributes.description' },
+    ],
+  });
+};
 
 const MarketPlacePage = () => {
   const { formatMessage } = useIntl();
   const { trackUsage } = useTracking();
+  const { notifyStatus } = useNotifyAT();
+  const trackUsageRef = useRef(trackUsage);
+  const toggleNotification = useNotification();
+  const [searchQuery, setSearchQuery] = useState('');
+
+  useFocusWhenNavigate();
+
+  const marketplaceTitle = formatMessage({
+    id: 'admin.pages.MarketPlacePage.title',
+    defaultMessage: 'Marketplace',
+  });
+
+  const notifyMarketplaceLoad = () => {
+    notifyStatus(
+      formatMessage(
+        {
+          id: 'app.utils.notify.data-loaded',
+          defaultMessage: 'The {target} has loaded',
+        },
+        { target: marketplaceTitle }
+      )
+    );
+  };
+
+  const {
+    status: marketplacePluginsStatus,
+    data: marketplacePluginsResponse,
+  } = useFetchMarketplacePlugins(notifyMarketplaceLoad);
+
+  const {
+    status: installedPluginsStatus,
+    data: installedPluginsResponse,
+  } = useFetchInstalledPlugins();
+
+  const { data: appInfoResponse, status: appInfoStatus } = useQuery(
+    'app-information',
+    fetchAppInformation,
+    {
+      onError: () => {
+        toggleNotification({
+          type: 'warning',
+          message: { id: 'notification.error', defaultMessage: 'An error occured' },
+        });
+      },
+    }
+  );
+
+  const isLoading = [marketplacePluginsStatus, installedPluginsStatus, appInfoStatus].includes(
+    'loading'
+  );
+
+  const hasFailed = [marketplacePluginsStatus, installedPluginsStatus, appInfoStatus].includes(
+    'error'
+  );
 
   useEffect(() => {
-    trackUsage('didGoToMarketplace');
-  }, [trackUsage]);
+    trackUsageRef.current('didGoToMarketplace');
+  }, []);
 
-  return (
-    <CheckPagePermissions permissions={adminPermissions.marketplace.main}>
+  if (hasFailed) {
+    return (
       <Layout>
-        <Main>
-          <Helmet
-            title={formatMessage({
-              id: 'admin.pages.MarketPlacePage.helmet',
-              defaultMessage: 'Marketplace - Plugins',
-            })}
-          />
-          <HeaderLayout
-            title={formatMessage({
-              id: 'admin.pages.MarketPlacePage.title',
-              defaultMessage: 'Marketplace',
-            })}
-            subtitle={formatMessage({
-              id: 'admin.pages.MarketPlacePage.subtitle',
-              defaultMessage: 'Get more out of Strapi',
-            })}
-          />
-          <ContentLayout>
-            <StackCentered
-              size={0}
-              hasRadius
-              background="neutral0"
-              shadow="tableShadow"
-              paddingTop={10}
-              paddingBottom={10}
-            >
-              <Box paddingBottom={7}>
-                <Img
-                  alt={formatMessage({
-                    id: 'admin.pages.MarketPlacePage.illustration',
-                    defaultMessage: 'marketplace illustration',
-                  })}
-                  src={MarketplacePicture}
-                />
-              </Box>
-              <Typography variant="alpha">
-                {formatMessage({
-                  id: 'admin.pages.MarketPlacePage.coming-soon.1',
-                  defaultMessage: 'A new way to make Strapi awesome.',
-                })}
-              </Typography>
-              <Typography variant="alpha" textColor="primary700">
-                {formatMessage({
-                  id: 'admin.pages.MarketPlacePage.published',
-                  defaultMessage: 'Finally here.',
-                })}
-              </Typography>
-              <Flex maxWidth={pxToRem(620)} paddingTop={3}>
-                <CenterTypography variant="epsilon" textColor="neutral600">
-                  {formatMessage({
-                    id: 'admin.pages.MarketPlacePage.content.subtitle.published',
-                    defaultMessage:
-                      'The web marketplace helps you get the most of Strapi. In addition, we are working hard to offer the best experience to discover and install plugins, directly from the app.',
-                  })}
-                </CenterTypography>
-              </Flex>
-              <Stack paddingTop={6} horizontal size={2}>
-                <LinkButton href="https://market.strapi.io" size="L" variant="primary" endIcon={<ExternalLink />}>
-                  {formatMessage({
-                    id: 'admin.pages.MarketPlacePage.submit.market.link',
-                    defaultMessage: 'Visit the web marketplace',
-                  })}
-                </LinkButton>
-                <LinkButton href="https://market.strapi.io/submit-plugin" size="L" variant="secondary">
-                  {formatMessage({
-                    id: 'admin.pages.MarketPlacePage.submit.plugin.link',
-                    defaultMessage: 'Submit your plugin',
-                  })}
-                </LinkButton>
-              </Stack>
-            </StackCentered>
-          </ContentLayout>
+        <AnErrorOccurred />
+      </Layout>
+    );
+  }
+
+  if (isLoading) {
+    return (
+      <Layout>
+        <Main aria-busy>
+          <LoadingIndicatorPage />
         </Main>
       </Layout>
-    </CheckPagePermissions>
+    );
+  }
+
+  const searchResults = matchSearch(marketplacePluginsResponse.data, searchQuery);
+  const installedPluginNames = installedPluginsResponse.plugins.map(plugin => plugin.packageName);
+
+  return (
+    <Layout>
+      <Main>
+        <Helmet
+          title={formatMessage({
+            id: 'admin.pages.MarketPlacePage.helmet',
+            defaultMessage: 'Marketplace - Plugins',
+          })}
+        />
+        <HeaderLayout
+          title={formatMessage({
+            id: 'admin.pages.MarketPlacePage.title',
+            defaultMessage: 'Marketplace',
+          })}
+          subtitle={formatMessage({
+            id: 'admin.pages.MarketPlacePage.subtitle',
+            defaultMessage: 'Get more out of Strapi',
+          })}
+          primaryAction={
+            <LinkButton
+              startIcon={<Plus />}
+              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>
+          }
+        />
+        <ActionLayout
+          startActions={
+            <Searchbar
+              name="searchbar"
+              onClear={() => setSearchQuery('')}
+              value={searchQuery}
+              onChange={e => setSearchQuery(e.target.value)}
+              clearLabel={formatMessage({
+                id: 'admin.pages.MarketPlacePage.search.clear',
+                defaultMessage: 'Clear the plugin search',
+              })}
+              placeholder={formatMessage({
+                id: 'admin.pages.MarketPlacePage.search.placeholder',
+                defaultMessage: 'Search for a plugin',
+              })}
+            >
+              {formatMessage({
+                id: 'admin.pages.MarketPlacePage.search.placeholder',
+                defaultMessage: 'Search for a plugin',
+              })}
+            </Searchbar>
+          }
+        />
+        <ContentLayout>
+          {searchQuery.length > 0 && !searchResults.length ? (
+            <EmptyPluginSearch
+              content={formatMessage(
+                {
+                  id: 'admin.pages.MarketPlacePage.search.empty',
+                  defaultMessage: 'No result for "{target}"',
+                },
+                { target: searchQuery }
+              )}
+            />
+          ) : (
+            <Grid gap={4}>
+              {searchResults.map(plugin => (
+                <GridItem col={4} s={6} xs={12} style={{ height: '100%' }} key={plugin.id}>
+                  <PluginCard
+                    plugin={plugin}
+                    installedPluginNames={installedPluginNames}
+                    useYarn={appInfoResponse.data.useYarn}
+                  />
+                </GridItem>
+              ))}
+            </Grid>
+          )}
+        </ContentLayout>
+      </Main>
+    </Layout>
   );
 };
 
-export default MarketPlacePage;
+const ProtectedMarketPlace = () => (
+  <CheckPagePermissions permissions={adminPermissions.marketplace.main}>
+    <MarketPlacePage />
+  </CheckPagePermissions>
+);
+
+export { MarketPlacePage };
+export default ProtectedMarketPlace;

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

@@ -0,0 +1,9 @@
+import { axiosInstance } from '../../../core/utils';
+
+const fetchAppInformation = async () => {
+  const { data } = await axiosInstance.get('/admin/information');
+
+  return data;
+};
+
+export { fetchAppInformation };

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

@@ -182,7 +182,7 @@ const ProfilePage = () => {
               />
               <Box paddingBottom={10}>
                 <ContentLayout>
-                  <Stack size={6}>
+                  <Stack spacing={6}>
                     <Box
                       background="neutral0"
                       hasRadius
@@ -192,7 +192,7 @@ const ProfilePage = () => {
                       paddingLeft={7}
                       paddingRight={7}
                     >
-                      <Stack size={4}>
+                      <Stack spacing={4}>
                         <Typography variant="delta" as="h2">
                           {formatMessage({
                             id: 'Settings.profile.form.section.profile.title',
@@ -263,7 +263,7 @@ const ProfilePage = () => {
                       paddingLeft={7}
                       paddingRight={7}
                     >
-                      <Stack size={4}>
+                      <Stack spacing={4}>
                         <Typography variant="delta" as="h2">
                           {formatMessage({
                             id: 'Settings.profile.form.section.password.title',
@@ -410,8 +410,8 @@ const ProfilePage = () => {
                       paddingLeft={7}
                       paddingRight={7}
                     >
-                      <Stack size={4}>
-                        <Stack size={1}>
+                      <Stack spacing={4}>
+                        <Stack spacing={1}>
                           <Typography variant="delta" as="h2">
                             {formatMessage({
                               id: 'Settings.profile.form.section.experience.title',

package/admin/src/pages/SettingsPage/components/SettingsNav/index.js

@@ -29,7 +29,10 @@ const SettingsNav = ({ menu }) => {
     };
   });
 
-  const label = formatMessage({ id: 'app.components.LeftMenuLinkContainer.settings' });
+  const label = formatMessage({
+    id: 'app.components.LeftMenuLinkContainer.settings',
+    defaultMessage: 'Settings',
+  });
 
   return (
     <SubNav ariaLabel={label}>