diff --git a/src/modules/metadata/components/Description/index.js b/src/modules/metadata/components/Description/index.js index a72770333..576244041 100644 --- 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 ( -
    - {data.map((datum, index) => { - return ( -
  1. - {index > 0 && } - -
  2. - ); - })} -
- ); - } - 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 deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/modules/metadata/components/Metadata/index.js b/src/modules/metadata/components/Metadata/index.js index 6b0383925..b5d3c04ec 100644 --- 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 (
- + {Array.isArray(descriptor) + ? ( +
    + {descriptor.map((descript, number) => { + return ( +
  1. + {number > 0 && } + +
  2. + ); + })} +
+ ) + : }
); })}