Skip to content

[backport] PR #7781 to 4.x - Implement template notifications#7916

Merged
w33ble merged 4 commits into4.xfrom
jasper/backport/7781/4.x
Aug 9, 2016
Merged

[backport] PR #7781 to 4.x - Implement template notifications#7916
w33ble merged 4 commits into4.xfrom
jasper/backport/7781/4.x

Conversation

@elastic-jasper
Copy link
Copy Markdown
Contributor

Backport PR #7781

Commit 1:
[Notifier] Added a custom notify function which allows complete control over notifications

Commit 2:
custom notifications: use text as property for action button label

Commit 3:
remove distinction between content and markdown

just run all content through the markdown parser, and add margin to
alight text correctly

Commit 4:
fix timeout starting at 0 bug

Commit 5:
allow 0 to be used to disable timeout

Commit 6:
allow property overrides on helper methods

Commit 7:
make custom notify api closer to other helper apis

Commit 8:
update custom notification tests

Commit 9:
punch up the tests

check value types, more tests with less concerns, clean up notifications after each test

Commit 10:
fix issue with custom notification handling

Commit 11:
update the docblock

Commit 12:
Custom notification: throw error if config object is invalid

Commit 13:
Notifier Config: move overridableOptions to higher level

Commit 14:
switch order of negative/postive condition blocks

Commit 15:
remove unecessary ng-if

Commit 16:
remove limit of number of actions

Commit 17:
custom notifier dynamic lifetime based on type

Commit 18:
test cleanup per feedback

Commit 19:
allow passing of type: ‘error’

Commit 20:
add tests for latest enhancements

@elastic-jasper elastic-jasper added backport This PR is a backport of another PR has conflicts labels Aug 3, 2016
@tsullivan tsullivan force-pushed the jasper/backport/7781/4.x branch from 6114c3f to 5414b21 Compare August 3, 2016 22:03
@tsullivan tsullivan force-pushed the jasper/backport/7781/4.x branch from 5414b21 to aace5fd Compare August 3, 2016 22:06
@tsullivan
Copy link
Copy Markdown
Member

@w33ble assigning this to you for a first look. This was a PITA to back port because notifier.js in 4.x doesn't have some abilities that were available when we worked on it in master:

  • no banner type
  • no Notifier.config.xyzLifetime
  • closeNotif needed to be synced with master a little bit to work for custom notifications

I cherry-picked in most of the commits from #7781, except for the cleanup work where all the notifier types can take a config object, and the work where you made all the messages go through markdown.

@w33ble
Copy link
Copy Markdown
Contributor

w33ble commented Aug 4, 2016

Looks good functionally.

Think you can backport 702c09a and eeeb94e here as well? Both commits are in the list, but the changes aren't in this PR.

@tsullivan
Copy link
Copy Markdown
Member

Think you can backport 702c09a and eeeb94e here as well? Both commits are in the list, but the changes aren't in this PR.

Sure. Those might have gotten lost just with the merge conflict resolution I had to do manually.

@w33ble
Copy link
Copy Markdown
Contributor

w33ble commented Aug 4, 2016

Whoops, forget about 702c09a, that's not in 2.4. Just eeeb94e.

@tsullivan
Copy link
Copy Markdown
Member

@w33ble does this LGTY?

@w33ble
Copy link
Copy Markdown
Contributor

w33ble commented Aug 9, 2016

@tsullivan still waiting on the "0 means don't use a timeout" commit here, aren't we?

@tsullivan
Copy link
Copy Markdown
Member

@w33ble whoops I pushed to my fork but forgot this needs to be on the upstream repo

@w33ble
Copy link
Copy Markdown
Contributor

w33ble commented Aug 9, 2016

Now it's a winner! 🏆

@w33ble w33ble merged commit e4eb59b into 4.x Aug 9, 2016
@epixa epixa deleted the jasper/backport/7781/4.x branch August 25, 2016 23:06
@epixa epixa changed the title [backport] PR #7781 to 4.x [backport] PR #7781 to 4.x - Implement template notifications Aug 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR review v4.6.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants