Skip to content
This repository has been archived by the owner on Mar 12, 2020. It is now read-only.

Featured artists module rebase #2032

Merged
merged 11 commits into from
Jan 13, 2020
Merged

Conversation

ashleyjelks
Copy link
Contributor

The work for the Featured Artists module in iOS Collections is complete, it just needed a rebase against master as many changes have been merged since the original featured-artists-module branch was created. I didn't want to push to @xtina-starr 's current branch so I created a new with the latest from master rebased against the work @xtina-starr has already completed in #2001

Screen Shot 2020-01-13 at 1 01 58 PM

Screen Shot 2020-01-13 at 1 01 53 PM

xtina-starr and others added 8 commits January 13, 2020 12:51
Co-authored-by: Christina Thompson <christina@artsymail.com>

# Conflicts:
#	data/complete.queryMap.json
Co-authored-by: Christina Thompson <christina@artsymail.com>
Co-authored-by: Christina Thompson <christina@artsymail.com>
Co-authored-by: Christina Thompson <christina@artsymail.com>
<Box width="100%" key={index} pb={20}>
<TouchableWithoutFeedback onPress={() => this.handleTap(this, `/artist/${artist.slug}`)}>
<EntityHeader
imageUrl={artist.image.resized.url}
Copy link
Contributor

Choose a reason for hiding this comment

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

#minor but you may want to use a safe get here in case one of these items returns null

Copy link
Contributor

Choose a reason for hiding this comment

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

That feels like a smart move. I think we should make this change, unless someone can definitely say that artist always have images.

Copy link
Contributor

Choose a reason for hiding this comment

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

Artists definitely sometimes have no images, we should use get here 👍

Copy link
Contributor

Choose a reason for hiding this comment

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

For future reference, we can use optional chaining instead of get now!! 🎉

artist.image?.resized.url

Copy link
Contributor

Choose a reason for hiding this comment

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

I forgot all about optional chaining! Yay!

Copy link
Contributor

@pepopowitz pepopowitz left a comment

Choose a reason for hiding this comment

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

I think we should make the image size change that Ash recommended in the original PR, as well as the change to use get against that image url. @ashleyjelks let me know if you're planning on making those changes or if you'd prefer me to do it!

internalID
name
image {
resized(width: 100) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Per this comment on the original PR, we should update this to be either 500, or the actual screen width if it's not too much work.

@pepopowitz
Copy link
Contributor

(Though I'd also be okay with merging & then fixing those two things later, if that's your preference @ashleyjelks.)

expect(output).toContain("Andy Warhol")
expect(output).toContain("Joan Miro")
})
})
Copy link
Contributor

Choose a reason for hiding this comment

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

Test coverage looks good 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

(Though I'd also be okay with merging & then fixing those two things later, if that's your preference @ashleyjelks.)

Ok, let me address the img resize based on the screen width in a follow-up. The other requested changes have been made!

@pepopowitz pepopowitz merged commit 17e280b into master Jan 13, 2020
@pepopowitz pepopowitz deleted the featured-artists-module-rebase branch January 13, 2020 21:47
@artsyit
Copy link
Collaborator

artsyit commented Jan 13, 2020

🚀 PR was released in v1.21.6 🚀

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants