From 482809996fe070eafe8542b72ca75ef9ba79287c Mon Sep 17 00:00:00 2001 From: Joey Orlando Date: Fri, 14 Apr 2023 12:03:37 +0200 Subject: [PATCH] fix small bug in IRMBanner rendering logic (#1749) --- grafana-plugin/src/containers/IRMBanner/IRMBanner.tsx | 4 +--- grafana-plugin/src/models/alertgroup/alertgroup.ts | 4 +++- grafana-plugin/src/pages/incidents/Incidents.tsx | 6 +----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/grafana-plugin/src/containers/IRMBanner/IRMBanner.tsx b/grafana-plugin/src/containers/IRMBanner/IRMBanner.tsx index fc9c0818..fe62f699 100644 --- a/grafana-plugin/src/containers/IRMBanner/IRMBanner.tsx +++ b/grafana-plugin/src/containers/IRMBanner/IRMBanner.tsx @@ -15,9 +15,7 @@ const IRMBanner: React.FC = observer(() => { } = store; useEffect(() => { - if (store.isOpenSource()) { - alertGroupStore.fetchIRMPlan(); - } + alertGroupStore.fetchIRMPlan(); }, []); if (store.isOpenSource() || !irmPlan?.limits) { diff --git a/grafana-plugin/src/models/alertgroup/alertgroup.ts b/grafana-plugin/src/models/alertgroup/alertgroup.ts index 4e35488f..63376466 100644 --- a/grafana-plugin/src/models/alertgroup/alertgroup.ts +++ b/grafana-plugin/src/models/alertgroup/alertgroup.ts @@ -208,7 +208,9 @@ export class AlertGroupStore extends BaseStore { } async fetchIRMPlan() { - this.irmPlan = await makeRequest(`/usage-limits`, { method: 'GET' }); + if (!this.rootStore.isOpenSource()) { + this.irmPlan = await makeRequest(`/usage-limits`, { method: 'GET' }); + } } // methods were moved from rootBaseStore. diff --git a/grafana-plugin/src/pages/incidents/Incidents.tsx b/grafana-plugin/src/pages/incidents/Incidents.tsx index 38146e12..94681eae 100644 --- a/grafana-plugin/src/pages/incidents/Incidents.tsx +++ b/grafana-plugin/src/pages/incidents/Incidents.tsx @@ -99,11 +99,7 @@ class Incidents extends React.Component private pollingIntervalId: NodeJS.Timer = undefined; async componentDidMount() { - const { store } = this.props; - - if (!store.isOpenSource()) { - await store.alertGroupStore.fetchIRMPlan(); - } + await this.props.store.alertGroupStore.fetchIRMPlan(); } componentWillUnmount(): void {