github/karma
1
0
Fork 0
mirror of https://github.com/prymitive/karma synced 2026-05-05 03:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1084 from prymitive/silence-tweaks

Browse Source 
fix(ui): set silence modal tab on edit
This commit is contained in:
Łukasz Mierzwa
2019-10-27 13:08:58 +00:00
committed by GitHub
parent 88d9d78233 3ef58930ad
commit 85c7fd82c6
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
demo/Dockerfile
View File

@@ -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

3
ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js
View File

@@ -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();
};

3
ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/GroupMenu.js
View File

@@ -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();
};

2
ui/src/Components/ManagedSilence/index.scss
View File

@@ -8,7 +8,7 @@
}
&.card {
border-left-width: 4px;
border-left-width: 3px;
border-left-color: $gray-700;
}
}