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

Jump to bottom

fix: improve summary grid / always show filtering by timeframe #812

Merged
merged 2 commits into from
Aug 3, 2023
Merged

fix: improve summary grid / always show filtering by timeframe #812

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
e3c42b5
fix: avoid jumping screen when metrics are loading
rangoo94 Aug 3, 2023
2bf1c0a
fix: always show filtering by date
rangoo94 Aug 3, 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
22 changes: 9 additions & 13 deletions src/components/organisms/EntityDetails/EntityDetailsContent/EntityDetailsContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@ const EntityDetailsContent: React.FC = () => {
}
: {};

const isMetricsEmpty = !metrics?.executions || !metrics?.executions.length;

const isPageDisabled = !name;

return (
Expand All @@ -149,16 +147,14 @@ const EntityDetailsContent: React.FC = () => {
onBack={() => navigate(defaultStackRoute)}
title={name || 'Loading...'}
extra={[
!isMetricsEmpty ? (
<Select
placeholder="Last 7/30/90/Year/All days"
options={filterOptions}
style={{width: 250}}
value={daysFilterValue}
onChange={setDaysFilterValue}
key="days-filter-select"
/>
) : null,
<Select
placeholder="Last 7/30/90/Year/All days"
options={filterOptions}
style={{width: 250}}
value={daysFilterValue}
onChange={setDaysFilterValue}
key="days-filter-select"
/>,
<DotsDropdown
key="entity-options"
items={[{key: 1, label: <span onClick={onAbortAllExecutionsClick}>Abort all executions</span>}]}
Expand Down Expand Up @@ -187,7 +183,7 @@ const EntityDetailsContent: React.FC = () => {
) : null}
</Space>
</PageHeader>
{!isMetricsEmpty ? <SummaryGrid metrics={metrics} /> : null}
<SummaryGrid metrics={metrics} />
<Tabs
activeKey={activeTabKey}
onChange={setActiveTabKey}
Expand Down
79 changes: 34 additions & 45 deletions src/components/organisms/EntityDetails/EntityDetailsContent/SummaryGrid/SummaryGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,51 @@
import React from 'react';
import React, {FC, memo} from 'react';

import {Title} from '@custom-antd';
import {LoadingOutlined} from '@ant-design/icons';

import {Metrics} from '@models/metrics';

import Colors from '@styles/Colors';

import {formatDuration} from '@utils/formatDate';

import {CustomText, SummaryGridItem, SummaryGridWrapper} from './SummaryGrid.styled';
import {SummaryGridWrapper} from './SummaryGrid.styled';
import SummaryGridItem from './SummaryGridItem';

type SummaryGridProps = {
metrics: Metrics;
metrics?: Metrics;
};

const SummaryGrid: React.FC<SummaryGridProps> = props => {
const SummaryGrid: FC<SummaryGridProps> = memo(props => {
const {metrics} = props;

return (
<>
if (!metrics) {
return (
<SummaryGridWrapper>
<SummaryGridItem>
<CustomText title="PASS/FAIL RATIO" className="uppercase middle" $color={Colors.slate500}>
pass/fail ratio
</CustomText>
<Title level={3}>{metrics?.passFailRatio ? `${metrics?.passFailRatio.toFixed(2)}%` : '-'}</Title>
</SummaryGridItem>
<SummaryGridItem>
<CustomText title="EXECUTION DURATION (P50)" className="uppercase middle" $color={Colors.slate500}>
execution duration (p50)
</CustomText>
<Title level={3}>
{metrics?.executionDurationP50ms ? formatDuration(metrics?.executionDurationP50ms / 1000) : '-'}
</Title>
</SummaryGridItem>
<SummaryGridItem>
<CustomText title="EXECUTION DURATION (P95)" className="uppercase middle" $color={Colors.slate500}>
execution duration (p95)
</CustomText>
<Title level={3}>
{metrics?.executionDurationP95ms ? formatDuration(metrics?.executionDurationP95ms / 1000) : '-'}
</Title>
</SummaryGridItem>
<SummaryGridItem>
<CustomText title="FAILED EXECUTIONS" className="uppercase middle" $color={Colors.slate500}>
failed executions
</CustomText>
<Title level={3}>{metrics?.failedExecutions || '-'}</Title>
</SummaryGridItem>
<SummaryGridItem>
<CustomText title="TOTAL EXECUTIONS" className="uppercase middle" $color={Colors.slate500}>
total executions
</CustomText>
<Title level={3}>{metrics?.totalExecutions || '-'}</Title>
</SummaryGridItem>
<SummaryGridItem title="PASS/FAIL RATIO" value={<LoadingOutlined />} />
<SummaryGridItem title="EXECUTION DURATION (P50)" value={<LoadingOutlined />} />
<SummaryGridItem title="EXECUTION DURATION (P95)" value={<LoadingOutlined />} />
<SummaryGridItem title="FAILED EXECUTIONS" value={<LoadingOutlined />} />
<SummaryGridItem title="TOTAL EXECUTIONS" value={<LoadingOutlined />} />
</SummaryGridWrapper>
</>
);
}

return (
<SummaryGridWrapper>
<SummaryGridItem
title="PASS/FAIL RATIO"
value={metrics.passFailRatio && `${metrics.passFailRatio.toFixed(2)}%`}
/>
<SummaryGridItem
title="EXECUTION DURATION (P50)"
value={metrics.executionDurationP50ms && formatDuration(metrics.executionDurationP50ms / 1000)}
/>
<SummaryGridItem
title="EXECUTION DURATION (P95)"
value={metrics.executionDurationP95ms && formatDuration(metrics.executionDurationP95ms / 1000)}
/>
<SummaryGridItem title="FAILED EXECUTIONS" value={metrics.failedExecutions} />
<SummaryGridItem title="TOTAL EXECUTIONS" value={metrics.totalExecutions} />
</SummaryGridWrapper>
);
};
});

export default SummaryGrid;
23 changes: 23 additions & 0 deletions src/components/organisms/EntityDetails/EntityDetailsContent/SummaryGrid/SummaryGridItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import React, {FC, ReactNode, memo} from 'react';

import {Title} from '@custom-antd';

import Colors from '@styles/Colors';

import {CustomText, SummaryGridItem as ItemContainer} from './SummaryGrid.styled';

type SummaryGridProps = {
title: string;
value?: ReactNode;
};

const SummaryGridItem: FC<SummaryGridProps> = memo(({title, value}) => (
<ItemContainer>
<CustomText title={title} className="uppercase middle" $color={Colors.slate500}>
{title}
</CustomText>
<Title level={3}>{value ?? '-'}</Title>
</ItemContainer>
));

export default SummaryGridItem;
Loading