From 467d720ba936c416f2c1442e6f822efce263f6c1 Mon Sep 17 00:00:00 2001
From: Jon Jackson <jonjacks@redhat.com>
Date: Mon, 1 Dec 2025 15:30:48 -0500
Subject: [PATCH 1/2] OCPBUGS-65946: Fix search component to not pass
 ALL_NAMESPACES_KEY to the AsyncComponent

---
 frontend/public/components/search.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/public/components/search.tsx b/frontend/public/components/search.tsx
index 002a85f0fa0..ad09430ece2 100644
--- a/frontend/public/components/search.tsx
+++ b/frontend/public/components/search.tsx
@@ -49,6 +49,7 @@ import {
 } from '@console/dynamic-plugin-sdk/src/extensions/pages';
 import { useActivePerspective } from '@console/dynamic-plugin-sdk/src/perspective';
 import { useActiveNamespace, useK8sModel } from '@console/dynamic-plugin-sdk/src/lib-core';
+import { ALL_NAMESPACES_KEY } from '@console/shared/src/constants';
 
 const ResourceList = ({ kind, mock, namespace, selector, nameFilter }) => {
   const { plural } = useParams<{ plural?: string }>();
@@ -67,7 +68,7 @@ const ResourceList = ({ kind, mock, namespace, selector, nameFilter }) => {
   return (
     <AsyncComponent
       loader={componentLoader}
-      namespace={ns}
+      namespace={ns === ALL_NAMESPACES_KEY ? undefined : ns}
       selector={selector}
       nameFilter={nameFilter}
       kind={kindObj.crd ? referenceForModel(kindObj) : kindObj.kind}

From 545ca3541f19ea1e261765b5ff8bef0a5aa2fb88 Mon Sep 17 00:00:00 2001
From: Robb Hamilton <rhamilto@redhat.com>
Date: Tue, 9 Dec 2025 10:38:42 -0500
Subject: [PATCH 2/2] cherry-pick test updates from robb's duplicate bug fix

---
 .../tests/app/filtering-and-searching.cy.ts   | 45 +++++++++++++------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/frontend/packages/integration-tests-cypress/tests/app/filtering-and-searching.cy.ts b/frontend/packages/integration-tests-cypress/tests/app/filtering-and-searching.cy.ts
index aa8afa0d1be..56597cd74f1 100644
--- a/frontend/packages/integration-tests-cypress/tests/app/filtering-and-searching.cy.ts
+++ b/frontend/packages/integration-tests-cypress/tests/app/filtering-and-searching.cy.ts
@@ -6,6 +6,9 @@ import { listPage } from '../../views/list-page';
 import { modal } from '../../views/modal';
 import * as yamlEditor from '../../views/yaml-editor';
 
+const SEARCH_NAMESPACE = 'openshift-authentication-operator';
+const SEARCH_DEPLOYMENT_NAME = 'authentication-operator';
+
 describe('Filtering and Searching', () => {
   let WORKLOAD_NAME;
   let WORKLOAD_LABEL;
@@ -50,14 +53,13 @@ describe('Filtering and Searching', () => {
     cy.deleteProjectWithCLI(testName);
   });
 
-  // disabled as listPage.rows.shouldExist isn't a valid test
-  xit('filters Pod from object detail', () => {
+  it('filters Pod from object detail', () => {
     cy.visit(`/k8s/ns/${testName}/deployments`);
-    listPage.rows.shouldExist(WORKLOAD_NAME);
+    listPage.dvRows.shouldExist(WORKLOAD_NAME);
     cy.visit(`/k8s/ns/${testName}/deployments/${WORKLOAD_NAME}/pods`);
-    listPage.rows.shouldBeLoaded();
-    listPage.filter.byName(WORKLOAD_NAME);
-    listPage.rows.shouldExist(WORKLOAD_NAME);
+    listPage.dvRows.shouldBeLoaded();
+    listPage.dvFilter.byName(WORKLOAD_NAME);
+    listPage.dvRows.countShouldBe(3);
   });
 
   it('filters invalid Pod from object detail', () => {
@@ -68,12 +70,28 @@ describe('Filtering and Searching', () => {
       cy.get('.pf-v6-l-bullseye').should('contain', 'No Pods found');
     });
   });
-  // disabled as listPage.rows.shouldExist isn't a valid test
-  xit('filters from Pods list', () => {
+
+  it('filters from Pods list', () => {
     cy.visit(`/k8s/all-namespaces/pods`);
-    listPage.rows.shouldBeLoaded();
-    listPage.filter.byName(WORKLOAD_NAME);
-    listPage.rows.shouldExist(WORKLOAD_NAME);
+    listPage.dvRows.shouldBeLoaded();
+    listPage.dvFilter.byName(WORKLOAD_NAME);
+    listPage.dvRows.countShouldBe(3);
+  });
+
+  it('displays namespace on Search when All Namespaces is selected', () => {
+    cy.visit(
+      `/search/all-namespaces?kind=apps~v1~Deployment&page=1&perPage=50&name=${SEARCH_DEPLOYMENT_NAME}`,
+    );
+    listPage.dvRows.countShouldBe(1);
+    cy.get(`[data-test-id="${SEARCH_NAMESPACE}"]`).should('exist');
+  });
+
+  it('does not display namespace on Search when namespace is selected', () => {
+    cy.visit(
+      `/search/ns/${SEARCH_NAMESPACE}?kind=apps~v1~Deployment&page=1&perPage=50&name=${SEARCH_DEPLOYMENT_NAME}`,
+    );
+    listPage.dvRows.countShouldBe(1);
+    cy.get(`[data-test-id="${SEARCH_NAMESPACE}"]`).should('not.exist');
   });
 
   it('searches for object by kind and label', () => {
@@ -81,11 +99,10 @@ describe('Filtering and Searching', () => {
     listPage.dvRows.shouldExist(WORKLOAD_NAME);
   });
 
-  // disabled as listPage.rows.shouldExist isn't a valid test
-  xit('searches for object by kind, label, and name', () => {
+  it('searches for object by kind, label, and name', () => {
     cy.visit(`/search/all-namespaces`, {
       qs: { kind: 'Pod', q: 'app=name', name: WORKLOAD_NAME },
     });
-    listPage.rows.shouldExist(WORKLOAD_NAME);
+    listPage.dvRows.countShouldBe(3);
   });
 });