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.

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

Themes: Hide upload eligibility card if no messages #11433

Merged
merged 2 commits into from
Feb 17, 2017

Conversation

seear
Copy link
Contributor

@seear seear commented Feb 16, 2017

If there are no holds or warnings to display, simply show the upload dropzone. This removes the need for the user to click the 'Proceed' button on an empty 'Conflicts' card.

To Test
Go to http://calypso.localhost:3000/design/upload and view for different sites.

No errors/warnings before
screen shot 2017-02-09 at 13 58 57

No errors/warnings after
screen shot 2017-02-09 at 13 59 11

Note this PR should not interfere with the redesign to the eligibility component in #11394

If there are no holds or warnings to display, simply show
the upload dropzone. This removes the need for the user
to click the 'Proceed' button on an empty 'Conflicts' card.
@seear seear added [Feature Group] Appearance & Themes Features related to the appearance of sites. [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Feb 16, 2017
@seear seear self-assigned this Feb 16, 2017
@matticbot
Copy link
Contributor

matticbot commented Feb 16, 2017

Copy link
Contributor

@folletto folletto left a comment

Choose a reason for hiding this comment

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

Looking good 👍

@budzanowski
Copy link
Contributor

eligibility

First load does not have full eligibility data.

* Use `isEligible...` selector to show card before data loads to get placeholders
* Ensure we set local state when data has loaded
@seear
Copy link
Contributor Author

seear commented Feb 17, 2017

First load does not have full eligibility data.

Nice catch. Addressed in 48cdf41

Makes use of the eligibility card's own placeholders if the data is not yet loaded.

Copy link
Contributor

@budzanowski budzanowski left a comment

Choose a reason for hiding this comment

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

:shipit:

@seear seear merged commit 916e146 into master Feb 17, 2017
@seear seear deleted the modify/themes-upload-eligibility-alternate branch February 17, 2017 16:36
@matticbot matticbot removed the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Feb 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature Group] Appearance & Themes Features related to the appearance of sites.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants