Signup: Add a domain to an existing site (/domains) #13605

aidvu · 2017-05-03T17:02:55Z

Add steps that allow adding a domain to an existing eligible site coming from /domains.

Added site-picker step for logged-in users which creates a new cart and redirects to checkout, because this is a regular purchase with an existing site.

What to test for logged in user:

/domains picking an existing site which has a plan (only domain added)
/domains picking an existing site w/o plan (plan and domain added)
/domains picking an existing site which is domain-only (plan and domain added)
shouldn't see any Jetpack sites in the site-picker

Easiest way is to hit: http://calypso.localhost:3000/start/domain-first/?new=some-random-url-xxx-test.com

Fixes: #12196

matticbot · 2017-05-03T17:02:56Z

Test live: https://calypso.live/?branch=update/add-existing-site-domain-only

a8ci18n · 2017-05-04T16:34:43Z

client/signup/config/steps.js

+		stepName: 'site-picker',
+		apiRequestFunction: stepActions.linkExistingSite,
+		props: {
+			headerText: i18n.translate( 'Choose your site?' ),


Hi! I've found a possible matching string that has already been translated 18 times:
translate( 'Choose a site' ) ES Score: 7

Help me improve these suggestions: react with 👎 if the suggestion doesn't make any sense, or with 👍 if it's a particularly good one (even if not implemented).

a8ci18n · 2017-05-05T19:11:04Z

client/signup/steps/site-or-domain/index.jsx

 			{
 				type: 'domain',
-				label: 'Just buy a domain',
+				label: translate( 'Just buy a domain' ),


Hi! I've found a possible matching string that has already been translated 18 times:
translate( 'Buy Domain' ) ES Score: 6

Help me improve these suggestions: react with 👎 if the suggestion doesn't make any sense, or with 👍 if it's a particularly good one (even if not implemented).

klimeryk

Overal, the approach seems good - I'll test more tomorrow.

klimeryk · 2017-05-07T18:00:32Z

client/signup/steps/design-type-with-store/new-site-image.jsx

@@ -13,7 +13,7 @@ export default () => (
 				<use xlinkHref="#path-1"></use>
 			</mask>
 		</defs>
-		<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+		<g id="Page-1" stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">


Good catch!

klimeryk · 2017-05-07T18:08:36Z

client/signup/steps/site-picker/index.jsx

+export default connect(
+	( state ) => {
+		return {
+			sites: getSites( state )


I'm a bit confused here - what's the purpose of this sites vs the global ones on line 18? It seems like you're only using the global ones?

Thought I might use this one, forgot to remove it. Not there yet. :)

klimeryk · 2017-05-08T10:08:20Z

client/signup/steps/site-picker/index.jsx

+				<SiteSelector
+					filter={
+						function( site ) {
+							return ! site.jetpack;


A possible additional criteria - being an admin on the site :) Otherwise, they user won't be able to manage the domain, right?

klimeryk · 2017-05-08T10:24:46Z

It seems with this patch, the plans page is in the loading state indefinitely (the /plans endpoint finished returning, but the UI did not update for some reason):

Small desing nitpick - I think these boxes should have the same height (ha! I remember you had the same nitpick on one of my PRs - revennnnnge! 😈)

Actually, it seems like at least one of the containers has the same height, since when you hover one of them, the border is the same height for all of them (but the white part is not):

While testing, I've realized that this flow could introduce some confusion for existing users - when they start at /domains, they are given a price per one domain (without plan), but if they then proceed to add the domain to an existing site, a lot of things could change:

Probably most common scenario: they are on Free plan and will have to upgrade to a paid plan - something we don't mention at all on /domains and could cause confusion and/or anger.
They have free domain credit unused from their existing plan - great, they don't owe us anything, but it's a shame they learn that at the very last step of the flow.

Honestly, I'm not sure if/how this could be improved given the flow right now (which is non-site centric). Just noting it here in case someone has any ideas or if we should at least prepare the HEs for those type of questions.

Edit: I've just noticed the Free domain included with all plans. bit:

But it doesn't stand out at all (the highlight is my doing ;)) and could be easily missed.

klimeryk · 2017-05-08T15:35:50Z

As discussed on Slack, I can't reproduce the first issue (infinitely loading plans page) anymore, so unless someone else can reproduce it, I'd treat it as a one-off issue on my end.

klimeryk · 2017-05-08T16:34:36Z

client/lib/signup/step-actions.js

-import defer from 'lodash/defer';
-import isEmpty from 'lodash/isEmpty';
-import pick from 'lodash/pick';
+import { assign, defer, isEmpty, isNull, omitBy, pick, startsWith } from 'lodash';


At this number of imports, it might be better to put them on new line each.

a8ci18n · 2017-05-08T17:41:50Z

client/signup/config/steps.js

+		stepName: 'site-picker',
+		props: {
+			headerText: i18n.translate( 'Choose your site?' ),
+		},


Hi! I've found a possible matching string that has already been translated 18 times:
translate( 'Choose a site' ) ES Score: 7

Help me improve these suggestions: react with 👎 if the suggestion doesn't make any sense, or with 👍 if it's a particularly good one (even if not implemented).

gwwar · 2017-05-08T18:56:19Z

Can we not use siteSelection in my-sites/controller.js? I think we'll want to pass around the slug in the route for the next steps. When I tested this I hit site selection again after choosing a domain and site.

aidvu · 2017-05-08T18:59:54Z

@gwwar still not for review. Forgot to remove the label.

klimeryk · 2017-05-25T17:50:37Z

@aidvu, I can't seem to finish (or get to) checkout with the newest change - I get redirected to something like checkout/undefined, then to /plans/, as if the selected site was not persisted.
This happens for a DWPO user and it doesn't seem to matter if I select a site on the Free plan or a paid one.
Just go through the NUX flow, trying to add the domain to an existing site.

klimeryk

Tested again - now all works fine 👍 Thank you for your perseverance with this PR! 😅 NOW MERGE IT WHILE IT'S WORKING! 😀

localize the copy update css

fix stuff per code reviews

getSiteBySlug doesn't return computed attributes for a site thus there is no site slug.

aidvu added [Feature Group] Emails & Domains Features related to email integrations and domain management. NUX [Feature] Signup & Account Creation All screens and flows for making a new WordPress.com account. [Status] In Progress labels May 3, 2017

aidvu added this to the Tortuga: Development milestone May 3, 2017

aidvu self-assigned this May 3, 2017

matticbot added [Size] M Medium sized issue [Size] XL Probably needs to be broken down into multiple smaller issues and removed [Size] M Medium sized issue labels May 3, 2017

a8ci18n reviewed May 4, 2017

View reviewed changes

aidvu force-pushed the update/add-existing-site-domain-only branch 2 times, most recently from 079c192 to b450976 Compare May 5, 2017 18:55

a8ci18n reviewed May 5, 2017

View reviewed changes

aidvu added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. and removed [Status] In Progress labels May 5, 2017

aidvu requested review from umurkontaci, gwwar and klimeryk May 5, 2017 19:58

klimeryk reviewed May 7, 2017

View reviewed changes

klimeryk reviewed May 8, 2017

View reviewed changes

aidvu force-pushed the update/add-existing-site-domain-only branch from 931c6cd to df8bc6e Compare May 8, 2017 17:31

a8ci18n reviewed May 8, 2017

View reviewed changes

aidvu added [Status] In Progress and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels May 8, 2017

aidvu force-pushed the update/add-existing-site-domain-only branch from bbd6325 to 0e716f6 Compare May 25, 2017 20:11

klimeryk approved these changes May 26, 2017

View reviewed changes

aidvu added 23 commits May 26, 2017 14:20

Signup: Add domain-only to existing site

8ab4562

A working existing site flow :)

758f0c5

Add all files

cd3c1bd

some fixes for the SVG images and removing getSites selector

b3ce0c2

Filter sites to not include jetpack sites

3e9b2a2

localize the copy update css

add placeholder for existing site image

b780704

Wrap site selector in Card, update css

a39f95a

Omit provided dependencies that are null

876474f

update existing site svg

c3650ba

Fix height issues, ad check for manage_options

1bd64c4

each import on new line

4f86c66

revert margin

69c5865

make the whole choices clickable

a9a940d

fix api request function for domain-first flow

7291adc

fixing existing flows to work properly with additional existing site one

2331d2a

remove sites-lits usage

67302f0

properly pass data when creating a new site

3b60d5e

properly pass the data to createSiteWithCart

e8e39cc

Move the submit action to a component, so we don't bind state

7193e11

Use different plans step, so no free plan is present

81f1c66

fix stuff per code reviews

Update to using getSite selector

2b8090b

getSiteBySlug doesn't return computed attributes for a site thus there is no site slug.

Rename design-with-type svgs

8c853ec

Fix for upgrading from domain only to a site with plan

dcf7c4b

aidvu force-pushed the update/add-existing-site-domain-only branch from db8369e to dcf7c4b Compare May 26, 2017 13:05

aidvu merged commit 5da1ab2 into master May 26, 2017

aidvu removed the [Status] Ready to Merge label May 26, 2017

klimeryk deleted the update/add-existing-site-domain-only branch May 27, 2017 13:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Signup: Add a domain to an existing site (/domains) #13605

Signup: Add a domain to an existing site (/domains) #13605

aidvu commented May 3, 2017 •

edited

Loading

matticbot commented May 3, 2017

a8ci18n May 4, 2017

a8ci18n May 5, 2017

klimeryk left a comment

klimeryk May 7, 2017

klimeryk May 7, 2017

aidvu May 7, 2017

klimeryk May 8, 2017

klimeryk commented May 8, 2017 •

edited

Loading

klimeryk commented May 8, 2017

klimeryk May 8, 2017

a8ci18n May 8, 2017

gwwar commented May 8, 2017

aidvu commented May 8, 2017

klimeryk commented May 25, 2017

klimeryk left a comment •

edited

Loading

Signup: Add a domain to an existing site (/domains) #13605

Signup: Add a domain to an existing site (/domains) #13605

Conversation

aidvu commented May 3, 2017 • edited Loading

matticbot commented May 3, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

klimeryk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

klimeryk commented May 8, 2017 • edited Loading

klimeryk commented May 8, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gwwar commented May 8, 2017

aidvu commented May 8, 2017

klimeryk commented May 25, 2017

klimeryk left a comment • edited Loading

Choose a reason for hiding this comment

aidvu commented May 3, 2017 •

edited

Loading

klimeryk commented May 8, 2017 •

edited

Loading

klimeryk left a comment •

edited

Loading