MM-31503 - screen to restrict access because workspace capacity" #7468

pvev · 2021-02-03T19:38:44Z

Summary

Create a new screen for users who are restricted from joining a workspace because the free capacity is exceeded

Ticket Link

MM-31503

Related Pull Requests

mattermost/mattermost-redux#1351

Screenshots

nickmisasi · 2021-02-04T15:36:26Z

components/error_page/workspace_user_limit_reached.tsx

+import computerWithAlert from 'images/cloud/computer-with-alert.svg';
+import mattermostCloud from 'images/cloud/mattermost-cloud.svg';
+import wavesBackground from 'images/cloud/waves.svg';
+import blueDotes from 'images/cloud/blue.svg';


Should probably be blueDots not blueDotes.

yes, thanks for finding this typo.

nickmisasi · 2021-02-04T15:43:49Z

components/signup/signup_controller/index.js

+ const subscriptionStats = subscriptionStatsFromState(state);
 const isLicensed = license && license.IsLicensed === 'true';
+ const isCloud = license && license.Cloud === 'true';


Should we just have the subscriptionsStats selector return whether its cloud?

Hi @nickmisasi , that makes sense, I will add that validation.

pvev · 2021-02-06T09:41:13Z

/update-branch

marianunez

Great work @pablovelezvidal! Some non-blocking comments below

components/signup/signup_controller/signup_controller.jsx

components/signup/signup_controller/signup_controller.test.jsx

marianunez · 2021-02-08T15:11:54Z

@pablovelezvidal can we set up the test server where we can see the new page and provide a link for UX review?

pvev · 2021-02-08T19:03:33Z

/test

pvev · 2021-02-09T10:08:58Z

depends on mattermost/mattermost#16896

matthewbirtch · 2021-02-09T16:52:12Z

@pablovelezvidal can we set up the test server where we can see the new page and provide a link for UX review?

@pablovelezvidal let me know how I should review. You noted /test above, but that doesn't appear to be working for me.

pvev · 2021-02-09T16:59:52Z

@pablovelezvidal can we set up the test server where we can see the new page and provide a link for UX review?

@pablovelezvidal let me know how I should review. You noted /test above, but that doesn't appear to be working for me.

there is a PR that needs to be merged in the server, after that I will set up everything here and I will let you know how to test. The /test you saw here was a mistake from me, that was intended to be set in the chat post panel.

nickmisasi

LGTM

ethervoid · 2021-02-12T10:47:16Z

/update-branch

pvev · 2021-02-12T11:11:56Z

@pablovelezvidal can we set up the test server where we can see the new page and provide a link for UX review?

@pablovelezvidal let me know how I should review. You noted /test above, but that doesn't appear to be working for me.

there is a PR that needs to be merged in the server, after that I will set up everything here and I will let you know how to test. The /test you saw here was a mistake from me, that was intended to be set in the chat post panel.

@matthewbirtch the PR is ready to review. This is the invitation link you should use to see the restriction screen (I already added more than the free tier limit users) https://mattermost-webapp-pr-7468.test.mattermost.cloud/signup_user_complete/?id=brag37o5mffu5ktfxfggoc76hw . If for any reason it doesn't work for you, the testing procedure would be, copy the invitation link, then activate enough users to get the upgrade account banner, and in a different browser or incognito window, paste the invitation link.

matthewbirtch

Looks great! Thanks @pablovelezvidal

mm-cloud-bot · 2021-02-12T23:56:23Z

Test server destroyed

