diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/index.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/index.js index 942f03a07..079e5e308 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/index.js +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/index.js @@ -28,10 +28,11 @@ const GroupHeader = observer( silenceFormStore: PropTypes.instanceOf(SilenceFormStore).isRequired, themedCounters: PropTypes.bool.isRequired, setIsMenuOpen: PropTypes.func.isRequired, + gridLabelValue: PropTypes.string.isRequired, }; onCollapseClick = (event) => { - const { collapseStore } = this.props; + const { collapseStore, gridLabelValue } = this.props; // left click => toggle current group // left click + alt => toggle all groups @@ -40,7 +41,10 @@ const GroupHeader = observer( if (event.altKey === true) { const toggleEvent = new CustomEvent("alertGroupCollapse", { - detail: collapseStore.value, + detail: { + gridLabelValue: gridLabelValue, + value: collapseStore.value, + }, }); window.dispatchEvent(toggleEvent); } diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/index.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/index.js index 1b6c564f8..1c2bc5b76 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/index.js +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/index.js @@ -56,6 +56,7 @@ const AlertGroup = observer( settingsStore: PropTypes.instanceOf(Settings).isRequired, silenceFormStore: PropTypes.instanceOf(SilenceFormStore).isRequired, style: PropTypes.object, + gridLabelValue: PropTypes.string.isRequired, }; constructor(props) { @@ -144,7 +145,11 @@ const AlertGroup = observer( } onAlertGroupCollapseEvent = (event) => { - this.collapse.set(event.detail); + const { gridLabelValue } = this.props; + + if (event.detail.gridLabelValue === gridLabelValue) { + this.collapse.set(event.detail.value); + } }; componentDidMount() { @@ -176,6 +181,7 @@ const AlertGroup = observer( alertStore, settingsStore, style, + gridLabelValue, } = this.props; let footerAlertmanagers = []; @@ -229,6 +235,7 @@ const AlertGroup = observer( silenceFormStore={silenceFormStore} themedCounters={themedCounters} setIsMenuOpen={this.renderConfig.setIsMenuOpen} + gridLabelValue={gridLabelValue} /> {this.collapse.value ? null : (