Moving array descriptions outside of Description.

mlibrary · Nov 22, 2024 · ff3f1cb · ff3f1cb
1 parent 3181a58
commit ff3f1cb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/src/modules/metadata/components/Description/index.js b/src/modules/metadata/components/Description/index.js
@@ -5,21 +5,6 @@ import React from 'react';
 import { TrimString } from '../../../core';
 
 const Description = ({ data, viewType }) => {
-  if (Array.isArray(data)) {
-    return (
-      <ol className='list__unstyled'>
-        {data.map((datum, index) => {
-          return (
-            <li key={index}>
-              {index > 0 && <Icon icon='navigate_next' className='text-grey__light' />}
-              <Description data={datum} />
-            </li>
-          );
-        })}
-      </ol>
-    );
-  }
-
   const { icon, image, search: { scope } = {}, text } = data;
 
   return (
@@ -34,10 +19,7 @@ const Description = ({ data, viewType }) => {
 };
 
 Description.propTypes = {
-  data: PropTypes.oneOfType([
-    PropTypes.array,
-    PropTypes.object
-  ]),
+  data: PropTypes.object,
   viewType: PropTypes.string
 };
 

diff --git a/src/modules/metadata/components/Descriptions/index.js b/src/modules/metadata/components/Descriptions/index.js
diff --git a/src/modules/metadata/components/Metadata/index.js b/src/modules/metadata/components/Metadata/index.js
@@ -3,7 +3,8 @@ import {
   ContextProvider,
   Expandable,
   ExpandableButton,
-  ExpandableChildren
+  ExpandableChildren,
+  Icon
 } from '../../../reusable';
 import Description from '../Description';
 import PropTypes from 'prop-types';
@@ -39,7 +40,20 @@ const Metadata = ({ metadata = {} }) => {
                       {description.map((descriptor, index) => {
                         return (
                           <dd key={index}>
-                            <Description data={descriptor} viewType={viewType} />
+                            {Array.isArray(descriptor)
+                              ? (
+                                  <ol className='list__unstyled'>
+                                    {descriptor.map((descript, number) => {
+                                      return (
+                                        <li key={number}>
+                                          {number > 0 && <Icon icon='navigate_next' className='text-grey__light' />}
+                                          <Description data={descript} />
+                                        </li>
+                                      );
+                                    })}
+                                  </ol>
+                                )
+                              : <Description data={descriptor} viewType={viewType} />}
                           </dd>
                         );
                       })}