refactor: convert Author component to hooks

verdaccio · Oct 3, 2019 · 0ba12a1 · 0ba12a1
1 parent f8a1f2c
commit 0ba12a1
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 80 deletions.
diff --git a/src/components/Author/Author.test.tsx b/src/components/Author/Author.test.tsx
@@ -1,30 +1,21 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import Authors from './Author';
 
-const mockPackageMeta = jest.fn(() => ({
-  latest: {
-    homepage: 'https://verdaccio.tld',
-    bugs: {
-      url: 'https://verdaccio.tld/bugs',
-    },
-    dist: {
-      tarball: 'https://verdaccio.tld/download',
-    },
-  },
-}));
+import { DetailContext } from '../../pages/Version';
 
-jest.mock('../../pages/Version', () => ({
-  DetailContextConsumer: component => {
-    return component.children({ packageMeta: mockPackageMeta() });
-  },
-}));
+import Authors from './Author';
 
 describe('<Author /> component', () => {
   beforeEach(() => {
     jest.resetAllMocks();
   });
 
+  const component = (packageMeta: React.ContextType<typeof DetailContext>['packageMeta']): JSX.Element => (
+    <DetailContext.Provider value={{ packageMeta }}>
+      <Authors />
+    </DetailContext.Provider>
+  );
+
   test('should render the component in default state', () => {
     const packageMeta = {
       latest: {
@@ -36,13 +27,12 @@ describe('<Author /> component', () => {
           url: '',
           avatar: 'https://www.gravatar.com/avatar/000000',
         },
+        dist: { fileCount: 0, unpackedSize: 0 },
       },
+      _uplinks: {},
     };
 
-    // @ts-ignore
-    mockPackageMeta.mockImplementation(() => packageMeta);
-
-    const wrapper = mount(<Authors />);
+    const wrapper = mount(component(packageMeta));
     expect(wrapper.html()).toMatchSnapshot();
   });
 
@@ -51,14 +41,13 @@ describe('<Author /> component', () => {
       latest: {
         name: 'verdaccio',
         version: '4.0.0',
+        dist: { fileCount: 0, unpackedSize: 0 },
       },
+      _uplinks: {},
     };
 
-    // @ts-ignore
-    mockPackageMeta.mockImplementation(() => packageMeta);
-
-    const wrapper = mount(<Authors />);
-    expect(wrapper.html()).toEqual('');
+    const wrapper = mount(component(packageMeta));
+    expect(wrapper.html()).toBeNull();
   });
 
   test('should render the component when there is no author email', () => {
@@ -71,13 +60,12 @@ describe('<Author /> component', () => {
           url: '',
           avatar: 'https://www.gravatar.com/avatar/000000',
         },
+        dist: { fileCount: 0, unpackedSize: 0 },
       },
+      _uplinks: {},
     };
 
-    // @ts-ignore
-    mockPackageMeta.mockImplementation(() => packageMeta);
-
-    const wrapper = mount(<Authors />);
+    const wrapper = mount(component(packageMeta));
     expect(wrapper.html()).toMatchSnapshot();
   });
 });
diff --git a/src/components/Author/Author.tsx b/src/components/Author/Author.tsx
@@ -1,58 +1,44 @@
-import React, { Component, ReactNode, ReactElement } from 'react';
+import React, { FC, useContext } from 'react';
 
 import Avatar from '@material-ui/core/Avatar';
 import List from '@material-ui/core/List';
 
-import { DetailContextConsumer } from '../../pages/Version';
+import { DetailContext } from '../../pages/Version';
 import { Heading, AuthorListItem, AuthorListItemText } from './styles';
 import { isEmail } from '../../utils/url';
 
-class Authors extends Component {
-  public render(): ReactElement<HTMLElement> {
-    return (
-      <DetailContextConsumer>
-        {context => {
-          const { packageMeta } = context;
-
-          if (!packageMeta) {
-            return null;
-          }
-
-          return this.renderAuthor(packageMeta);
-        }}
-      </DetailContextConsumer>
-    );
+const Authors: FC = () => {
+  const { packageMeta } = useContext(DetailContext);
+
+  if (!packageMeta) {
+    return null;
   }
 
-  public renderLinkForMail(email: string, avatarComponent: ReactNode, packageName: string, version: string): ReactElement<HTMLElement> | ReactNode {
-    if (!email || isEmail(email) === false) {
-      return avatarComponent;
-    }
+  const { author, name: packageName, version } = packageMeta.latest;
 
-    return (
-      <a href={`mailto:${email}?subject=${packageName}@${version}`} target={'_top'}>
-        {avatarComponent}
-      </a>
-    );
+  if (!author) {
+    return null;
   }
 
-  public renderAuthor = ({ latest }) => {
-    const { author, name: packageName, version } = latest;
-
-    if (!author) {
-      return null;
-    }
-
-    const avatarComponent = <Avatar alt={author.name} src={author.avatar} />;
-    return (
-      <List subheader={<Heading variant={'subtitle1'}>{'Author'}</Heading>}>
-        <AuthorListItem button={true}>
-          {this.renderLinkForMail(author.email, avatarComponent, packageName, version)}
-          <AuthorListItemText primary={author.name} />
-        </AuthorListItem>
-      </List>
-    );
-  };
-}
+  const { email, name } = author;
+
+  const avatarComponent = <Avatar alt={author.name} src={author.avatar} />;
+
+  return (
+    <List subheader={<Heading variant={'subtitle1'}>{'Author'}</Heading>}>
+      <AuthorListItem button={true}>
+        {!email || !isEmail(email) ? (
+          <>{avatarComponent}</>
+        ) : (
+          <a href={`mailto:${email}?subject=${packageName}@${version}`} target={'_top'}>
+            {avatarComponent}
+          </a>
+        )}
+
+        <AuthorListItemText primary={name} />
+      </AuthorListItem>
+    </List>
+  );
+};
 
 export default Authors;
diff --git a/src/components/Package/Package.tsx b/src/components/Package/Package.tsx
@@ -28,11 +28,6 @@ import {
   WrapperLink,
 } from './styles';
 import { isURL } from '../../utils/url';
-interface Author {
-  name: string;
-  avatar?: string;
-  email?: string;
-}
 
 interface Bugs {
   url: string;
@@ -45,7 +40,7 @@ export interface PackageInterface {
   name: string;
   version: string;
   time?: number | string;
-  author: Author;
+  author: Required<PackageMetaInterface['latest']>['author'];
   description?: string;
   keywords?: string[];
   license?: PackageMetaInterface['latest']['license'];

diff --git a/types/packageMeta.ts b/types/packageMeta.ts
@@ -1,11 +1,19 @@
+export interface Author {
+  name: string;
+  avatar?: string;
+  email?: string;
+}
+
 export interface PackageMetaInterface {
   latest: {
+    author?: Author;
     name: string;
     dist: {
       fileCount: number;
       unpackedSize: number;
     };
     license?: Partial<LicenseInterface> | string;
+    version: string;
   };
   _uplinks: {};
 }