Skip to content

Monitoring: Fix hiding sidebar links for pages the user cannot access #1117

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

Merged
openshift-merge-robot merged 1 commit into from
Jan 25, 2019
Merged

Monitoring: Fix hiding sidebar links for pages the user cannot access #1117

Show file tree
Hide file tree
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
30 changes: 19 additions & 11 deletions frontend/public/components/nav.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as _ from 'lodash-es';
import * as PropTypes from 'prop-types';

import { FLAGS, featureReducerName, flagPending } from '../features';
import { MonitoringRoutes, connectToURLs } from '../monitoring';
import { monitoringReducerName, MonitoringRoutes } from '../monitoring';
import { formatNamespacedRouteForResource } from '../ui/ui-actions';
import {
BuildConfigModel,
Expand Down Expand Up @@ -285,21 +285,29 @@ const imagestreamsStartsWith = ['imagestreams', 'imagestreamtags'];
const monitoringAlertsStartsWith = ['monitoring/alerts', 'monitoring/alertrules'];
const clusterSettingsStartsWith = ['settings/cluster', 'config.openshift.io'];

const MonitoringNavSection_ = ({ urls }) => {
const prometheusURL = urls[MonitoringRoutes.Prometheus];
const grafanaURL = urls[MonitoringRoutes.Grafana];
const kibanaURL = urls[MonitoringRoutes.Kibana];
return window.SERVER_FLAGS.prometheusBaseURL || window.SERVER_FLAGS.alertManagerBaseURL || prometheusURL || grafanaURL || kibanaURL
const monitoringNavSectionStateToProps = (state) => ({
canAccess: !!state[featureReducerName].get(FLAGS.CAN_GET_NS),
grafanaURL: state[monitoringReducerName].get(MonitoringRoutes.Grafana),
kibanaURL: state[monitoringReducerName].get(MonitoringRoutes.Kibana),
prometheusURL: state[monitoringReducerName].get(MonitoringRoutes.Prometheus),
});

const MonitoringNavSection_ = ({grafanaURL, canAccess, kibanaURL, prometheusURL}) => {
const showAlerts = canAccess && !!window.SERVER_FLAGS.prometheusBaseURL;
const showSilences = canAccess && !!window.SERVER_FLAGS.alertManagerBaseURL;
const showPrometheus = canAccess && !!prometheusURL;
const showGrafana = canAccess && !!grafanaURL;
return showAlerts || showSilences || showPrometheus || showGrafana || kibanaURL
? <NavSection title="Monitoring">
{window.SERVER_FLAGS.prometheusBaseURL && <HrefLink href="/monitoring/alerts" name="Alerts" startsWith={monitoringAlertsStartsWith} />}
{window.SERVER_FLAGS.alertManagerBaseURL && <HrefLink href="/monitoring/silences" name="Silences" />}
{prometheusURL && <ExternalLink href={prometheusURL} name="Metrics" />}
{grafanaURL && <ExternalLink href={grafanaURL} name="Dashboards" />}
{showAlerts && <HrefLink href="/monitoring/alerts" name="Alerts" startsWith={monitoringAlertsStartsWith} />}
{showSilences && <HrefLink href="/monitoring/silences" name="Silences" />}
{showPrometheus && <ExternalLink href={prometheusURL} name="Metrics" />}
{showGrafana && <ExternalLink href={grafanaURL} name="Dashboards" />}
{kibanaURL && <ExternalLink href={kibanaURL} name="Logging" />}
</NavSection>
: null;
};
const MonitoringNavSection = connectToURLs(MonitoringRoutes.Prometheus, MonitoringRoutes.Grafana, MonitoringRoutes.Kibana)(MonitoringNavSection_);
const MonitoringNavSection = connect(monitoringNavSectionStateToProps)(MonitoringNavSection_);

export const Navigation = ({ isNavOpen, onNavSelect }) => {
const PageNav = (
Expand Down
5 changes: 5 additions & 0 deletions frontend/public/features.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { UIActions } from './ui/ui-actions';
OPERATOR_LIFECYCLE_MANAGER: false,
CHARGEBACK: false,
OPENSHIFT: false,
CAN_GET_NS: false,
CAN_LIST_NS: false,
CAN_LIST_NODE: false,
CAN_LIST_PV: false,
Expand All @@ -46,6 +47,7 @@ export enum FLAGS {
OPERATOR_LIFECYCLE_MANAGER = 'OPERATOR_LIFECYCLE_MANAGER',
CHARGEBACK = 'CHARGEBACK',
OPENSHIFT = 'OPENSHIFT',
CAN_GET_NS = 'CAN_GET_NS',
CAN_LIST_NS = 'CAN_LIST_NS',
CAN_LIST_NODE = 'CAN_LIST_NODE',
CAN_LIST_PV = 'CAN_LIST_PV',
Expand Down Expand Up @@ -228,6 +230,9 @@ const detectShowOpenShiftStartGuide = (dispatch, canListNS: boolean = false) =>

// Check the user's access to some resources.
const ssarChecks = [{
flag: FLAGS.CAN_GET_NS,
resourceAttributes: { resource: 'namespaces', verb: 'get' },
}, {
flag: FLAGS.CAN_LIST_NS,
resourceAttributes: { resource: 'namespaces', verb: 'list' },
after: detectShowOpenShiftStartGuide,
Expand Down