Skip to content

Commit c6fc8d3

Browse files
committed
fixes colors in risk assessment feed
1 parent cca1d6a commit c6fc8d3

2 files changed

Lines changed: 9 additions & 14 deletions

File tree

src/components/risk-assessment/RiskAssessmentFeed.tsx

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { useActiveAssetVersion } from "@/hooks/useActiveAssetVersion";
1818
import { useActiveOrg } from "@/hooks/useActiveOrg";
1919
import { useActiveProject } from "@/hooks/useActiveProject";
2020
import { useCurrentUser } from "@/hooks/useCurrentUser";
21+
import { useCurrentUserRole } from "@/hooks/useUserRole";
2122
import { UserRole, VulnEventDTO } from "@/types/api/api";
2223
import { classNames } from "@/utils/common";
2324
import {
@@ -44,28 +45,22 @@ import {
4445
Scale,
4546
} from "lucide-react";
4647
import Image from "next/image";
47-
import Link from "next/link";
48+
import { useState } from "react";
4849
import Markdown from "react-markdown";
4950
import rehypeExternalLinks from "rehype-external-links";
5051
import remarkGfm from "remark-gfm";
52+
import Alert from "../common/Alert";
5153
import { Avatar, AvatarFallback, AvatarImage } from "../ui/avatar";
5254
import { Badge } from "../ui/badge";
5355
import { Button } from "../ui/button";
54-
import FormatDate from "./FormatDate";
56+
import { Collapsible, CollapsibleContent } from "../ui/collapsible";
5557
import {
5658
DropdownMenu,
5759
DropdownMenuContent,
5860
DropdownMenuItem,
5961
DropdownMenuTrigger,
6062
} from "../ui/dropdown-menu";
61-
import Alert from "../common/Alert";
62-
import { useCurrentUserRole } from "@/hooks/useUserRole";
63-
import {
64-
Collapsible,
65-
CollapsibleContent,
66-
CollapsibleTrigger,
67-
} from "../ui/collapsible";
68-
import { useState } from "react";
63+
import FormatDate from "./FormatDate";
6964

7065
function EventTypeIcon({ eventType }: { eventType: VulnEventDTO["type"] }) {
7166
switch (eventType) {
@@ -143,9 +138,9 @@ const RiskFeedItem = ({
143138
<div
144139
className={classNames(
145140
event.createdByVexRule
146-
? "bg-secondary"
141+
? "bg-secondary text-secondary-foreground"
147142
: evTypeBackground[event.type],
148-
"h-7 w-7 rounded-full text-white border-2 flex flex-row items-center z-10 justify-center border-background p-1",
143+
"h-7 w-7 rounded-full border-2 flex flex-row items-center z-10 justify-center border-background p-1",
149144
)}
150145
>
151146
<EventTypeIcon eventType={event.type} />

src/utils/view.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ export const evTypeBackground: { [key in VulnEventDTO["type"]]: string } = {
162162
falsePositive: "bg-purple-600 text-white!",
163163
mitigate: "bg-green-600 text-white!",
164164
markedForTransfer: "bg-blue-600 text-white!",
165-
rawRiskAssessmentUpdated: "bg-secondary text-white!",
165+
rawRiskAssessmentUpdated: "bg-secondary text-secondary-foreground!",
166166
reopened: "bg-red-600 text-white!",
167-
comment: "bg-secondary",
167+
comment: "bg-secondary text-secondary-foreground!",
168168
ticketClosed: "bg-red-600 text-white!",
169169
ticketDeleted: "bg-red-600 text-white!",
170170
licenseDecision: "bg-yellow-500 !text-black",

0 commit comments

Comments
 (0)