Skip to content

Fix for silence entities/checks for a specific duration #416

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

Open
alrf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for silence entities/checks for a specific duration #416

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
34 changes: 30 additions & 4 deletions src/lib/component/partial/SilenceEntryForm/SilenceEntryFormExpirationPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,24 @@ import { withField } from "/vendor/@10xjs/form";

import Panel from "./SilenceEntryFormPanel";

const DEFAULT_EXPIRE_DURATION = 3600;
const DEFAULT_EXPIRE_DURATION = 24;

class SilenceEntryFormExpirationPanel extends React.PureComponent {
static propTypes = {
expireOnResolve: PropTypes.object.isRequired,
expire: PropTypes.object.isRequired,
expireAt: PropTypes.object.isRequired,
};

render() {
const { expireOnResolve, expire } = this.props;
const { expireOnResolve, expire, expireAt } = this.props;

this._addHours = function addHours(numOfHours, date = new Date()) {
const dateCopy = new Date(date.getTime());
dateCopy.setTime(dateCopy.getTime() + numOfHours * 60 * 60 * 1000);
dateCopy.toISOString();
return dateCopy;
}

const expireAfterDuration = expire.rawValue > 0;

Expand All @@ -41,7 +49,7 @@ class SilenceEntryFormExpirationPanel extends React.PureComponent {
expireOnResolve.input.checked ? "on resolved check" : null,
expireAfterDuration
? `after ${expire.rawValue} ${
expire.rawValue === 1 ? "second" : "seconds"
expire.rawValue === 1 ? "hour" : "hours"
}`
: null,
]
Expand Down Expand Up @@ -76,6 +84,11 @@ class SilenceEntryFormExpirationPanel extends React.PureComponent {
? this._lastExprireValue || DEFAULT_EXPIRE_DURATION
: -1,
);
expireAt.setValue(
checked
? this._addHours(this._lastExprireValue || DEFAULT_EXPIRE_DURATION)
: undefined,
);
}}
/>
}
Expand All @@ -89,14 +102,18 @@ class SilenceEntryFormExpirationPanel extends React.PureComponent {
label="Expire after"
InputProps={{
endAdornment: (
<InputAdornment position="end">seconds</InputAdornment>
<InputAdornment position="end">hour(s)</InputAdornment>
),
}}
{...expire.composeInput({
onChange: event => {
if (!event.target.value) {
this._lastExprireValue = undefined;
expire.setValue(-1);
expireAt.setValue(undefined);
}
else {
expireAt.setValue(this._addHours(event.target.value));
}
},
})}
Expand Down Expand Up @@ -126,4 +143,13 @@ export default compose(
return `${value}`;
},
}),
withField("expireAt", {
path: "props.expireAt",
format(value) {
if (value === undefined || value === null || value === -1) {
return "";
}
return `${value}`;
},
}),
)(SilenceEntryFormExpirationPanel);