Skip to content

Revert "OSAC-2932: [UI] Catalog management list page with resource type tabs" - #108

Merged
openshift-merge-bot[bot] merged 2 commits into
osac-project:mainfrom
ElayAharoni:revert-pr-100-OSAC-2932-catalog-management
Jul 30, 2026
Merged

Revert "OSAC-2932: [UI] Catalog management list page with resource type tabs"#108
openshift-merge-bot[bot] merged 2 commits into
osac-project:mainfrom
ElayAharoni:revert-pr-100-OSAC-2932-catalog-management

Conversation

@ElayAharoni

@ElayAharoni ElayAharoni commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Summary

Test plan

  • pnpm --filter @osac/app-frontend run build — passes
  • pnpm test — passes (one unrelated pre-existing flaky test in ClusterCreatePage.test.tsx, untouched by this change, confirmed passing in isolation)
  • pnpm lint (including i18n sync check) — passes

Assisted-by: Claude Code noreply@anthropic.com

Summary by CodeRabbit

  • Removed Features

    • Removed the Administration navigation and catalog management section.
    • Removed catalog management pages, creation/detail routes, and related status and scope indicators.
    • Catalog item cards no longer display publication status or scope badges.
    • Private catalog item types and related API access have been removed.
  • Updates

    • Tenant catalog browsing continues to support search and resource filtering.
    • Catalog data now uses the streamlined public catalog interfaces.

…pe tabs" (osac-project#100)

This reverts commit 53f774c, reversing
changes made to afbc45d391851d2cea2417e29fbc27977c8ff8d8.

Assisted-by: Claude Code <noreply@anthropic.com>
Signed-off-by: Elay Aharoni <elayaha@gmail.com>
@openshift-ci-robot

openshift-ci-robot commented Jul 30, 2026

Copy link
Copy Markdown

@ElayAharoni: This pull request references OSAC-2932 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

Test plan

  • pnpm --filter @osac/app-frontend run build — passes
  • pnpm test — passes (one unrelated pre-existing flaky test in ClusterCreatePage.test.tsx, untouched by this revert, confirmed passing in isolation)
  • pnpm lint — passes

Assisted-by: Claude Code noreply@anthropic.com

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Jul 30, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: osac-project/coderabbit/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 8c29161f-62a9-48f8-aed4-ee3c812a2822

📥 Commits

Reviewing files that changed from the base of the PR and between 98312d8 and 5ccf669.

📒 Files selected for processing (33)
  • apps/app-frontend/src/shell/AdminCatalogRoutes.tsx
  • apps/app-frontend/src/shell/AppShell.tsx
  • apps/app-frontend/src/shell/shellNav.test.ts
  • apps/app-frontend/src/shell/shellNav.ts
  • libs/i18n/locales/en/translation.json
  • libs/ui-components/src/api/types.ts
  • libs/ui-components/src/api/v1/baremetal-instance.test.ts
  • libs/ui-components/src/api/v1/baremetal-instance.ts
  • libs/ui-components/src/api/v1/cluster-catalog-item.test.ts
  • libs/ui-components/src/api/v1/compute-instance-catalog-item.test.ts
  • libs/ui-components/src/api/v1/private/baremetal-instance-catalog-item.test.ts
  • libs/ui-components/src/api/v1/private/baremetal-instance-catalog-item.ts
  • libs/ui-components/src/api/v1/private/cluster-catalog-item.test.ts
  • libs/ui-components/src/api/v1/private/cluster-catalog-item.ts
  • libs/ui-components/src/api/v1/private/compute-instance-catalog-item.test.ts
  • libs/ui-components/src/api/v1/private/compute-instance-catalog-item.ts
  • libs/ui-components/src/components/catalog/CatalogItemCard.test.tsx
  • libs/ui-components/src/components/catalog/CatalogItemCard.tsx
  • libs/ui-components/src/components/catalog/catalogItemDisplay.test.ts
  • libs/ui-components/src/components/catalog/catalogItemDisplay.ts
  • libs/ui-components/src/components/catalogManagement/CatalogItemScopeBadge.test.tsx
  • libs/ui-components/src/components/catalogManagement/CatalogItemScopeBadge.tsx
  • libs/ui-components/src/components/catalogManagement/CatalogItemStatusLabel.test.tsx
  • libs/ui-components/src/components/catalogManagement/CatalogItemStatusLabel.tsx
  • libs/ui-components/src/icons.tsx
  • libs/ui-components/src/pages/admin/BareMetalInstanceCatalogManagementPanel.tsx
  • libs/ui-components/src/pages/admin/CatalogManagementListPage.test.tsx
  • libs/ui-components/src/pages/admin/CatalogManagementListPage.tsx
  • libs/ui-components/src/pages/admin/ClusterCatalogManagementPanel.tsx
  • libs/ui-components/src/pages/admin/ComputeInstanceCatalogManagementPanel.tsx
  • libs/ui-components/src/pages/tenant/CatalogPage.tsx
  • libs/ui-components/src/test-utils/TestProviders.tsx
  • libs/ui-components/src/test-utils/catalogHookTestHelpers.ts
