Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: artsy/force
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bc170534e21f6fd94a2d88c22001ba606e0bc975
Choose a base ref
..
head repository: artsy/force
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 816691643274e7d95eeadbc7ab6c8a911c0a3fd4
Choose a head ref
Showing with 3,108 additions and 3,165 deletions.
  1. +1 −1 .circleci/config.yml
  2. +1 −0 .eslintrc.js
  3. +2 −2 .secrets.baseline
  4. +216 −6 data/schema.graphql
  5. +38 −0 hokusai/production.yml
  6. +38 −0 hokusai/staging.yml
  7. +3 −3 package.json
  8. +9 −6 src/Apps/About/AboutApp.tsx
  9. +5 −11 src/Apps/Artwork/ArtworkApp.tsx
  10. +6 −1 src/Apps/Artwork/Components/ArtworkDetails/ArtworkDetailsAdditionalInfo.tsx
  11. +27 −0 src/Apps/Artwork/Components/ArtworkDetails/__tests__/ArtworkDetailsAdditionalInfo.jest.tsx
  12. +1 −1 src/Apps/Artwork/Components/ArtworkErrorApp/ArtworkErrorAppOtherWorks.tsx
  13. +2 −2 src/Apps/Artwork/Components/ArtworkErrorApp/ArtworkErrorAppRelatedWorks.tsx
  14. +3 −8 src/Apps/Artwork/Components/ArtworkPageBanner.tsx
  15. +1 −7 src/Apps/Artwork/Components/ArtworkSidebar/ArtworkSidebar.tsx
  16. +28 −24 src/Apps/Artwork/Components/ArtworkSidebar/ArtworkSidebarCommercialButtons.tsx
  17. +8 −0 src/Apps/Artwork/Components/ArtworkSidebar/ArtworkSidebarEditionSets.tsx
  18. +2 −7 src/Apps/Artwork/Components/ArtworkSidebar/ArtworkSidebarPrivateArtwork.tsx
  19. +4 −4 src/Apps/Artwork/Components/OtherWorks/index.tsx
  20. +27 −17 src/Apps/Artwork/Components/PrivateArtwork/PrivateArtworkAboutArtist.tsx
  21. +2 −2 src/Apps/Artwork/Components/RelatedWorks/index.tsx
  22. +28 −0 src/Apps/Artwork/Components/SelectedEditionSetContext.tsx
  23. +3 −3 src/Apps/Auction/Components/AuctionDetails/AddToCalendar.tsx
  24. +34 −25 src/Apps/Auction/Components/AuctionDetails/AuctionDetails.tsx
  25. +7 −3 src/Apps/Auction/Components/AuctionDetails/AuctionDetailsStartTime.tsx
  26. +0 −1 src/Apps/Auction/Components/AuctionDetails/AuctionInfoSidebar.tsx
  27. +7 −7 src/Apps/Auction/Components/AuctionDetails/SaleDetailTimer.tsx
  28. +0 −1 src/Apps/Auction/Components/AuctionDetails/__tests__/AuctionInfoSidebar.jest.tsx
  29. +1 −1 src/Apps/Auction/Components/AuctionDetails/helpers.ts
  30. +17 −10 src/Apps/CollectorProfile/Routes/Saves/Components/ArtworkListArtworksGrid.tsx
  31. +5 −10 src/Apps/Consign/Hooks/useSubmissionFlowSteps.ts
  32. +1 −1 src/Apps/Consign/Routes/MarketingLanding/Components/LandingPage/HeaderSWA.tsx
  33. +12 −12 src/Apps/Consign/Routes/MarketingLanding/Components/LandingPage/MeetTheSpecialists.tsx
  34. +10 −4 src/Apps/Consign/Routes/MarketingLanding/Components/LandingPage/SWAStickyFooter.tsx
  35. +1 −8 src/Apps/Consign/Routes/MarketingLanding/MarketingLandingApp.tsx
  36. +50 −43 src/Apps/Consign/Routes/SubmissionFlow/ArtworkDetails/ArtworkDetails.tsx
  37. +7 −12 src/Apps/Consign/Routes/SubmissionFlow/ArtworkDetails/Components/ArtworkDetailsForm.tsx
  38. +0 −8 src/Apps/Consign/Routes/SubmissionFlow/ArtworkDetails/__tests__/ArtworkDetails.jest.tsx
  39. +0 −280 src/Apps/Consign/Routes/SubmissionFlow/ContactInformation/ContactInformation.tsx
  40. +0 −514 src/Apps/Consign/Routes/SubmissionFlow/ContactInformation/__tests__/ContactInformation.jest.tsx
  41. +1 −1 src/Apps/Consign/Routes/SubmissionFlow/ThankYou/ThankYou.tsx
  42. +6 −12 src/Apps/Consign/Routes/SubmissionFlow/UploadPhotos/UploadPhotos.tsx
  43. +0 −36 src/Apps/Consign/Routes/SubmissionFlow/Utils/formHelpers.ts
  44. +1 −13 src/Apps/Consign/Routes/SubmissionFlow/Utils/redirects.ts
  45. +23 −103 src/Apps/Consign/consignRoutes.tsx
  46. +3 −1 src/Apps/Conversations/components/ConversationCTA/ConversationCTA.tsx
  47. +3 −1 src/Apps/Conversations/components/ConversationCTA/ConversationMakeOfferButton.tsx
  48. +3 −1 src/Apps/Conversations/components/ConversationCTA/ConversationPurchaseButton.tsx
  49. +3 −1 src/Apps/Conversations/components/ConversationCTA/__tests__/ConversationCTA.jest.tsx
  50. +1 −1 src/Apps/Conversations/components/Message/ConversationTimeSince.tsx
  51. +4 −1 src/Apps/Conversations/components/Sidebar/ConversationsSidebarItem.tsx
  52. 0 ...nFlow/ContactInformation/Components → MyCollection/ContactInformation}/ContactInformationForm.tsx
  53. +27 −11 src/Apps/MyCollection/Routes/EditArtwork/Components/MyCollectionArtworkFormDetails.tsx
  54. +14 −5 src/Apps/MyCollection/Routes/EditArtwork/MyCollectionEditArtwork.tsx
  55. +1 −1 src/Apps/MyCollection/Routes/EditArtwork/Utils/artworkFormHelpers.ts
  56. +8 −1 src/Apps/MyCollection/Routes/EditArtwork/Utils/artworkModel.ts
  57. +8 −1 src/Apps/MyCollection/Routes/EditArtwork/Utils/useCreateOrUpdateArtwork.ts
  58. +15 −5 src/Apps/MyCollection/Routes/EditArtwork/__tests__/MyCollectionEditArtwork.jest.tsx
  59. +2 −1 src/Apps/MyCollection/Routes/MyCollectionArtwork/Components/MyCollectionArtworkInsights.tsx
  60. +12 −3 .../MyCollectionArtwork/Components/MyCollectionArtworkSidebar/MyCollectionArtworkSidebarMetadata.tsx
  61. +7 −3 ...ectionArtwork/Components/MyCollectionArtworkSidebar/__tests__/MyCollectionArtworkSidebar.jest.tsx
  62. +1 −1 src/Apps/MyCollection/Routes/MyCollectionArtwork/MyCollectionArtwork.tsx
  63. +2 −1 src/Apps/MyCollection/Routes/MyCollectionArtwork/MyCollectionArtworkAboutTab.tsx
  64. +4 −4 src/Apps/MyCollection/Routes/PriceEstimate/PriceEstimateContactInformation.tsx
  65. +1 −1 src/Apps/Order/Components/BuyerGuarantee.tsx
  66. +26 −36 src/Apps/Order/Components/TransactionDetailsSummaryItem.tsx
  67. +1 −1 src/Apps/Order/Routes/Payment/PaymentContent.tsx
  68. +5 −5 src/Apps/Order/Routes/__tests__/Status.jest.tsx
  69. +18 −10 src/Apps/Partner/Routes/Shows/index.tsx
  70. +10 −5 src/Apps/Settings/Routes/EditProfile/Components/SettingsEditProfileFields.tsx
  71. +6 −1 src/Apps/Settings/Routes/EditProfile/Components/__tests__/SettingsEditProfileFields.jest.tsx
  72. +0 −95 src/Apps/Settings/Routes/MyCollection/Components/MyCollectionAppDownload.tsx
  73. +1 −1 src/Apps/Settings/Routes/MyCollection/Components/MyCollectionArtworkGrid.tsx
  74. +1 −0 src/Apps/Shows/Components/ShowsCurrentShows.tsx
  75. +0 −1 src/Components/ArtworkFilter/__tests__/ArtworkFilter.jest.tsx
  76. +2 −2 src/Components/ArtworkFilter/index.tsx
  77. +28 −26 src/Components/BankDebitForm/BankDebitProvider.tsx
  78. +17 −15 src/Components/CreditCardInput/CreditCardInput.tsx
  79. +5 −4 src/Components/DownloadAppBadges/DownloadAppBadge.tsx
  80. +2 −9 src/Components/DownloadAppBadges/DownloadAppBadges.tsx
  81. +6 −1 src/Components/Footer/Footer.tsx
  82. +1 −1 src/Components/Footer/FooterDownloadAppBanner.tsx
  83. +13 −8 src/Components/LocationAutocompleteInput.tsx
  84. +34 −26 src/Components/Notifications/NotificationItem.tsx
  85. +9 −21 src/Components/Notifications/PartnerOfferArtwork.tsx
  86. +3 −8 src/Components/Notifications/__tests__/PartnerOfferCreatedNotification.jest.tsx
  87. +1 −1 src/Components/__tests__/LocationAutocompleteInput.jest.tsx
  88. +1 −1 src/DevTools/MockBoot.tsx
  89. +1 −17 src/DevTools/__tests__/renderUntil.jest.tsx
  90. +2 −0 src/Server/middleware/hardcodedRedirects.ts
  91. +20 −34 src/System/Router/Boot.tsx
  92. +0 −110 src/Utils/Responsive/DeprecatedResponsive.tsx
  93. +5 −6 src/Utils/Responsive/index.tsx
  94. +109 −96 src/__generated__/ArtworkAppTestQuery.graphql.ts
  95. +10 −2 src/__generated__/ArtworkApp_artwork.graphql.ts
  96. +18 −32 src/__generated__/{ContactInformation_me.graphql.ts → ArtworkDetails_me.graphql.ts}
  97. +24 −24 src/__generated__/ArtworkSidebarCommercialButtons_Test_Query.graphql.ts
  98. +32 −3 src/__generated__/ArtworkSidebarCommercialButtons_artwork.graphql.ts
  99. +31 −2 src/__generated__/ArtworkSidebarEditionSets_artwork.graphql.ts
  100. +4 −4 src/__generated__/ArtworkSidebarPrivateArtworkQuery.graphql.ts
  101. +4 −5 src/__generated__/ArtworkSidebarPrivateArtwork_artwork.graphql.ts
  102. +200 −203 src/__generated__/ArtworkSidebar_Test_Query.graphql.ts
  103. +0 −257 src/__generated__/ContactInformation_SubmissionFlowTest_Query.graphql.ts
  104. +0 −66 src/__generated__/ContactInformation_submission.graphql.ts
  105. +16 −3 src/__generated__/ConversationCTA_Test_Query.graphql.ts
  106. +10 −2 src/__generated__/ConversationCTA_conversation.graphql.ts
  107. +16 −3 src/__generated__/ConversationReplyTestQuery.graphql.ts
  108. +42 −5 src/__generated__/MyCollectionArtworkSidebarMetadata_artwork.graphql.ts
  109. +49 −6 src/__generated__/MyCollectionArtworkSidebarTestQuery.graphql.ts
  110. +298 −260 src/__generated__/MyCollectionArtworkTestQuery.graphql.ts
  111. +43 −10 src/__generated__/MyCollectionEditArtworkTest_Query.graphql.ts
  112. +47 −10 src/__generated__/MyCollectionEditArtwork_artwork.graphql.ts
  113. +10 −4 src/__generated__/ShowsCurrentShowsQuery.graphql.ts
  114. +8 −3 src/__generated__/ShowsCurrentShows_viewer.graphql.ts
  115. +109 −96 src/__generated__/artworkRoutes_ArtworkQuery.graphql.ts
  116. +63 −35 src/__generated__/collectorProfileRoutes_ArtworkQuery.graphql.ts
  117. +43 −10 src/__generated__/collectorProfileRoutes_MyCollectionArtworkFormQuery.graphql.ts
  118. +68 −4 src/__generated__/consignRoutes_artworkDetailsQuery.graphql.ts
  119. +15 −94 ...signRoutes_contactInformationQuery.graphql.ts → consignRoutes_artworkEditDetailsQuery.graphql.ts}
  120. +0 −135 src/__generated__/consignRoutes_contactInformationMeQuery.graphql.ts
  121. +10 −3 src/__generated__/conversationsRoutes_DetailQuery.graphql.ts
  122. +63 −35 src/__generated__/myCollectionRoutes_ArtworkQuery.graphql.ts
  123. +43 −10 src/__generated__/myCollectionRoutes_MyCollectionArtworkFormQuery.graphql.ts
  124. +11 −1 src/__generated__/useCreateArtworkMutation.graphql.ts
  125. +11 −1 src/__generated__/useUpdateArtworkMutation.graphql.ts
  126. +726 −42 yarn.lock
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -210,7 +210,7 @@ jobs:

smoke-test-on-live-env:
docker:
- image: cypress/included:13.10.0
- image: cypress/included:13.11.0
environment:
TERM: xterm
working_directory: ~/app
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -67,6 +67,7 @@ module.exports = {
"react/prop-types": 0,
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "error",
"react/no-unstable-nested-components": ["error", { allowAsProps: false }],

// FIXME: Investigate / reenable these rules. Disabled to introduce eslint
// into codebase.
4 changes: 2 additions & 2 deletions .secrets.baseline
Original file line number Diff line number Diff line change
@@ -187,7 +187,7 @@
"filename": "src/Apps/MyCollection/Routes/EditArtwork/__tests__/MyCollectionEditArtwork.jest.tsx",
"hashed_secret": "dc312ec7ed341804d6911ecdcf18eea1858f6091",
"is_verified": false,
"line_number": 512
"line_number": 517
}
],
"src/Apps/ViewingRoom/Routes/Statement/__tests__/ViewingRoomStatementRoute.jest.tsx": [
@@ -562,5 +562,5 @@
}
]
},
"generated_at": "2024-05-08T18:36:57Z"
"generated_at": "2024-05-21T11:05:10Z"
}
Loading