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

[MM-28211] Plan Details Card #6582

Merged
merged 13 commits into from
Oct 7, 2020
Merged

[MM-28211] Plan Details Card #6582

merged 13 commits into from
Oct 7, 2020

Conversation

devinbinnie
Copy link
Member

@devinbinnie devinbinnie commented Sep 29, 2020 •
edited
Loading

Summary

Plan Details card showing current cloud subscription, features, # of seats and some pricing.
UX reviewed here: #6463

Ticket Link

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

Related Pull Requests

@devinbinnie devinbinnie added 2: Dev Review Requires review by a core commiter Work in Progress Not yet ready for review 3: QA Review Requires review by a QA tester labels Sep 29, 2020
@devinbinnie devinbinnie requested a review from a team September 29, 2020 18:25
@ghost ghost requested review from jwilander and Szymongib and removed request for a team September 29, 2020 18:25
@jwilander jwilander requested review from alifarooq0 and removed request for Szymongib September 29, 2020 18:28
This was referenced Sep 29, 2020
Closed
Merged
jwilander
jwilander approved these changes Oct 1, 2020
View reviewed changes
Copy link
Member

@jwilander jwilander left a comment

Choose a reason for hiding this comment

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

LGTM - just the one comment

i18n/en.json Outdated Show resolved Hide resolved
@devinbinnie devinbinnie removed the 2: Dev Review Requires review by a core commiter label Oct 5, 2020
@jwilander
Copy link
Member

@devinbinnie this still has the WIP label on it - just checking if that should be removed

@devinbinnie
Copy link
Member Author

@jwilander It's currently waiting on this ticket to finish: https://mattermost.atlassian.net/browse/MM-28714

We can merge as is if you'd like.

@jwilander
Copy link
Member

Nope, that's fine was just checking - please ignore me :)

@devinbinnie devinbinnie removed the Work in Progress Not yet ready for review label Oct 7, 2020
@devinbinnie devinbinnie removed the request for review from stevemudie October 7, 2020 19:53
@devinbinnie devinbinnie removed the 3: QA Review Requires review by a QA tester label Oct 7, 2020
@devinbinnie devinbinnie merged commit 5d7cb86 into mattermost:master Oct 7, 2020
devinbinnie added a commit to devinbinnie/mattermost-webapp that referenced this pull request Oct 7, 2020
@devinbinnie
[MM-28211] Plan Details Card (mattermost#6582)
7011c4b 
* 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
@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-28211] Plan Details Card (#6582)
f00280c 
* 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
calebroseland pushed a commit that referenced this pull request Oct 27, 2020
@devinbinnie @calebroseland
[MM-28211] Plan Details Card (#6582)
c81f873 
* 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
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jwilander jwilander jwilander approved these changes

@alifarooq0 alifarooq0 alifarooq0 approved these changes

Assignees
No one assigned
Labels
Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@devinbinnie @jwilander @alifarooq0 @amyblais