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

Bug 1827688: kubvirt redirect vm, vmi and vmtemplates to virtualization page #5295

Merged
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,21 @@ import { K8sResourceKindReference } from '@console/internal/module/k8s';
import { TemplateModel } from '@console/internal/models';
import { VMDisksFirehose } from '../vm-disks';
import { VMNics } from '../vm-nics';
import { breadcrumbsForVMPage } from '../vms/vm-details-page';
import { menuActions } from './menu-actions';
import { VMTemplateDetailsConnected } from './vm-template-details';

export const breadcrumbsForVMTemplatePage = (match: any) => () => [
{
name: 'Virtualization',
path: `/k8s/ns/${match.params.ns || 'default'}/virtualization`,
},
{
name: 'Templates',
path: `/k8s/ns/${match.params.ns || 'default'}/virtualization/templates`,
},
{ name: `${match.params.name} Details`, path: `${match.url}` },
];

export const VMTemplateDetailsPage: React.FC<VMTemplateDetailsPageProps> = (props) => {
const nicsPage = {
href: 'nics',
Expand Down Expand Up @@ -38,7 +49,7 @@ export const VMTemplateDetailsPage: React.FC<VMTemplateDetailsPageProps> = (prop
namespace={props.match.params.ns}
menuActions={menuActions}
pages={pages}
breadcrumbsFor={breadcrumbsForVMPage(props.match)}
breadcrumbsFor={breadcrumbsForVMTemplatePage(props.match)}
/>
);
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import { Redirect, RouteComponentProps } from 'react-router-dom';
import { Helmet } from 'react-helmet';
import { compose } from 'redux';
import { withStartGuide } from '@console/internal/components/start-guide';
Expand All @@ -9,6 +10,32 @@ import { VirtualMachinesPage } from './vm';
import { VirtualMachineTemplatesPage } from '../vm-templates/vm-template';
import { VirtualMachineModel } from '../../models';

export const RedirectToVirtualizationPage: React.FC<RouteComponentProps<{ ns: string }>> = (
props,
) => (
<Redirect
to={{
pathname: props.match.params.ns
? `/k8s/ns/${props.match.params.ns}/virtualization`
: `/k8s/all-namespaces/virtualization`,
search: decodeURI(props.location.search),
}}
/>
);

export const RedirectToVirtualizationTemplatePage: React.FC<RouteComponentProps<{ ns: string }>> = (
props,
) => (
<Redirect
to={{
pathname: props.match.params.ns
? `/k8s/ns/${props.match.params.ns}/virtualization/templates`
: `/k8s/all-namespaces/virtualization/templates`,
search: decodeURI(props.location.search),
}}
/>
);

export const WrappedVirtualizationPage: React.FC<VirtualizationPageProps> = (props) => {
const title = 'Virtualization';

Expand Down Expand Up @@ -55,6 +82,7 @@ type VirtualizationPageProps = {
skipAccessReview?: boolean;
noProjectsAvailable?: boolean;
flags: FlagsObject;
location?: { search?: string };
};

const VirtualizationPage = withStartGuide(
Expand Down
24 changes: 24 additions & 0 deletions frontend/packages/kubevirt-plugin/src/plugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,30 @@ const plugin: Plugin<ConsumedExtensions> = [
required: FLAG_KUBEVIRT,
},
},
{
type: 'Page/Route',
properties: {
exact: true,
path: ['/k8s/ns/:ns/virtualmachines', '/k8s/all-namespaces/virtualmachines'],
loader: () =>
import('./components/vms/virtualization' /* webpackChunkName: "kubevirt" */).then(
(m) => m.RedirectToVirtualizationPage,
),
required: FLAG_KUBEVIRT,
},
},
{
type: 'Page/Route',
properties: {
exact: true,
path: ['/k8s/ns/:ns/vmtemplates', '/k8s/all-namespaces/vmtemplates'],
loader: () =>
import('./components/vms/virtualization' /* webpackChunkName: "kubevirt" */).then(
(m) => m.RedirectToVirtualizationTemplatePage,
),
required: FLAG_KUBEVIRT,
},
},
{
type: 'Page/Route',
properties: {
Expand Down