Skip to content

[release-4.19] OCPBUGS-81736: Migrate InstallPlan components table to PatternFly Table #16256

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

Open
rhamilto wants to merge 1 commit into
base: release-4.19
Choose a base branch
from
+55 −58
Open

[release-4.19] OCPBUGS-81736: Migrate InstallPlan components table to PatternFly Table #16256

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions frontend/packages/operator-lifecycle-manager/src/components/install-plan.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Button, Hint } from '@patternfly/react-core';
import { Tbody, Tr, Td } from '@patternfly/react-table';
import { shallow, ShallowWrapper } from 'enzyme';
import * as _ from 'lodash';
import { Link } from 'react-router-dom-v5-compat';
Expand All @@ -21,6 +22,7 @@ import {
} from '@console/internal/components/utils';
import { CustomResourceDefinitionModel } from '@console/internal/models';
import { referenceForModel, K8sResourceKind } from '@console/internal/module/k8s';
import PaneBody from '@console/shared/src/components/layout/PaneBody';
import { testInstallPlan } from '../../mocks';
import { InstallPlanModel, ClusterServiceVersionModel, OperatorGroupModel } from '../models';
import { InstallPlanKind, InstallPlanApproval } from '../types';
Expand Down Expand Up @@ -316,31 +318,31 @@ describe('InstallPlanPreview', () => {

it('renders section for each resolving `ClusterServiceVersion`', () => {
const wrapper = shallow(<InstallPlanPreview obj={obj} />);
expect(wrapper.find('.co-m-pane__body').length).toEqual(1);
wrapper.find('.co-m-pane__body').forEach((section) => {
expect(section.find('tbody').find('tr').length).toEqual(2);
expect(wrapper.find(PaneBody).length).toEqual(1);
wrapper.find(PaneBody).forEach((section) => {
expect(section.find(Tbody).find(Tr).length).toEqual(2);
});
});

it('renders link to view install plan component if it exists', () => {
const wrapper = shallow(<InstallPlanPreview obj={obj} />);
const row = wrapper.find('.co-m-pane__body').find('tbody').find('tr').at(0);
const row = wrapper.find(PaneBody).find(Tbody).find(Tr).at(0);

expect(row.find('td').at(0).find(ResourceLink).props().name).toEqual(
expect(row.find(Td).at(0).find(ResourceLink).props().name).toEqual(
obj.status.plan[0].resource.name,
);
});

it('renders link to open preview modal for install plan component if not created yet', () => {
const wrapper = shallow(<InstallPlanPreview obj={obj} />);
const row = wrapper.find('.co-m-pane__body').find('tbody').find('tr').at(1);
const row = wrapper.find(PaneBody).find(Tbody).find(Tr).at(1);
const modalSpy = spyOn(modal, 'installPlanPreviewModal').and.returnValue(null);

expect(row.find('td').at(0).find(ResourceIcon).props().kind).toEqual(
expect(row.find(Td).at(0).find(ResourceIcon).props().kind).toEqual(
referenceForStepResource(obj.status.plan[1].resource),
);

row.find('td').at(0).find(Button).simulate('click');
row.find(Td).at(0).find(Button).simulate('click');

expect(modalSpy.calls.argsFor(0)[0].stepResource).toEqual(obj.status.plan[1].resource);
});
Expand Down
95 changes: 45 additions & 50 deletions frontend/packages/operator-lifecycle-manager/src/components/install-plan.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
DescriptionListTerm,
DescriptionListDescription,
} from '@patternfly/react-core';
import { sortable } from '@patternfly/react-table';
import { sortable, Table as PFTable, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
import classNames from 'classnames';
import { Map as ImmutableMap, Set as ImmutableSet, fromJS } from 'immutable';
import * as _ from 'lodash';
Expand Down Expand Up @@ -482,56 +482,51 @@ export const InstallPlanPreview: React.FC<InstallPlanPreviewProps> = ({
</PaneBody>
)}
{stepsByCSV.map((steps) => (
<div key={steps[0].resolving} className="co-m-pane__body">
<PaneBody key={steps[0].resolving}>
<SectionHeading text={steps[0].resolving} />
<div className="co-table-container">
<table className="pf-v6-c-table pf-m-compact pf-m-border-rows">
<thead className="pf-v6-c-table__thead">
<tr className="pf-v6-c-table__tr">
<th className={componentsTableColumnClasses[0]}>{t('olm~Name')}</th>
<th className={componentsTableColumnClasses[1]}>{t('olm~Kind')}</th>
<th className={componentsTableColumnClasses[2]}>{t('olm~Status')}</th>
<th className={componentsTableColumnClasses[3]}>{t('olm~API version')}</th>
</tr>
</thead>
<tbody className="pf-v6-c-table__tbody">
{steps.map((step) => (
<tr
key={`${referenceForStepResource(step.resource)}-${step.resource.name}`}
className="pf-v6-c-table__tr"
>
<td className={componentsTableColumnClasses[0]}>
{['Present', 'Created'].includes(step.status) ? (
<ResourceLink
kind={referenceForStepResource(step.resource)}
namespace={obj.metadata.namespace}
name={step.resource.name}
title={step.resource.name}
/>
) : (
<>
<ResourceIcon kind={referenceForStepResource(step.resource)} />
<Button
type="button"
onClick={() => installPlanPreviewModal({ stepResource: step.resource })}
variant="link"
>
{step.resource.name}
</Button>
</>
)}
</td>
<td className={componentsTableColumnClasses[1]}>{step.resource.kind}</td>
<td className={componentsTableColumnClasses[2]}>{stepStatus(step.status)}</td>
<td className={componentsTableColumnClasses[3]}>
{apiVersionForReference(referenceForStepResource(step.resource))}
</td>
</tr>
))}
</tbody>
</table>
</div>
</div>
<PFTable variant="compact" borders>
<Thead>
<Tr>
<Th className={componentsTableColumnClasses[0]}>{t('olm~Name')}</Th>
<Th className={componentsTableColumnClasses[1]}>{t('olm~Kind')}</Th>
<Th className={componentsTableColumnClasses[2]}>{t('olm~Status')}</Th>
<Th className={componentsTableColumnClasses[3]}>{t('olm~API version')}</Th>
</Tr>
</Thead>
<Tbody>
{steps.map((step) => (
<Tr key={`${referenceForStepResource(step.resource)}-${step.resource.name}`}>
<Td className={componentsTableColumnClasses[0]}>
{['Present', 'Created'].includes(step.status) ? (
<ResourceLink
kind={referenceForStepResource(step.resource)}
namespace={obj.metadata.namespace}
name={step.resource.name}
title={step.resource.name}
/>
) : (
<>
<ResourceIcon kind={referenceForStepResource(step.resource)} />
<Button
type="button"
onClick={() => installPlanPreviewModal({ stepResource: step.resource })}
variant="link"
>
{step.resource.name}
</Button>
</>
)}
</Td>
<Td className={componentsTableColumnClasses[1]}>{step.resource.kind}</Td>
<Td className={componentsTableColumnClasses[2]}>{stepStatus(step.status)}</Td>
<Td className={componentsTableColumnClasses[3]}>
{apiVersionForReference(referenceForStepResource(step.resource))}
</Td>
</Tr>
))}
</Tbody>
</PFTable>
</PaneBody>
))}
</>
) : (
Expand Down