Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update/mailbox link professional email without feature flags #64986

Merged
merged 12 commits into from
Jun 28, 2022
Merged

Update/mailbox link professional email without feature flags #64986

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
764506c
Adding feature flags
AllTerrainDeveloper May 16, 2022
ebe78b1
Better naming
AllTerrainDeveloper May 17, 2022
387e28c
Emails: Better namings
AllTerrainDeveloper May 20, 2022
31aa831
Open embedded mailbox in the same tab
AllTerrainDeveloper May 25, 2022
545fd98
Update Test URL for Professional Email
AllTerrainDeveloper May 31, 2022
78895c6
Update URLS
AllTerrainDeveloper Jun 3, 2022
9e4d8c8
Initial code to update thank you page
AllTerrainDeveloper Jun 17, 2022
83487eb
Emails: Add redirect & Email parameters to the Professional Email client
AllTerrainDeveloper Jun 27, 2022
ac47d80
Emails: Remove TEMPORARILY Contact & Calendar apps
AllTerrainDeveloper Jun 27, 2022
5abf215
Emails: Linting
AllTerrainDeveloper Jun 27, 2022
e73b7fe
Emails: Add suggestions
AllTerrainDeveloper Jun 28, 2022
25e9097
Emails: Fix build
AllTerrainDeveloper Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Initial code to update thank you page
  • Loading branch information
@AllTerrainDeveloper
AllTerrainDeveloper committed Jun 27, 2022
commit 9e4d8c855e50276c2711023d1f25532684396c8b
9 changes: 9 additions & 0 deletions client/lib/titan/get-titan-urls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ export function getTitanContactsUrl( titanAppsUrlPrefix, email ) {
return getTitanUrl( titanAppsUrlPrefix, email, TITAN_APPS.CONTACTS );
}

/**
* Gets the Web client URL for Professional Email
*
* @param { string } titanAppsUrlPrefix URL prefix to build the final URL based on the next parameters
* @param { string | undefined } email Email account is going to be used
* @param { boolean } clearPreviousSessions Flag to clear session in the Web Client
* @param { string } redirectUrl URL to go back from the Web Client
* @returns { string } Path to be used to send the user to the Web Client
*/
export function getTitanEmailUrl(
titanAppsUrlPrefix,
email,
Expand Down
16 changes: 13 additions & 3 deletions client/my-sites/email/titan-set-up-thank-you/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { isEnabled } from '@automattic/calypso-config';
import { Gridicon } from '@automattic/components';
import classNames from 'classnames';
import { useTranslate } from 'i18n-calypso';
Expand Down Expand Up @@ -41,6 +42,12 @@ const TitanSetUpThankYou = ( {
const titanAppsUrlPrefix = useTitanAppsUrlPrefix();
const translate = useTranslate();

const isEmbeddedInboxTestingEnabled = isEnabled( 'emails/embedded-inbox-testing' );

const mailboxPrefixUrl = isEmbeddedInboxTestingEnabled
? 'https://webmail-alpha.riva.co'
: titanAppsUrlPrefix;

const emailManagementPath = emailManagement( selectedSiteSlug, domainName, currentRoute );

const thankYouImage = {
Expand All @@ -67,9 +74,13 @@ const TitanSetUpThankYou = ( {
stepDescription: translate( 'Access your email from anywhere with our webmail.' ),
stepCta: (
<FullWidthButton
href={ getTitanEmailUrl( titanAppsUrlPrefix, emailAddress, true ) }
href={ getTitanEmailUrl(
mailboxPrefixUrl,
emailAddress,
true,
`${ window.location.protocol }//${ window.location.host }/${ emailManagementPath }`
) }
primary
target="_blank"
onClick={ () => {
recordEmailAppLaunchEvent( {
provider: 'titan',
Expand All @@ -79,7 +90,6 @@ const TitanSetUpThankYou = ( {
} }
>
{ translate( 'Go to Inbox' ) }
<Gridicon className="titan-set-up-thank-you__icon-external" icon="external" />
</FullWidthButton>
),
},
Expand Down