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.

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

OCPBUGS-27310: Source column header not displayed in PVC > VolumeSnapshots tab #13565

Merged
Changes from all commits
Commits
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
Expand Up @@ -134,7 +134,7 @@ const Row: React.FC<RowFunctionArgs<VolumeSnapshotKind>> = ({ obj, customData })
<Status status={volumeSnapshotStatus(obj)} />
</TableData>
<TableData className={tableColumnClasses[3]}>{sizeMetrics}</TableData>
{!customData?.disableItems?.PVC && (
{!customData?.disableItems?.Source && (
<TableData className={tableColumnClasses[4]}>
<ResourceLink
kind={referenceForModel(sourceModel)}
Expand Down Expand Up @@ -234,11 +234,11 @@ const FilteredSnapshotTable: React.FC<FilteredSnapshotTable> = (props) => {
);
};

export const VolumeSnapshotPVCPage: React.FC<VolumeSnapshotPVCPage> = (props) => {
export const VolumeSnapshotPVCPage: React.FC<VolumeSnapshotPVCPage> = ({ ns, obj }) => {
const { t } = useTranslation();
const params = useParams();
const canListVSC = useFlag(FLAGS.CAN_LIST_VSC);
const namespace = props.ns || params?.ns;
const namespace = ns || params?.ns;
const [resources, loaded, loadError] = useK8sWatchResource<VolumeSnapshotKind[]>({
groupVersionKind: {
group: VolumeSnapshotModel.apiGroup,
Expand Down Expand Up @@ -267,15 +267,15 @@ export const VolumeSnapshotPVCPage: React.FC<VolumeSnapshotPVCPage> = (props) =>
return (
<ListPageBody>
<ListPageFilter
data={data}
data={checkPVCSnapshot(data, obj)}
loaded={loaded}
onFilterChange={onFilterChange}
rowFilters={rowFilters}
/>
<FilteredSnapshotTable
data={filteredData}
customData={{
pvc: props.obj,
pvc: obj,
disableItems: { Source: true, 'Snapshot Content': !canListVSC },
}}
loaded={loaded}
Expand Down