diff --git a/catalog-rest-service/src/main/resources/ui/src/components/card-list/CardListItem/CardWithListItems.interface.ts b/catalog-rest-service/src/main/resources/ui/src/components/card-list/CardListItem/CardWithListItems.interface.ts index f8e4a60bc1d..fcf1ed395eb 100644 --- a/catalog-rest-service/src/main/resources/ui/src/components/card-list/CardListItem/CardWithListItems.interface.ts +++ b/catalog-rest-service/src/main/resources/ui/src/components/card-list/CardListItem/CardWithListItems.interface.ts @@ -16,10 +16,10 @@ */ export type CardWithListItems = { - title: string; id: string; description: string; - contents: Array>; + data: string; + title: string; }; export type Props = { diff --git a/catalog-rest-service/src/main/resources/ui/src/components/card-list/CardListItem/CardWithListItems.tsx b/catalog-rest-service/src/main/resources/ui/src/components/card-list/CardListItem/CardWithListItems.tsx index 015de030d50..d3de3016f19 100644 --- a/catalog-rest-service/src/main/resources/ui/src/components/card-list/CardListItem/CardWithListItems.tsx +++ b/catalog-rest-service/src/main/resources/ui/src/components/card-list/CardListItem/CardWithListItems.tsx @@ -17,6 +17,7 @@ import classNames from 'classnames'; import React, { FunctionComponent } from 'react'; +import RichTextEditorPreviewer from '../../common/rich-text-editor/RichTextEditorPreviewer'; import { Props } from './CardWithListItems.interface'; import { cardStyle } from './CardWithListItems.style'; @@ -39,7 +40,9 @@ const CardListItem: FunctionComponent = ({ )}>

{card.title}

-

{card.description}

+

+ {card.description.replaceAll('*', '')} +

{isActive && } @@ -50,11 +53,7 @@ const CardListItem: FunctionComponent = ({ cardStyle.body.base, isActive ? cardStyle.body.active : cardStyle.body.default )}> -
    - {card.contents.map(({ text }, i) => ( -
  1. {text}
  2. - ))} -
+
); diff --git a/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/ManageTab.tsx b/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/ManageTab.tsx index 2d3458e8f84..56f3e9213c2 100644 --- a/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/ManageTab.tsx +++ b/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/ManageTab.tsx @@ -15,15 +15,17 @@ * limitations under the License. */ +import { AxiosResponse } from 'axios'; import { isEmpty } from 'lodash'; import { TableDetail } from 'Models'; import React, { FunctionComponent, useEffect, useState } from 'react'; import appState from '../../AppState'; -import cardData from '../../jsons/tiersData.json'; +import { getCategory } from '../../axiosAPIs/tagAPI'; import { getUserTeams } from '../../utils/CommonUtils'; import SVGIcons from '../../utils/SvgUtils'; import { Button } from '../buttons/Button/Button'; import CardListItem from '../card-list/CardListItem/CardWithListItems'; +import { CardWithListItems } from '../card-list/CardListItem/CardWithListItems.interface'; import NonAdminAction from '../common/non-admin-action/NonAdminAction'; import DropDownList from '../dropdown/DropDownList'; import Loader from '../Loader/Loader'; @@ -44,13 +46,14 @@ const ManageTab: FunctionComponent = ({ onSave, hasEditAccess, }: Props) => { - const { data } = cardData; const [loading, setLoading] = useState(false); const [status, setStatus] = useState<'initial' | 'waiting' | 'success'>( 'initial' ); const [activeTier, setActiveTier] = useState(currentTier); const [listVisible, setListVisible] = useState(false); + + const [tierData, setTierData] = useState>([]); const [listOwners] = useState(() => { const user = !isEmpty(appState.userDetails) ? appState.userDetails @@ -113,6 +116,34 @@ const ManageTab: FunctionComponent = ({ setOwner(currentUser); }; + const getTierData = () => { + getCategory('Tier').then((res: AxiosResponse) => { + if (res.data) { + const tierData = res.data.children.map( + (tier: { name: string; description: string }) => ({ + id: `Tier.${tier.name}`, + title: tier.name, + description: tier.description.substring( + 0, + tier.description.indexOf('\n\n') + ), + data: tier.description.substring( + tier.description.indexOf('\n\n') + 1 + ), + }) + ); + + setTierData(tierData); + } else { + setTierData([]); + } + }); + }; + + useEffect(() => { + getTierData(); + }, []); + useEffect(() => { setActiveTier(currentTier); }, [currentTier]); @@ -165,7 +196,7 @@ const ManageTab: FunctionComponent = ({
- {data.map((card, i) => ( + {tierData.map((card, i) => (