diff --git a/frontend/packages/dev-console/src/components/catalog/CatalogDefaultNamespaceRedirect.tsx b/frontend/packages/console-shared/src/components/catalog/CatalogDefaultNamespaceRedirect.tsx similarity index 61% rename from frontend/packages/dev-console/src/components/catalog/CatalogDefaultNamespaceRedirect.tsx rename to frontend/packages/console-shared/src/components/catalog/CatalogDefaultNamespaceRedirect.tsx index a3621a627ef..bf01ecc38e3 100644 --- a/frontend/packages/dev-console/src/components/catalog/CatalogDefaultNamespaceRedirect.tsx +++ b/frontend/packages/console-shared/src/components/catalog/CatalogDefaultNamespaceRedirect.tsx @@ -1,8 +1,6 @@ -import * as React from 'react'; import { Navigate, useSearchParams } from 'react-router-dom-v5-compat'; -// Redirect all-namespaces catalog to default namespace -// TODO: Make Software Catalog work with all namespaces. https://issues.redhat.com/browse/CONSOLE-4827 +// Redirect catalog to default namespace const CatalogDefaultNamespaceRedirect: React.FCC = () => { const [params] = useSearchParams(); return ; diff --git a/frontend/packages/dev-console/console-extensions.json b/frontend/packages/dev-console/console-extensions.json index 4bb6bd779fb..fd4830bfe76 100644 --- a/frontend/packages/dev-console/console-extensions.json +++ b/frontend/packages/dev-console/console-extensions.json @@ -1065,14 +1065,6 @@ "component": { "$codeRef": "topologyPage" } } }, - { - "type": "console.page/route", - "properties": { - "exact": true, - "path": ["/catalog/all-namespaces"], - "component": { "$codeRef": "CatalogDefaultNamespaceRedirect" } - } - }, { "type": "console.page/route", "properties": { diff --git a/frontend/packages/dev-console/package.json b/frontend/packages/dev-console/package.json index c979f25cdeb..4ebb6e281c2 100644 --- a/frontend/packages/dev-console/package.json +++ b/frontend/packages/dev-console/package.json @@ -32,7 +32,6 @@ "CatalogTypesConfiguration": "src/components/catalog/CatalogTypesConfiguration.tsx", "PinnedResourcesConfiguration": "src/components/catalog/PinnedResourcesConfiguration.tsx", "CatalogPage": "src/components/catalog/CatalogPage.tsx", - "CatalogDefaultNamespaceRedirect": "src/components/catalog/CatalogDefaultNamespaceRedirect.tsx", "fileUpload": "src/components/jar-file-upload/jar-file-upload-utils.ts", "devConsoleComponentFactory": "src/components/topology/components/devConsoleComponentFactory.ts", "hpaTabSection": "src/components/topology/hpa-tab-section.tsx", diff --git a/frontend/public/components/app-contents.tsx b/frontend/public/components/app-contents.tsx index 5f97cda6aa4..8c40744f98a 100644 --- a/frontend/public/components/app-contents.tsx +++ b/frontend/public/components/app-contents.tsx @@ -17,6 +17,7 @@ import { usePerspectives, } from '@console/shared/src/hooks/perspective-utils'; import { ErrorBoundaryPage } from '@console/shared/src/components/error'; +import CatalogDefaultNamespaceRedirect from '@console/shared/src/components/catalog/CatalogDefaultNamespaceRedirect'; import { getReferenceForModel } from '@console/dynamic-plugin-sdk/src/utils/k8s'; import { connectToFlags } from '../reducers/connectToFlags'; import { flagPending, FlagsObject } from '../reducers/features'; @@ -257,6 +258,9 @@ const AppContents: React.FC<{}> = () => { } /> + } /> + {/* TODO: Make Software Catalog work with all namespaces. https://issues.redhat.com/browse/CONSOLE-4827 */} + } />