[release-4.20] OCPBUGS-74158: Do not resolve disabled catalog type extensions

[logonoff]

This is an automated cherry-pick of #15930

[openshift-ci-robot]

@logonoff: This pull request references Jira Issue OCPBUGS-74158, which is invalid:

• expected dependent Jira Issue OCPBUGS-74157 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #15930

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]

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)

• do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

• 🔍 Trigger a full review

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[TheRealJon]

/lgtm

[logonoff]

/assign @yapei

[logonoff]

/label backport-risk-assessed

[logonoff]

/jira refresh

[openshift-ci-robot]

@logonoff: This pull request references Jira Issue OCPBUGS-74158, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.20.z) matches configured target version for branch (4.20.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-74157 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-74157 targets the "4.21.0" version, which is one of the valid target versions: 4.21.0
• bug has dependents

Requesting review from QA contact:
/cc @yapei

Details

In response to this:

/jira refresh

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.

[logonoff]

/cherry-pick release-4.19

[openshift-cherrypick-robot]

@logonoff: once the present PR merges, I will cherry-pick it on top of release-4.19 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.19

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 kubernetes-sigs/prow repository.

[TheRealJon]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: logonoff, TheRealJon

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:

• frontend/OWNERS [TheRealJon,logonoff]

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

[logonoff]

/cc @yanpzhan

[yanpzhan]

Tested on cluster launched against the pr, set Cluster Samples Operator as 'managementState: removed' and disabled devfiles catalog from customization page, checked catalogs by clicking "All services", "Database" or "Samples" from "+Add" page. There was not error msg, and no https request for 'devfiles' in network.

[yanpzhan]

/verified by yanpzhan

[openshift-ci-robot]

@yanpzhan: This PR has been marked as verified by yanpzhan.

Details

In response to this:

/verified by yanpzhan

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.

[logonoff]

/retest

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 52fe23a and 2 for PR HEAD bc05b7e in total

[logonoff]

/retest

[logonoff]

/retest

[logonoff]

/retest

[logonoff]

/retest

[openshift-ci]

@logonoff: all tests passed!

Full PR test history. Your PR dashboard.

Details

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 kubernetes-sigs/prow repository. I understand the commands that are listed here.

[openshift-ci-robot]

@logonoff: Jira Issue Verification Checks: Jira Issue OCPBUGS-74158
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-74158 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

This is an automated cherry-pick of #15930

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.

[openshift-cherrypick-robot]

@logonoff: #15931 failed to apply on top of branch "release-4.19":

Applying: OCPBUGS-74158: Do not resolve disabled catalog type extensions
Using index info to reconstruct a base tree...
M	frontend/packages/console-shared/src/components/catalog/__tests__/CatalogController.spec.tsx
M	frontend/packages/console-shared/src/components/catalog/hooks/useCatalogExtensions.ts
M	frontend/packages/console-shared/src/components/catalog/utils/catalog-utils.tsx
M	frontend/packages/console-shared/src/utils/__tests__/isSubCatalogTypeEnabled.spec.ts
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/console-shared/src/utils/__tests__/isSubCatalogTypeEnabled.spec.ts
Auto-merging frontend/packages/console-shared/src/components/catalog/utils/catalog-utils.tsx
CONFLICT (content): Merge conflict in frontend/packages/console-shared/src/components/catalog/utils/catalog-utils.tsx
Auto-merging frontend/packages/console-shared/src/components/catalog/hooks/useCatalogExtensions.ts
CONFLICT (content): Merge conflict in frontend/packages/console-shared/src/components/catalog/hooks/useCatalogExtensions.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-74158: Do not resolve disabled catalog type extensions

Details

In response to this:

/cherry-pick release-4.19

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 kubernetes-sigs/prow repository.

[openshift-merge-robot]

Fix included in accepted release 4.20.0-0.nightly-2026-01-30-225120