Skip to content

feat(heureka): wire Jira ticket to dedicated url field for risk acceptance #1702

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
hodanoori merged 14 commits into from
May 20, 2026
Merged

feat(heureka): wire Jira ticket to dedicated url field for risk acceptance #1702

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7878697
feat(heureka): wire Jira ticket to dedicated url field in createRemed…
hodanoori May 19, 2026
116954e
fix(heureka): use -- as fallback for empty remediation panel cells
hodanoori May 19, 2026
933bcf9
fix(heureka): fix empty fallback for remediatedBy and wrap descriptio…
hodanoori May 19, 2026
03a417b
Merge branch 'main' into hoda-heureka-add-jira-ticket-url
hodanoori May 19, 2026
a342933
fix(heureka): format dates with 2-digit day and 4-digit year in remed…
hodanoori May 19, 2026
d1c6dbd
chore: add changeset for Jira ticket url field in risk acceptance
hodanoori May 19, 2026
17cb743
fix(heureka): address code review comments on remediation history panel
hodanoori May 19, 2026
6a1f4bb
fix(heureka): fix TypeScript types in RemediationHistoryPanel test mock
hodanoori May 19, 2026
5763752
fix(heureka): remove unused eslint-disable in RemediationHistoryPanel…
hodanoori May 19, 2026
d38fa98
feat(heureka): make Jira ticket mandatory in RiskAcceptanceModal
hodanoori May 20, 2026
ffede4b
fix(heureka): add missing fallback for null type in remediations panel
hodanoori May 20, 2026
25545ce
Merge branch 'main' into hoda-heureka-add-jira-ticket-url
hodanoori May 20, 2026
2576f27
style(heureka): fix prettier formatting in RiskAcceptanceModal
hodanoori May 20, 2026
811b638
chore: remove greenhouse from changeset scope
hodanoori May 20, 2026
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
12 changes: 7 additions & 5 deletions ...eka/src/components/Service/ImageDetails/ImageIssuesList/RemediationHistoryPanel/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type RemediationHistoryPanelProps = {
refreshKey?: number
}

const COLUMN_SPAN = 6
const COLUMN_SPAN = 7

