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

#588 all runs list #611

Merged
merged 3 commits into from
Aug 1, 2023
Merged

#588 all runs list #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55dfd3c
#588 Created All run list page.
olgenn Jul 31, 2023
6ca4df6
Close #588 Fixes after review
olgenn Aug 1, 2023
ebeb0a7
Merge branch 'master' into #588_all_runs_list
olgenn Aug 1, 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
92 changes: 56 additions & 36 deletions hub/src/pages/Runs/MainList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useEffect, useMemo, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { get as _get, uniqBy as _uniqBy } from 'lodash';
import { /*get as _get,*/ sortBy as _sortBy, uniqBy as _uniqBy } from 'lodash';
import { format } from 'date-fns';

import {
Expand All @@ -15,7 +15,7 @@ import {
SpaceBetween,
StatusIndicator,
Table,
TextFilter,
// TextFilter,
Toggle,
} from 'components';

Expand All @@ -30,13 +30,13 @@ import { isAvailableAbortingForRun, isAvailableDeletingForRun, isAvailableStoppi

import styles from './styles.module.scss';

export const SEARCHABLE_COLUMNS = [
'run_head.run_name',
'run_head.job_heads.[0].configuration_path',
'run_head.job_heads.[0].instance_type',
'run_head.hub_user_name',
'run_head.status',
];
// export const SEARCHABLE_COLUMNS = [
// 'run_head.run_name',
// 'run_head.job_heads.[0].configuration_path',
// 'run_head.job_heads.[0].instance_type',
// 'run_head.hub_user_name',
// 'run_head.status',
// ];

export const List: React.FC = () => {
const { t } = useTranslation();
Expand Down Expand Up @@ -66,6 +66,16 @@ export const List: React.FC = () => {
</NavigateLink>
),
},
{
id: 'project',
header: `${t('projects.run.project')}`,
cell: (item: IRunListItem) => item.project,
},
{
id: 'repo',
header: `${t('projects.run.repo')}`,
cell: (item: IRunListItem) => item.repo.repo_info.repo_name,
},
{
id: 'configuration',
header: `${t('projects.run.configuration')}`,
Expand Down Expand Up @@ -95,11 +105,11 @@ export const List: React.FC = () => {
header: t('projects.run.submitted_at'),
cell: (item: IRunListItem) => format(new Date(item.run_head.submitted_at), DATE_TIME_FORMAT),
},
{
id: 'artifacts',
header: t('projects.run.artifacts_count'),
cell: (item: IRunListItem) => item.run_head.artifact_heads?.length ?? '-',
},
// {
// id: 'artifacts',
// header: t('projects.run.artifacts_count'),
// cell: (item: IRunListItem) => item.run_head.artifact_heads?.length ?? '-',
// },
];

useEffect(() => {
Expand Down Expand Up @@ -130,28 +140,39 @@ export const List: React.FC = () => {
);
};

const { items, actions, filteredItemsCount, collectionProps, filterProps, paginationProps } = useCollection(data ?? [], {
filtering: {
empty: renderEmptyMessage(),
noMatch: renderNoMatchMessage(),
const sortedData = useMemo(() => {
if (!data) return [];

return _sortBy(data, [(i) => -i.run_head.submitted_at]);
}, [data]);

const { items, actions, /*filteredItemsCount,*/ collectionProps, filterProps, paginationProps } = useCollection(
sortedData ?? [],
{
filtering: {
empty: renderEmptyMessage(),
noMatch: renderNoMatchMessage(),

filteringFunction: (runItem /*, filteringText*/) => {
// const filteringTextLowerCase = filteringText.toLowerCase();

filteringFunction: (runItem, filteringText) => {
const filteringTextLowerCase = filteringText.toLowerCase();
if (selectedProject?.value && runItem.project !== selectedProject.value) return false;

if (selectedProject?.value && runItem.project !== selectedProject.value) return false;
if (selectedRepo?.value && runItem.repo.repo_id !== selectedRepo.value) return false;

if (selectedRepo?.value && runItem.repo.repo_id !== selectedRepo.value) return false;
if (onlyActive && !unfinishedRuns.includes(runItem.run_head.status)) return false;

if (onlyActive && !unfinishedRuns.includes(runItem.run_head.status)) return false;
// return SEARCHABLE_COLUMNS.map((key) => _get(runItem, key)).some(
// (value) => typeof value === 'string' && value.toLowerCase().indexOf(filteringTextLowerCase) > -1,
// );

return SEARCHABLE_COLUMNS.map((key) => _get(runItem, key)).some(
(value) => typeof value === 'string' && value.toLowerCase().indexOf(filteringTextLowerCase) > -1,
);
return true;
},
},
pagination: { pageSize: 20 },
selection: {},
},
pagination: { pageSize: 20 },
selection: {},
});
);

const { selectedItems } = collectionProps;

Expand Down Expand Up @@ -299,13 +320,12 @@ export const List: React.FC = () => {
}
filter={
<div>
<TextFilter
{...filterProps}
filteringPlaceholder={t('projects.run.search_placeholder')}
countText={t('common.match_count_with_value', { count: filteredItemsCount })}
disabled={isLoading}
/>

{/*<TextFilter*/}
{/* {...filterProps}*/}
{/* filteringPlaceholder={t('projects.run.search_placeholder')}*/}
{/* countText={t('common.match_count_with_value', { count: filteredItemsCount })}*/}
{/* disabled={isLoading}*/}
{/*/>*/}
<div className={styles.selectFilters}>
<div className={styles.select}>
<FormField label={t('projects.run.project')}>
Expand Down
2 changes: 0 additions & 2 deletions hub/src/pages/Runs/MainList/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
.selectFilters {
--select-width: calc((688px - 3 * 20px) / 2);

display: flex;
gap: 20px;
margin-top: 16px;

.select {
width: var(--select-width, 30%);
Expand Down
Loading