Skip to content

Fixed the props for search component #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
longshuicy merged 3 commits into from
Apr 21, 2023
Merged

Fixed the props for search component #444

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11654f8
Fixed the props for search component
arunapa Apr 19, 2023
79f7239
Added try-catch function to handle inconsistent HTML content in elast…
arunapa Apr 20, 2023
5ca5b78
Merge branch 'main' into 437-advanced-search-page-error
longshuicy Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions frontend/src/components/search/SearchResult.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,19 @@ import {theme} from "../../theme";

import parse from "html-react-parser";

// Function to parse the elastic search parameter
// If it contains HTML tags like <mark>, it removes them
// If there is no HTML tags, it returns the original string
function parseString(str: string) {
try {
const parsedHtml = parse(str);
return parsedHtml;

} catch (error) {
return str;
}
}

export function SearchResult(props) {

const {data} = props;
Expand All @@ -24,28 +37,28 @@ export function SearchResult(props) {
item._index === "dataset" ?
<MuiLink component={Link} to={`/datasets/${item._id}`}
sx={{fontWeight: "bold", fontSize: "18px"}}>
{parse(item.name)}
{parseString(item.name)}
</MuiLink>
:
<MuiLink component={Link} to={`/files/${item._id}?dataset=${item.dataset_id}`}
sx={{fontWeight: "bold", fontSize: "18px"}}>
{parse(item.name)}
{parseString(item.name)}
</MuiLink>
}
<Typography variant="body2" color={theme.palette.secondary.light}>
{
item._index === "dataset" ?
`Created by ${parse(item.author)} at ${parseDate(item.created)}`
`Created by ${parseString(item.author)} at ${parseDate(item.created)}`
:
`Created by ${parse(item.creator)} at ${parseDate(item.created)}`
`Created by ${parseString(item.creator)} at ${parseDate(item.created)}`
}
</Typography>
<Typography variant="body2" color={theme.palette.secondary.dark}>
{item._index === "dataset" ? parse(item.description) : `${item.content_type.content_type} | ${item.bytes} bytes`}
{item._index === "dataset" ? parseString(item.description) : `${item.content_type} | ${item.bytes} bytes`}
</Typography>
</Box>
</ListItem>
))}
))}
</List>
);

Expand Down