Skip to content

OCPBUGS-99491: Fix Installed Operators table row cells ignoring column management #16817

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
TheRealJon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-99491: Fix Installed Operators table row cells ignoring column management #16817

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
104 changes: 86 additions & 18 deletions frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,14 @@ const ConsolePluginStatus: FC<ConsolePluginStatusProps> = ({ csv, csvPlugins })
};

export const ClusterServiceVersionTableRow = withFallback<ClusterServiceVersionTableRowProps>(
({ activeNamespace, obj, subscription, catalogSourceMissing, lifecycleEnabled }) => {
({
activeNamespace,
obj,
subscription,
catalogSourceMissing,
lifecycleEnabled,
activeColumnIDs,
}) => {
const { displayName, provider, version } = obj.spec ?? {};
const { t } = useTranslation('olm');
const olmOperatorNamespace = operatorNamespaceFor(obj) ?? '';
Expand All @@ -386,7 +393,7 @@ export const ClusterServiceVersionTableRow = withFallback<ClusterServiceVersionT
return (
<>
{/* Name */}
<TableData className={nameColumnClass}>
<TableData columnID="name" columns={activeColumnIDs} className={nameColumnClass}>
<Link
to={route}
className="co-clusterserviceversion-link"
Expand All @@ -403,7 +410,11 @@ export const ClusterServiceVersionTableRow = withFallback<ClusterServiceVersionT

{/* Operator Namespace */}
{activeNamespace === ALL_NAMESPACES_KEY ? (
<TableData className={namespaceColumnClass}>
<TableData
columnID="namespace"
columns={activeColumnIDs}
className={namespaceColumnClass}
>
<ResourceLink
kind="Namespace"
title={olmOperatorNamespace}
Expand All @@ -413,12 +424,16 @@ export const ClusterServiceVersionTableRow = withFallback<ClusterServiceVersionT
) : null}

{/* Managed Namespaces */}
<TableData className={managedNamespacesColumnClass}>
<TableData
columnID="managedNamespaces"
columns={activeColumnIDs}
className={managedNamespacesColumnClass}
>
<ManagedNamespaces obj={obj} />
</TableData>

{/* Status */}
<TableData className={statusColumnClass}>
<TableData columnID="status" columns={activeColumnIDs} className={statusColumnClass}>
<div className="co-clusterserviceversion-row__status">
{catalogSourceMissing ? (
<SourceMissingStatus />
Expand All @@ -436,7 +451,11 @@ export const ClusterServiceVersionTableRow = withFallback<ClusterServiceVersionT
</TableData>

{/* Provided APIs */}
<TableData className={providedAPIsColumnClass}>
<TableData
columnID="providedAPIs"
columns={activeColumnIDs}
className={providedAPIsColumnClass}
>
{!_.isEmpty(providedAPIs)
? _.take(providedAPIs, 4).map((desc) => (
<div key={referenceForProvidedAPI(desc)}>
Expand All @@ -458,20 +477,32 @@ export const ClusterServiceVersionTableRow = withFallback<ClusterServiceVersionT

{/* Cluster Compatibility */}
{lifecycleEnabled ? (
<TableData className={clusterCompatibilityColumnClass}>
<TableData
columnID="clusterCompatibility"
columns={activeColumnIDs}
className={clusterCompatibilityColumnClass}
>
<ClusterCompatibilityStatus compatible={compatible} />
</TableData>
) : null}

{/* Support Phase */}
{lifecycleEnabled ? (
<TableData className={supportPhaseColumnClass}>
<TableData
columnID="supportPhase"
columns={activeColumnIDs}
className={supportPhaseColumnClass}
>
<SupportPhaseBadge phase={supportPhase} />
</TableData>
) : null}

{/* Last Updated */}
<TableData className={lastUpdatedColumnClass}>
<TableData
columnID="lastUpdated"
columns={activeColumnIDs}
className={lastUpdatedColumnClass}
>
{obj.status == null ? '-' : <Timestamp timestamp={obj.status.lastUpdateTime} />}
</TableData>

Expand All @@ -492,6 +523,7 @@ const SubscriptionTableRow: FC<SubscriptionTableRowProps> = ({
catalogSourceMissing,
obj,
lifecycleEnabled,
activeColumnIDs,
}) => {
const { t } = useTranslation('olm');
const csvName = obj?.spec?.name;
Expand All @@ -501,7 +533,7 @@ const SubscriptionTableRow: FC<SubscriptionTableRowProps> = ({
return (
<>
{/* Name */}
<TableData className={nameColumnClass}>
<TableData columnID="name" columns={activeColumnIDs} className={nameColumnClass}>
<Link to={route}>
<ClusterServiceVersionLogo
icon={null}
Expand All @@ -514,36 +546,62 @@ const SubscriptionTableRow: FC<SubscriptionTableRowProps> = ({

{/* Operator Namespace */}
{activeNamespace === ALL_NAMESPACES_KEY ? (
<TableData className={namespaceColumnClass}>
<TableData columnID="namespace" columns={activeColumnIDs} className={namespaceColumnClass}>
<ResourceLink kind="Namespace" title={namespace} name={namespace} />
</TableData>
) : null}

{/* Managed Namespaces */}
<TableData className={managedNamespacesColumnClass}>
<TableData
columnID="managedNamespaces"
columns={activeColumnIDs}
className={managedNamespacesColumnClass}
>
<span className="pf-v6-u-text-color-subtle">{t('None')}</span>
</TableData>

{/* Status */}
<TableData className={statusColumnClass}>
<TableData columnID="status" columns={activeColumnIDs} className={statusColumnClass}>
{catalogSourceMissing ? <SourceMissingStatus /> : <SubscriptionStatus subscription={obj} />}
</TableData>

{/* Provided APIs */}
<TableData className={providedAPIsColumnClass}>
<TableData
columnID="providedAPIs"
columns={activeColumnIDs}
className={providedAPIsColumnClass}
>
<span className="pf-v6-u-text-color-subtle">{t('None')}</span>
</TableData>

{/* Cluster Compatibility */}
{lifecycleEnabled ? (
<TableData className={clusterCompatibilityColumnClass}>-</TableData>
<TableData
columnID="clusterCompatibility"
columns={activeColumnIDs}
className={clusterCompatibilityColumnClass}
>
-
</TableData>
) : null}

{/* Support Phase */}
{lifecycleEnabled ? <TableData className={supportPhaseColumnClass}>-</TableData> : null}
{lifecycleEnabled ? (
<TableData
columnID="supportPhase"
columns={activeColumnIDs}
className={supportPhaseColumnClass}
>
-
</TableData>
) : null}

{/* Last Updated */}
<TableData className={lastUpdatedColumnClass}>
<TableData
columnID="lastUpdated"
columns={activeColumnIDs}
className={lastUpdatedColumnClass}
>
{obj.status == null ? '-' : <Timestamp timestamp={obj.status.lastUpdated} />}
</TableData>

Expand All @@ -558,7 +616,11 @@ const SubscriptionTableRow: FC<SubscriptionTableRowProps> = ({
);
};

const InstalledOperatorTableRow: FC<InstalledOperatorTableRowProps> = ({ obj, customData }) => {
const InstalledOperatorTableRow: FC<InstalledOperatorTableRowProps> = ({
obj,
columns,
customData,
}) => {
const { catalogSources, subscriptions, activeNamespace, lifecycleEnabled } = customData;
const subscription = isCSV(obj)
? subscriptionForCSV(subscriptions, obj as ClusterServiceVersionKind)
Expand All @@ -571,20 +633,24 @@ const InstalledOperatorTableRow: FC<InstalledOperatorTableRowProps> = ({ obj, cu
!catalogSourceForSubscription(catalogSources, subscription) &&
!isPackageServer(obj);

const activeColumnIDs = useMemo(() => new Set(columns?.map((c) => c.id)), [columns]);

return isCSV(obj) ? (
<ClusterServiceVersionTableRow
activeNamespace={activeNamespace}
catalogSourceMissing={catalogSourceMissing}
obj={obj as ClusterServiceVersionKind}
subscription={subscription}
lifecycleEnabled={lifecycleEnabled}
activeColumnIDs={activeColumnIDs}
/>
) : (
<SubscriptionTableRow
activeNamespace={activeNamespace}
catalogSourceMissing={catalogSourceMissing}
obj={subscription as SubscriptionKind}
lifecycleEnabled={lifecycleEnabled}
activeColumnIDs={activeColumnIDs}
/>
);
};
Expand Down Expand Up @@ -1549,13 +1615,15 @@ export type ClusterServiceVersionTableRowProps = {
subscription: SubscriptionKind;
activeNamespace?: string;
lifecycleEnabled?: boolean;
activeColumnIDs?: Set<string>;
};

type SubscriptionTableRowProps = {
obj: SubscriptionKind;
catalogSourceMissing: boolean;
activeNamespace?: string;
lifecycleEnabled?: boolean;
activeColumnIDs?: Set<string>;
};

type ManagedNamespacesProps = {
Expand Down