hide All models toggle when only one category has models by ConorOM1 · Pull Request #3157 · kubeflow/hub

ConorOM1 · 2026-09-01T13:31:52Z

Description

The "All models" toggle was still shown whenever 2+ category labels existed, even if only one of them actually had models.
This hides the toggle bar entirely when just one category has models, by excluding empty categories
from the count.

How Has This Been Tested?

Edit clients/ui/bff/internal/mocks/static_data_mock.go:
- In GetCatalogSourceMocks(), put all model-bearing sources under a single
  label (e.g. "Sample category 1") and add one additional source with a
  distinct label and no models, e.g.:
```
{
    Id:      "empty-models-source",
    Name:    "Empty Models Source",
    Enabled: &enabled,
    Labels:  []string{"empty models category"},
    Status:  &availableStatus,
},
```
- In GetCatalogLabelListMock(), add a matching label entry for
  "empty models category".
From clients/ui/, run make dev-start.
Open http://localhost:9000 → Model Catalog.

Expected: No "All models" tab and no empty category tab are shown — just the single populated category's models, with no toggle bar at all.

Before: Both "All models" and the populated category's tab would incorrectly appear.
Cypress test case added in (modelCatalogAllModelsView.cy.ts)

Merge criteria:

All the commits have been signed-off (To pass the DCO check)

The commits have meaningful messages
Automated tests are provided as part of the PR for major new functionalities; testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
The developer has manually tested the changes and verified that the changes work.
Code changes follow the kubeflow contribution guidelines.
For first time contributors: Please reach out to the Reviewers to ensure all tests are being run, ensuring the label ok-to-test has been added to the PR.

If you have UI changes

The developer has added tests or explained why testing cannot be added.
Included any necessary screenshots or gifs if it was a UI change.
Verify that UI/UX changes conform the UX guidelines for Kubeflow.

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

manaswinidas · 2026-09-03T08:03:55Z

/ok-to-test

ConorOM1 · 2026-09-03T09:15:52Z

/retest

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

Signed-off-by: Conor O'Malley <97108400+ConorOM1@users.noreply.github.com>

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

ConorOM1 · 2026-09-07T10:51:58Z

/retest

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

ConorOM1 · 2026-09-07T15:31:42Z

/retest

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

manaswinidas

Core empty-category hide looks right. Blocking concerns: reset/search regressions from forking shared CatalogSourceLabelSelector, plus incomplete Cypress coverage for single-category sort. Prefer restore shared selector and keep only the empty-aware category count change.

manaswinidas · 2026-09-23T17:52:18Z

+  }, [hasActiveFilters, onResetAllFilters]);
+
+  React.useEffect(() => {
+    setInputValue(searchTerm || '');


🔴 bug: shared CatalogSourceLabelSelector reset clears search (onClearSearch + input). This only calls onResetAllFilters. Restore clear-search here or keep using the shared component.

manaswinidas · 2026-09-23T17:52:18Z

+              }
+            : {})}
+        >
+          <ToolbarContent rowWrap={{ default: 'wrap' }}>


🔴 bug: was hasBasicFiltersApplied || hasSearchTerm. Search-only now hides "Reset all filters". Restore hasSearchTerm (or go back to shared selector).

manaswinidas · 2026-09-23T17:52:19Z

