MM-27454 - Contact Us and Billing Documentation Links #6731

marianunez · 2020-10-11T03:16:44Z

Summary

Changed Contact Support and Contact Sales links to point to the new Cloud Contact us page at /cloud/contact-us in CWS with query params for MM User full name and email.
Updated How Billing works links to new Cloud Billing documentation page here

Ticket Link

Related Pull Requests

CWS: https://github.com/mattermost/customer-web-server/pull/245
Redux: mattermost/mattermost-redux#1255
Server: mattermost/mattermost#15916

components/admin_console/billing/billing_history.tsx

components/purchase_modal/purchase_modal.tsx

alifarooq0 · 2020-10-12T16:19:23Z

components/admin_console/billing/billing_subscriptions.tsx

+                    <a
+                        href={contactSalesLink}
+                        rel='noopener noreferrer'
+                        target='_blank'


all these _blank elements would be worth checking if they work as expected on the desktop client.

Good catch! Fixed them all to use target='_new' which does work properly on both webapp and desktop 👌

justinegeffen · 2020-10-13T11:34:44Z

@marianunez, just to note that the cloud billing docs are not live yet (I'm sure you know that!). Do you have an ETA as to when this will be merged so we can align with the doc release?

marianunez · 2020-10-13T12:26:26Z

@marianunez, just to note that the cloud billing docs are not live yet (I'm sure you know that!). Do you have an ETA as to when this will be merged so we can align with the doc release?

@justinegeffen this is expected to go live for Soft GA this Thrusday Oct 15th. Would that doc be published by then?

justinegeffen · 2020-10-13T12:41:02Z

Thanks, @marianunez! I've updated the doc PR and @adamjclarkson is aware. :)

devinbinnie · 2020-10-13T14:21:31Z

components/admin_console/billing/billing_history.tsx

@@ -27,9 +29,9 @@ const noBillingHistorySection = (
            />
        </div>
        <a
-            target='_blank'
+            target='_new'


Why _new over _blank? Most of what I've read claims this is invalid HTML.

_blank is currently blocked on the desktop app. @Willyfrog what do you recommend here to open links from the desktop app?

it shouldn't be blocked, have you checked with 4.6-rc1? it does have some changes that might affect this (using _blank)

Checked in 4.6-rc1 and is good with both _new and _blank. What is the recommended one to use ?

use _blank if possible
some info on why: https://stackoverflow.com/questions/4964130/target-blank-vs-target-new

devinbinnie · 2020-10-13T14:23:30Z

components/admin_console/billing/plan_details.tsx

                                        />
+                                        <a


The markdown formatter already opens the link in a new window/tab, this link feels unnecessary.

I moved out the link from the formatted message so it was not part of the translation string though

marianunez · 2020-10-13T15:21:04Z

/update-branch

…t-webapp into cloud-links

marianunez · 2020-10-13T16:33:17Z

@stevemudie Will be tested post-merge once https://github.com/mattermost/customer-web-server/pull/245 is complete.

marianunez · 2020-10-13T16:33:50Z

/cherry-pick cloud-ga

mattermod · 2020-10-13T16:33:51Z

Cherry pick is scheduled.

Co-authored-by: Mattermod <mattermod@users.noreply.github.com> (cherry picked from commit 2d69be5)

mattermost#6731-upstream-cloud-ga

Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>

…o MM-20457 * 'master' of github.com:Tak-Iwamoto/mattermost-webapp: (87 commits) MM-T644 Integrations display on team where they were created (mattermost#6752) [MM-20478] Migrate post_header module to TypeScript (mattermost#6631) [MM-20599] Migrated select_team component to Typescript (mattermost#6574) MM-20554 Migrate 'components/delete_post_modal' module and associated tests to TypeScript (mattermost#6656) [MM-24436]- Add a threshold from bottom for new messages toast (mattermost#5828) [MM-20489] Migrate failed_post_options and its tests to typescript (mattermost#6717) [MM-28063] Cloud Telemetry - Admin Console (mattermost#6762) [MM-29559][MM-29558] Company Info Fixes (mattermost#6764) [MM-29557] [MM-29590] Update subscription when purchase modal closes (mattermost#6765) [MM-29615] Fixed subscription page so it doesn't load until subscription info is loaded (mattermost#6766) [MM-28064] Add telemetry in various places around cloud message banners (mattermost#6763) migrate changeCSS function CSS variable for mobile CSS .tutorial-steps__container selector. (mattermost#6743) [MM-27231]: cypress test for MM-T1837 (mattermost#6676) [MM-28062] Add telemetry for in-app purchase flow (mattermost#6760) MM-27454 - Contact Us and Billing Documentation Links (mattermost#6731) [MM-20514] Migrates components/password reset send link to typescript (mattermost#6584) Cloud Billing polish Soft GA (mattermost#6740) [MM-28221] Payment Info Edit/View (mattermost#6709) MM-T636 Description field for incoming and outgoing webhooks can hold 500 characters (mattermost#6682) Translations update from Weblate (mattermost#6748) ...

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>

marianunez added 2 commits October 10, 2020 22:58

Contact Us Links

0f896ba

translation fix

5871efa

marianunez requested review from devinbinnie and alifarooq0 October 11, 2020 13:42

marianunez added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Oct 11, 2020

marianunez mentioned this pull request Oct 11, 2020

MM-27454 - Added CWSUrl to client config mattermost/mattermost-redux#1255

Merged

alifarooq0 approved these changes Oct 12, 2020

View reviewed changes

marianunez added 3 commits October 12, 2020 22:57

Changed to target=_new

5a98174

Merge remote-tracking branch 'origin/master' into cloud-links

9108d5a

Updated redux hash

7935606

devinbinnie approved these changes Oct 13, 2020

View reviewed changes

devinbinnie assigned marianunez Oct 13, 2020

devinbinnie removed the 2: Dev Review Requires review by a core commiter label Oct 13, 2020

mattermod and others added 4 commits October 13, 2020 11:21

Merge branch 'master' into cloud-links

7f4e145

Bumped circleci cache

1e633b6

Merge branch 'cloud-links' of https://github.com/mattermost/mattermos…

d1f80a2

…t-webapp into cloud-links

Don't forget package-lock.json

bb4a841

marianunez merged commit 2d69be5 into master Oct 13, 2020

marianunez deleted the cloud-links branch October 13, 2020 16:32

marianunez added 4: Reviews Complete All reviewers have approved the pull request and removed 3: QA Review Requires review by a QA tester labels Oct 13, 2020

mattermost-build mentioned this pull request Oct 13, 2020

Automated cherry pick of #6731 #6761

Merged

mattermod added the CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone label Oct 13, 2020

marianunez added a commit to mattermost-build/mattermost-webapp that referenced this pull request Oct 13, 2020

Merge branch 'cloud-ga' into automated-cherry-pick-of-mattermost-webapp-

c2b8664

mattermost#6731-upstream-cloud-ga

marianunez added a commit that referenced this pull request Oct 13, 2020

Automated cherry pick of #6731 (#6761)

d2c619c

Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>

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

MM-27454 - Contact Us and Billing Documentation Links (#6731)

843fd30

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>

calebroseland pushed a commit that referenced this pull request Oct 27, 2020

MM-27454 - Contact Us and Billing Documentation Links (#6731)

c216163

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MM-27454 - Contact Us and Billing Documentation Links #6731

MM-27454 - Contact Us and Billing Documentation Links #6731

marianunez commented Oct 11, 2020

alifarooq0 Oct 12, 2020

marianunez Oct 13, 2020

justinegeffen commented Oct 13, 2020

marianunez commented Oct 13, 2020

justinegeffen commented Oct 13, 2020

devinbinnie Oct 13, 2020

marianunez Oct 13, 2020

Willyfrog Oct 13, 2020 •

edited

Loading

marianunez Oct 13, 2020

Willyfrog Oct 14, 2020 •

edited

Loading

devinbinnie Oct 13, 2020

marianunez Oct 13, 2020

marianunez commented Oct 13, 2020

marianunez commented Oct 13, 2020

marianunez commented Oct 13, 2020

mattermod commented Oct 13, 2020

MM-27454 - Contact Us and Billing Documentation Links #6731

MM-27454 - Contact Us and Billing Documentation Links #6731

Conversation

marianunez commented Oct 11, 2020

Summary

Ticket Link

Related Pull Requests

alifarooq0 Oct 12, 2020

Choose a reason for hiding this comment

marianunez Oct 13, 2020

Choose a reason for hiding this comment

justinegeffen commented Oct 13, 2020

marianunez commented Oct 13, 2020

justinegeffen commented Oct 13, 2020

devinbinnie Oct 13, 2020

Choose a reason for hiding this comment

marianunez Oct 13, 2020

Choose a reason for hiding this comment

Willyfrog Oct 13, 2020 • edited Loading

Choose a reason for hiding this comment

marianunez Oct 13, 2020

Choose a reason for hiding this comment

Willyfrog Oct 14, 2020 • edited Loading

Choose a reason for hiding this comment

devinbinnie Oct 13, 2020

Choose a reason for hiding this comment

marianunez Oct 13, 2020

Choose a reason for hiding this comment

marianunez commented Oct 13, 2020

marianunez commented Oct 13, 2020

marianunez commented Oct 13, 2020

mattermod commented Oct 13, 2020

Willyfrog Oct 13, 2020 •

edited

Loading

Willyfrog Oct 14, 2020 •

edited

Loading