Skip to content

Fix badge for bundles with no feature ID #2931

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
Apr 23, 2025
Merged

Fix badge for bundles with no feature ID #2931

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
4 changes: 2 additions & 2 deletions libs/ui-lib/lib/common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react';
import { SupportLevel } from '@openshift-assisted/types/assisted-installer-service';
import { FeatureId, isPreviewSupportLevel } from '../../types';
import { isPreviewSupportLevel } from '../../types';
import { TechnologyPreview } from '../ui/TechnologyPreview';
import { DeveloperPreview } from '../ui/DeveloperPreview';

export type NewSupportLevelBadgeProps = {
featureId: FeatureId;
featureId: string;
supportLevel: SupportLevel | undefined;
};

Expand Down
5 changes: 1 addition & 4 deletions libs/ui-lib/lib/ocm/components/clusterConfiguration/operators/bundleSpecs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import * as React from 'react';
import { List, ListItem } from '@patternfly/react-core';
import { FeatureId, OPENSHIFT_AI_REQUIREMENTS_LINK } from '../../../../common';
import { OPENSHIFT_AI_REQUIREMENTS_LINK } from '../../../../common';

export type BundleSpec = {
featureId?: FeatureId;
noSNO?: boolean;
incompatibleBundles?: string[];
Description: React.ComponentType;
Expand All @@ -28,7 +27,6 @@ export const bundleSpecs: { [key: string]: BundleSpec } = {
),
},
'openshift-ai-nvidia': {
featureId: 'OPENSHIFT_AI',
noSNO: true,
incompatibleBundles: ['openshift-ai-amd'],
Description: () => (
Expand All @@ -46,7 +44,6 @@ export const bundleSpecs: { [key: string]: BundleSpec } = {
docsLink: OPENSHIFT_AI_REQUIREMENTS_LINK,
},
'openshift-ai-amd': {
featureId: 'OPENSHIFT_AI',
noSNO: true,
incompatibleBundles: ['openshift-ai-nvidia'],
Description: () => (
Expand Down
24 changes: 11 additions & 13 deletions libs/ui-lib/lib/ocm/components/clusterWizard/OperatorsBundle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,19 +186,17 @@ const BundleCard = ({
<StackItem isFilled>
<div>{bundle.description}</div>
</StackItem>
{bundleSpec.featureId && (
<StackItem>
<Split>
<SplitItem isFilled />
<SplitItem>
<NewFeatureSupportLevelBadge
featureId={bundleSpec.featureId}
supportLevel={supportLevel}
/>
</SplitItem>
</Split>
</StackItem>
)}
<StackItem>
<Split>
<SplitItem isFilled />
<SplitItem>
<NewFeatureSupportLevelBadge
featureId={bundle.id || ''}
supportLevel={supportLevel}
/>
</SplitItem>
</Split>
</StackItem>
</Stack>
</CardBody>
</Card>
Expand Down
Loading