+  const hasMultipleCategories = React.useMemo(() => {
+    const activeLabels = getActiveSourceLabels(catalogSources, catalogLabels);
+    if (!categoriesResolved) {
+      return activeLabels.length > 1;
+    }


🟡 risk: before categoriesResolved, empty labels still count — toggle can flash then hide. Prefer hide until resolved, or reuse layout’s effectiveCategories helper.

already handled

manaswinidas · 2026-09-23T17:52:20Z

+          // Use PatternFly's native clearAllFilters - it automatically shows/hides based on ToolbarFilter labels
+          // When performance view is OFF, show reset button for basic filters
+          // When performance view is ON, the HardwareConfigurationFilterToolbar handles resetting
+          {...(onResetAllFilters && !performanceViewEnabled && hasBasicFiltersApplied


🟡 maintenance: this forks shared CatalogSourceLabelSelector (~agents/MCP still use it). Core fix only needs empty-aware hasMultipleCategories + render props — please restore shared component to avoid drift (reset/CSS already diverged).

restored to upstream

manaswinidas · 2026-09-23T17:52:21Z

      emptyCategoryLabels={emptyCategoryLabels}
      className="pf-v6-u-pb-0"
      ariaLabel="Source label selection"
+      hideWhenSingleCategory


🔵 nit: redundant with parent hasMultipleCategories gate. Keep one source of truth.

correct, removed

manaswinidas · 2026-09-23T17:52:22Z

+  selectAnySortOption(testId: string) {
+    cy.get(
+      '[data-testid="model-catalog-sort-dropdown"], [data-testid="model-catalog-category-sort-dropdown"]',
+    ).click();


🟡 risk: papers over dual sort dropdowns (sort vs category-sort). Prefer asserting the active surface, or one helper that picks by view — don’t leave both selectSortOption and this forever.

reworked for existing pattern

manaswinidas · 2026-09-23T17:52:24Z

+    it('should show sort dropdown when performance toggle is enabled', () => {
+      // Default intercepts have multiple categories
+      modelCatalog.togglePerformanceView();
+      modelCatalog.findLoadingState().should('not.exist');
+
+      modelCatalog.findSortDropdown().should('be.visible');
+    });
+
+    it('should hide All models toggle when only one non-empty category remains', () => {


🟡 gap: only covers multi-category. Also assert single non-empty category + perf on → findCategorySortDropdown() visible (as requested earlier).

manaswinidas · 2026-09-23T17:52:25Z

+      modelCatalog.findCategoryToggle('label-Empty Category').should('not.exist');
+      modelCatalog.findCategoryToggle('label-Hugging Face').should('not.exist');
+    });


🟡 gap: only asserts toggles absent. Also assert models / category title still show (gallery single-category path).

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

ConorOM1 · 2026-09-24T15:31:47Z

/retest

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

ppadti · 2026-09-30T10:07:04Z

/ok-to-test

ppadti

Thanks @ConorOM1
/lgtm
/approve

google-oss-prow · 2026-10-01T11:43:17Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ppadti

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~clients/ui/OWNERS~~ [ppadti]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

enhance tab row logic

d7f3378

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

google-oss-prow Bot requested review from Philip-Carneiro and fege September 1, 2026 13:31

google-oss-prow Bot added the size/M label Sep 1, 2026

github-actions Bot added the Area/UI label Sep 1, 2026

google-oss-prow Bot added the ok-to-test label Sep 3, 2026

fix sort dropdown

7d4439c

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

ppadti suggested changes Sep 4, 2026

View reviewed changes

Comment thread ...tend/src/__tests__/cypress/cypress/tests/mocked/modelCatalog/modelCatalogAllModelsView.cy.ts

Comment thread clients/ui/frontend/src/app/pages/modelCatalog/screens/ModelCatalogSourceLabelSelector.tsx

google-oss-prow Bot assigned ppadti Sep 4, 2026

ConorOM1 and others added 2 commits September 7, 2026 11:04

fix dropdown dupe

eb32f22

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

Merge branch 'main' into all_model_fix

ed6fe21

Signed-off-by: Conor O'Malley <97108400+ConorOM1@users.noreply.github.com>

google-oss-prow Bot added size/L and removed size/M labels Sep 7, 2026

fix merge conflict

c260512

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

retrigger CI

37b3673

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

ConorOM1 requested a review from ppadti September 7, 2026 11:10

ConorOM1 added 2 commits September 7, 2026 16:56

retrigger CI

3ba1f9d

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

update test

6f043d1

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

manaswinidas suggested changes Sep 23, 2026

View reviewed changes

google-oss-prow Bot assigned manaswinidas Sep 23, 2026

address comments

7be4472

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

retrigger CI

cf98ace

Signed-off-by: Conor O'Malley <conormomalley@gmail.com>

ppadti approved these changes Oct 1, 2026

View reviewed changes

google-oss-prow Bot added the lgtm label Oct 1, 2026

google-oss-prow Bot added the approved label Oct 1, 2026

google-oss-prow Bot merged commit e5987f9 into kubeflow:main Oct 1, 2026
27 of 28 checks passed

Conversation

ConorOM1 commented Sep 1, 2026

Description

How Has This Been Tested?

Merge criteria:

Uh oh!

manaswinidas commented Sep 3, 2026

Uh oh!

ConorOM1 commented Sep 3, 2026

Uh oh!

Uh oh!

Uh oh!

ConorOM1 commented Sep 7, 2026

Uh oh!

ConorOM1 commented Sep 7, 2026

Uh oh!

manaswinidas left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ConorOM1 commented Sep 24, 2026

Uh oh!

ppadti commented Sep 30, 2026

Uh oh!

ppadti left a comment

Choose a reason for hiding this comment

Uh oh!

google-oss-prow Bot commented Oct 1, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants