Skip to content

Commit a56e633

Browse files
bugfix: markdown is rendered correctly on dataset field overview page (#1595)
1 parent 8866d3c commit a56e633

File tree

11 files changed

+107
-130
lines changed

11 files changed

+107
-130
lines changed

odd-platform-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@tanstack/react-query": "^5.15.0",
4949
"@tanstack/react-virtual": "^3.0.1",
5050
"@tanstack/react-table": "^8.11.2",
51-
"@uiw/react-md-editor": "^3.23.5",
51+
"@uiw/react-md-editor": "^3.25.6",
5252
"@visx/curve": "^3.3.0",
5353
"@visx/event": "^3.3.0",
5454
"@visx/group": "^3.3.0",

odd-platform-ui/pnpm-lock.yaml

Lines changed: 28 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldDescription/DatasetFieldDescription.tsx

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,22 @@ const DatasetFieldDescription: FC<DatasetFieldDescriptionProps> = ({
7676
/>
7777
)}
7878
</Grid>
79-
{editMode ? (
80-
<DatasetFieldDescriptionEdit
81-
value={internalDescription}
82-
handleMarkdownChange={handleRealtimeMarkdownChange}
83-
handleUpdateDescription={handleUpdateDescription}
84-
toggleEditMode={toggleEditMode}
85-
error={error}
86-
/>
87-
) : (
88-
<DatasetFieldDescriptionPreview
89-
isDescriptionEmpty={!description}
90-
value={transformDescriptionToMarkdown(description)}
91-
/>
92-
)}
79+
<Box width='100%'>
80+
{editMode ? (
81+
<DatasetFieldDescriptionEdit
82+
value={internalDescription}
83+
handleMarkdownChange={handleRealtimeMarkdownChange}
84+
handleUpdateDescription={handleUpdateDescription}
85+
toggleEditMode={toggleEditMode}
86+
error={error}
87+
/>
88+
) : (
89+
<DatasetFieldDescriptionPreview
90+
isDescriptionEmpty={!description}
91+
value={transformDescriptionToMarkdown(description)}
92+
/>
93+
)}
94+
</Box>
9395
</>
9496
);
9597
};

odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldDescription/DatasetFieldDescriptionPreview/DatasetFieldDescriptionPreview.tsx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ interface DatasetFieldDescriptionPreviewProps {
1010
const DatasetFieldDescriptionPreview: FC<DatasetFieldDescriptionPreviewProps> = ({
1111
isDescriptionEmpty,
1212
value,
13-
}) => (
14-
<div>
15-
{!isDescriptionEmpty ? (
16-
<Markdown value={value} variant='subtitle1' />
17-
) : (
18-
<Typography mt={1} variant='subtitle1'>
19-
Description is not created yet
20-
</Typography>
21-
)}
22-
</div>
23-
);
13+
}) =>
14+
!isDescriptionEmpty ? (
15+
<Markdown value={value} variant='subtitle1' />
16+
) : (
17+
<Typography mt={1} variant='subtitle1'>
18+
Description is not created yet
19+
</Typography>
20+
);
2421

2522
export default DatasetFieldDescriptionPreview;

odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldTerms/TermItem/TermItem.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { type FC, useCallback } from 'react';
2-
import { Box } from '@mui/material';
2+
import { Box, Typography } from '@mui/material';
33
import { Permission, type TermRef } from 'generated-sources';
44
import { WithPermissions } from 'components/shared/contexts';
55
import {
@@ -11,6 +11,7 @@ import {
1111
import { DeleteIcon, LinkedTermIcon } from 'components/shared/icons';
1212
import { useDeleteDatasetFieldTerm } from 'lib/hooks';
1313
import { termDetailsPath } from 'routes';
14+
import { Link } from 'react-router-dom';
1415

1516
interface TermItemProps {
1617
name: TermRef['name'];
@@ -45,15 +46,18 @@ const TermItem: FC<TermItemProps> = ({
4546

4647
return (
4748
<InfoItem
48-
labelWidth={4}
49+
sx={{ width: '100%' }}
4950
label={
50-
<Box p={0.75} display='flex' flexWrap='nowrap' alignItems='center'>
51-
<Button to={termDetailsLink} buttonType='link-m' text={name} sx={{ mr: 0.5 }} />
51+
<Box p={0.75} display='flex' flexWrap='nowrap' alignItems='center' gap={0.5}>
52+
<Link to={termDetailsLink}>
53+
<Typography color='button.link.normal.color'>{name}</Typography>
54+
</Link>
5255
{isDescriptionLink && <LinkedTermIcon />}
5356
</Box>
5457
}
5558
info={
5659
<CollapsibleInfoContainer
60+
style={{ width: '100%' }}
5761
content={<Markdown value={definition} />}
5862
actions={
5963
!isDescriptionLink ? (

0 commit comments

Comments
 (0)