diff --git a/demo/Dockerfile b/demo/Dockerfile index 3de860fbe..c9ad0547b 100644 --- a/demo/Dockerfile +++ b/demo/Dockerfile @@ -28,4 +28,5 @@ COPY demo/karma.yaml /etc/karma.yaml COPY demo/custom.js /custom.js RUN adduser -D karma USER karma +ENV GOGC=20 CMD supervisord --nodaemon --configuration /etc/supervisord.conf diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js index d0a505ca5..3c9965c78 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js @@ -18,7 +18,7 @@ import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons/faExternalL import { APIAlert, APIGroup } from "Models/API"; import { AlertStore } from "Stores/AlertStore"; -import { SilenceFormStore } from "Stores/SilenceFormStore"; +import { SilenceFormStore, SilenceTabNames } from "Stores/SilenceFormStore"; import { FetchPauser } from "Components/FetchPauser"; import { DropdownSlide } from "Components/Animations/DropdownSlide"; @@ -29,6 +29,7 @@ const onSilenceClick = (alertStore, silenceFormStore, group, alert) => { alertStore.settings.values.silenceForm.strip.labels, [alert] ); + silenceFormStore.tab.setTab(SilenceTabNames.Editor); silenceFormStore.toggle.show(); }; diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/GroupMenu.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/GroupMenu.js index 355deaadd..6d7ebe3bc 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/GroupMenu.js +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/GroupMenu.js @@ -17,7 +17,7 @@ import { faBellSlash } from "@fortawesome/free-solid-svg-icons/faBellSlash"; import { APIGroup } from "Models/API"; import { FormatAlertsQ } from "Stores/AlertStore"; import { AlertStore } from "Stores/AlertStore"; -import { SilenceFormStore } from "Stores/SilenceFormStore"; +import { SilenceFormStore, SilenceTabNames } from "Stores/SilenceFormStore"; import { QueryOperators, StaticLabels, FormatQuery } from "Common/Query"; import { DropdownSlide } from "Components/Animations/DropdownSlide"; import { FetchPauser } from "Components/FetchPauser"; @@ -28,6 +28,7 @@ const onSilenceClick = (alertStore, silenceFormStore, group) => { group, alertStore.settings.values.silenceForm.strip.labels ); + silenceFormStore.tab.setTab(SilenceTabNames.Editor); silenceFormStore.toggle.show(); }; diff --git a/ui/src/Components/ManagedSilence/index.scss b/ui/src/Components/ManagedSilence/index.scss index 8f44f7679..7e1f19849 100644 --- a/ui/src/Components/ManagedSilence/index.scss +++ b/ui/src/Components/ManagedSilence/index.scss @@ -8,7 +8,7 @@ } &.card { - border-left-width: 4px; + border-left-width: 3px; border-left-color: $gray-700; } }