feat: shallow partner and artist in Artwork data when possible

artsy · Nov 21, 2024 · 696e014 · 696e014
1 parent 714f5df
commit 696e014
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 25 deletions.
diff --git a/src/app/Components/Artist/ArtistArtworks/CreateArtworkAlertModal.tests.tsx b/src/app/Components/Artist/ArtistArtworks/CreateArtworkAlertModal.tests.tsx
@@ -1,3 +1,4 @@
+import { screen } from "@testing-library/react-native"
 import { CreateArtworkAlertModal_artwork$data } from "__generated__/CreateArtworkAlertModal_artwork.graphql"
 import {
   CreateArtworkAlertModal,
@@ -24,13 +25,13 @@ describe("CreateArtworkAlertModal", () => {
   })
 
   it("returns null if artwork is ineligible", () => {
-    const { queryByText } = renderWithRelay({
+    renderWithRelay({
       Artwork: () => ({
         isEligibleToCreateAlert: false,
       }),
     })
 
-    expect(queryByText("CreateSavedSearchModal")).toBeFalsy()
+    expect(screen.queryByText("CreateSavedSearchModal")).toBeFalsy()
   })
 
   it("returns renders modal", () => {
@@ -50,7 +51,7 @@ describe("CreateArtworkAlertModal", () => {
 
 describe("computeArtworkAlertProps", () => {
   const artwork = {
-    artistsArray: [{ name: "foo", internalID: "bar" }],
+    artists: [{ name: "foo", internalID: "bar" }],
     isEligibleToCreateAlert: true,
     attributionClass: {
       internalID: "1",

diff --git a/src/app/Components/Artist/ArtistArtworks/CreateArtworkAlertModal.tsx b/src/app/Components/Artist/ArtistArtworks/CreateArtworkAlertModal.tsx
@@ -34,7 +34,7 @@ export const CreateArtworkAlertModal: React.FC<CreateArtworkAlertModalProps> = (
         internalID
         slug
         isEligibleToCreateAlert
-        artistsArray: artists {
+        artists(shallow: true) {
           internalID
           name
         }
@@ -92,7 +92,7 @@ export const computeArtworkAlertProps = (
   let aggregations: Aggregations = []
   let additionalGeneIDs: string[] = []
 
-  const artists = compact(artwork?.artistsArray)
+  const artists = compact(artwork?.artists)
   const attributionClass = compact([artwork?.attributionClass?.internalID])
   const formattedArtists: SavedSearchEntityArtist[] = artists.map((artist) => ({
     id: artist.internalID,

diff --git a/src/app/Components/ArtworkGrids/ArtworkGridItem.tsx b/src/app/Components/ArtworkGrids/ArtworkGridItem.tsx
@@ -539,7 +539,7 @@ export default createFragmentContainer(Artwork, {
         endAt
         extendedBiddingEndAt
       }
-      partner {
+      partner(shallow: true) {
         name
       }
       image(includeAll: $includeAllImages) {

diff --git a/src/app/Components/ArtworkRail/ArtworkRailCardMeta.tsx b/src/app/Components/ArtworkRail/ArtworkRailCardMeta.tsx
@@ -272,7 +272,7 @@ const artworkMetaFragment = graphql`
       }
     }
     saleMessage
-    partner {
+    partner(shallow: true) {
       name
     }
     title

diff --git a/src/app/Components/ContextMenu/ContextMenuArtworkPreviewCard.tsx b/src/app/Components/ContextMenu/ContextMenuArtworkPreviewCard.tsx
@@ -145,7 +145,7 @@ const artworkFragment = graphql`
       endAt
       extendedBiddingEndAt
     }
-    partner {
+    partner(shallow: true) {
       name
     }
   }

diff --git a/src/app/Scenes/Activity/components/PartnerOfferCreatedNotification.tsx b/src/app/Scenes/Activity/components/PartnerOfferCreatedNotification.tsx
@@ -173,7 +173,7 @@ export const PartnerOfferCreatedNotificationFragment = graphql`
       edges {
         node {
           internalID
-          partner {
+          partner(shallow: true) {
             profile {
               icon {
                 url(version: "square140")

diff --git a/src/app/Scenes/Artwork/Artwork.tsx b/src/app/Scenes/Artwork/Artwork.tsx
@@ -732,7 +732,7 @@ export const ArtworkContainer = createRefetchContainer(
           type
           isInquireable
         }
-        artist {
+        artist(shallow: true) {
           biographyBlurb {
             text
           }
@@ -774,7 +774,7 @@ export const ArtworkContainer = createRefetchContainer(
             }
           }
         }
-        artists {
+        artists(shallow: true) {
           isConsignable
         }
         isEligibleForArtsyGuarantee

diff --git a/src/app/Scenes/Artwork/Components/AboutArtist.tsx b/src/app/Scenes/Artwork/Components/AboutArtist.tsx
@@ -71,15 +71,15 @@ export const AboutArtistFragmentContainer = createFragmentContainer(AboutArtist,
   artwork: graphql`
     fragment AboutArtist_artwork on Artwork {
       displayArtistBio
-      artists {
+      artists(shallow: true) {
         id
         biographyBlurb {
           text
         }
 
         ...ArtistListItem_artist
       }
-      artist {
+      artist(shallow: true) {
         partnerBiographyBlurb {
           text
         }

diff --git a/src/app/Scenes/Artwork/Components/ArtworkConsignments.tsx b/src/app/Scenes/Artwork/Components/ArtworkConsignments.tsx
@@ -48,7 +48,7 @@ export const ArtworkConsignments: React.FC<ArtworkConsignmentsProps> = ({ artwor
 
 const artworkConsignmentsFragment = graphql`
   fragment ArtworkConsignments_artwork on Artwork {
-    artists {
+    artists(shallow: true) {
       isConsignable
       name
     }

diff --git a/src/app/Scenes/Artwork/Components/ArtworkHeader.tsx b/src/app/Scenes/Artwork/Components/ArtworkHeader.tsx
@@ -141,7 +141,7 @@ export const ArtworkHeaderFragmentContainer = createFragmentContainer(ArtworkHea
       internalID
       slug
       visibilityLevel
-      artists {
+      artists(shallow: true) {
         name
       }
       partner {

diff --git a/src/app/Scenes/Artwork/Components/ArtworkLotDetails/ArtworkLotDetails.tsx b/src/app/Scenes/Artwork/Components/ArtworkLotDetails/ArtworkLotDetails.tsx
@@ -119,7 +119,7 @@ const artworkFragment = graphql`
   fragment ArtworkLotDetails_artwork on Artwork {
     isForSale
     title
-    artist {
+    artist(shallow: true) {
       name
     }
     sale {

diff --git a/src/app/Scenes/Artwork/Components/ArtworkMakerTitle.tsx b/src/app/Scenes/Artwork/Components/ArtworkMakerTitle.tsx
@@ -111,7 +111,7 @@ export const ArtworkMakerTitleFragmentContainer = createFragmentContainer(Artwor
   artwork: graphql`
     fragment ArtworkMakerTitle_artwork on Artwork {
       culturalMaker
-      artists {
+      artists(shallow: true) {
         name
         href
       }

diff --git a/src/app/Scenes/Artwork/Components/ArtworkScreenHeaderCreateAlert.tsx b/src/app/Scenes/Artwork/Components/ArtworkScreenHeaderCreateAlert.tsx
@@ -58,7 +58,7 @@ const ArtworkScreenHeaderCreateAlert_artwork = graphql`
     isEligibleToCreateAlert
     isInAuction
     ...CreateArtworkAlertModal_artwork
-    artists {
+    artists(shallow: true) {
       internalID
     }
     isForSale

diff --git a/src/app/Scenes/Artwork/Components/BrowseSimilarWorks/BrowseSimilarWorks.tsx b/src/app/Scenes/Artwork/Components/BrowseSimilarWorks/BrowseSimilarWorks.tsx
@@ -92,7 +92,7 @@ const similarWorksFragment = graphql`
     internalID
     slug
     isEligibleToCreateAlert
-    artistsArray: artists {
+    artists(shallow: true) {
       internalID
       name
     }

diff --git a/src/app/Scenes/CollectionsByCategory/CollectionRail.tsx b/src/app/Scenes/CollectionsByCategory/CollectionRail.tsx
@@ -32,12 +32,12 @@ export const CollectionRail: FC<CollectionRailProps> = ({
   const collection = useFragment(fragment, _collection)
   const { trackArtworkRailItemTap, trackArtworkRailViewAllTap } = useCollectionByCategoryTracking()
 
-  if (!collection || collection.artworksConnection?.counts.total === 0) {
+  const artworks = extractNodes(collection?.artworksConnection)
+
+  if (!collection || !artworks.length) {
     return null
   }
 
-  const artworks = extractNodes(collection.artworksConnection)
-
   const handleArtworkPress = (artwork: ArtworkRail_artworks$data[0], index: number) => {
     trackArtworkRailItemTap(artwork.internalID, index)
     navigate(artwork.href ?? "")
@@ -89,9 +89,6 @@ const fragment = graphql`
     slug @required(action: NONE)
 
     artworksConnection(first: 10, sort: "-decayed_merch") {
-      counts @required(action: NONE) {
-        total
-      }
       edges {
         node {
           ...ArtworkRail_artworks