💤 Files with no reviewable changes (25)
  • libs/ui-components/src/components/catalogManagement/CatalogItemStatusLabel.test.tsx
  • libs/ui-components/src/api/v1/cluster-catalog-item.test.ts
  • libs/ui-components/src/api/v1/private/baremetal-instance-catalog-item.test.ts
  • libs/ui-components/src/api/v1/private/cluster-catalog-item.test.ts
  • libs/ui-components/src/api/v1/private/cluster-catalog-item.ts
  • apps/app-frontend/src/shell/AdminCatalogRoutes.tsx
  • libs/ui-components/src/api/v1/compute-instance-catalog-item.test.ts
  • libs/ui-components/src/test-utils/catalogHookTestHelpers.ts
  • libs/ui-components/src/api/v1/private/compute-instance-catalog-item.ts
  • libs/ui-components/src/pages/admin/CatalogManagementListPage.test.tsx
  • libs/ui-components/src/api/v1/private/baremetal-instance-catalog-item.ts
  • libs/ui-components/src/components/catalogManagement/CatalogItemScopeBadge.test.tsx
  • libs/ui-components/src/pages/admin/BareMetalInstanceCatalogManagementPanel.tsx
  • libs/ui-components/src/pages/admin/CatalogManagementListPage.tsx
  • libs/ui-components/src/components/catalog/CatalogItemCard.test.tsx
  • libs/ui-components/src/components/catalogManagement/CatalogItemScopeBadge.tsx
  • apps/app-frontend/src/shell/AppShell.tsx
  • libs/ui-components/src/components/catalog/CatalogItemCard.tsx
  • libs/ui-components/src/api/v1/private/compute-instance-catalog-item.test.ts
  • libs/ui-components/src/pages/admin/ClusterCatalogManagementPanel.tsx
  • libs/ui-components/src/api/types.ts
  • libs/ui-components/src/components/catalog/catalogItemDisplay.test.ts
  • libs/ui-components/src/pages/admin/ComputeInstanceCatalogManagementPanel.tsx
  • libs/i18n/locales/en/translation.json
  • libs/ui-components/src/components/catalogManagement/CatalogItemStatusLabel.tsx

Walkthrough

Changes

Removes the admin catalog route, management pages, private catalog hooks, scope/status UI, and role-specific navigation. Public catalog types and bare-metal hook usage are simplified, with related tests, helpers, icons, and translations removed.

Catalog management removal

Layer / File(s) Summary
Narrow catalog contracts
libs/ui-components/src/api/types.ts, libs/ui-components/src/api/v1/baremetal-instance.ts, libs/ui-components/src/components/catalog/catalogItemDisplay.ts, libs/ui-components/src/icons.tsx
Catalog APIs and display types now cover public catalog items, while bare-metal catalog queries no longer accept list parameters.
Remove management UI and test support
libs/ui-components/src/components/catalog/*, libs/ui-components/src/components/catalogManagement/*, libs/ui-components/src/pages/admin/*, libs/ui-components/src/test-utils/*
Admin catalog panels, pages, badges, private hook tests, and shared hook-rendering helpers are removed; cards no longer render scope or status content.
Remove shell routing and navigation
apps/app-frontend/src/shell/*, libs/i18n/locales/en/translation.json
The admin catalog route and administration navigation are removed, and related English translations are deleted.

Estimated code review effort: 4 (Complex) | ~45 minutes

Possibly related PRs

Suggested labels: lgtm

Suggested reviewers: batzionb, rawagner, liatb-rh

🚥 Pre-merge checks | ✅ 11
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately states this is a revert of the catalog management list page change and matches the main purpose of the PR.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
No-Hardcoded-Secrets ✅ Passed Patch only removes admin catalog UI/nav strings; no API keys, tokens, passwords, private keys, credentialed URLs, or suspicious literals were added.
No-Weak-Crypto ✅ Passed Touched files only remove admin nav/UI text; no MD5/SHA1/DES/RC4/3DES/Blowfish, custom crypto, or secret comparisons were added.
No-Injection-Vectors ✅ Passed Touched files only remove routes/tests/nav; the remaining added code has no eval/exec, shell, YAML, pickle, SQL, or dangerouslySetInnerHTML sinks.
Container-Privileges ✅ Passed Diff only touches frontend/i18n files; no container/K8s manifests or privilege settings (privileged, hostPID/Network/IPC, SYS_ADMIN, allowPrivilegeEscalation) are present.
No-Sensitive-Data-In-Logs ✅ Passed PASS: Diff adds no console/logger statements or secret-bearing strings; patch searches found no added sensitive-data logging.
Ai-Attribution ✅ Passed HEAD commit includes Assisted-by: Claude Code <noreply@anthropic.com> and no AI Co-Authored-By trailer was found.
✨ Finishing Touches 💡 1
🛠️ Fix failing CI checks 💡
  • Fix failing CI checks
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

After reverting OSAC-2932 (osac-project#100), the "Catalog management" nav item
still pointed at an empty placeholder page (the OSAC-2931 scaffold
that osac-project#100 built on top of). Remove the nav item, the now-empty
Administration nav section, the /admin/catalog route, and the
AdminCatalogRoutes placeholder so nothing links to dead UI.

Assisted-by: Claude Code <noreply@anthropic.com>
Signed-off-by: Elay Aharoni <elayaha@gmail.com>
@ElayAharoni
ElayAharoni marked this pull request as ready for review July 30, 2026 09:54
@ElayAharoni
ElayAharoni requested review from batzionb and rawagner and removed request for jhernand and omer-vishlitzky July 30, 2026 09:54
@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: batzionb, ElayAharoni

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:
  • OWNERS [ElayAharoni,batzionb]

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

@openshift-ci openshift-ci Bot added the lgtm label Jul 30, 2026
@openshift-merge-bot
openshift-merge-bot Bot merged commit d74aaaf into osac-project:main Jul 30, 2026
7 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants