global: add identifiers tab in documents frontsite and display isbn i…

…n backoffice (#791) * add identifiers tab in document frontsite and fix problems with identifiers in backoffice * Add isbn to identifiers vocabulary
inveniosoftware · Apr 3, 2020 · f264e91 · f264e91
1 parent d2b1ab3
commit f264e91
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 11 deletions.
diff --git a/invenio_app_ils/vocabularies/data/alternative_identifier_schemes.json b/invenio_app_ils/vocabularies/data/alternative_identifier_schemes.json
@@ -9,11 +9,6 @@
     "key": "ASIN",
     "text": "Amazon Standard Id. Number (ASIN)"
   },
-  {
-    "type": "alternative_identifier_scheme",
-    "key": "ISBN",
-    "text": "International Standard Book Number (ISBN)"
-  },
   {
     "type": "alternative_identifier_scheme",
     "key": "HDL",
@@ -24,4 +19,4 @@
     "key": "SAFARI",
     "text": "Safari Books Online (SAFARI)"
   }
-]
+]
diff --git a/invenio_app_ils/vocabularies/data/identifier_schemes.json b/invenio_app_ils/vocabularies/data/identifier_schemes.json
@@ -8,5 +8,10 @@
     "type": "identifier_scheme",
     "key": "URN",
     "text": "Uniform Resource Name (URN)"
+  },
+  {
+    "type": "identifier_scheme",
+    "key": "ISBN",
+    "text": "International Standard Book Number (ISBN)"
   }
-]
+]
diff --git a/...es/backoffice/Document/DocumentDetails/components/DocumentMetadata/DocumentIdentifiers.js b/...es/backoffice/Document/DocumentDetails/components/DocumentMetadata/DocumentIdentifiers.js
@@ -6,10 +6,12 @@ import React, { Component } from 'react';
 export class DocumentIdentifiers extends Component {
   render() {
     const { document } = this.props;
+    const identifiers = groupedSchemeValueList(document.metadata.identifiers);
+    const alternative_identifiers = groupedSchemeValueList(
+      document.metadata.alternative_identifiers
+    );
     return document.metadata.identifiers ? (
-      <MetadataTable
-        rows={groupedSchemeValueList(document.metadata.identifiers)}
-      />
+      <MetadataTable rows={identifiers.concat(alternative_identifiers)} />
     ) : (
       <InfoMessage
         header={'No stored identifiers.'}

diff --git a/ui/src/pages/frontsite/components/Document/DocumentInfo.js b/ui/src/pages/frontsite/components/Document/DocumentInfo.js
@@ -2,6 +2,8 @@ import React, { Component } from 'react';
 import { Divider, Table } from 'semantic-ui-react';
 import PropTypes from 'prop-types';
 import { DocumentAuthors } from '@components/Document';
+import isEmpty from 'lodash/isEmpty';
+import { IdentifierRows } from '../Identifiers';
 
 export class DocumentInfo extends Component {
   constructor(props) {
@@ -23,6 +25,19 @@ export class DocumentInfo extends Component {
     return null;
   }
 
+  renderSpecificIdentifiers(scheme) {
+    const identifiers = this.metadata.identifiers
+      ? this.metadata.identifiers.filter(
+          identifier => identifier.scheme === scheme
+        )
+      : null;
+
+    if (!isEmpty(identifiers)) {
+      return <IdentifierRows identifiers={identifiers} />;
+    }
+    return null;
+  }
+
   render() {
     return (
       <>
@@ -50,6 +65,8 @@ export class DocumentInfo extends Component {
                 {this.metadata.keywords.value} ({this.metadata.keywords.source})
               </Table.Cell>
             </Table.Row>
+            {this.renderSpecificIdentifiers('ISBN')}
+            {this.renderSpecificIdentifiers('DOI')}
           </Table.Body>
         </Table>
       </>

diff --git a/ui/src/pages/frontsite/components/Document/DocumentMetadataTabs.js b/ui/src/pages/frontsite/components/Document/DocumentMetadataTabs.js
@@ -7,6 +7,8 @@ import { DocumentConference } from './DocumentConference';
 import { DocumentLinks } from './DocumentLinks';
 import { Notes } from '../Notes';
 import _get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import { Identifiers } from '../Identifiers';
 
 export class DocumentMetadataTabs extends Component {
   constructor(props) {
@@ -28,6 +30,22 @@ export class DocumentMetadataTabs extends Component {
           </Tab.Pane>
         ),
       },
+      {
+        menuItem: 'Identifiers',
+        render: () => (
+          <Tab.Pane attached={false}>
+            <Identifiers
+              identifiers={
+                isEmpty(this.document.identifiers)
+                  ? this.document.alternative_identifiers
+                  : this.document.identifiers.concat(
+                      this.document.alternative_identifiers
+                    )
+              }
+            />
+          </Tab.Pane>
+        ),
+      },
       {
         menuItem: 'Content',
         render: () => (

diff --git a/ui/src/pages/frontsite/components/Document/DocumentRelations.js b/ui/src/pages/frontsite/components/Document/DocumentRelations.js
@@ -91,6 +91,7 @@ export class DocumentRelations extends Component {
           {this.renderSerials()}
           {this.renderLanguages()}
           {this.renderEditions()}
+          )}
         </>
       );
     } else {

diff --git a/ui/src/pages/frontsite/components/Identifiers/Identifiers.js b/ui/src/pages/frontsite/components/Identifiers/Identifiers.js
@@ -31,7 +31,7 @@ export const IdentifierRows = ({ includeSchemes, identifiers }) => {
     // Only include whitelisted schemes if includeSchemes is set
     if (!includeSchemes || includeSchemes.includes(id.scheme)) {
       const value = { value: id.value, material: id.material };
-      if (id.scheme in identifiers) {
+      if (id.scheme in idsByScheme) {
         idsByScheme[id.scheme].push(value);
       } else {
         idsByScheme[id.scheme] = [value];