#106 Fix for metadata field "publication"

mitaai · Dec 31, 2020 · db7b7b3 · db7b7b3
1 parent 082ce36
commit db7b7b3
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 33 deletions.
diff --git a/src/components/DocumentMetadata/DocumentMetadata.js b/src/components/DocumentMetadata/DocumentMetadata.js
@@ -4,6 +4,7 @@ import { FieldArray } from 'formik';
 import {
   Button, Col, Form, InputGroup, Row,
 } from 'react-bootstrap';
+import { publicationFieldName } from '../../utils/metadataUtil';
 
 const DocumentMetadata = ({
   resourceType,
@@ -13,17 +14,6 @@ const DocumentMetadata = ({
   errors,
   touched,
 }) => {
-  const publicationFieldName = (type) => {
-    switch (type) {
-      case 'Book Section': return 'Book title';
-      case 'Journal Article': return 'Journal title';
-      case 'Newspaper Article': return 'Newspaper title';
-      case 'Magazine Article': return 'Magazine title';
-      case 'Web Page': return 'Website title';
-      default: return 'Publication title';
-    }
-  };
-
   const contributorTypes = ['Author', 'Editor', 'Translator', 'Contributor'];
 
   const [expandMeta, setExpandMeta] = useState(false);

diff --git a/src/components/SecondNavbar/SecondNavbar.js b/src/components/SecondNavbar/SecondNavbar.js
@@ -2,34 +2,31 @@ import React, { useState } from 'react';
 import {
   Nav, Navbar, Breadcrumb, Container, Modal, Table,
 } from 'react-bootstrap';
-import {
-  InfoSquare,
-} from 'react-bootstrap-icons';
-
+import { InfoSquare } from 'react-bootstrap-icons';
 import FilterPopover from '../FilterPopover';
+import { publicationFieldName } from '../../utils/metadataUtil';
 
 const SecondNavbar = ({
   session,
   type,
   document,
   docView,
 }) => {
-  const metaData = {
+  const metadataFields = {
     title: 'Title',
-    resourceType: 'Resource Type',
+    resourceType: 'Type',
     contributors: 'Contributors',
-    bookTitle: 'Book Title',
-    publication: 'Publication',
+    publication: document ? publicationFieldName(document.resourceType) : 'Publication',
     series: 'Series',
-    seriesNumber: 'Series Number',
+    seriesNumber: 'Series number',
     volume: 'Volume',
     issue: 'Issue',
-    pageNumbers: 'Page Numbers',
+    pageNumbers: 'Page numbers',
     edition: 'Edition',
     publisher: 'Publisher',
-    publicationDate: 'Publication Date',
+    publicationDate: 'Publication date',
     location: 'Location',
-    rightsStatus: 'Rights Status',
+    rightsStatus: 'Rights status',
     url: 'URL',
     accessed: 'Accessed',
     notes: 'Notes',
@@ -106,7 +103,7 @@ const SecondNavbar = ({
           <Modal.Body>
             <Table bordered size="sm">
               <tbody>
-                {Object.keys(metaData).map((key) => {
+                {Object.keys(metadataFields).map((key) => {
                   let str = '';
                   if (document[key] !== undefined) {
                     if (Array.isArray(document[key])) {
@@ -120,15 +117,15 @@ const SecondNavbar = ({
                     } else {
                       str = document[key];
                     }
-                  }
-                  return (
-                    <tr>
-                      <td className="table-meta-data-name">
-                        <strong>{metaData[key]}</strong>
-                      </td>
-                      <td>{str}</td>
-                    </tr>
-                  );
+                    return (
+                      <tr>
+                        <td className="table-meta-data-name">
+                          <strong>{metadataFields[key]}</strong>
+                        </td>
+                        <td>{str}</td>
+                      </tr>
+                    );
+                  } return '';
                 })}
               </tbody>
             </Table>

diff --git a/src/utils/metadataUtil.js b/src/utils/metadataUtil.js
@@ -0,0 +1,14 @@
+/* eslint-disable import/prefer-default-export */
+
+const publicationFieldName = (type) => {
+  switch (type) {
+    case 'Book Section': return 'Book title';
+    case 'Journal Article': return 'Journal title';
+    case 'Newspaper Article': return 'Newspaper title';
+    case 'Magazine Article': return 'Magazine title';
+    case 'Web Page': return 'Website title';
+    default: return 'Publication title';
+  }
+};
+
+export { publicationFieldName };