Skip to content
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

🐛 [backport release-0.2] Always show analysis details in drawer (#1103) #1190

Merged
merged 2 commits into from
Jul 21, 2023
Merged

🐛 [backport release-0.2] Always show analysis details in drawer (#1103) #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ff95b8
:bug: Always show analysis details in drawer (#1103)
ibolton336 Jul 12, 2023
97b7fe2
:bug: Add missing icon & fix open/close state (#1158)
ibolton336 Jul 18, 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
68 changes: 52 additions & 16 deletions .../applications/components/application-detail-drawer/application-detail-drawer-analysis.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { SimpleDocumentViewerModal } from "@app/shared/components/simple-task-vi
import { getApplicationAnalysis, getTaskById } from "@app/api/rest";
import { useSetting } from "@app/queries/settings";
import { APPLICATIONS } from "@app/api/rest";
import { COLOR_HEX_VALUES_BY_NAME } from "@app/Constants";

export interface IApplicationDetailDrawerAnalysisProps
extends Pick<
Expand Down Expand Up @@ -107,13 +108,20 @@ export const ApplicationDetailDrawerAnalysis: React.FC<
{task?.state === "Succeeded" && application ? (
<>
<Tooltip content="View Report">
<Button variant="link" isInline>
<Link
to={`/hub/applications/${application.id}/bucket${task?.data?.output}`}
target="_blank"
>
Report
</Link>
<Button
icon={
<span className={spacing.mrXs}>
<ExclamationCircleIcon
color={COLOR_HEX_VALUES_BY_NAME.blue}
></ExclamationCircleIcon>
</span>
}
type="button"
variant="link"
isInline
onClick={() => setAppAnalysisToView(application.id)}
>
View analysis
</Button>
</Tooltip>
{(isHTMLDownloadEnabled || isCSVDownloadEnabled) && (
Expand Down Expand Up @@ -174,7 +182,9 @@ export const ApplicationDetailDrawerAnalysis: React.FC<
<Button
icon={
<span className={spacing.mrXs}>
<ExclamationCircleIcon color="#c9190b"></ExclamationCircleIcon>
<ExclamationCircleIcon
color={COLOR_HEX_VALUES_BY_NAME.red}
></ExclamationCircleIcon>
</span>
}
type="button"
Expand All @@ -185,22 +195,48 @@ export const ApplicationDetailDrawerAnalysis: React.FC<
>
Analysis details
</Button>
<SimpleDocumentViewerModal<Task | string>
title={`Analysis details for ${application?.name}`}
fetch={getTaskById}
documentId={taskIdToView}
onClose={() => setTaskIdToView(undefined)}
/>
</>
) : (
<span className={spacing.mlSm}>
<ExclamationCircleIcon color="#c9190b"></ExclamationCircleIcon>
<ExclamationCircleIcon
color={COLOR_HEX_VALUES_BY_NAME.red}
></ExclamationCircleIcon>
Failed
</span>
)
) : (
notAvailable
<>
{task ? (
<Button
icon={
<span className={spacing.mrXs}>
<ExclamationCircleIcon
color={COLOR_HEX_VALUES_BY_NAME.blue}
></ExclamationCircleIcon>
</span>
}
type="button"
variant="link"
onClick={() => setTaskIdToView(task?.id)}
className={spacing.ml_0}
style={{ margin: "0", padding: "0" }}
>
Analysis details
</Button>
) : (
notAvailable
)}
</>
)}
<SimpleDocumentViewerModal<Task | string>
title={`Analysis details for ${application?.name}`}
fetch={getTaskById}
documentId={taskIdToView || appAnalysisToView}
onClose={() => {
setTaskIdToView(undefined);
setAppAnalysisToView(undefined);
}}
/>
</TextContent>
}
factsTabContent={
Expand Down
10 changes: 2 additions & 8 deletions ...app/pages/applications/components/application-detail-drawer/application-detail-drawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,12 @@ export const ApplicationDetailDrawer: React.FC<
application && <ApplicationTags application={application} />
)}
</Tab>
{reportsTabContent && (
{reportsTabContent && task && (
<Tab
eventKey={TabKey.Reports}
title={<TabTitleText>Reports</TabTitleText>}
>
{task?.state === "Running" ? (
<Bullseye className={spacing.mtLg}>
<Spinner size="xl">Loading...</Spinner>
</Bullseye>
) : (
reportsTabContent
)}
{reportsTabContent}
</Tab>
)}
{factsTabContent && (
Expand Down