@verdaccio/ui-components 3.0.0-next.1 → 4.0.0-next-8.0

package/src/sections/Detail/Tabs.tsx

@@ -9,22 +9,19 @@ import { Theme } from '../../Theme';
 interface Props {
   onChange: (event: React.ChangeEvent<{}>, newValue: number) => void;
   tabPosition: number;
+  showUplinks?: boolean;
 }
 
-const DetailContainerTabs: React.FC<Props> = ({ tabPosition, onChange }) => {
+const DetailContainerTabs: React.FC<Props> = ({ tabPosition, onChange, showUplinks }) => {
   const { t } = useTranslation();
   return (
-    <Tabs
-      color={'primary'}
-      indicatorColor={'primary'}
-      onChange={onChange}
-      value={tabPosition}
-      variant={'fullWidth'}
-    >
+    <Tabs onChange={onChange} value={tabPosition} variant={'fullWidth'}>
       <Tab data-testid={'readme-tab'} id={'readme-tab'} label={t('tab.readme')} />
       <Tab data-testid={'dependencies-tab'} id={'dependencies-tab'} label={t('tab.dependencies')} />
       <Tab data-testid={'versions-tab'} id={'versions-tab'} label={t('tab.versions')} />
-      <Tab data-testid={'uplinks-tab'} id={'uplinks-tab'} label={t('tab.uplinks')} />
+      {showUplinks && (
+        <Tab data-testid={'uplinks-tab'} id={'uplinks-tab'} label={t('tab.uplinks')} />
+      )}
     </Tabs>
   );
 };

package/src/sections/Footer/Footer.tsx

@@ -27,28 +27,34 @@ const Footer = () => {
             <StyledEarth />
             <Flags>
               <Icon>
-                <FlagsIcon.ES />
+                <FlagsIcon.ES title={t('flag.spain')} />
               </Icon>
               <Icon>
-                <FlagsIcon.NI />
+                <FlagsIcon.NI title={t('flag.nicaragua')} />
               </Icon>
               <Icon>
-                <FlagsIcon.IN />
+                <FlagsIcon.IN title={t('flag.india')} />
               </Icon>
               <Icon>
-                <FlagsIcon.BR />
+                <FlagsIcon.BR title={t('flag.brazil')} />
               </Icon>
               <Icon>
-                <FlagsIcon.CN />
+                <FlagsIcon.CN title={t('flag.china')} />
               </Icon>
               <Icon>
-                <FlagsIcon.AU />
+                <FlagsIcon.AU title={t('flag.australia')} />
               </Icon>
               <Icon>
-                <FlagsIcon.DE />
+                <FlagsIcon.DE title={t('flag.germany')} />
               </Icon>
               <Icon>
-                <FlagsIcon.TW />
+                <FlagsIcon.TW title={t('flag.taiwan')} />
+              </Icon>
+              <Icon>
+                <FlagsIcon.AT title={t('flag.austria')} />
+              </Icon>
+              <Icon>
+                <FlagsIcon.CA title={t('flag.canada')} />
               </Icon>
             </Flags>
           </ToolTip>
@@ -56,9 +62,13 @@ const Footer = () => {
         <Right>
           {configOptions?.version && (
             <>
-              <span data-testid="version-footer">{t('footer.powered-by')}</span>
-              <Logo isDefault={true} onClick={goToVerdaccioWebsite} size="x-small" />
-              {`/ ${configOptions.version}`}
+              <PoweredBy data-testid="version-footer">{t('footer.powered-by')}</PoweredBy>
+              <Logo
+                isDefault={true}
+                onClick={goToVerdaccioWebsite}
+                size="x-small"
+                title={configOptions.version}
+              />
             </>
           )}
         </Right>
@@ -69,13 +79,17 @@ const Footer = () => {
 
 export default Footer;
 
+const PoweredBy = styled('span')(() => ({
+  paddingRight: '5px',
+}));
+
 const StyledEarth = styled(Earth)<{ theme?: Theme }>(({ theme }) => ({
   margin: theme.spacing(0, 1),
 }));
 
 const Flags = styled('span')<{ theme?: Theme }>(({ theme }) => ({
   display: 'inline-grid',
-  gridTemplateColumns: 'repeat(8, max-content)',
+  gridTemplateColumns: 'repeat(10, max-content)',
   gridGap: theme.spacing(0, 1),
   position: 'absolute',
   background: theme?.palette.greyAthens,

package/src/sections/Footer/styles.ts

@@ -14,6 +14,8 @@ export const Inner = styled('div')<{ theme?: Theme }>(({ theme }) => ({
   display: 'flex',
   alignItems: 'center',
   justifyContent: 'flex-end',
+  paddingLeft: 16,
+  paddingRight: 16,
   width: '100%',
   [`@media (min-width: ${theme?.breakPoints.medium}px)`]: {
     minWidth: 400,
@@ -32,10 +34,12 @@ export const Left = styled('div')<{ theme?: Theme }>(({ theme }) => ({
   [`@media (min-width: ${theme?.breakPoints.medium}px)`]: {
     display: 'flex',
   },
+  marginLeft: 1,
 }));
 
 export const Right = styled(Left)({
   display: 'flex',
+  marginRight: 1,
 });
 
 export const Love = styled('span')<{ theme?: Theme }>(({ theme }) => ({

package/src/sections/Header/Header.test.tsx

@@ -39,7 +39,7 @@ describe('<Header /> component with logged in state', () => {
     cleanup();
   });
 
-  test('should load the component n logged out state', () => {
+  test('should load the component in logged out state', () => {
     renderWithStore(
       <Router>
         <Header />
@@ -59,7 +59,9 @@ describe('<Header /> component with logged in state', () => {
       </Router>,
       store
     );
-    store.dispatch.login.logInUser({ username: 'store', token: '12345' });
+    act(() => {
+      store.dispatch.login.logInUser({ username: 'store', token: '12345' });
+    });
 
     await waitFor(() => {
       expect(screen.getByTestId('logInDialogIcon')).toBeTruthy();
@@ -78,13 +80,13 @@ describe('<Header /> component with logged in state', () => {
     const loginBtn = screen.getByTestId('header--button-login');
     fireEvent.click(loginBtn);
 
-    const loginDialog = await waitFor(() => screen.getByTestId('login--dialog'));
+    const loginDialog = await waitFor(() => screen.findByTestId('login--dialog'));
 
     expect(loginDialog).toBeTruthy();
   });
 
   test('should login and logout the user', async () => {
-    const { getByText, getByTestId } = renderWithStore(
+    const { getByText, getByTestId, findByText, findByTestId } = renderWithStore(
       <Router>
         <Header />
       </Router>,
@@ -104,14 +106,14 @@ describe('<Header /> component with logged in state', () => {
     await act(async () => {
       fireEvent.click(signInButton);
     });
-    await waitFor(() => getByTestId('logInDialogIcon'));
+    await waitFor(() => findByTestId('logInDialogIcon'));
     const headerMenuAccountCircle = getByTestId('logInDialogIcon');
     fireEvent.click(headerMenuAccountCircle);
 
     // // wait for button Logout's appearance and return the element
-    const logoutBtn = await waitFor(() => getByText('button.logout'));
+    const logoutBtn = await waitFor(() => findByText('button.logout'));
     fireEvent.click(logoutBtn);
-    await waitFor(() => getByText('button.login'));
+    await waitFor(() => findByText('button.login'));
     expect(getByText('button.login')).toBeTruthy();
   });
 
@@ -169,12 +171,12 @@ describe('<Header /> component with logged in state', () => {
     expect(infoBtn).toBeInTheDocument();
     fireEvent.click(infoBtn);
     // wait for registrationInfo modal appearance and return the element
-    const registrationInfoModal = await waitFor(() => screen.getByTestId('registryInfo--dialog'));
+    const registrationInfoModal = await waitFor(() => screen.findByTestId('registryInfo--dialog'));
     expect(registrationInfoModal).toBeTruthy();
   });
 
   test('should close the registrationInfo modal when clicking on the button close', async () => {
-    const { getByTestId, getByText, queryByTestId } = renderWithStore(
+    const { getByTestId, findByText, queryByTestId } = renderWithStore(
       <Router>
         <Header HeaderInfoDialog={CustomInfoDialog} />
       </Router>,
@@ -185,7 +187,7 @@ describe('<Header /> component with logged in state', () => {
     fireEvent.click(infoBtn);
 
     // wait for Close's button of registrationInfo modal appearance and return the element
-    const closeBtn = await waitFor(() => getByText('button.close'));
+    const closeBtn = await waitFor(() => findByText('button.close'));
     fireEvent.click(closeBtn);
 
     const hasRegistrationInfoModalBeenRemoved = await waitForElementToBeRemoved(() =>

package/src/sections/Header/HeaderLeft.tsx

@@ -1,29 +1,37 @@
-import styled from '@emotion/styled';
+import Toolbar from '@mui/material/Toolbar';
 import React from 'react';
-import { Link } from 'react-router-dom';
+import { Link as RouterLink } from 'react-router-dom';
 
 import { Logo, Search } from '../../';
-import { LeftSide, SearchWrapper } from './styles';
+import { SearchWrapper } from './styles';
 
 interface Props {
   showSearch?: boolean;
 }
 
-const StyledLink = styled(Link)({
-  marginRight: '1em',
-});
-
 const HeaderLeft: React.FC<Props> = ({ showSearch }) => (
-  <LeftSide>
-    <StyledLink to={'/'}>
+  <Toolbar
+    sx={{
+      display: 'flex',
+      padding: 0,
+      marginLeft: 1,
+      flex: 1,
+      '@media (min-width: 600px)': {
+        padding: 0,
+        marginLeft: 1,
+        marginRight: '20px',
+      },
+    }}
+  >
+    <RouterLink to={'/'}>
       <Logo />
-    </StyledLink>
+    </RouterLink>
     {showSearch && (
       <SearchWrapper data-testid="search-container">
         <Search />
       </SearchWrapper>
     )}
-  </LeftSide>
+  </Toolbar>
 );
 
 export default HeaderLeft;

package/src/sections/Header/HeaderMenu.tsx

@@ -39,7 +39,7 @@ const HeaderMenu: React.FC<Props> = ({
       <Menu
         anchorEl={anchorEl}
         anchorOrigin={{
-          vertical: 'top',
+          vertical: 'bottom',
           horizontal: 'right',
         }}
         onClose={onLoggedInMenuClose}

package/src/sections/Header/HeaderRight.tsx

@@ -1,11 +1,11 @@
 import Button from '@mui/material/Button';
+import Toolbar from '@mui/material/Toolbar';
 import React, { MouseEvent, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useCustomTheme } from '../../';
 import HeaderMenu from './HeaderMenu';
 import HeaderToolTip from './HeaderToolTip';
-import { RightSide } from './styles';
 
 interface Props {
   showSearch?: boolean;
@@ -75,7 +75,18 @@ const HeaderRight: React.FC<Props> = ({
   };
 
   return (
-    <RightSide data-testid="header-right">
+    <Toolbar
+      data-testid="header-right"
+      sx={{
+        display: 'flex',
+        padding: 0,
+        marginRight: 0,
+        '@media (min-width: 600px)': {
+          padding: 0,
+          marginRight: 0,
+        },
+      }}
+    >
       {showSearch === true && (
         <HeaderToolTip
           onClick={onToggleMobileNav}
@@ -124,7 +135,7 @@ const HeaderRight: React.FC<Props> = ({
           )}
         </>
       )}
-    </RightSide>
+    </Toolbar>
   );
 };
 

package/src/sections/Header/HeaderSettingsDialog.tsx

@@ -7,12 +7,11 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import ReactMarkdown from 'react-markdown';
 import { useSelector } from 'react-redux';
-import remarkGfm from 'remark-gfm';
 
 import { RootState, Theme } from '../../';
+import RegistryInfoDialog from '../../components/RegistryInfoDialog';
 import LanguageSwitch from './LanguageSwitch';
 import RegistryInfoContent from './RegistryInfoContent';
-import RegistryInfoDialog from './RegistryInfoDialog';
 
 interface Props {
   isOpen: boolean;
@@ -71,7 +70,7 @@ const HeaderSettingsDialog: React.FC<Props> = ({ onCloseDialog, isOpen }) => {
         <TabPanel index={1} value={value}>
           <TextContent>{t('language.description')}</TextContent>
           <LanguageSwitch />
-          <ReactMarkdown remarkPlugins={[remarkGfm]}>{t('language.contribute')}</ReactMarkdown>
+          <ReactMarkdown>{t('language.contribute')}</ReactMarkdown>
         </TabPanel>
       </Box>
     </RegistryInfoDialog>

package/src/sections/Header/LanguageSwitch.tsx

@@ -41,13 +41,16 @@ const LanguageContent = ({ translation, icon }) => (
 
 const LanguageSwitch = () => {
   const { language, setLanguage, listLanguages } = useLanguage();
-  const listConverted = listLanguages.reduce((prev, item) => {
-    prev[item.lng] = {
-      translation: item.menuKey,
-      icon: item.icon,
-    };
-    return prev;
-  }, {} as Record<string, { translation: string; icon: any }>);
+  const listConverted = listLanguages.reduce(
+    (prev, item) => {
+      prev[item.lng] = {
+        translation: item.menuKey,
+        icon: item.icon,
+      };
+      return prev;
+    },
+    {} as Record<string, { translation: string; icon: any }>
+  );
 
   const [languages] = useState<string[]>(Object.keys(i18next.options?.resources || {}));
   const { t } = useTranslation();

package/src/sections/Header/RegistryInfoContent/RegistryInfoContent.test.tsx

@@ -13,7 +13,7 @@ describe('<RegistryInfoContent /> component', () => {
     expect(screen.getByText('packageManagers.description')).toBeInTheDocument();
   });
 
-  test('should load the appropiate tab content when the tab is clicked', () => {
+  test('should load the appropiate tab content when the tab is clicked', () => {
     const props = { registryUrl: 'http://localhost:4872', scope: '@' };
     render(<RegistryInfoContent registryUrl={props.registryUrl} scope={props.scope} />);
 

package/src/sections/Header/RegistryInfoContent/RegistryInfoContent.tsx

@@ -10,7 +10,6 @@ import makeStyles from '@mui/styles/makeStyles';
 import React, { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import ReactMarkdown from 'react-markdown';
-import remarkGfm from 'remark-gfm';
 
 import {
   CopyClipboard,
@@ -150,17 +149,13 @@ const RegistryInfoContent: FC<Props> = ({ scope, registryUrl }) => {
           </AccordionSummary>
           <AccordionDetails>
             <Description>
-              <ReactMarkdown remarkPlugins={[remarkGfm]}>
-                {t('packageManagers.yarnclassicDetails')}
-              </ReactMarkdown>
+              <ReactMarkdown>{t('packageManagers.yarnclassicDetails')}</ReactMarkdown>
             </Description>
             <CommandContainer data-testid={'tab-content'}>
               {renderYarnTab(scope, registryUrl)}
             </CommandContainer>
             <Description>
-              <ReactMarkdown remarkPlugins={[remarkGfm]}>
-                {t('packageManagers.yarnBerryDetails')}
-              </ReactMarkdown>
+              <ReactMarkdown>{t('packageManagers.yarnBerryDetails')}</ReactMarkdown>
             </Description>
             <CommandContainer data-testid={'tab-content'}>
               {renderYarnBerryTab(scope, registryUrl)}

package/src/sections/Header/styles.ts

@@ -4,27 +4,18 @@ import AppBar from '@mui/material/AppBar';
 import IconButton from '@mui/material/IconButton';
 import Toolbar from '@mui/material/Toolbar';
 
-import { Link, Theme } from '../../';
+import { Theme } from '../../Theme';
 
 export const InnerNavBar = styled(Toolbar)({
   justifyContent: 'space-between',
   alignItems: 'center',
-  padding: '0 15px',
+  padding: 0,
 });
 
 export const Greetings = styled('span')({
   margin: '0 5px 0 0',
 });
 
-export const RightSide = styled(Toolbar)({
-  display: 'flex',
-  padding: 0,
-});
-
-export const LeftSide = styled(RightSide)({
-  flex: 1,
-});
-
 export const MobileNavBar = styled('div')<{ theme?: Theme }>((props) => ({
   alignItems: 'center',
   display: 'flex',
@@ -50,6 +41,7 @@ export const SettingsButtom = styled(IconButton)({});
 export const SearchWrapper = styled('div')({
   display: 'none',
   width: '100%',
+  marginLeft: 20,
 });
 
 export const NavBar = styled(AppBar)<{ theme?: Theme }>(({ theme }) => ({
@@ -83,7 +75,7 @@ export const NavBar = styled(AppBar)<{ theme?: Theme }>(({ theme }) => ({
   `,
   [`@media (min-width: ${theme?.breakPoints.large}px)`]: css`
     ${InnerNavBar} {
-      padding: 0 20px;
+      padding: 0 16px;
     }
   `,
   [`@media (min-width: ${theme?.breakPoints.xlarge}px)`]: css`
@@ -94,7 +86,3 @@ export const NavBar = styled(AppBar)<{ theme?: Theme }>(({ theme }) => ({
     }
   `,
 }));
-
-export const StyledLink = styled(Link)<{ theme?: Theme }>(({ theme }) => ({
-  color: theme?.palette.white,
-}));

package/src/sections/Home/Home.test.tsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import { MemoryRouter } from 'react-router';
+
+import { store } from '../../store';
+import { act, renderWithStore, screen, waitFor } from '../../test/test-react-testing-library';
+import Home from './Home';
+
+// force the windows to expand to display items
+// https://github.com/bvaughn/react-virtualized/issues/493#issuecomment-640084107
+jest.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockReturnValue(600);
+jest.spyOn(HTMLElement.prototype, 'offsetWidth', 'get').mockReturnValue(600);
+
+const ComponentHome: React.FC = () => (
+  <MemoryRouter>
+    <Home />
+  </MemoryRouter>
+);
+
+describe('Home', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('should render titles', async () => {
+    act(() => {
+      renderWithStore(<ComponentHome />, store);
+    });
+    await waitFor(() => expect(screen.getAllByTestId('package-item-list')).toHaveLength(5));
+  });
+
+  test('should render loading', async () => {
+    act(() => {
+      renderWithStore(<ComponentHome />, store);
+    });
+    await waitFor(() => expect(screen.getByTestId('loading')).toBeInTheDocument());
+  });
+});

package/src/sections/Home/Home.tsx

@@ -11,7 +11,6 @@ const Home: React.FC = () => {
     // @ts-ignore
     dispatch.packages.getPackages();
   }, [dispatch]);
-
   return (
     <div className="container content" data-testid="home-page-container">
       {isLoading ? <Loading /> : <PackageList packages={packages} />}

package/src/sections/SideBar/Sidebar.test.tsx

@@ -1,106 +1,74 @@
-import { rest } from 'msw';
 import React from 'react';
 import { MemoryRouter } from 'react-router';
 
-import { server } from '../../../jest/server';
 import { VersionProvider } from '../../providers';
 import { store } from '../../store';
-import { renderWithStore, waitFor } from '../../test/test-react-testing-library';
-import DetailSidebar from './Sidebar';
+import { act, renderWithStore, screen, waitFor } from '../../test/test-react-testing-library';
+import Sidebar from './Sidebar';
 
-const ComponentToBeRendered: React.FC = () => (
+jest.mock('marked');
+jest.mock('marked-highlight');
+
+const ComponentSideBar: React.FC = () => (
   <MemoryRouter>
     <VersionProvider>
-      <DetailSidebar />
+      <Sidebar />
     </VersionProvider>
   </MemoryRouter>
 );
 
-// https://stackoverflow.com/a/54010619/308341
-jest.mock('react', () => {
-  const React = jest.requireActual('react');
-  React.Suspense = ({ children }) => children;
-  return React;
-});
-
-const packageMeta = {
-  _uplinks: {},
-  latest: {
-    name: 'verdaccio-ui/local-storage',
-    version: '8.0.1-next.1',
-    dist: {
-      fileCount: 0,
-      unpackedSize: 0,
-      tarball: 'http://localhost:8080/bootstrap/-/bootstrap-4.3.1.tgz',
-    },
-    homepage: 'https://verdaccio.org',
-    bugs: {
-      url: 'https://github.com/verdaccio/monorepo/issues',
-    },
-  },
-};
-
-// const detailContextValue = {
-//   packageName: 'foo',
-//   readMe: 'test',
-//   isLoading: false,
-//   hasNotBeenFound: false,
-//   packageMeta: ,
-// };
+const mockPkgName = jest.fn().mockReturnValue('jquery');
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'), // use actual for all non-hook parts
   useParams: () => ({
-    package: 'jquery',
+    package: mockPkgName(),
   }),
 }));
 
-server.use(
-  ...[
-    rest.get('http://localhost:9000/-/verdaccio/data/sidebar/jquery', (req, res, ctx) => {
-      return res(ctx.json(packageMeta));
-    }),
-    rest.get('http://localhost:9000/-/verdaccio/data/package/readme/jquery', (req, res, ctx) => {
-      return res(ctx.text('foo readme'));
-    }),
-  ]
-);
-// describe('DetailSidebar', () => {
-test('should render commonjs module icon', async () => {
-  const { getByText } = renderWithStore(<ComponentToBeRendered />, store);
+describe('Sidebar', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  test('should render titles', async () => {
+    act(() => {
+      renderWithStore(<ComponentSideBar />, store);
+    });
+    await waitFor(() => expect(screen.getAllByText('jquery')).toHaveLength(2));
 
-  await waitFor(() => expect(getByText('jquery')).toBeInTheDocument());
-});
+    expect(screen.getByText(`sidebar.detail.latest-version`, { exact: false })).toBeInTheDocument();
+    expect(
+      screen.getByText(/sidebar.detail.published .*years? ago/i, { exact: false })
+    ).toBeInTheDocument();
+    expect(screen.getByText(`sidebar.installation.title`, { exact: false })).toBeInTheDocument();
+  });
 
-//   test('should render ts module icon', () => {
-//     renderWithStore(
-//       <ComponentToBeRendered
-//         contextValue={_.merge(detailContextValue, {
-//           packageMeta: {
-//             latest: {
-//               types: './src/index.d.ts',
-//             },
-//           },
-//         })}
-//       />,
-//       store
-//     );
-//     expect(screen.getByAltText('typescript')).toBeInTheDocument();
-//   });
+  test('should render commonJS', async () => {
+    act(() => {
+      renderWithStore(<ComponentSideBar />, store);
+    });
+    // package name + keyword
+    await waitFor(() => expect(screen.getAllByText('jquery')).toHaveLength(2));
+    expect(screen.getByAltText('commonjs')).toBeInTheDocument();
+  });
 
-//   test('should render es6 module icon', () => {
-//     renderWithStore(
-//       <ComponentToBeRendered
-//         contextValue={_.merge(detailContextValue, {
-//           packageMeta: {
-//             latest: {
-//               type: 'module',
-//             },
-//           },
-//         })}
-//       />,
-//       store
-//     );
-//     expect(screen.getByAltText('es6 modules')).toBeInTheDocument();
-//   });
-// });
+  test('should render typescript', async () => {
+    mockPkgName.mockReturnValue('glob');
+    act(() => {
+      renderWithStore(<ComponentSideBar />, store);
+    });
+    // just package name
+    await waitFor(() => expect(screen.getByText('glob')).toBeInTheDocument());
+    expect(screen.getByAltText('typescript')).toBeInTheDocument();
+  });
+
+  test('should render es modules', async () => {
+    mockPkgName.mockReturnValue('got');
+    act(() => {
+      renderWithStore(<ComponentSideBar />, store);
+    });
+    // package name + keyword
+    await waitFor(() => expect(screen.getAllByText('got')).toHaveLength(2));
+    expect(screen.getByAltText('es6 modules')).toBeInTheDocument();
+  });
+});