diff --git a/frontend/__tests__/components/operator-lifecycle-manager/clusterserviceversion.spec.tsx b/frontend/__tests__/components/operator-lifecycle-manager/clusterserviceversion.spec.tsx index 1010f775779..554b009e461 100644 --- a/frontend/__tests__/components/operator-lifecycle-manager/clusterserviceversion.spec.tsx +++ b/frontend/__tests__/components/operator-lifecycle-manager/clusterserviceversion.spec.tsx @@ -154,7 +154,7 @@ describe(ClusterServiceVersionsPage.displayName, () => { let wrapper: ShallowWrapper; beforeEach(() => { - wrapper = shallow(); + wrapper = shallow(); }); it('renders a `ListPage` with correct props', () => { @@ -166,17 +166,8 @@ describe(ClusterServiceVersionsPage.displayName, () => { expect(listPage.props().showTitle).toBe(false); }); - it('renders an error page if the namespace is not enabled', () => { - wrapper = wrapper.setProps({namespaceEnabled: false}); - const msgBox = wrapper.find(MsgBox); - const listPage = wrapper.find(ListPage); - - expect(listPage.exists()).toBe(false); - expect(msgBox.exists()).toBe(true); - }); - it('renders `LoadingBox` if still detecting OpenShift or namespaces/projects are loading', () => { - wrapper = wrapper.setProps({namespaceEnabled: false, loading: true}); + wrapper = wrapper.setProps({loading: true}); const msgBox = wrapper.find(MsgBox); const listPage = wrapper.find(ListPage); diff --git a/frontend/public/components/operator-lifecycle-manager/clusterserviceversion.tsx b/frontend/public/components/operator-lifecycle-manager/clusterserviceversion.tsx index 375cc18e1aa..eb1718f1f5c 100644 --- a/frontend/public/components/operator-lifecycle-manager/clusterserviceversion.tsx +++ b/frontend/public/components/operator-lifecycle-manager/clusterserviceversion.tsx @@ -1,9 +1,8 @@ -/* eslint-disable no-undef */ +/* eslint-disable no-undef, no-unused-vars */ import * as React from 'react'; import { Link, match as RouterMatch } from 'react-router-dom'; import * as _ from 'lodash-es'; -import { Map as ImmutableMap } from 'immutable'; import { connect } from 'react-redux'; import { Alert } from 'patternfly-react'; @@ -24,7 +23,6 @@ import { referenceForCRDDesc } from './index'; import { - Box, Cog, LoadingBox, MsgBox, @@ -39,8 +37,6 @@ import { ScrollToTopOnMount, } from '../utils'; -import * as operatorLogo from '../../imgs/operator.svg'; - export const ClusterServiceVersionHeader: React.SFC = () => Name Namespace @@ -96,9 +92,7 @@ export const ClusterServiceVersionList: React.SFC ({ - loading: FLAGS.get(featureFlags.OPENSHIFT) === undefined || !k8s.getIn([FLAGS.get(featureFlags.OPENSHIFT) ? 'projects' : 'namespaces', 'loaded']), - namespaceEnabled: k8s.getIn([FLAGS.get(featureFlags.OPENSHIFT) ? 'projects' : 'namespaces', 'data'], ImmutableMap()) - .find((objMap) => objMap.getIn(['metadata', 'name']) === match.params.ns && objMap.getIn(['metadata', 'annotations', 'alm-manager'])) !== undefined, + loading: FLAGS.get(featureFlags.OPENSHIFT) === undefined || !k8s.getIn([FLAGS.get(featureFlags.OPENSHIFT) ? 'projects' : 'namespaces', 'loaded']) }); export const ClusterServiceVersionsPage = connect(stateToProps)((props: ClusterServiceVersionsPageProps) => { @@ -107,22 +101,17 @@ export const ClusterServiceVersionsPage = connect(stateToProps)((props: ClusterS return ; } - return props.match.params.ns && !props.namespaceEnabled - ? - - - - : - - - ; + return + + + ; }); export const MarkdownView = (props: {content: string}) => { @@ -257,7 +246,6 @@ export const ClusterServiceVersionsDetailsPage: React.StatelessComponent; resourceDescriptions: CRDDescription[]; };