Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 3 additions & 15 deletions frontend/src/components/analyzables/analyzablesTableColumns.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import {
} from "@certego/certego-ui";

import TableCell from "../common/TableCell";
import TagsCell from "../common/TagsCell";
import { ObservableClassifications } from "../../constants/jobConst";
import { TagsBadge, LastEvaluationComponent } from "../common/engineBadges";
import { LastEvaluationComponent } from "../common/engineBadges";

export const analyzablesTableColumns = [
{
Expand Down Expand Up @@ -156,20 +157,7 @@ export const analyzablesTableColumns = [
Header: "Tags",
id: "tags",
accessor: (analyzable) => analyzable?.last_data_model?.tags,
Cell: ({ value: tags, row }) =>
tags ? (
<div className="d-flex justify-content-center py-2">
{tags.map((tag, index) => (
<TagsBadge
id={`tag-row${row.id}_${index}`}
tag={tag}
className="ms-1"
/>
))}
</div>
) : (
<div />
),
Cell: ({ value: tags, row }) => <TagsCell values={tags} rowId={row.id} />,
disableSortBy: true,
maxWidth: 100,
Filter: DefaultColumnFilter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import {
import { format } from "date-fns-tz";

import TableCell from "../../common/TableCell";
import { TagsBadge, LastEvaluationComponent } from "../../common/engineBadges";
import TagsCell from "../../common/TagsCell";
import { LastEvaluationComponent } from "../../common/engineBadges";
import {
JobResultSections,
AnalyzableHistoryTypes,
Expand Down Expand Up @@ -130,20 +131,7 @@ export const analyzablesHistoryTableColumns = [
Header: "Tags",
id: "tags",
accessor: "data_model.tags",
Cell: ({ value, row }) =>
value ? (
<div className="d-flex justify-content-center py-2">
{value.map((tag, index) => (
<TagsBadge
id={`row${row.id}_${index}`}
tag={tag}
className="ms-1"
/>
))}
</div>
) : (
<div />
),
Cell: ({ value, row }) => <TagsCell values={value} rowId={row.id} />,
disableSortBy: true,
maxWidth: 100,
Filter: DefaultColumnFilter,
Expand Down
40 changes: 40 additions & 0 deletions frontend/src/components/common/TagsCell.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import React from "react";
import PropTypes from "prop-types";
import { UncontrolledTooltip, Badge } from "reactstrap";
import { BsFillPlusCircleFill } from "react-icons/bs";

import { TagsBadge } from "./engineBadges";

export default function TagsCell({ values, rowId }) {
let lastTags = null;
if (values?.length > 10) {
lastTags = values?.slice(10, values.length);
}

return values ? (
<div className="d-flex justify-content-center py-2 flex-wrap">
{values?.slice(0, 9).map((tag, index) => (
<TagsBadge
id={`row${rowId}_${index}`}
tag={tag}
className="ms-1 mb-1"
/>
))}
{lastTags && (
<Badge id="last_tags" className="d-flex-center ms-1 mb-1">
<BsFillPlusCircleFill />
<UncontrolledTooltip target="last_tags" placement="top" fade={false}>
{lastTags.toString()}
</UncontrolledTooltip>
</Badge>
)}
</div>
) : (
<div />
);
}

TagsCell.propTypes = {
values: PropTypes.array.isRequired,
rowId: PropTypes.string.isRequired,
};
38 changes: 3 additions & 35 deletions frontend/src/components/userEvents/userEventsTableColumns.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
/* eslint-disable react/prop-types */
import React from "react";
import { UncontrolledTooltip, Badge } from "reactstrap";
import { BsFillPlusCircleFill } from "react-icons/bs";

import { DefaultColumnFilter, DateHoverable } from "@certego/certego-ui";

import { LastEvaluationComponent, TagsBadge } from "../common/engineBadges";
import { LastEvaluationComponent } from "../common/engineBadges";
import { UserEventDecay } from "./UserEventDecay";
import TableCell from "../common/TableCell";
import TagsCell from "../common/TagsCell";

export const userEventsTableStartColumns = [
{
Expand Down Expand Up @@ -91,38 +90,7 @@ export const userEventsTableEndColumns = [
Header: "Tags",
id: "tags",
accessor: (userEvent) => userEvent.data_model.tags,
Cell: ({ value: tags, row }) => {
let lastTags = null;
if (tags?.length > 10) {
lastTags = tags?.slice(10, tags.length);
}

return tags ? (
<div className="d-flex justify-content-center py-2 flex-wrap">
{tags?.slice(0, 9).map((tag, index) => (
<TagsBadge
id={`tag-row${row.id}_${index}`}
tag={tag}
className="ms-1 mb-1"
/>
))}
{lastTags && (
<Badge id="last_tags" className="d-flex-center ms-1 mb-1">
<BsFillPlusCircleFill />
<UncontrolledTooltip
target="last_tags"
placement="top"
fade={false}
>
{lastTags.toString()}
</UncontrolledTooltip>
</Badge>
)}
</div>
) : (
<div />
);
},
Cell: ({ value: tags, row }) => <TagsCell values={tags} rowId={row.id} />,
disableSortBy: true,
maxWidth: 100,
},
Expand Down
Loading