Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve Installed Operators list page #4830

Merged
merged 1 commit into from
Apr 18, 2020
Merged

Improve Installed Operators list page #4830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions frontend/packages/operator-lifecycle-manager/mocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ export const testClusterServiceVersion: ClusterServiceVersionKind = {
apiVersion: 'operators.coreos.com/v1alpha1',
kind: 'ClusterServiceVersion',
metadata: {
annotations: {
'olm.operatorNamespace': 'openshift-operators',
'olm.targetNamespaces': 'openshift-operators',
},
name: 'testapp',
uid: 'c02c0a8f-88e0-11e7-851b-080027b424ef',
creationTimestamp: '2017-09-20T18:19:49Z',
Expand Down
98 changes: 27 additions & 71 deletions frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ import {
TableInnerProps,
Table,
TableRow,
MultiListPage,
} from '@console/internal/components/factory';
import {
Timestamp,
ResourceLink,
ResourceKebab,
ScrollToTopOnMount,
SectionHeading,
Expand All @@ -30,23 +28,23 @@ import {
testCatalogSource,
testInstallPlan,
} from '../../mocks';
import { ClusterServiceVersionModel, SubscriptionModel, CatalogSourceModel } from '../models';
import { ClusterServiceVersionModel } from '../models';
import { ClusterServiceVersionKind, ClusterServiceVersionPhase } from '../types';
import {
ClusterServiceVersionsDetailsPage,
ClusterServiceVersionsDetailsPageProps,
ClusterServiceVersionDetails,
ClusterServiceVersionDetailsProps,
ClusterServiceVersionsPage,
ClusterServiceVersionsPageProps,
ClusterServiceVersionList,
ClusterServiceVersionTableHeader,
NamespacedClusterServiceVersionList,
ClusterServiceVersionTableRow,
NamespacedClusterServiceVersionTableRow,
ClusterServiceVersionTableRowProps,
CRDCard,
CRDCardRow,
CSVSubscription,
CSVSubscriptionProps,
SingleProjectTableHeader,
AllProjectsTableHeader,
} from './clusterserviceversion';
import { SubscriptionUpdates, SubscriptionDetails } from './subscription';
import {
Expand All @@ -55,9 +53,15 @@ import {
referenceForProvidedAPI,
} from '.';

describe(ClusterServiceVersionTableHeader.displayName, () => {
it('returns column header definition for cluster service version table header', () => {
expect(Array.isArray(ClusterServiceVersionTableHeader()));
describe('SingleProjectTableHeader.displayName', () => {
it('returns single project column header definition for cluster service version table header', () => {
expect(Array.isArray(SingleProjectTableHeader()));
});
});

describe('AllProjectsTableHeader.displayName', () => {
it('returns all projects column header definition for cluster service version table header', () => {
expect(Array.isArray(AllProjectsTableHeader()));
});
});

Expand All @@ -66,7 +70,8 @@ describe(ClusterServiceVersionTableRow.displayName, () => {

beforeEach(() => {
wrapper = shallow(
<ClusterServiceVersionTableRow
<NamespacedClusterServiceVersionTableRow
activeNamespace="test"
catalogSourceMissing={false}
obj={testClusterServiceVersion}
subscription={testSubscription}
Expand All @@ -81,7 +86,7 @@ describe(ClusterServiceVersionTableRow.displayName, () => {

it('renders a component wrapped in an `ErrorBoundary', () => {
wrapper = shallow(
<ClusterServiceVersionTableRow
<NamespacedClusterServiceVersionTableRow
catalogSourceMissing={false}
obj={testClusterServiceVersion}
subscription={testSubscription}
Expand Down Expand Up @@ -118,24 +123,15 @@ describe(ClusterServiceVersionTableRow.displayName, () => {
).toBe(true);
});

it('renders column for app namespace link', () => {
const link = wrapper
.find(TableRow)
.childAt(1)
.find(ResourceLink);

expect(link.props().kind).toEqual('Namespace');
expect(link.props().title).toEqual(testClusterServiceVersion.metadata.namespace);
expect(link.props().name).toEqual(testClusterServiceVersion.metadata.namespace);
it('renders column for managedNamespace', () => {
const col = wrapper.find(TableRow).childAt(1);
const managedNamespace = col.childAt(0);
expect(managedNamespace.exists()).toBeTruthy();
});

it('renders column with link to Operator deployment', () => {
it('renders column for last updated', () => {
const col = wrapper.find(TableRow).childAt(3);

expect(col.find(ResourceLink).props().kind).toEqual('Deployment');
expect(col.find(ResourceLink).props().name).toEqual(
testClusterServiceVersion.spec.install.spec.deployments[0].name,
);
expect(col.render().text()).toContain('years from now');
});

it('renders column for app status', () => {
Expand Down Expand Up @@ -217,59 +213,19 @@ describe(ClusterServiceVersionLogo.displayName, () => {
});
});

describe(ClusterServiceVersionList.displayName, () => {
describe(NamespacedClusterServiceVersionList.displayName, () => {
it('renders `List` with correct props', () => {
const wrapper = shallow(
<ClusterServiceVersionList
<NamespacedClusterServiceVersionList
activeNamespace="test"
data={[]}
subscriptions={{ loaded: true, data: [testSubscription], loadError: null }}
catalogSources={{ loaded: true, data: [testCatalogSource], loadError: null }}
loaded
/>,
);

expect(wrapper.find<TableInnerProps>(Table).props().Header).toEqual(
ClusterServiceVersionTableHeader,
);
});
});

describe(ClusterServiceVersionsPage.displayName, () => {
let wrapper: ShallowWrapper<ClusterServiceVersionsPageProps>;

beforeEach(() => {
spyOn(rbac, 'useAccessReview').and.returnValue(true);
wrapper = shallow(
<ClusterServiceVersionsPage
kind={referenceForModel(ClusterServiceVersionModel)}
resourceDescriptions={[]}
namespace="foo"
/>,
);
});

it('renders a `MultiListPage` with correct props', () => {
const listPage = wrapper.find(MultiListPage);

expect(listPage.props().resources).toEqual([
{
kind: referenceForModel(ClusterServiceVersionModel),
namespace: 'foo',
prop: 'clusterServiceVersions',
},
{
kind: referenceForModel(SubscriptionModel),
prop: 'subscriptions',
optional: true,
},
{
kind: referenceForModel(CatalogSourceModel),
prop: 'catalogSources',
optional: true,
},
]);
expect(listPage.props().ListComponent).toEqual(ClusterServiceVersionList);
expect(listPage.props().showTitle).toBe(false);
expect(wrapper.find<TableInnerProps>(Table).props().Header).toEqual(SingleProjectTableHeader);
});
});

Expand Down