Skip to content
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.

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

user Usage notfication refactored #2574

Merged
merged 3 commits into from
Nov 16, 2020
Merged

Conversation

piotrmilcarz
Copy link
Contributor

No description provided.

@piotrmilcarz piotrmilcarz merged commit 4ba9260 into epic-pricing-3 Nov 16, 2020
@piotrmilcarz piotrmilcarz deleted the users_limit_fix branch November 16, 2020 08:13
shairyar pushed a commit that referenced this pull request Dec 15, 2020
* Update Plans page UI (#2530)

Co-authored-by: Stanislav Kolotinskiy <stanislav@assembla.com>

* Warning banner in case of negative v2 subscription balance (#2527)

* Warning banne in case of negative v2 subscription ballance

* fix

* fix

* fixes and test

* Update app/components/flash-display.js

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* imiprovements

* fix

* acceptance test

* test fixed

* flasher improved

* data-test added

* fix

* fix

* fix

* fix

* fix

* fix

* visual fixes

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* Disallow triggering builds also in Dashboard (#2536)

* Changes for V2 Plan summary and change pages (#2535)

* WIP on new Plan change page

* Further work on v2 plan change page

* More work in progress on v2 plan change page

* Fix tests

* WIP billing and payment info steps to plan change

* Continued work on v2 Plan change page

* Plan change page WIP for users with no billing

* WIP on fixing tests for v2 plan change

* WIP for v2 Plan page

* Add credit usage bar to the plan page

* Add Buy Addons button

* Work on API connection for v2 Plan change

* Some tests and work on plan summary and change pages

* Fix tests

* Fix review comments part 1

* Fix review comments part 2

* Adjust plan docs link

* Use adapter for fetching v2-plan-config

* Fix more review comments

* Show plan selector with GH subscription

* Fix plan page route (#2540)

* Fix plan page route

* Fix failing spec

* Separate addon purchase (#2542)

* Separate addons purchase

* Make eslint happy

* Add tests

* Fix eslint errors

* Fix specs

* Apply suggestions from code review

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* Apply review fixes

* Apply review fixes

* Apply review fixes

* Fix button misalignment

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* Owner allowance for repository context - refactored (#2544)

* Allowance for repository refactored

* text fix

* text fix

* better wording

* Update app/models/repo.js

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* improvements

* tests fix

* tests fixed

* fix

* fix

* fix

* missing newline at end of file

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* Corner cases handling (#2541)

* WIP on new Plan change page

* Further work on v2 plan change page

* More work in progress on v2 plan change page

* Fix tests

* WIP billing and payment info steps to plan change

* Continued work on v2 Plan change page

* Plan change page WIP for users with no billing

* WIP on fixing tests for v2 plan change

* WIP for v2 Plan page

* Add credit usage bar to the plan page

* Add Buy Addons button

* Work on API connection for v2 Plan change

* Some tests and work on plan summary and change pages

* Fix tests

* Fix review comments part 1

* Fix review comments part 2

* Adjust plan docs link

* Use adapter for fetching v2-plan-config

* Fix more review comments

* Show plan selector with GH subscription

* Billing warning messages + Switch to free modal

* fix

* whitespace fix

* some code was refactored

* fix

* fix

* debug

* test is moving to another pr

* improvement

* Remove logging

Co-authored-by: Andrii Mysko <usandrewmisko@gmail.com>
Co-authored-by: AndriiMysko <69478317+AndriiMysko@users.noreply.github.com>
Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* Fix for addon purchase process (#2545)

* Negative balance fix (#2546)

* missing beforeModel added

* tests adopted to new allowance rules

* Update tests/acceptance/repo/settings-test.js

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* owner model improvement (#2547)

* owner model improvement

* allowance improvements

* User usage on plan page and some improvements (#2548)

* Add OSS credit usage option to plan page (#2549)

* Implement user license warnings (#2551)

* Milestone 0 changes (#2559)

* Milestone 0 UI changes

* Add v2-subscription status

* Rename fixedPrice

* Fix price display

* Fix plan type

* Fix property dependency

* Milestone 0 changes

* fix addon display

* Add subscription status

* Don't display notice for hybrid plans

* Fix null plan id

* Adjust computed properties dependencies

* Add more metrics tracking for new billing (#2563)

* Add more metrics tracking for new billing

* Fix reverting to free plan tracking

* Fix

* Plan usage page (#2557)

* User management (#2570)

* improvements + bug fixes (#2573)

* user Usage notfication refactored (#2574)

user Usage notification refactored

* Plan usage csv fix (#2576)

Plans page - csv - fix in minutes calculation + typo fix

* User management filter secured + typo fix (#2577)

* filter secured

* typo fixed

* clear filter at modal close

* tests fixed

* fix of executions urls (#2582)

Co-authored-by: Stanislav K <speedy.wizard@gmail.com>
Co-authored-by: Stanislav Kolotinskiy <stanislav@assembla.com>
Co-authored-by: Artur Smirnov <reg@artursmirnov.com>
Co-authored-by: Piotr Milcarz <piotr.milcarz@gmail.com>
Co-authored-by: AndriiMysko <69478317+AndriiMysko@users.noreply.github.com>
Co-authored-by: Pavel Dotsulenko <pavel@travis-ci.com>
Co-authored-by: Andrii Mysko <usandrewmisko@gmail.com>
Co-authored-by: Piotr Milcarz <piotrm@travis-ci.org>
shairyar pushed a commit that referenced this pull request Jan 6, 2021
* Update Plans page UI (#2530)

Co-authored-by: Stanislav Kolotinskiy <stanislav@assembla.com>

* Warning banner in case of negative v2 subscription balance (#2527)

* Warning banne in case of negative v2 subscription ballance

* fix

* fix

* fixes and test

* Update app/components/flash-display.js

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* imiprovements

* fix

* acceptance test

* test fixed

* flasher improved

* data-test added

* fix

* fix

* fix

* fix

* fix

* fix

* visual fixes

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* Disallow triggering builds also in Dashboard (#2536)

* Changes for V2 Plan summary and change pages (#2535)

* WIP on new Plan change page

* Further work on v2 plan change page

* More work in progress on v2 plan change page

* Fix tests

* WIP billing and payment info steps to plan change

* Continued work on v2 Plan change page

* Plan change page WIP for users with no billing

* WIP on fixing tests for v2 plan change

* WIP for v2 Plan page

* Add credit usage bar to the plan page

* Add Buy Addons button

* Work on API connection for v2 Plan change

* Some tests and work on plan summary and change pages

* Fix tests

* Fix review comments part 1

* Fix review comments part 2

* Adjust plan docs link

* Use adapter for fetching v2-plan-config

* Fix more review comments

* Show plan selector with GH subscription

* Fix plan page route (#2540)

* Fix plan page route

* Fix failing spec

* Separate addon purchase (#2542)

* Separate addons purchase

* Make eslint happy

* Add tests

* Fix eslint errors

* Fix specs

* Apply suggestions from code review

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* Apply review fixes

* Apply review fixes

* Apply review fixes

* Fix button misalignment

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* Owner allowance for repository context - refactored (#2544)

* Allowance for repository refactored

* text fix

* text fix

* better wording

* Update app/models/repo.js

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* improvements

* tests fix

* tests fixed

* fix

* fix

* fix

* missing newline at end of file

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* Corner cases handling (#2541)

* WIP on new Plan change page

* Further work on v2 plan change page

* More work in progress on v2 plan change page

* Fix tests

* WIP billing and payment info steps to plan change

* Continued work on v2 Plan change page

* Plan change page WIP for users with no billing

* WIP on fixing tests for v2 plan change

* WIP for v2 Plan page

* Add credit usage bar to the plan page

* Add Buy Addons button

* Work on API connection for v2 Plan change

* Some tests and work on plan summary and change pages

* Fix tests

* Fix review comments part 1

* Fix review comments part 2

* Adjust plan docs link

* Use adapter for fetching v2-plan-config

* Fix more review comments

* Show plan selector with GH subscription

* Billing warning messages + Switch to free modal

* fix

* whitespace fix

* some code was refactored

* fix

* fix

* debug

* test is moving to another pr

* improvement

* Remove logging

Co-authored-by: Andrii Mysko <usandrewmisko@gmail.com>
Co-authored-by: AndriiMysko <69478317+AndriiMysko@users.noreply.github.com>
Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* Fix for addon purchase process (#2545)

* Negative balance fix (#2546)

* missing beforeModel added

* tests adopted to new allowance rules

* Update tests/acceptance/repo/settings-test.js

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

Co-authored-by: Artur Smirnov <reg@artursmirnov.com>

* owner model improvement (#2547)

* owner model improvement

* allowance improvements

* User usage on plan page and some improvements (#2548)

* Add OSS credit usage option to plan page (#2549)

* Implement user license warnings (#2551)

* Milestone 0 changes (#2559)

* Milestone 0 UI changes

* Add v2-subscription status

* Rename fixedPrice

* Fix price display

* Fix plan type

* Fix property dependency

* Milestone 0 changes

* fix addon display

* Add subscription status

* Don't display notice for hybrid plans

* Fix null plan id

* Adjust computed properties dependencies

* Add more metrics tracking for new billing (#2563)

* Add more metrics tracking for new billing

* Fix reverting to free plan tracking

* Fix

* Plan usage page (#2557)

* User management (#2570)

* improvements + bug fixes (#2573)

* user Usage notfication refactored (#2574)

user Usage notification refactored

* Plan usage csv fix (#2576)

Plans page - csv - fix in minutes calculation + typo fix

* User management filter secured + typo fix (#2577)

* filter secured

* typo fixed

* clear filter at modal close

* tests fixed

* Manual plan (#2578)

manual v2subscription

* Fix for manual plan (#2579)

* Fix for manual plan
* price per user removed

* Executions call fix (#2581)

fix of executions urls

* Fix in User management modal (#2583)

* Plan usage page - manual plan indicator (#2584)

* Plan usage page - manual plan indicator

* validTo fix in manual plans

* Plan usage CSV - fix for minutes column (#2585)

Co-authored-by: Stanislav K <speedy.wizard@gmail.com>
Co-authored-by: Stanislav Kolotinskiy <stanislav@assembla.com>
Co-authored-by: Artur Smirnov <reg@artursmirnov.com>
Co-authored-by: Piotr Milcarz <piotr.milcarz@gmail.com>
Co-authored-by: AndriiMysko <69478317+AndriiMysko@users.noreply.github.com>
Co-authored-by: Pavel Dotsulenko <pavel@travis-ci.com>
Co-authored-by: Andrii Mysko <usandrewmisko@gmail.com>
Co-authored-by: Piotr Milcarz <piotrm@travis-ci.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants