Merge pull request #2151 from DaoDaoNoCode/upstream-issue-2120

Remove projects filter on the project view page
opendatahub-io · Nov 15, 2023 · 69b1c16 · 69b1c16
2 parents c32df9c + 4a04b0e
commit 69b1c16
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/frontend/src/__tests__/integration/pages/projects/ProjectView.spec.ts b/frontend/src/__tests__/integration/pages/projects/ProjectView.spec.ts
@@ -2,9 +2,7 @@ import { test, expect } from '@playwright/test';
 import { navigateToStory } from '~/__tests__/integration/utils';
 
 test('Project view page', async ({ page }) => {
-  await page.goto(
-    './iframe.html?id=tests-integration-pages-projects-projectview--default&viewMode=story',
-  );
+  await page.goto(navigateToStory('pages-projects-projectview', 'default'));
 
   // wait for page to load
   await page.waitForSelector('text=Data science projects');
@@ -26,6 +24,11 @@ test('Project view page', async ({ page }) => {
   await expect(page.getByText('Non-DS Project 1', { exact: true })).toBeVisible();
   await expect(page.getByText('Non-DS Project 2', { exact: true })).toBeVisible();
   await expect(page.getByText('Non-DS Project 3', { exact: true })).toBeVisible();
+
+  await page.locator('#search-field-toggle').click();
+  await expect(page.getByRole('listitem')).toHaveCount(2);
+  await expect(page.getByRole('listitem').nth(0)).toHaveText('Name');
+  await expect(page.getByRole('listitem').nth(1)).toHaveText('User');
 });
 
 test('Create project', async ({ page }) => {

diff --git a/frontend/src/pages/modelServing/screens/global/InferenceServiceListView.tsx b/frontend/src/pages/modelServing/screens/global/InferenceServiceListView.tsx
@@ -1,11 +1,10 @@
 import * as React from 'react';
 import { ToolbarItem } from '@patternfly/react-core';
 import { InferenceServiceKind, ServingRuntimeKind } from '~/k8sTypes';
-import SearchField, { SearchType } from '~/pages/projects/components/SearchField';
 import { ModelServingContext } from '~/pages/modelServing/ModelServingContext';
 import { ProjectsContext } from '~/concepts/projects/ProjectsContext';
+import DashboardSearchField, { SearchType } from '~/concepts/dashboard/DashboardSearchField';
 import { getInferenceServiceDisplayName, getInferenceServiceProjectDisplayName } from './utils';
-//import ServeModelButton from './ServeModelButton';
 import InferenceServiceTable from './InferenceServiceTable';
 import ServeModelButton from './ServeModelButton';
 
@@ -59,7 +58,7 @@ const InferenceServiceListView: React.FC<InferenceServiceListViewProps> = ({
         toolbarContent={
           <>
             <ToolbarItem>
-              <SearchField
+              <DashboardSearchField
                 types={searchTypes}
                 searchType={searchType}
                 searchValue={search}

diff --git a/frontend/src/pages/projects/components/SearchField.tsx b/frontend/src/pages/projects/components/SearchField.tsx
@@ -4,7 +4,6 @@ import { InputGroup, SearchInput, Select, SelectOption } from '@patternfly/react
 export enum SearchType {
   NAME = 'Name',
   USER = 'User',
-  PROJECT = 'Project',
 }
 
 type SearchFieldProps = {
@@ -27,6 +26,7 @@ const SearchField: React.FC<SearchFieldProps> = ({
   return (
     <InputGroup>
       <Select
+        toggleId="search-field-toggle"
         removeFindDomNode
         isOpen={typeOpen}
         onToggle={() => setTypeOpen(!typeOpen)}