From 6051e8ba8690a9f77c540ff39a249e0d6257449b Mon Sep 17 00:00:00 2001 From: camilovegag Date: Thu, 4 Jul 2024 09:31:17 -0500 Subject: [PATCH 1/2] Replicate pr to support markdown at develop --- .../src/components/option-card/OptionCard.tsx | 13 ++++++++++++- .../tables/results-table/ResultsTable.tsx | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/packages/berlin/src/components/option-card/OptionCard.tsx b/packages/berlin/src/components/option-card/OptionCard.tsx index 1072de63..53d10b7f 100644 --- a/packages/berlin/src/components/option-card/OptionCard.tsx +++ b/packages/berlin/src/components/option-card/OptionCard.tsx @@ -21,6 +21,8 @@ import { useNavigate, useParams } from 'react-router-dom'; import { useQuery } from '@tanstack/react-query'; import { useMemo, useState } from 'react'; import IconButton from '../icon-button'; +import Markdown from 'react-markdown'; +import Link from '../link'; type OptionCardProps = { option: GetCycleResponse['forumQuestions'][number]['questionOptions'][number]; @@ -161,7 +163,16 @@ function OptionCard({ Funding request: {option.fundingRequest} )} - {option.optionSubTitle && {option.optionSubTitle}} + {option.optionSubTitle && ( + {props.children}, + p: ({ node, ...props }) => {props.children}, + }} + > + {option.optionSubTitle} + + )} - {option.optionSubTitle} + {option.optionSubTitle && ( + {props.children}, + p: ({ node, ...props }) => {props.children}, + }} + > + {option.optionSubTitle} + + )} Research Output: {researchOutputValue} From 1d509aedf606bbaaa30f4776328b1c46cf5184c5 Mon Sep 17 00:00:00 2001 From: Diego Alzate Date: Thu, 4 Jul 2024 15:42:54 +0100 Subject: [PATCH 2/2] update pnpm action to v4 --- .github/workflows/check-formatting.yml | 2 +- .github/workflows/lint.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml index d4c8c816..09814185 100644 --- a/.github/workflows/check-formatting.yml +++ b/.github/workflows/check-formatting.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v4 with: version: 8 - name: Setup Node.js environment diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cab3377c..30740e9f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v4 with: version: 8 - name: Setup Node.js environment