[RHOAIENG-2977] Artifacts table

opendatahub-io · Apr 24, 2024 · 83ea172 · 83ea172
1 parent bd833fd
commit 83ea172
Show file tree

Hide file tree

Showing 11 changed files with 418 additions and 41 deletions.
diff --git a/frontend/src/__tests__/cypress/cypress/pages/pipelines/experiments.ts b/frontend/src/__tests__/cypress/cypress/pages/pipelines/experiments.ts
@@ -140,7 +140,7 @@ class ExperimentsTable {
   findFilterTextField() {
     return this.findContainer()
       .findByTestId('experiment-table-toolbar')
-      .findByTestId('run-table-toolbar-filter-text-field');
+      .findByTestId('pipeline-filter-text-field');
   }
 }
 

diff --git a/frontend/src/__tests__/cypress/cypress/pages/pipelines/pipelineFilterBar.ts b/frontend/src/__tests__/cypress/cypress/pages/pipelines/pipelineFilterBar.ts
@@ -12,7 +12,7 @@ class PipelineRunFilterBar extends PipelineFilterBar {
   }
 
   findExperimentInput() {
-    return cy.findByTestId('run-table-toolbar-filter-text-field').find('#experiment-search-input');
+    return cy.findByTestId('pipeline-filter-text-field').find('#experiment-search-input');
   }
 
   findPipelineVersionSelect() {

diff --git a/frontend/src/__tests__/cypress/cypress/pages/pipelines/pipelineRunTable.ts b/frontend/src/__tests__/cypress/cypress/pages/pipelines/pipelineRunTable.ts
@@ -152,9 +152,7 @@ class PipelineRunJobTable extends PipelineRunsTable {
   }
 
   findFilterTextField() {
-    return cy
-      .findByTestId('schedules-table-toolbar')
-      .findByTestId('run-table-toolbar-filter-text-field');
+    return cy.findByTestId('schedules-table-toolbar').findByTestId('pipeline-filter-text-field');
   }
 
   findExperimentFilterSelect() {

diff --git a/frontend/src/components/table/TableBase.tsx b/frontend/src/components/table/TableBase.tsx
@@ -46,12 +46,24 @@ type Props<DataType> = {
     tooltip?: string;
   };
   getColumnSort?: GetColumnSort;
+  disableItemCount?: boolean;
 } & EitherNotBoth<
   { disableRowRenderSupport?: boolean },
   { tbodyProps?: TbodyProps & { ref?: React.Ref<HTMLTableSectionElement> } }
 > &
   Omit<TableProps, 'ref' | 'data'> &
-  Pick<PaginationProps, 'itemCount' | 'onPerPageSelect' | 'onSetPage' | 'page' | 'perPage'>;
+  Pick<
+    PaginationProps,
+    | 'itemCount'
+    | 'onPerPageSelect'
+    | 'onSetPage'
+    | 'page'
+    | 'perPage'
+    | 'perPageOptions'
+    | 'toggleTemplate'
+    | 'onNextClick'
+    | 'onPreviousClick'
+  >;
 
 export const MIN_PAGE_SIZE = 10;
 
@@ -87,26 +99,35 @@ const TableBase = <T,>({
   tbodyProps,
   perPage = 10,
   page = 1,
+  perPageOptions = defaultPerPageOptions,
   onSetPage,
+  onNextClick,
+  onPreviousClick,
   onPerPageSelect,
   getColumnSort,
   itemCount = 0,
   loading,
+  toggleTemplate,
+  disableItemCount = false,
   ...props
 }: Props<T>): React.ReactElement => {
   const selectAllRef = React.useRef(null);
-  const showPagination = enablePagination && itemCount > MIN_PAGE_SIZE;
+  const showPagination = enablePagination;
+
   const pagination = (variant: 'top' | 'bottom') => (
     <Pagination
       isCompact={enablePagination === 'compact'}
-      itemCount={itemCount}
+      {...(!disableItemCount && { itemCount })}
       perPage={perPage}
       page={page}
       onSetPage={onSetPage}
+      onNextClick={onNextClick}
+      onPreviousClick={onPreviousClick}
       onPerPageSelect={onPerPageSelect}
+      toggleTemplate={toggleTemplate}
       variant={variant}
       widgetId="table-pagination"
-      perPageOptions={defaultPerPageOptions}
+      perPageOptions={perPageOptions}
       titles={{
         paginationAriaLabel: `${variant} pagination`,
       }}

diff --git a/frontend/src/concepts/pipelines/content/tables/PipelineFilterBar.tsx b/frontend/src/concepts/pipelines/content/tables/PipelineFilterBar.tsx
@@ -16,42 +16,44 @@ type FilterOptionRenders = {
   label?: string;
 };
 
-type PipelineFilterBarProps<Options extends FilterOptions> = {
+type ToolbarFilterProps<T extends string> = React.ComponentProps<typeof ToolbarGroup> & {
   children?: React.ReactNode;
-  filterOptions: { [key in Options]?: string };
-  filterOptionRenders: Record<Options, (props: FilterOptionRenders) => React.ReactNode>;
-  filterData: Record<Options, string | { label: string; value: string } | undefined>;
-  onFilterUpdate: (filterType: Options, value?: string | { label: string; value: string }) => void;
+  filterOptions: { [key in T]?: string };
+  filterOptionRenders: Record<T, (props: FilterOptionRenders) => React.ReactNode>;
+  filterData: Record<T, string | { label: string; value: string } | undefined>;
+  onFilterUpdate: (filterType: T, value?: string | { label: string; value: string }) => void;
   onClearFilters: () => void;
+  testId?: string;
 };
 
 export type FilterProps = Pick<
-  React.ComponentProps<typeof PipelineFilterBar>,
+  React.ComponentProps<typeof FilterToolbar>,
   'filterData' | 'onFilterUpdate' | 'onClearFilters'
 >;
 
-const PipelineFilterBar = <Options extends FilterOptions>({
+export function FilterToolbar<T extends string>({
   filterOptions,
   filterOptionRenders,
   filterData,
   onFilterUpdate,
   onClearFilters,
   children,
-  ...props
-}: PipelineFilterBarProps<Options>): React.JSX.Element => {
-  const keys = Object.keys(filterOptions) as Array<Options>;
+  testId = 'filter-toolbar',
+  ...toolbarGroupProps
+}: ToolbarFilterProps<T>): React.JSX.Element {
+  const keys = Object.keys(filterOptions) as Array<T>;
   const [open, setOpen] = React.useState(false);
-  const [currentFilterType, setCurrentFilterType] = React.useState<Options>(keys[0]);
-  const isToolbarChip = (v: unknown): v is ToolbarChip & { key: Options } =>
+  const [currentFilterType, setCurrentFilterType] = React.useState<T>(keys[0]);
+  const isToolbarChip = (v: unknown): v is ToolbarChip & { key: T } =>
     !!v && Object.keys(v as ToolbarChip).every((k) => ['key', 'node'].includes(k));
 
   return (
     <>
-      <ToolbarGroup variant="filter-group" data-testid="pipeline-filter-toolbar" {...props}>
+      <ToolbarGroup variant="filter-group" data-testid={testId} {...toolbarGroupProps}>
         <ToolbarItem>
           <Dropdown
             toggle={
-              <DropdownToggle id="pipeline-filter-toggle-button" onToggle={() => setOpen(!open)}>
+              <DropdownToggle id={`${testId}-toggle-button`} onToggle={() => setOpen(!open)}>
                 <>
                   <FilterIcon /> {filterOptions[currentFilterType]}
                 </>
@@ -60,7 +62,8 @@ const PipelineFilterBar = <Options extends FilterOptions>({
             isOpen={open}
             dropdownItems={keys.map((filterKey) => (
               <DropdownItem
-                key={filterKey.toString()}
+                key={filterKey}
+                id={filterKey}
                 onClick={() => {
                   setOpen(false);
                   setCurrentFilterType(filterKey);
@@ -69,12 +72,12 @@ const PipelineFilterBar = <Options extends FilterOptions>({
                 {filterOptions[filterKey]}
               </DropdownItem>
             ))}
-            data-testid="pipeline-filter-dropdown"
+            data-testid={`${testId}-dropdown`}
           />
         </ToolbarItem>
         <ToolbarFilter
           categoryName="Filters"
-          data-testid="run-table-toolbar-filter-text-field"
+          data-testid={`${testId}-text-field`}
           variant="search-filter"
           chips={keys
             .map<ToolbarChip | null>((filterKey) => {
@@ -100,7 +103,7 @@ const PipelineFilterBar = <Options extends FilterOptions>({
             .filter(isToolbarChip)}
           deleteChip={(_, chip) => {
             if (isToolbarChip(chip)) {
-              onFilterUpdate(chip.key);
+              onFilterUpdate(chip.key, '');
             }
           }}
           deleteChipGroup={() => onClearFilters()}
@@ -117,6 +120,10 @@ const PipelineFilterBar = <Options extends FilterOptions>({
       {children}
     </>
   );
-};
+}
+
+const PipelineFilterBar = <Options extends FilterOptions>(
+  props: ToolbarFilterProps<Options>,
+): React.JSX.Element => <FilterToolbar {...props} testId="pipeline-filter" />;
 
 export default PipelineFilterBar;
diff --git a/...eriments/artifacts/ArtifactsListTable.tsx → ...l/experiments/artifacts/ArtifactsList.tsx b/...eriments/artifacts/ArtifactsListTable.tsx → ...l/experiments/artifacts/ArtifactsList.tsx
@@ -3,18 +3,28 @@ import React from 'react';
 import {
   Bullseye,
   EmptyState,
-  EmptyStateBody,
+  EmptyStateVariant,
   EmptyStateHeader,
   EmptyStateIcon,
-  EmptyStateVariant,
+  EmptyStateBody,
   Spinner,
 } from '@patternfly/react-core';
 import { ExclamationCircleIcon, PlusCircleIcon } from '@patternfly/react-icons';
 
+import { useMlmdRequestProps } from '~/pages/pipelines/global/experiments/useMlmdRequestProps';
 import { useGetArtifactsList } from './useGetArtifactsList';
+import { ArtifactsTable } from './ArtifactsTable';
 
-export const ArtifactsListTable: React.FC = () => {
-  const [artifacts, isArtifactsLoaded, artifactsError] = useGetArtifactsList();
+export const ArtifactsList: React.FC = () => {
+  const { pageToken, maxResultSize, filterQuery, setFilterQuery, setPageToken, setMaxResultSize } =
+    useMlmdRequestProps();
+  const [artifactsResponse, isArtifactsLoaded, artifactsError] = useGetArtifactsList({
+    pageToken,
+    maxResultSize,
+    filterQuery,
+  });
+  const { artifacts, nextPageToken } = artifactsResponse || {};
+  const filterQueryRef = React.useRef(filterQuery);
 
   if (artifactsError) {
     return (
@@ -39,7 +49,7 @@ export const ArtifactsListTable: React.FC = () => {
     );
   }
 
-  if (!artifacts?.length) {
+  if (!artifacts?.length && !filterQuery && filterQueryRef.current === filterQuery) {
     return (
       <EmptyState data-testid="artifacts-list-empty-state" variant={EmptyStateVariant.lg}>
         <EmptyStateHeader
@@ -55,5 +65,15 @@ export const ArtifactsListTable: React.FC = () => {
     );
   }
 
-  return <></>;
+  return (
+    <ArtifactsTable
+      artifacts={artifacts}
+      nextPageToken={nextPageToken}
+      isLoaded={isArtifactsLoaded}
+      maxResultSize={maxResultSize}
+      setFilterQuery={setFilterQuery}
+      setPageToken={setPageToken}
+      setMaxResultSize={setMaxResultSize}
+    />
+  );
 };