Merge pull request #6263 from abhinandan13jan/monitoring-links

Bug 1868013: Point admin monitoring links to admin
openshift · Aug 22, 2020 · 11fe709 · 11fe709
2 parents 94ec863 + cfd1d17
commit 11fe709
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/...tend/packages/dev-console/src/components/monitoring/overview/MonitoringOverviewAlerts.tsx b/...tend/packages/dev-console/src/components/monitoring/overview/MonitoringOverviewAlerts.tsx
@@ -1,7 +1,10 @@
 import * as React from 'react';
+import { connect } from 'react-redux';
 import * as _ from 'lodash';
 import { Alert } from '@patternfly/react-core';
 import { Link } from 'react-router-dom';
+import { getActivePerspective } from '@console/internal/reducers/ui';
+import { RootState } from '@console/internal/redux';
 import { fromNow } from '@console/internal/components/utils/datetime';
 import { Alert as AlertType } from '@console/internal/components/monitoring/types';
 import { labelsToParams } from '@console/internal/components/monitoring/utils';
@@ -13,7 +16,14 @@ interface MonitoringOverviewAlertsProps {
   alerts: AlertType[];
 }
 
-const MonitoringOverviewAlerts: React.FC<MonitoringOverviewAlertsProps> = ({ alerts }) => {
+interface StateProps {
+  activePerspective?: string;
+}
+
+const MonitoringOverviewAlerts: React.FC<MonitoringOverviewAlertsProps & StateProps> = ({
+  alerts,
+  activePerspective,
+}) => {
   const sortedAlerts = sortMonitoringAlerts(alerts);
 
   return (
@@ -25,9 +35,10 @@ const MonitoringOverviewAlerts: React.FC<MonitoringOverviewAlertsProps> = ({ ale
           labels: { severity, alertname, namespace },
           rule: { name, id },
         } = alert;
-        const alertDetailsPageLink = `/dev-monitoring/ns/${namespace}/alerts/${id}?${labelsToParams(
-          alert.labels,
-        )}`;
+        const alertDetailsPageLink =
+          activePerspective === 'admin'
+            ? `/monitoring/alerts/${id}?${labelsToParams(alert.labels)}`
+            : `/dev-monitoring/ns/${namespace}/alerts/${id}?${labelsToParams(alert.labels)}`;
         return (
           <Alert
             variant={getAlertType(severity)}
@@ -46,4 +57,9 @@ const MonitoringOverviewAlerts: React.FC<MonitoringOverviewAlertsProps> = ({ ale
   );
 };
 
-export default MonitoringOverviewAlerts;
+const stateToProps = (state: RootState) => ({
+  activePerspective: getActivePerspective(state),
+});
+
+export const InternalMonitoringOverviewAlerts = MonitoringOverviewAlerts;
+export default connect<StateProps>(stateToProps)(MonitoringOverviewAlerts);
diff --git a/...ev-console/src/components/monitoring/overview/__tests__/MonitoringOverviewAlerts.spec.tsx b/...ev-console/src/components/monitoring/overview/__tests__/MonitoringOverviewAlerts.spec.tsx
@@ -6,7 +6,7 @@ import {
   expectedSortedAlerts,
 } from '@console/shared/src/utils/__mocks__/alerts-and-rules-data';
 import { sortMonitoringAlerts } from '@console/shared';
-import MonitoringOverviewAlerts from '../MonitoringOverviewAlerts';
+import { InternalMonitoringOverviewAlerts as MonitoringOverviewAlerts } from '../MonitoringOverviewAlerts';
 
 describe('Monitoring Alerts Section', () => {
   const monitoringOverviewProps: React.ComponentProps<typeof MonitoringOverviewAlerts> = {