Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

[MM-28216] Billing History View (UX Only) #6637

Merged
merged 10 commits into from
Oct 7, 2020
Merged

[MM-28216] Billing History View (UX Only) #6637

merged 10 commits into from
Oct 7, 2020

Conversation

devinbinnie
Copy link
Member

Summary

Billing History table demo. UX only.
Includes a button so you can see what no billing history looks like.
Will merge this PR and submit a follow-up PR once the backend is complete.

Ticket Link

https://mattermost.atlassian.net/browse/MM-28216

@devinbinnie devinbinnie added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester 1: UX Review Requires review by a UX Designer labels Oct 5, 2020
nickmisasi
nickmisasi approved these changes Oct 5, 2020
View reviewed changes
Copy link
Contributor

@nickmisasi nickmisasi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 👍

@stevemudie stevemudie added the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Oct 5, 2020
stevemudie
stevemudie approved these changes Oct 5, 2020
View reviewed changes
Copy link
Contributor

@stevemudie stevemudie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@stevemudie stevemudie added QA Review Done and removed 3: QA Review Requires review by a QA tester Setup Cloud Test Server Setup a test server using Mattermost Cloud labels Oct 5, 2020
@marianunez marianunez added the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Oct 5, 2020
@marianunez marianunez removed the 2: Dev Review Requires review by a core commiter label Oct 5, 2020
matthewbirtch
matthewbirtch approved these changes Oct 6, 2020
View reviewed changes
Copy link
Contributor

@matthewbirtch matthewbirtch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Solid work @devinbinnie. Will we include pagination in another PR?

@devinbinnie
Copy link
Member Author

Solid work @devinbinnie. Will we include pagination in another PR?

Thanks @matthewbirtch. The functionality will, but I think i'll add the UI for it now. Thanks for the reminder!

@devinbinnie devinbinnie added 4: Reviews Complete All reviewers have approved the pull request and removed 1: UX Review Requires review by a UX Designer labels Oct 6, 2020
@devinbinnie
Copy link
Member Author

@matthewbirtch I added the paging section, can you have a quick glance?

matthewbirtch
matthewbirtch approved these changes Oct 7, 2020
View reviewed changes
Copy link
Contributor

@matthewbirtch matthewbirtch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@devinbinnie devinbinnie merged commit 07858e0 into mattermost:master Oct 7, 2020
@mattermod mattermod removed the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Oct 7, 2020
@mm-cloud-bot
Copy link

Test server destroyed

1 similar comment
@mm-cloud-bot
Copy link

Test server destroyed

