Skip to content

Commit f22f82a

Browse files
authored
fix: clear all filters (kubeflow#1262)
Signed-off-by: rsun19 <[email protected]>
1 parent 3efb314 commit f22f82a

File tree

10 files changed

+58
-4
lines changed

10 files changed

+58
-4
lines changed

clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistry.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,10 @@ class ModelRegistry {
184184
return cy.findByTestId('registered-model-table-search');
185185
}
186186

187+
findModelVersionsTableToolbar() {
188+
return cy.findByTestId('model-versions-table-toolbar');
189+
}
190+
187191
findModelVersionsTableSearch() {
188192
return cy.findByTestId('model-versions-table-search');
189193
}
@@ -207,6 +211,10 @@ class ModelRegistry {
207211
findRegisterModelButton() {
208212
return cy.findByRole('button', { name: 'Register model' });
209213
}
214+
215+
findRegisteredModelsTableToolbar() {
216+
return cy.findByTestId('registered-models-table-toolbar');
217+
}
210218
}
211219

212220
export const modelRegistry = new ModelRegistry();

clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionArchive.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ class ModelVersionArchive {
9393
cy.findByTestId('empty-archive-state').should('exist');
9494
}
9595

96+
findArchivedVersionTableToolbar() {
97+
return cy.findByTestId('model-versions-archive-table-toolbar');
98+
}
99+
100+
findArchivedVersionTableSearch() {
101+
return cy.findByTestId('model-versions-archive-table-search');
102+
}
103+
96104
findArchiveVersionBreadcrumbItem() {
97105
return cy.findByTestId('archive-version-page-breadcrumb');
98106
}

clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registeredModelArchive.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@ class ModelArchive {
104104
return cy.findByTestId('registered-models-archive-table');
105105
}
106106

107+
findArchiveModelsTableSearch() {
108+
return cy.findByTestId('registered-models-archive-table-search');
109+
}
110+
111+
findArchiveModelsTableToolbar() {
112+
return cy.findByTestId('registered-models-archive-table-toolbar');
113+
}
114+
107115
findArchiveModelsTableRows() {
108116
return this.findArchiveModelTable().find('tbody tr');
109117
}

clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,11 @@ describe('Model Registry core', () => {
261261
modelRegistry.findTableSearch().type('Fraud detection model');
262262
modelRegistry.findTableRows().should('have.length', 1);
263263
modelRegistry.findTableRows().contains('Fraud detection model');
264+
modelRegistry
265+
.findRegisteredModelsTableToolbar()
266+
.findByRole('button', { name: 'Clear all filters' })
267+
.click();
268+
modelRegistry.findTableRows().should('have.length', 2);
264269
});
265270
});
266271
});

clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersionArchive.cy.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,13 @@ describe('Model version archive list', () => {
187187

188188
// name, last modified, owner, labels modal
189189
modelVersionArchive.findArchiveVersionTable().should('be.visible');
190+
191+
modelVersionArchive.findArchivedVersionTableSearch().type('model version 1');
192+
modelVersionArchive.findArchiveVersionsTableRows().should('have.length', 1);
193+
modelVersionArchive
194+
.findArchivedVersionTableToolbar()
195+
.findByRole('button', { name: 'Clear all filters' })
196+
.click();
190197
modelVersionArchive.findArchiveVersionsTableRows().should('have.length', 2);
191198

192199
const archiveVersionRow = modelVersionArchive.getRow('model version 1');

clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersions.cy.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,22 @@ describe('Model Versions', () => {
224224
modelRegistry.findModelVersionsTableSearch().type('new model version');
225225
modelRegistry.findModelVersionsTableRows().should('have.length', 1);
226226
modelRegistry.findModelVersionsTableRows().contains('new model version');
227-
modelRegistry.findModelVersionsTableSearch().focused().clear();
227+
modelRegistry
228+
.findModelVersionsTableToolbar()
229+
.findByRole('button', { name: 'Clear all filters' })
230+
.click();
231+
modelRegistry.findModelVersionsTableRows().should('have.length', 2);
228232

229233
// filtering by model version author
230234
modelRegistry.findModelVersionsTableFilter().findSelectOption('Author').click();
231235
modelRegistry.findModelVersionsTableSearch().type('Test author');
232236
modelRegistry.findModelVersionsTableRows().should('have.length', 1);
233237
modelRegistry.findModelVersionsTableRows().contains('Test author');
238+
modelRegistry
239+
.findModelVersionsTableToolbar()
240+
.findByRole('button', { name: 'Clear all filters' })
241+
.click();
242+
modelRegistry.findModelVersionsTableRows().should('have.length', 2);
234243
});
235244

236245
it('Model version details back button should lead to versions table', () => {

clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/registeredModelArchive.cy.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,12 @@ describe('Model archive list', () => {
219219

220220
// name, last modified, owner, labels modal
221221
registeredModelArchive.findArchiveModelTable().should('be.visible');
222+
registeredModelArchive.findArchiveModelsTableSearch().type('model 1');
223+
registeredModelArchive.findArchiveModelsTableRows().should('have.length', 1);
224+
registeredModelArchive
225+
.findArchiveModelsTableToolbar()
226+
.findByRole('button', { name: 'Clear all filters' })
227+
.click();
222228
registeredModelArchive.findArchiveModelsTableRows().should('have.length', 2);
223229

224230
const archiveModelRow = registeredModelArchive.getRow('model 1');

clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ const ModelVersionListView: React.FC<ModelVersionListViewProps> = ({
130130
clearFilters={resetFilters}
131131
modelVersions={sortModelVersionsByCreateTime(filteredModelVersions)}
132132
toolbarContent={
133-
<Toolbar data-testid="model-versions-table-toolbar">
133+
<Toolbar data-testid="model-versions-table-toolbar" clearAllFilters={resetFilters}>
134134
<ToolbarContent>
135135
<ToolbarToggleGroup toggleIcon={<FilterIcon />} breakpoint="xl">
136136
<ToolbarGroup variant="filter-group">

clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveListView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const ModelVersionsArchiveListView: React.FC<ModelVersionsArchiveListViewProps>
5151
clearFilters={resetFilters}
5252
modelVersions={filteredModelVersions}
5353
toolbarContent={
54-
<Toolbar>
54+
<Toolbar data-testid="model-versions-archive-table-toolbar" clearAllFilters={resetFilters}>
5555
<ToolbarContent>
5656
<ToolbarToggleGroup toggleIcon={<FilterIcon />} breakpoint="xl">
5757
<ToolbarGroup variant="filter-group">

clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveListView.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ const RegisteredModelsArchiveListView: React.FC<RegisteredModelsArchiveListViewP
5858
clearFilters={resetFilters}
5959
registeredModels={filteredRegisteredModels}
6060
toolbarContent={
61-
<Toolbar>
61+
<Toolbar
62+
data-testid="registered-models-archive-table-toolbar"
63+
clearAllFilters={resetFilters}
64+
>
6265
<ToolbarContent>
6366
<ToolbarToggleGroup toggleIcon={<FilterIcon />} breakpoint="xl">
6467
<ToolbarGroup variant="filter-group">

0 commit comments

Comments
 (0)