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

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

Merged
merged 8 commits into from
Oct 7, 2020
Merged

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

merged 8 commits into from
Oct 7, 2020

Conversation

devinbinnie
Copy link
Member

Summary

System Console components to display Company Information from the CWS to the admins.
Edit is coming later.

Ticket Link

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

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 1: UX Review Requires review by a UX Designer labels Sep 29, 2020
@devinbinnie
Copy link
Member Author

NOTE: Not ready for review until we have a way to setup a link to the CWS on the SpinWick.

This was referenced Sep 29, 2020
Merged
Closed
Merged
nickmisasi
nickmisasi approved these changes Sep 29, 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.

Very clean. LGTM!

@stevemudie stevemudie added the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Sep 29, 2020
@mm-cloud-bot mm-cloud-bot removed the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Sep 29, 2020
@mm-cloud-bot
Copy link

Test server creation failed. See the logs for more information.

@devinbinnie
Copy link
Member Author

/update-branch

alifarooq0
alifarooq0 approved these changes Oct 5, 2020
View reviewed changes
components/admin_console/billing/company_info.tsx Outdated
const store = useStore();

useEffect(() => {
getCloudCustomer()(dispatch, store.getState());
Copy link
Contributor

Choose a reason for hiding this comment

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

Better to dispatch this action as opposed manually invoking the func.

Suggested change
getCloudCustomer()(dispatch, store.getState());
dispatch(getCloudCustomer());

components/admin_console/billing/company_info_display.scss Outdated
text-decoration: none;
color: var(--sys-center-channel-color);
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: empty line

@devinbinnie devinbinnie removed the 2: Dev Review Requires review by a core commiter label Oct 5, 2020
@marianunez
Copy link
Member

marianunez commented Oct 7, 2020 •
edited
Loading

NOTE: Not ready for review until we have a way to setup a link to the CWS on the SpinWick.

Given that we still don't have the ability to set this up easily, let's merge and cherry pick this and we can do a QA Review and UX Review on the cloud-ga branch. I will be setting up a "epic PR" just so we can a do a full review there

@devinbinnie devinbinnie removed 1: UX Review Requires review by a UX Designer 3: QA Review Requires review by a QA tester Work in Progress Not yet ready for review labels Oct 7, 2020
@devinbinnie devinbinnie merged commit 6bcee0e into mattermost:master Oct 7, 2020
devinbinnie added a commit to devinbinnie/mattermost-webapp that referenced this pull request Oct 7, 2020
@devinbinnie @mattermod
[MM-28217] Front-end for displaying company info (mattermost#6580)
e19b733 
* [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 <mattermod@users.noreply.github.com>
@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 <mattermod@users.noreply.github.com>

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
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 @mattermod @jfrerich
[MM-28217] Front-end for displaying company info (#6580)
80d643c 
* [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 <mattermod@users.noreply.github.com>
calebroseland pushed a commit that referenced this pull request Oct 27, 2020
@devinbinnie @mattermod @calebroseland
[MM-28217] Front-end for displaying company info (#6580)
557c224 
* [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 <mattermod@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@alifarooq0 alifarooq0 alifarooq0 approved these changes

@nickmisasi nickmisasi nickmisasi 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.
8 participants
@devinbinnie @mm-cloud-bot @marianunez @nickmisasi @alifarooq0 @stevemudie @amyblais @mattermod