Skip to content

Commit

Permalink
Separated Alert to View / Edit / New page components (#4183)
Browse files Browse the repository at this point in the history
* Separated Alert to View / Edit / New page components

* Moved query result loader into <Query />

* Added missing Query prop

* No reload for edit / view / new state changes

* Added warn and tooltip when non-editable

* Rebased
  • Loading branch information
ranbena authored and arikfr committed Oct 7, 2019
1 parent 8f378ed commit be404a4
Show file tree
Hide file tree
Showing 10 changed files with 576 additions and 286 deletions.
2 changes: 1 addition & 1 deletion client/app/assets/less/inc/alert.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
flex-grow: 1;

input {
margin: -0.2em 0; //
margin: -0.2em 0;
width: 100%;
min-width: 170px;
}
Expand Down
2 changes: 1 addition & 1 deletion client/app/components/proptypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export const Alert = PropTypes.shape({
rearm: PropTypes.number,
state: PropTypes.oneOf(['ok', 'triggered', 'unknown']),
user: UserProfile,
query: Query.isRequired,
query: Query,
options: PropTypes.shape({
column: PropTypes.string,
op: PropTypes.string,
Expand Down
Loading

0 comments on commit be404a4

Please sign in to comment.