devinbinnie added a commit to devinbinnie/mattermost-webapp that referenced this pull request Oct 7, 2020
@devinbinnie
[MM-28216] Billing History View (UX Only) (mattermost#6637)
c9e760a 
* Main card and no billing history view

* Translation and style stuff

* [MM-28216] Styles and component for Billing History view

* Translations

* UX demo changes

* Added paging section

* Translations

* Added paging hover states

* Fix extra padding
@devinbinnie devinbinnie mentioned this pull request Oct 7, 2020
Merged
devinbinnie added a commit that referenced this pull request Oct 7, 2020
@devinbinnie @mattermod
Billing UI Cherry-picks (#6688)
eb75f29 
* [MM-28216] Billing History View (UX Only) (#6637)

* Main card and no billing history view

* Translation and style stuff

* [MM-28216] Styles and component for Billing History view

* Translations

* UX demo changes

* Added paging section

* Translations

* Added paging hover states

* Fix extra padding

* [MM-29302] Billing Summary Card - No Billing History case (#6639)

* [MM-28211] Plan Details Card (#6582)

* WIP

* WIP

* Hookups to back-end (WIP)

* UX fixes

* Added the product info, still waiting on the actual SKUs for now

* Redux update and lint and translation fixes

* Update to 99.0%

* Lint fix

* Changes to incorporate free vs. paid tier

* Translation fix

* [MM-28217] Front-end for displaying company info (#6580)

* [MM-28217] Front-end for displaying company info

* Translations

* [MM-28217] Front-end to display company information

* Redux update

* PR feedback

Co-authored-by: Mattermod <[email protected]>

Co-authored-by: Mattermod <[email protected]>
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 10, 2020
Merge branch 'master' of github.com:Tak-Iwamoto/mattermost-webapp int…
8f76d21 
…o MM-20499

* 'master' of github.com:Tak-Iwamoto/mattermost-webapp: (71 commits)
  Fix bot icon heigth (mattermost#6578)
  Cypress/E2E: Update quick switch hint (mattermost#6691)
  migrate string-refs in search_results.jsx (mattermost#6671)
  MM-T581 Regen token (mattermost#6642)
  Switch button-bg-## to use button-bg-rgb variables (mattermost#6635)
  [MM-27142] In-Web-App purchase of Mattermost Cloud  (mattermost#6583)
  migrate user_list_row_with_error to ts (mattermost#6624)
  [MM-28217] Front-end for displaying company info (mattermost#6580)
  [MM-28211] Plan Details Card (mattermost#6582)
  [MM-28216] Billing History View (UX Only) (mattermost#6637)
  Added final set of cypress tests part of MM-29347 (mattermost#6659)
  [MM-24507] - Pin comment box on bottom of RHS thread (mattermost#6167)
  Cypress/E2E: Fix channel switcher spec (mattermost#6662)
  [MM-28781] migrate string refs in channelView (mattermost#6607)
  [GH-15777] Replace center-channel-color-## with center-channel-color-rgb variables (mattermost#6643)
  [GH-15776]Switch center-channel-color-## with center-channel-color-rgb variables (mattermost#6641)
  MM-29038 Removed usage of centre-channel-color from post comments (mattermost#6633)
  [MM-29034] Remove usage of sidebar-text-## CSS variables (mattermost#6634)
  Translations update from Weblate (mattermost#6673)
  [MM-20462] migrate any_team_permission_gate to typescript (mattermost#6547)
  ...
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 10, 2020
Merge branch 'master' of github.com:Tak-Iwamoto/mattermost-webapp int…
0f3c332 
…o MM-20465

* 'master' of github.com:Tak-Iwamoto/mattermost-webapp: (71 commits)
  Fix bot icon heigth (mattermost#6578)
  Cypress/E2E: Update quick switch hint (mattermost#6691)
  migrate string-refs in search_results.jsx (mattermost#6671)
  MM-T581 Regen token (mattermost#6642)
  Switch button-bg-## to use button-bg-rgb variables (mattermost#6635)
  [MM-27142] In-Web-App purchase of Mattermost Cloud  (mattermost#6583)
  migrate user_list_row_with_error to ts (mattermost#6624)
  [MM-28217] Front-end for displaying company info (mattermost#6580)
  [MM-28211] Plan Details Card (mattermost#6582)
  [MM-28216] Billing History View (UX Only) (mattermost#6637)
  Added final set of cypress tests part of MM-29347 (mattermost#6659)
  [MM-24507] - Pin comment box on bottom of RHS thread (mattermost#6167)
  Cypress/E2E: Fix channel switcher spec (mattermost#6662)
  [MM-28781] migrate string refs in channelView (mattermost#6607)
  [GH-15777] Replace center-channel-color-## with center-channel-color-rgb variables (mattermost#6643)
  [GH-15776]Switch center-channel-color-## with center-channel-color-rgb variables (mattermost#6641)
  MM-29038 Removed usage of centre-channel-color from post comments (mattermost#6633)
  [MM-29034] Remove usage of sidebar-text-## CSS variables (mattermost#6634)
  Translations update from Weblate (mattermost#6673)
  [MM-20462] migrate any_team_permission_gate to typescript (mattermost#6547)
  ...
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 10, 2020
Merge remote-tracking branch 'upstream/master' into MM-20469
02663a8 
* upstream/master: (84 commits)
  Fix bot icon heigth (mattermost#6578)
  Cypress/E2E: Update quick switch hint (mattermost#6691)
  migrate string-refs in search_results.jsx (mattermost#6671)
  MM-T581 Regen token (mattermost#6642)
  Switch button-bg-## to use button-bg-rgb variables (mattermost#6635)
  [MM-27142] In-Web-App purchase of Mattermost Cloud  (mattermost#6583)
  migrate user_list_row_with_error to ts (mattermost#6624)
  [MM-28217] Front-end for displaying company info (mattermost#6580)
  [MM-28211] Plan Details Card (mattermost#6582)
  [MM-28216] Billing History View (UX Only) (mattermost#6637)
  Added final set of cypress tests part of MM-29347 (mattermost#6659)
  [MM-24507] - Pin comment box on bottom of RHS thread (mattermost#6167)
  Cypress/E2E: Fix channel switcher spec (mattermost#6662)
  [MM-28781] migrate string refs in channelView (mattermost#6607)
  [GH-15777] Replace center-channel-color-## with center-channel-color-rgb variables (mattermost#6643)
  [GH-15776]Switch center-channel-color-## with center-channel-color-rgb variables (mattermost#6641)
  MM-29038 Removed usage of centre-channel-color from post comments (mattermost#6633)
  [MM-29034] Remove usage of sidebar-text-## CSS variables (mattermost#6634)
  Translations update from Weblate (mattermost#6673)
  [MM-20462] migrate any_team_permission_gate to typescript (mattermost#6547)
  ...
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Oct 13, 2020
jfrerich pushed a commit that referenced this pull request Oct 23, 2020
@devinbinnie @jfrerich
[MM-28216] Billing History View (UX Only) (#6637)
0895f4f 
* Main card and no billing history view

* Translation and style stuff

* [MM-28216] Styles and component for Billing History view

* Translations

* UX demo changes

* Added paging section

* Translations

* Added paging hover states

* Fix extra padding
calebroseland pushed a commit that referenced this pull request Oct 27, 2020
@devinbinnie @calebroseland
[MM-28216] Billing History View (UX Only) (#6637)
b9ab005 
* Main card and no billing history view

* Translation and style stuff

* [MM-28216] Styles and component for Billing History view

* Translations

* UX demo changes

* Added paging section

* Translations

* Added paging hover states

* Fix extra padding
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@marianunez marianunez marianunez approved these changes

@matthewbirtch matthewbirtch matthewbirtch approved these changes

@stevemudie stevemudie stevemudie approved these changes

@nickmisasi nickmisasi nickmisasi approved these changes

Assignees
No one assigned
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation QA Review Done
Projects
None yet
Milestone
No milestone
8 participants
@devinbinnie @mm-cloud-bot @marianunez @matthewbirtch @stevemudie @nickmisasi @mattermod @amyblais