Skip to content

[release-4.20] OCPBUGS-61777: Fix improper DescriptionList refactor #15499

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

Merged
openshift-merge-bot merged 1 commit into from
Sep 16, 2025
Merged

[release-4.20] OCPBUGS-61777: Fix improper DescriptionList refactor #15499

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
14 changes: 6 additions & 8 deletions frontend/packages/operator-lifecycle-manager/src/components/descriptors/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ const DescriptorDetailsItemGroup: React.FC<DescriptorDetailsItemGroupProps> = ({
);
};

export const DescriptorDetailsItemList: React.FC<DescriptorDetailsItemListProps> = ({
/** Note: MUST be used inside a `<DescriptionList>` */
export const DescriptorDetailsItems: React.FC<DescriptorDetailsItemsProps> = ({
descriptors,
model,
obj,
Expand All @@ -160,7 +161,7 @@ export const DescriptorDetailsItemList: React.FC<DescriptorDetailsItemListProps>
descriptors,
]);
return (
<DescriptionList className={`olm-descriptors olm-descriptors--${type}`}>
<>
{_.map(groupedDescriptors, (group, groupPath) => {
const groupProps = {
group,
Expand Down Expand Up @@ -205,7 +206,7 @@ export const DescriptorDetailsItemList: React.FC<DescriptorDetailsItemListProps>
/>
);
})}
</DescriptionList>
</>
);
};

Expand All @@ -225,14 +226,11 @@ type DescriptorDetailsItemGroupProps = Omit<DescriptorDetailsItemProps, 'descrip
className?: string;
};

type DescriptorDetailsItemListProps = Omit<
DescriptorDetailsItemGroupProps,
'groupPath' | 'group'
> & {
type DescriptorDetailsItemsProps = Omit<DescriptorDetailsItemGroupProps, 'groupPath' | 'group'> & {
descriptors: Descriptor[];
itemClassName?: string;
};

DescriptorDetailsItem.displayName = 'DescriptorDetailsItem';
DescriptorDetailsItemGroup.displayName = 'DescriptorDetailsItemGroup';
DescriptorDetailsItemList.displayName = 'DescriptorDetailsItemList';
DescriptorDetailsItems.displayName = 'DescriptorDetailsItems';
6 changes: 3 additions & 3 deletions frontend/packages/operator-lifecycle-manager/src/components/operand/index.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
testConditionsDescriptor,
} from '../../../mocks';
import { ClusterServiceVersionModel } from '../../models';
import { DescriptorDetailsItem, DescriptorDetailsItemList } from '../descriptors';
import { DescriptorDetailsItem, DescriptorDetailsItems } from '../descriptors';
import { Resources } from '../k8s-resource';
import { OperandLink } from './operand-link';
import {
Expand Down Expand Up @@ -271,7 +271,7 @@ describe(OperandDetails.displayName, () => {

xit('[CONSOLE-2336] renders spec descriptor fields if the custom resource is `owned`', () => {
expect(
wrapper.find(DescriptorDetailsItemList).last().shallow().find(DescriptorDetailsItem).length,
wrapper.find(DescriptorDetailsItems).last().shallow().find(DescriptorDetailsItem).length,
).toEqual(
testClusterServiceVersion.spec.customresourcedefinitions.owned[0].specDescriptors.length,
);
Expand All @@ -286,7 +286,7 @@ describe(OperandDetails.displayName, () => {
wrapper = wrapper.setProps({ csv });

expect(
wrapper.find(DescriptorDetailsItemList).last().shallow().find(DescriptorDetailsItem).length,
wrapper.find(DescriptorDetailsItems).last().shallow().find(DescriptorDetailsItem).length,
).toEqual(csv.spec.customresourcedefinitions.required[0].specDescriptors.length);
});

Expand Down
66 changes: 35 additions & 31 deletions frontend/packages/operator-lifecycle-manager/src/components/operand/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Grid, GridItem } from '@patternfly/react-core';
import { DescriptionList, Grid, GridItem } from '@patternfly/react-core';
import { css } from '@patternfly/react-styles';
import { sortable } from '@patternfly/react-table';
import { JSONSchema7 } from 'json-schema';
Expand Down Expand Up @@ -77,7 +77,7 @@ import { RouteParams } from '@console/shared/src/types';
import { ClusterServiceVersionModel } from '../../models';
import { ClusterServiceVersionKind, ProvidedAPI } from '../../types';
import { useClusterServiceVersion } from '../../utils/useClusterServiceVersion';
import { DescriptorDetailsItem, DescriptorDetailsItemList } from '../descriptors';
import { DescriptorDetailsItem, DescriptorDetailsItems } from '../descriptors';
import { DescriptorConditions } from '../descriptors/status/conditions';
import { DescriptorType, StatusCapability, StatusDescriptor } from '../descriptors/types';
import { isMainStatusDescriptor } from '../descriptors/utils';
Expand Down Expand Up @@ -673,29 +673,31 @@ export const OperandDetails = connectToModel(({ crd, csv, kindObj, obj }: Operan
<GridItem sm={6}>
<ResourceSummary resource={obj} />
</GridItem>
{mainStatusDescriptor && (
{mainStatusDescriptor || otherStatusDescriptors?.length > 0 ? (
<GridItem sm={6}>
<DescriptorDetailsItem
key={mainStatusDescriptor.path}
descriptor={mainStatusDescriptor}
model={kindObj}
obj={obj}
schema={schema}
type={DescriptorType.status}
/>
<DescriptionList>
{mainStatusDescriptor && (
<DescriptorDetailsItem
key={mainStatusDescriptor.path}
descriptor={mainStatusDescriptor}
model={kindObj}
obj={obj}
schema={schema}
type={DescriptorType.status}
/>
)}
{otherStatusDescriptors?.length > 0 && (
<DescriptorDetailsItems
descriptors={otherStatusDescriptors}
model={kindObj}
obj={obj}
schema={schema}
type={DescriptorType.status}
/>
)}
</DescriptionList>
</GridItem>
)}
{otherStatusDescriptors?.length > 0 && (
<GridItem sm={6}>
<DescriptorDetailsItemList
descriptors={otherStatusDescriptors}
model={kindObj}
obj={obj}
schema={schema}
type={DescriptorType.status}
/>
</GridItem>
)}
) : null}
</Grid>
</div>
</PaneBody>
Expand All @@ -704,14 +706,16 @@ export const OperandDetails = connectToModel(({ crd, csv, kindObj, obj }: Operan
<div className="co-operand-details__section co-operand-details__section--info">
<Grid hasGutter>
<GridItem sm={6}>
<DescriptorDetailsItemList
descriptors={specDescriptors}
model={kindObj}
obj={obj}
onError={handleError}
schema={schema}
type={DescriptorType.spec}
/>
<DescriptionList>
<DescriptorDetailsItems
descriptors={specDescriptors}
model={kindObj}
obj={obj}
onError={handleError}
schema={schema}
type={DescriptorType.spec}
/>
</DescriptionList>
</GridItem>
</Grid>
</div>
Expand Down