Skip to content

Commit

Permalink
Merge pull request #3934 from rawagner/overview_details
Browse files Browse the repository at this point in the history
Rename Overview pages to Details pages
  • Loading branch information
openshift-merge-robot committed Jan 22, 2020
2 parents b7a0c27 + fe2c461 commit 6cd4ee3
Show file tree
Hide file tree
Showing 88 changed files with 117 additions and 108 deletions.
2 changes: 1 addition & 1 deletion frontend/__tests__/components/cluster-settings.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ describe('Cluster Settings page', () => {
.find(HorizontalNav)
.at(0)
.props().pages[0].name,
).toBe('Overview');
).toBe('Details');
expect(
wrapper
.find(HorizontalNav)
Expand Down
22 changes: 11 additions & 11 deletions frontend/integration-tests/tests/monitoring.scenario.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,20 @@ describe('Monitoring: Alerts', () => {
expect(firstElementByTestID('alert-resource-link').getText()).toContain(testAlertName);
await firstElementByTestID('alert-resource-link').click();
await monitoringView.wait(until.presenceOf(monitoringView.detailsHeadingAlertIcon));
testDetailsPage('Alert Overview', testAlertName);
testDetailsPage('Alert Detail', testAlertName);
});

it('links to the Alerting Rule details page', async () => {
expect(monitoringView.ruleLink.getText()).toContain(testAlertName);
await monitoringView.ruleLink.click();
await monitoringView.wait(until.presenceOf(monitoringView.detailsHeadingRuleIcon));
testDetailsPage('Alerting Rule Overview', testAlertName, false);
testDetailsPage('Alerting Rule Details', testAlertName, false);

// Active Alerts list should contain a link back to the Alert details page
await monitoringView.wait(until.elementToBeClickable(monitoringView.firstAlertsListLink));
await monitoringView.firstAlertsListLink.click();
await monitoringView.wait(until.presenceOf(monitoringView.detailsHeadingAlertIcon));
testDetailsPage('Alert Overview', testAlertName);
testDetailsPage('Alert Details', testAlertName);
});

it('creates a new Silence from an existing alert', async () => {
Expand All @@ -72,7 +72,7 @@ describe('Monitoring: Alerts', () => {

// After creating the Silence, should be redirected to its details page
await monitoringView.wait(until.presenceOf(monitoringView.detailsHeadingSilenceIcon));
testDetailsPage('Silence Overview', testAlertName);
testDetailsPage('Silence Details', testAlertName);
});

it('shows the silenced Alert in the Silenced Alerts list', async () => {
Expand All @@ -82,7 +82,7 @@ describe('Monitoring: Alerts', () => {
// Click the link to navigate back to the Alert details link
await monitoringView.firstAlertsListLink.click();
await monitoringView.wait(until.presenceOf(monitoringView.detailsHeadingAlertIcon));
testDetailsPage('Alert Overview', testAlertName);
testDetailsPage('Alert Details', testAlertName);
});

it('shows the newly created Silence in the Silenced By list', async () => {
Expand All @@ -94,7 +94,7 @@ describe('Monitoring: Alerts', () => {
// Click the link to navigate back to the Silence details page
await firstElementByTestID('silence-resource-link').click();
await monitoringView.wait(until.presenceOf(monitoringView.detailsHeadingSilenceIcon));
testDetailsPage('Silence Overview', testAlertName);
testDetailsPage('Silence Details', testAlertName);
});

it('expires the Silence', async () => {
Expand Down Expand Up @@ -136,7 +136,7 @@ describe('Monitoring: Silences', () => {
// After creating the Silence, should be redirected to its details page
it('displays detail view for new Silence', async () => {
await monitoringView.wait(until.presenceOf(monitoringView.detailsHeadingSilenceIcon));
testDetailsPage('Silence Overview', testAlertName);
testDetailsPage('Silence Details', testAlertName);
});

it('filters Silences by name', async () => {
Expand All @@ -155,7 +155,7 @@ describe('Monitoring: Silences', () => {
expect(firstElementByTestID('silence-resource-link').getText()).toContain(testAlertName);
await firstElementByTestID('silence-resource-link').click();
await monitoringView.wait(until.presenceOf(monitoringView.detailsHeadingSilenceIcon));
testDetailsPage('Silence Overview', testAlertName);
testDetailsPage('Silence Details', testAlertName);
});

it('edits the Silence', async () => {
Expand All @@ -167,7 +167,7 @@ describe('Monitoring: Silences', () => {

// After editing the Silence, should be redirected to its details page, where we check that the edit is reflected
await monitoringView.wait(until.presenceOf(monitoringView.detailsHeadingSilenceIcon));
testDetailsPage('Silence Overview', testAlertName);
testDetailsPage('Silence Details', testAlertName);
expect(monitoringView.silenceComment.getText()).toEqual('Test Comment');
});

Expand Down Expand Up @@ -219,7 +219,7 @@ describe('Alertmanager: Configuration', () => {
checkErrors();
});

it('displays the Alermanager Configuration Overview page', async () => {
it('displays the Alermanager Configuration Details page', async () => {
await sidenavView.clickNavLink(['Administration', 'Cluster Settings']);
await crudView.isLoaded();
await horizontalnavView.clickHorizontalTab('Global Configuration');
Expand Down Expand Up @@ -365,7 +365,7 @@ receivers:
await yamlView.isLoaded();
expect(monitoringView.successAlert.isPresent()).toBe(true);

await horizontalnavView.clickHorizontalTab('Overview');
await horizontalnavView.clickHorizontalTab('Details');
await monitoringView.openFirstRowKebabMenu();
expect(monitoringView.disabledDeleteReceiverMenuItem.isPresent()).toBe(true);
expect(crudView.actionForLabel('Edit YAML').isPresent()).toBe(true); // should be 'Edit YAML' not 'Edit Receiver'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import UtilizationBody from '@console/shared/src/components/dashboard/utilization-card/UtilizationBody';
import { ByteDataTypes } from '@console/shared/src/graph-helper/data-utils';
import ConsumerPopover from '@console/shared/src/components/dashboard/utilization-card/TopConsumerPopover';
import { PrometheusUtilizationItem } from '@console/internal/components/dashboard/dashboards-page/overview-dashboard/utilization-card';
import { PrometheusUtilizationItem } from '@console/internal/components/dashboard/dashboards-page/cluster-dashboard/utilization-card';
import {
useMetricDuration,
Duration,
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/ceph-storage-plugin/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
DashboardsOverviewUtilizationItem,
} from '@console/plugin-sdk';
import { GridPosition } from '@console/shared/src/components/dashboard/DashboardGrid';
import { OverviewQuery } from '@console/internal/components/dashboard/dashboards-page/overview-dashboard/queries';
import { OverviewQuery } from '@console/internal/components/dashboard/dashboards-page/cluster-dashboard/queries';
import { ClusterServiceVersionModel } from '@console/operator-lifecycle-manager/src/models';
import { referenceForModel } from '@console/internal/module/k8s';
import * as models from './models';
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/console-demo-plugin/src/plugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
import { PodModel, RouteModel, NodeModel } from '@console/internal/models';
import { FLAGS } from '@console/shared';
import { GridPosition } from '@console/shared/src/components/dashboard/DashboardGrid';
import { OverviewQuery } from '@console/internal/components/dashboard/dashboards-page/overview-dashboard/queries';
import { OverviewQuery } from '@console/internal/components/dashboard/dashboards-page/cluster-dashboard/queries';
import { FooBarModel } from './models';
import { yamlTemplates } from './yaml-templates';
import TestIcon from './components/test-icon';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import DashboardCard from '@console/shared/src/components/dashboard/dashboard-ca
import DashboardCardHeader from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardHeader';
import DashboardCardTitle from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardTitle';
import UtilizationBody from '@console/shared/src/components/dashboard/utilization-card/UtilizationBody';
import { PrometheusUtilizationItem } from '@console/internal/components/dashboard/dashboards-page/overview-dashboard/utilization-card';
import { PrometheusUtilizationItem } from '@console/internal/components/dashboard/dashboards-page/cluster-dashboard/utilization-card';
import {
useMetricDuration,
Duration,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ export const VirtualMachinesDetailsPage: React.FC<VirtualMachinesDetailsPageProp

const dashboardPage = {
href: '', // default landing page
name: 'Dashboard',
name: 'Overview',
component: VMDashboard,
};

const overviewPage = {
href: VM_DETAIL_OVERVIEW_HREF,
name: 'Overview',
name: 'Details',
component: VMDetailsFirehose,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,21 @@ const BareMetalHostDetailsPage: React.FC<BareMetalHostDetailsPageProps> = ({
component: BareMetalHostDisks,
};
const dashboardPage = {
href: 'dashboard',
name: 'Dashboard',
href: '',
name: 'Overview',
component: BareMetalHostDashboard,
};
const detailsPage = {
href: 'details',
name: 'Details',
component: BareMetalHostDetails,
};
return (
<DetailsPage
{...props}
pagesFor={() => [
navFactory.details(BareMetalHostDetails),
dashboardPage,
detailsPage,
navFactory.editYaml(),
nicsPage,
disksPage,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from '@console/internal/components/utils';
import { getMachineNodeName } from '@console/shared';
import { ByteDataTypes } from '@console/shared/src/graph-helper/data-utils';
import { PrometheusUtilizationItem } from '@console/internal/components/dashboard/dashboards-page/overview-dashboard/utilization-card';
import { PrometheusUtilizationItem } from '@console/internal/components/dashboard/dashboards-page/cluster-dashboard/utilization-card';
import {
useMetricDuration,
Duration,
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/RBAC/role.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class Details extends React.Component {
return (
<div>
<div className="co-m-pane__body">
<SectionHeading text="Role Overview" />
<SectionHeading text="Role Details" />
<div className="row">
<div className="col-xs-6">
<dl className="co-m-pane__details">
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/alert-manager.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Details: React.SFC<DetailsProps> = (props) => {
return (
<div>
<div className="co-m-pane__body">
<SectionHeading text="Alert Manager Overview" />
<SectionHeading text="Alert Manager Details" />
<div className="row">
<div className="col-sm-6 col-xs-12">
<dl className="co-m-pane__details">
Expand Down
6 changes: 3 additions & 3 deletions frontend/public/components/api-explorer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ export const APIExplorerPage: React.FC<{}> = () => (
);
APIExplorerPage.displayName = 'APIExplorerPage';

const APIResourceOverview: React.FC<APIResourceTabProps> = ({ customData: { kindObj } }) => {
const APIResourceDetails: React.FC<APIResourceTabProps> = ({ customData: { kindObj } }) => {
const { kind, apiGroup, apiVersion, namespaced, verbs, shortNames } = kindObj;
const description = getResourceDescription(kindObj);
return (
Expand Down Expand Up @@ -652,8 +652,8 @@ const APIResourcePage_ = ({
const pages = [
{
href: '',
name: 'Overview',
component: APIResourceOverview,
name: 'Details',
component: APIResourceDetails,
},
{
href: 'schema',
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/build-config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const BuildConfigsDetails: React.SFC<BuildConfigsDetailsProps> = ({ obj:
<>
<div className="co-m-pane__body">
{hasPipeline && <PipelineBuildStrategyAlert obj={buildConfig} />}
<SectionHeading text="Build Config Overview" />
<SectionHeading text="Build Config Details" />
<div className="row">
<div className="col-sm-6">
<ResourceSummary resource={buildConfig} />
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/build.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ export const BuildsDetails: React.SFC<BuildsDetailsProps> = ({ obj: build }) =>
<>
<div className="co-m-pane__body">
{hasPipeline && <PipelineBuildStrategyAlert obj={build} />}
<SectionHeading text="Build Overview" />
<SectionHeading text="Build Details" />
<BuildGraphs build={build} />
{hasPipeline && (
<div className="row">
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/chargeback.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class ReportsDetails extends React.Component<ReportsDetailsProps> {
return (
<div>
<div className="co-m-pane__body">
<SectionHeading text="Report Overview" />
<SectionHeading text="Report Details" />
<div className="row">
<div className="col-sm-6 col-xs-12">
<ResourceSummary resource={obj} />
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/cluster-service-broker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const ClusterServiceBrokerDetails: React.SFC<ClusterServiceBrokerDetailsProps> =
return (
<>
<div className="co-m-pane__body">
<SectionHeading text="Service Broker Overview" />
<SectionHeading text="Service Broker Details" />
<div className="row">
<div className="col-md-6">
<ResourceSummary resource={serviceBroker} />
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/cluster-service-class.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const ClusterServiceClassDetails: React.FC<ClusterServiceClassDetailsProps> = ({
<ClusterServiceClassInfo obj={serviceClass} />
</div>
<div className="col-md-5 col-md-pull-7">
<SectionHeading text="Service Class Overview" />
<SectionHeading text="Service Class Details" />
<ResourceSummary resource={serviceClass}>
<dt>External Name</dt>
<dd>{serviceClass.spec.externalName || '-'}</dd>
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/cluster-service-plan.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const ClusterServicePlanDetails: React.SFC<ClusterServicePlanDetailsProps> = ({
}) => {
return (
<div className="co-m-pane__body">
<SectionHeading text="Service Plan Overview" />
<SectionHeading text="Service Plan Details" />
<div className="row">
<div className="col-md-6">
<ResourceSummary resource={servicePlan} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,13 @@ const ClusterOperatorDetails: React.SFC<ClusterOperatorDetailsProps> = ({ obj })
const { status, message } = getStatusAndMessage(obj);
const versions: OperandVersion[] = _.get(obj, 'status.versions', []);
const conditions = _.get(obj, 'status.conditions', []);
// Show the operator version in the details overview if it's the only version.
// Show the operator version in the details if it's the only version.
const operatorVersion =
versions.length === 1 && versions[0].name === 'operator' ? versions[0].version : null;
return (
<>
<div className="co-m-pane__body">
<SectionHeading text="Cluster Operator Overview" />
<SectionHeading text="Cluster Operator Details" />
<div className="row">
<div className="col-sm-6">
<ResourceSummary resource={obj} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ export const ClusterOperatorTabPage: React.SFC<ClusterOperatorTabPageProps> = ({
const pages = [
{
href: '',
name: 'Overview',
name: 'Details',
component: ClusterVersionDetailsTable,
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const ClusterVersionDetails: React.SFC<ClusterVersionDetailsProps> = ({ obj }) =
return (
<>
<div className="co-m-pane__body">
<SectionHeading text="Cluster Version Overview" />
<SectionHeading text="Cluster Version Details" />
<ResourceSummary resource={obj} />
</div>
<div className="co-m-pane__body">
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/cluster-settings/oauth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const OAuthDetails: React.SFC<OAuthDetailsProps> = ({ obj }: { obj: OAuthKind })
return (
<>
<div className="co-m-pane__body">
<SectionHeading text="OAuth Overview" />
<SectionHeading text="OAuth Details" />
<ResourceSummary resource={obj}>
{tokenConfig && (
<>
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/configmap.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const ConfigMapDetails = ({ obj: configMap }) => {
return (
<>
<div className="co-m-pane__body">
<SectionHeading text="Config Map Overview" />
<SectionHeading text="Config Map Details" />
<ResourceSummary resource={configMap} />
</div>
<div className="co-m-pane__body">
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/container.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ const ContainerDetails: React.FC<ContainerDetailsProps> = (props) => {

<div className="row">
<div className="col-lg-4">
<SectionHeading text="Container Overview" />
<SectionHeading text="Container Details" />
<dl className="co-m-pane__details">
<dt>State</dt>
<dd>
Expand Down
4 changes: 2 additions & 2 deletions frontend/public/components/cron-job.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ const CronJobDetails: React.FC<CronJobDetailsProps> = ({ obj: cronjob }) => {
<div className="co-m-pane__body">
<div className="row">
<div className="col-md-6">
<SectionHeading text="CronJob Overview" />
<SectionHeading text="CronJob Details" />
<ResourceSummary resource={cronjob}>
<DetailsItem label="Schedule" obj={cronjob} path="spec.schedule" />
<DetailsItem label="Concurrency Policy" obj={cronjob} path="spec.concurrencyPolicy" />
Expand All @@ -143,7 +143,7 @@ const CronJobDetails: React.FC<CronJobDetailsProps> = ({ obj: cronjob }) => {
</ResourceSummary>
</div>
<div className="col-md-6">
<SectionHeading text="Job Overview" />
<SectionHeading text="Job Details" />
<dl className="co-m-pane__details">
<DetailsItem
label="Desired Completions"
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/custom-resource-definition.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ const Details: React.FC<{ obj: CustomResourceDefinitionKind }> = ({ obj: crd })
return (
<>
<div className="co-m-pane__body">
<SectionHeading text="Custom Resource Definition Overview" />
<SectionHeading text="Custom Resource Definition Details" />
<div className="co-m-pane__body-group">
<div className="row">
<div className="col-sm-6">
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/daemon-set.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export const DaemonSetDetailsList: React.FC<DaemonSetDetailsListProps> = ({ ds }
const DaemonSetDetails: React.FC<DaemonSetDetailsProps> = ({ obj: daemonset }) => (
<>
<div className="co-m-pane__body">
<SectionHeading text="Daemon Set Overview" />
<SectionHeading text="Daemon Set Details" />
<div className="row">
<div className="col-lg-6">
<ResourceSummary resource={daemonset} showPodSelector showNodeSelector showTolerations />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { InventoryCard } from './inventory-card';
import { UtilizationCard } from './utilization-card';
import { ActivityCard } from './activity-card';

export const OverviewDashboard: React.FC<{}> = () => {
export const ClusterDashboard: React.FC<{}> = () => {
const mainCards = [{ Card: StatusCard }, { Card: UtilizationCard }];
const leftCards = [{ Card: DetailsCard }, { Card: InventoryCard }];
const rightCards = [{ Card: ActivityCard }];
Expand Down

0 comments on commit 6cd4ee3

Please sign in to comment.