function formatDateTime(value: string | null): string {
if (!value) return "—"
Comment thread
hodanoori marked this conversation as resolved.
Outdated
Expand Down Expand Up @@ -87,11 +87,12 @@ const RemediationHistoryTable = ({
<>
{remediatedVulnerabilities.map((r: RemediatedVulnerability) => (
<DataGridRow key={r.remediationId}>
<DataGridCell className="whitespace-nowrap">{r.type ?? "—"}</DataGridCell>
<DataGridCell className="whitespace-nowrap">{r.type}</DataGridCell>
Comment thread
hodanoori marked this conversation as resolved.
Outdated
<DataGridCell className="whitespace-nowrap">{formatDateTime(r.expirationDate)}</DataGridCell>
<DataGridCell className="whitespace-nowrap">{formatDateTime(r.remediationDate)}</DataGridCell>
Comment thread
hodanoori marked this conversation as resolved.
<DataGridCell>{r.remediatedBy ?? "—"}</DataGridCell>
<DataGridCell>{r.description ?? "—"}</DataGridCell>
<DataGridCell>{r.remediatedBy ?? "--"}</DataGridCell>
<DataGridCell className="min-w-0">{r.description ?? "--"}</DataGridCell>
<DataGridCell className="min-w-0">{r.url ?? "--"}</DataGridCell>
Comment thread
hodanoori marked this conversation as resolved.
Outdated
<DataGridCell className="cursor-default interactive" onClick={(e) => e.stopPropagation()}>
{revertingId === r.remediationId ? (
<Spinner variant="primary" size="small" className="ml-auto" />
Expand Down Expand Up @@ -225,13 +226,14 @@ export const RemediationHistoryPanel = ({
fallbackRender={getErrorDataRowComponent({ colspan: COLUMN_SPAN })}
resetKeys={[remediationsPromise]}
>
<DataGrid columns={COLUMN_SPAN} minContentColumns={[0, 1, 2, 3, 5]} cellVerticalAlignment="top">
<DataGrid columns={COLUMN_SPAN} minContentColumns={[0, 1, 2, 3, 6]} cellVerticalAlignment="top">
<DataGridRow>
<DataGridHeadCell>Type</DataGridHeadCell>
<DataGridHeadCell>Expiration Date</DataGridHeadCell>
<DataGridHeadCell>Remediation Date</DataGridHeadCell>
<DataGridHeadCell>Remediated By</DataGridHeadCell>
<DataGridHeadCell>Description</DataGridHeadCell>
<DataGridHeadCell>Source Ticket</DataGridHeadCell>
<DataGridHeadCell />
Comment thread
hodanoori marked this conversation as resolved.
</DataGridRow>
<Suspense fallback={<LoadingDataRow colSpan={COLUMN_SPAN} />}>
Expand Down
10 changes: 2 additions & 8 deletions apps/heureka/src/components/Service/ImageDetails/RiskAcceptanceModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,6 @@ export const RiskAcceptanceModal: React.FC<RiskAcceptanceModalProps> = ({
const descriptionTrimmed = description.trim()
const sourceTicketTrimmed = sourceTicket.trim()

const buildDescription = () => {
if (sourceTicketTrimmed) {
return `Source Ticket: ${sourceTicketTrimmed}\n\n${descriptionTrimmed}`
}
return descriptionTrimmed
}

const handleConfirm = async () => {
if (!descriptionTrimmed) {
setDescriptionError("Description is required")
Expand All @@ -118,10 +111,11 @@ export const RiskAcceptanceModal: React.FC<RiskAcceptanceModalProps> = ({
vulnerability,
service,
image,
description: buildDescription(),
description: descriptionTrimmed,
...(remediatedBy && { remediatedBy }),
...(severityValue !== undefined && { severity: severityValue }),
expirationDate: expirationDate.toISOString(),
...(sourceTicketTrimmed && { url: sourceTicketTrimmed }),
}
Comment thread
hodanoori marked this conversation as resolved.
const result = await onConfirm(input)
if (result?.error) {
Expand Down
4 changes: 3 additions & 1 deletion apps/heureka/src/components/Services/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ export type RemediatedVulnerability = {
remediationDate: string | null
remediatedBy: string | null
expirationDate: string | null
url: string | null
}

type NormalizedServiceImageVulnerabilities = {
Expand Down Expand Up @@ -622,8 +623,9 @@ export const getNormalizedRemediationsResponse = (
vulnerability: node.vulnerability || null,
vulnerabilityId: null,
remediationDate: node.remediationDate != null ? String(node.remediationDate) : null,
remediatedBy: node.remediatedBy ?? null,
remediatedBy: node.remediatedBy?.trim() || null,
expirationDate: node.expirationDate != null ? String(node.expirationDate) : null,
url: node.url?.trim() || null,
}
})

Expand Down
7 changes: 7 additions & 0 deletions apps/heureka/src/generated/graphql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1296,6 +1296,7 @@ export type Remediation = Node & {
serviceId?: Maybe<Scalars["ID"]["output"]>
severity?: Maybe<SeverityValues>
type?: Maybe<RemediationTypeValues>
url?: Maybe<Scalars["String"]["output"]>
vulnerability?: Maybe<Scalars["String"]["output"]>
vulnerabilityId?: Maybe<Scalars["ID"]["output"]>
}
Expand All @@ -1320,6 +1321,7 @@ export type RemediationFilter = {
severity?: InputMaybe<Array<InputMaybe<SeverityValues>>>
state?: InputMaybe<Array<StateFilter>>
type?: InputMaybe<Array<InputMaybe<RemediationTypeValues>>>
url?: InputMaybe<Array<InputMaybe<Scalars["String"]["input"]>>>
vulnerability?: InputMaybe<Array<InputMaybe<Scalars["String"]["input"]>>>
}

Expand All @@ -1332,6 +1334,7 @@ export type RemediationInput = {
service?: InputMaybe<Scalars["String"]["input"]>
severity?: InputMaybe<SeverityValues>
type?: InputMaybe<RemediationTypeValues>
url?: InputMaybe<Scalars["String"]["input"]>
vulnerability?: InputMaybe<Scalars["String"]["input"]>
}

Expand Down Expand Up @@ -1795,6 +1798,7 @@ export type CreateRemediationMutation = {
serviceId?: string | null
severity?: SeverityValues | null
type?: RemediationTypeValues | null
url?: string | null
vulnerability?: string | null
vulnerabilityId?: string | null
}
Expand Down Expand Up @@ -1828,6 +1832,7 @@ export type GetRemediationsQuery = {
expirationDate?: any | null
remediationDate?: any | null
remediatedBy?: string | null
url?: string | null
}
} | null> | null
} | null
Expand Down Expand Up @@ -2189,6 +2194,7 @@ export const CreateRemediationDocument = gql`
serviceId
severity
type
url
vulnerability
vulnerabilityId
}
Expand All @@ -2213,6 +2219,7 @@ export const GetRemediationsDocument = gql`
expirationDate
remediationDate
remediatedBy
url
}
}
totalCount
Expand Down
1 change: 1 addition & 0 deletions apps/heureka/src/graphql/Remediations/createRemediation.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ mutation CreateRemediation($input: RemediationInput!) {
serviceId
severity
type
url
vulnerability
vulnerabilityId
}
Expand Down
1 change: 1 addition & 0 deletions apps/heureka/src/graphql/Remediations/getRemediations.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ query GetRemediations($filter: RemediationFilter) {
expirationDate
remediationDate
remediatedBy
url
}
}
totalCount
Expand Down
Loading