Adding TrimString to author metadata. Replacing kind with `view…

…Type`.
mlibrary · Nov 19, 2024 · f56bb0d · f56bb0d
1 parent 7a995a0
commit f56bb0d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/modules/records/components/RecordMetadata/index.js b/src/modules/records/components/RecordMetadata/index.js
@@ -2,7 +2,7 @@ import { ContextProvider, Metadata } from '../../../reusable';
 import PropTypes from 'prop-types';
 import React from 'react';
 
-const RecordMetadata = ({ kind, record }) => {
+const RecordMetadata = ({ record }) => {
   const { metadata } = record;
 
   if (!metadata) {
@@ -17,14 +17,13 @@ const RecordMetadata = ({ kind, record }) => {
           Medium: metadata.medium,
           Preview: metadata.preview
         };
-        return <Metadata data={data[context.viewType] || metadata.full} kind={kind} />;
+        return <Metadata data={data[context.viewType] || metadata.full} viewType={context.viewType} />;
       }}
     />
   );
 };
 
 RecordMetadata.propTypes = {
-  kind: PropTypes.string,
   record: PropTypes.object
 };
 

diff --git a/src/modules/records/components/RecordPreview/index.js b/src/modules/records/components/RecordPreview/index.js
@@ -109,7 +109,7 @@ const RecordPreview = ({ datastoreUid, record, searchQuery }) => {
   return (
     <article className='record-preview'>
       <Header {...{ datastoreUid, record, searchQuery }} />
-      <RecordMetadata {...{ record }} kind='condensed' />
+      <RecordMetadata {...{ record }} />
       <Zotero {...{ record }} />
       <Footer {...{ record, searchQuery }} />
     </article>

diff --git a/src/modules/reusable/components/Metadata/index.js b/src/modules/reusable/components/Metadata/index.js
@@ -10,6 +10,7 @@ import { BrowseLink } from '../../../browse';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { stringifySearch } from '../../../search';
+import { TrimString } from '../../../core';
 import { useSelector } from 'react-redux';
 
 const DescriptionItem = ({ browse, children, href, search }) => {
@@ -63,7 +64,7 @@ DescriptionItem.propTypes = {
   search: PropTypes.object
 };
 
-const Description = ({ data }) => {
+const Description = ({ data, viewType }) => {
   if (Array.isArray(data)) {
     return (
       <ol className='list__unstyled'>
@@ -79,7 +80,7 @@ const Description = ({ data }) => {
     );
   }
 
-  const { icon, image, text } = data;
+  const { icon, image, search: { scope } = {}, text } = data;
 
   return (
     <DescriptionItem {...data}>
@@ -91,7 +92,7 @@ const Description = ({ data }) => {
             className='margin-right__2xs text-grey__light'
           />
         )}
-        {text}
+        {scope === 'author' && viewType !== 'Full' ? <TrimString {...{ string: text, trimLength: 64 }} /> : text}
       </span>
       {image && (
         <img
@@ -108,26 +109,27 @@ Description.propTypes = {
   data: PropTypes.oneOfType([
     PropTypes.array,
     PropTypes.object
-  ])
+  ]),
+  viewType: PropTypes.string
 };
 
-export default function Metadata ({ data, kind }) {
+export default function Metadata ({ data, viewType }) {
   return (
     <dl className='flex__responsive metadata-list'>
       {data.map((datum, datumIndex) => {
         const { description, term, termPlural } = datum;
         const isExpandable = description.length > 5;
         return (
-          <div className={kind === 'condensed' ? '' : 'metadata-list-item'} key={datumIndex}>
+          <div className={viewType === 'Preview' ? '' : 'metadata-list-item'} key={datumIndex}>
             <Expandable>
-              <dt className={kind === 'condensed' ? 'visually-hidden' : ''}>
+              <dt className={viewType === 'Preview' ? 'visually-hidden' : ''}>
                 {term}
               </dt>
               <ExpandableChildren show={isExpandable ? 4 : description.length}>
                 {description.map((descriptor, index) => {
                   return (
                     <dd key={index}>
-                      <Description data={descriptor} />
+                      <Description data={descriptor} viewType={viewType} />
                     </dd>
                   );
                 })}
@@ -143,5 +145,5 @@ export default function Metadata ({ data, kind }) {
 
 Metadata.propTypes = {
   data: PropTypes.array,
-  kind: PropTypes.string
+  viewType: PropTypes.string
 };