… custom-status * 'master' of github.com:mattermost/mattermost-webapp: Cypress/E2E: Fix slash commands spec and some promotions (mattermost#7522) E2 e prod tests fixes (mattermost#7509) MM-31503 - screen to restrict access because workspace capacity" (mattermost#7468) [MM-20378] Convert file_attachment_list and tests to TypeScript (mattermost#7488) [MM-20377] Convert persist_gate to TypeScript (mattermost#7434) [MM-32301] Post Aria Label (mattermost#7457) [MM-30042]: CWS - Step 3 of Getting Started shows error when trying to send 10 email addresses (mattermost#7439) fix typo (mattermost#7505) Add images for email notification redesign (mattermost#7417) Cypress/E2E: Distribute tests evenly when testing in parallel (mattermost#7508) Cypress/E2E: Use MinIO for S3 storage testing (mattermost#7506) MM-32354 - do not show renew now text in announcement bar tooltip (mattermost#7491) fix for test that requires untrusted connection (mattermost#7507) Revert "Allow uploading 10 files per post (mattermost#7160)" (mattermost#7510) MM-26497: markdown table word breaking (mattermost#7500) Cypress/E2E: Promote/Demote e2e tests (mattermost#7497) [MM-31497] - Prevent end users from inviting people and exceeding the free tier limits (mattermost#7408) MM-31961: fixed color in search field for dark-theme (mattermost#7490)

…termost#7468) * MM-31503 - screen to restrict access because workspace capacity" * Add the MM-redux commit hash * add unit test to cover the new restricted screen * fix linter and unit tests * Add test for not calling subscription stats when customer is not cloud * improve the way the subscription stats are loaded * modify styles to be consistent with other designed pages * make svg image to be responsive on any screen heigh Co-authored-by: Pablo Velez Vidal <[email protected]> Co-authored-by: Mattermod <[email protected]>

pvev added 2 commits February 3, 2021 20:22

MM-31503 - screen to restrict access because workspace capacity"

1a2d1d5

Add the MM-redux commit hash

c12acf5

pvev mentioned this pull request Feb 3, 2021

MM-31503 - create new restrict screens 4 users mattermost/mattermost-redux#1351

Merged

pvev added 2 commits February 3, 2021 22:33

add unit test to cover the new restricted screen

7972efd

fix linter and unit tests

27540b0

pvev added the Setup Cloud + CWS Test Server Setup a test server linked to the CWS test portal label Feb 4, 2021

pvev requested review from marianunez and nickmisasi February 4, 2021 14:44

pvev added the 2: Dev Review Requires review by a core commiter label Feb 4, 2021

nickmisasi suggested changes Feb 4, 2021

View reviewed changes

pvev added 2 commits February 5, 2021 23:07

add changes based on PR comments

739bb56

fix linter issues

fac9f10

Merge branch 'master' into MM-31503-design-restricted-workspace

9712dfd

marianunez added the 1: UX Review Requires review by a UX Designer label Feb 8, 2021

marianunez approved these changes Feb 8, 2021

View reviewed changes

components/signup/signup_controller/signup_controller.jsx Show resolved Hide resolved

components/signup/signup_controller/signup_controller.test.jsx Show resolved Hide resolved

marianunez requested a review from matthewbirtch February 8, 2021 15:12

Add test for not calling subscription stats when customer is not cloud

41b98c1

improve the way the subscription stats are loaded

5cdb66b

pvev added the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label Feb 9, 2021

pvev requested a review from nickmisasi February 9, 2021 17:00

Merge branch 'master' into MM-31503-design-restricted-workspace

cdd3f52

pvev added Setup Cloud + CWS Test Server Setup a test server linked to the CWS test portal and removed Setup Cloud + CWS Test Server Setup a test server linked to the CWS test portal Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) labels Feb 10, 2021

mm-cloud-bot removed the Setup Cloud + CWS Test Server Setup a test server linked to the CWS test portal label Feb 10, 2021

pvev added Setup Cloud + CWS Test Server Setup a test server linked to the CWS test portal and removed Setup Cloud + CWS Test Server Setup a test server linked to the CWS test portal labels Feb 10, 2021

mm-cloud-bot removed the Setup Cloud + CWS Test Server Setup a test server linked to the CWS test portal label Feb 11, 2021

pvev added the Setup Cloud + CWS Test Server Setup a test server linked to the CWS test portal label Feb 11, 2021

nickmisasi approved these changes Feb 11, 2021

View reviewed changes

Merge branch 'master' into MM-31503-design-restricted-workspace

44b00ee

pvev mentioned this pull request Feb 12, 2021

MM-3190 show user limit modal when cloud limit exceed #7496

Merged

pvev added 2 commits February 12, 2021 22:12

modify styles to be consistent with other designed pages

b5c2462

make svg image to be responsive on any screen heigh

75b7528

matthewbirtch approved these changes Feb 12, 2021

View reviewed changes

pvev merged commit 9610ac7 into master Feb 12, 2021

pvev deleted the MM-31503-design-restricted-workspace branch February 12, 2021 23:55

amyblais added this to the v5.33 milestone Feb 13, 2021

amyblais added Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation labels Feb 24, 2021

neallred removed the Setup Cloud + CWS Test Server Setup a test server linked to the CWS test portal label Jan 26, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MM-31503 - screen to restrict access because workspace capacity" #7468

MM-31503 - screen to restrict access because workspace capacity" #7468

pvev commented Feb 3, 2021

nickmisasi Feb 4, 2021

pvev Feb 4, 2021

nickmisasi Feb 4, 2021

pvev Feb 4, 2021

pvev commented Feb 6, 2021

marianunez left a comment

marianunez commented Feb 8, 2021

pvev commented Feb 8, 2021

pvev commented Feb 9, 2021

matthewbirtch commented Feb 9, 2021

pvev commented Feb 9, 2021

nickmisasi left a comment

ethervoid commented Feb 12, 2021

pvev commented Feb 12, 2021

matthewbirtch left a comment

mm-cloud-bot commented Feb 12, 2021

MM-31503 - screen to restrict access because workspace capacity" #7468

MM-31503 - screen to restrict access because workspace capacity" #7468

Conversation

pvev commented Feb 3, 2021

Summary

Ticket Link

Related Pull Requests

Screenshots

nickmisasi Feb 4, 2021

Choose a reason for hiding this comment

pvev Feb 4, 2021

Choose a reason for hiding this comment

nickmisasi Feb 4, 2021

Choose a reason for hiding this comment

pvev Feb 4, 2021

Choose a reason for hiding this comment

pvev commented Feb 6, 2021

marianunez left a comment

Choose a reason for hiding this comment

marianunez commented Feb 8, 2021

pvev commented Feb 8, 2021

pvev commented Feb 9, 2021

matthewbirtch commented Feb 9, 2021

pvev commented Feb 9, 2021

nickmisasi left a comment

Choose a reason for hiding this comment

ethervoid commented Feb 12, 2021

pvev commented Feb 12, 2021

matthewbirtch left a comment

Choose a reason for hiding this comment

mm-cloud-bot commented Feb 12, 2021