Merge pull request #14387 from artsy/joeyAghion/follows

fix: skip queries for artworks by followed artists when logged out
artsy · Aug 23, 2024 · 633a713 · 633a713
2 parents d0b5bd4 + d0aa092
commit 633a713
Show file tree

Hide file tree

Showing 15 changed files with 602 additions and 1,670 deletions.
diff --git a/src/Apps/Auction/AuctionApp.tsx b/src/Apps/Auction/AuctionApp.tsx
@@ -192,17 +192,21 @@ export const AuctionAppFragmentContainer = createFragmentContainer(AuctionApp, {
       @argumentDefinitions(
         input: { type: "FilterArtworksInput" }
         saleID: { type: "String!" }
+        isLoggedIn: { type: "Boolean!" }
       ) {
-      ...AuctionArtworkFilter_viewer @arguments(input: $input, saleID: $saleID)
-      ...AuctionWorksByFollowedArtistsRail_viewer @arguments(saleID: $saleID)
+      ...AuctionArtworkFilter_viewer
+        @arguments(input: $input, saleID: $saleID, isLoggedIn: $isLoggedIn)
+      ...AuctionWorksByFollowedArtistsRail_viewer
+        @arguments(saleID: $saleID)
+        @include(if: $isLoggedIn)
       ...AuctionCurrentAuctionsRail_viewer
 
       showFollowedArtistsTab: saleArtworksConnection(
         first: 1
         aggregations: [TOTAL]
         saleSlug: $saleID
         includeArtworksByFollowedArtists: true
-      ) {
+      ) @include(if: $isLoggedIn) {
         edges {
           node {
             internalID

diff --git a/src/Apps/Auction/Components/AuctionArtworkFilter.tsx b/src/Apps/Auction/Components/AuctionArtworkFilter.tsx
@@ -79,13 +79,14 @@ export const AuctionArtworkFilterRefetchContainer = createRefetchContainer(
         @argumentDefinitions(
           input: { type: "FilterArtworksInput" }
           saleID: { type: "String!" }
+          isLoggedIn: { type: "Boolean!" }
         ) {
         ...ArtworkFilter_viewer @arguments(input: $input)
         sale(id: $saleID) {
           featuredKeywords
         }
         sidebarAggregations: artworksConnection(input: $input, first: 1) {
-          counts {
+          counts @include(if: $isLoggedIn) {
             followedArtists
           }
           aggregations {
@@ -104,10 +105,11 @@ export const AuctionArtworkFilterRefetchContainer = createRefetchContainer(
     query AuctionArtworkFilterQuery(
       $input: FilterArtworksInput
       $saleID: String!
+      $isLoggedIn: Boolean!
     ) {
       viewer {
         ...AuctionArtworkFilter_viewer
-          @arguments(input: $input, saleID: $saleID)
+          @arguments(input: $input, saleID: $saleID, isLoggedIn: $isLoggedIn)
       }
     }
   `

diff --git a/src/Apps/Auction/Components/__tests__/AuctionArtworkFilter.jest.tsx b/src/Apps/Auction/Components/__tests__/AuctionArtworkFilter.jest.tsx
@@ -36,7 +36,7 @@ describe("AuctionArtworkFilter", () => {
       query AuctionArtworkFilterTestQuery($input: FilterArtworksInput!) {
         viewer {
           ...AuctionArtworkFilter_viewer
-            @arguments(input: $input, saleID: "test-sale")
+            @arguments(input: $input, saleID: "test-sale", isLoggedIn: false)
         }
       }
     `,

diff --git a/src/Apps/Auction/__tests__/AuctionApp.jest.tsx b/src/Apps/Auction/__tests__/AuctionApp.jest.tsx
@@ -70,7 +70,8 @@ describe("AuctionApp", () => {
           ...AuctionApp_sale
         }
         viewer {
-          ...AuctionApp_viewer @arguments(input: $input, saleID: $slug)
+          ...AuctionApp_viewer
+            @arguments(input: $input, saleID: $slug, isLoggedIn: true)
         }
       }
     `,

diff --git a/src/Apps/Auction/auctionRoutes.tsx b/src/Apps/Auction/auctionRoutes.tsx
@@ -61,6 +61,7 @@ export const auctionRoutes: RouteProps[] = [
       query auctionRoutes_TopLevelQuery(
         $input: FilterArtworksInput
         $slug: String!
+        $isLoggedIn: Boolean!
       ) {
         me {
           ...AuctionApp_me @arguments(saleID: $slug)
@@ -69,7 +70,8 @@ export const auctionRoutes: RouteProps[] = [
           ...AuctionApp_sale
         }
         viewer {
-          ...AuctionApp_viewer @arguments(input: $input, saleID: $slug)
+          ...AuctionApp_viewer
+            @arguments(input: $input, saleID: $slug, isLoggedIn: $isLoggedIn)
         }
       }
     `,
@@ -88,6 +90,7 @@ export const auctionRoutes: RouteProps[] = [
 
       const variables = {
         slug: params.slug,
+        isLoggedIn: !!props.context.user,
         input: {
           ...auctionFilterDefaults,
           ...initialFilterStateFromUrl,

diff --git a/src/Apps/Auctions/Components/WorksByArtistsYouFollowRail.tsx b/src/Apps/Auctions/Components/WorksByArtistsYouFollowRail.tsx
diff --git a/src/Apps/Auctions/Components/__tests__/WorksByArtistsYouFollowRail.jest.tsx b/src/Apps/Auctions/Components/__tests__/WorksByArtistsYouFollowRail.jest.tsx
diff --git a/src/__generated__/AuctionAppTestQuery.graphql.ts b/src/__generated__/AuctionAppTestQuery.graphql.ts