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
4 changes: 2 additions & 2 deletions dashboard/src/components/Accordion/Accordion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import ColoredCircle from '@/components/ColoredCircle/ColoredCircle';

import { ItemType } from '@/components/ListingItem/ListingItem';

import { TestStatus } from '@/components/Status/Status';
import { GroupedTestStatus } from '@/components/Status/Status';

import HeaderWithInfo from '@/pages/TreeDetails/Tabs/HeaderWithInfo';

Expand Down Expand Up @@ -189,7 +189,7 @@ const AccordionTestsTrigger = ({
<>
<TableCell>{triggerInfo.path_group}</TableCell>
<TableCell className="flex flex-row gap-1">
<TestStatus
<GroupedTestStatus
pass={triggerInfo.pass_tests}
done={triggerInfo.done_tests}
miss={triggerInfo.miss_tests}
Expand Down
38 changes: 19 additions & 19 deletions dashboard/src/components/Table/TestsTable.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useNavigate, useSearch } from '@tanstack/react-router';

import { useMemo } from 'react';
import { useCallback, useMemo } from 'react';

import { useIntl, FormattedMessage } from 'react-intl';

Expand Down Expand Up @@ -45,20 +45,23 @@ const TestsTable = ({ treeId }: ITestsTable): JSX.Element => {
usePagination(data_len, ITEMS_PER_PAGE);
const intl = useIntl();

const onClickFilter = (filter: TestsTableFilter): void => {
navigate({
search: previousParams => {
return {
...previousParams,
tableFilter: {
bootsTable: previousParams.tableFilter.bootsTable,
buildsTable: previousParams.tableFilter.buildsTable,
testsTable: filter,
},
};
},
});
};
const onClickFilter = useCallback(
(filter: TestsTableFilter): void => {
navigate({
search: previousParams => {
return {
...previousParams,
tableFilter: {
bootsTable: previousParams.tableFilter.bootsTable,
buildsTable: previousParams.tableFilter.buildsTable,
testsTable: filter,
},
};
},
});
},
[navigate],
);

const filters = useMemo(
() => [
Expand Down Expand Up @@ -151,10 +154,7 @@ const TestsTable = ({ treeId }: ITestsTable): JSX.Element => {
return (
<div className="flex flex-col gap-6">
<div className="flex flex-row justify-between">
<TableStatusFilter
onClickTest={(filter: TestsTableFilter) => onClickFilter(filter)}
filters={filters}
/>
<TableStatusFilter onClickTest={onClickFilter} filters={filters} />
{tableInfoElement}
</div>
<Accordion type="test" items={filteredData ?? []} />
Expand Down
4 changes: 2 additions & 2 deletions dashboard/src/pages/BuildDetails/BuildDetailsTestSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { TableCell, TableRow } from '@/components/ui/table';
import { useBuildTests } from '@/api/buildTests';
import { usePagination } from '@/hooks/usePagination';
import { MessagesKey } from '@/locales/messages';
import { TestStatus } from '@/components/Status/Status';
import { GroupedTestStatus } from '@/components/Status/Status';

interface IBuildDetailsTestSection {
buildId: string;
Expand Down Expand Up @@ -67,7 +67,7 @@ const BuildDetailsTestSection = ({
<TableRow key={test.path_group}>
<TableCell onClick={onClickName}>{test.path_group}</TableCell>
<TableCell className="flex flex-row gap-1">
<TestStatus
<GroupedTestStatus
pass={test.pass_tests}
done={test.done_tests}
miss={test.miss_tests}
Expand Down