Merge pull request #2862 from artsy/staging

Deploy

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 
 orbs:
   codecov: codecov/codecov@1.1.3
-  hokusai: artsy/hokusai@0.7.6
+  hokusai: artsy/hokusai@0.7.7
   horizon: artsy/release@0.0.1
   node: circleci/node@4.1.0
   yarn: artsy/yarn@5.1.3

.eslintignore

@@ -1,4 +1,4 @@
 node_modules/*
 build/*
 scripts/*
-**/__tests__/*
+

.eslintrc.json

@@ -6,12 +6,13 @@
     "jasmine": true,
     "es6": true
   },
-  "plugins": ["promise", "@typescript-eslint"],
+  "plugins": ["promise", "@typescript-eslint", "jest"],
   "extends": [
     "plugin:promise/recommended",
     "plugin:import/errors",
     "plugin:import/typescript",
-    "plugin:@typescript-eslint/recommended"
+    "plugin:@typescript-eslint/recommended",
+    "plugin:jest/recommended"
   ],
   "parser": "@typescript-eslint/parser",
   "rules": {
@@ -37,7 +38,18 @@
     ],
     "@typescript-eslint/no-use-before-define": 0,
     "@typescript-eslint/explicit-module-boundary-types": 0,
-    "prefer-const": ["error", { "ignoreReadBeforeAssign": true }]
+    "prefer-const": ["error", { "ignoreReadBeforeAssign": true }],
+    "jest/expect-expect": [
+      "warn",
+      {
+        "assertFunctionNames": [
+          "expect",
+          "expectPromiseRejectionToMatch",
+          "assertStatusSupported",
+          "assertInvalidStatusFails"
+        ]
+      }
+    ]
   },
   "globals": {
     "expect": false,

_schema.graphql

@@ -1442,12 +1442,16 @@ type Artwork implements Node & Searchable & Sellable {
     last: Int
   ): ArtistSeriesConnection
 
-  # Attribution class object
+  # Represents the "**classification**" of an artwork, such as _limited edition_
   attribution_class: AttributionClass
   availability: String
   cached: Int
   can_share_image: Boolean
     @deprecated(reason: "Prefer to use `is_*`. [Will be removed in v2]")
+
+  # Represents the "**medium type**", such as _Painting_. (This field is also
+  # commonly referred to as just "medium", but should not be confused with the
+  # artwork attribute called `medium`.)
   category: String
 
   # Returns the display label and detail for artwork certificate of authenticity
@@ -1554,6 +1558,10 @@ type Artwork implements Node & Searchable & Sellable {
   listPrice: ListPrice
   literature(format: Format): String
   manufacturer(format: Format): String
+
+  # Represents the **materials** used in this work, such as _oil and acrylic on
+  # canvas_. (This should not be confused with the artwork attribute called
+  # `category`, which is commonly referred to as "medium" or "medium type")
   medium: String
   meta: ArtworkMeta
   metric: String
@@ -2503,12 +2511,16 @@ type ArtworkItem implements Node & Searchable & Sellable {
     shallow: Boolean
   ): [Artist]
 
-  # Attribution class object
+  # Represents the "**classification**" of an artwork, such as _limited edition_
   attribution_class: AttributionClass
   availability: String
   cached: Int
   can_share_image: Boolean
     @deprecated(reason: "Prefer to use `is_*`. [Will be removed in v2]")
+
+  # Represents the "**medium type**", such as _Painting_. (This field is also
+  # commonly referred to as just "medium", but should not be confused with the
+  # artwork attribute called `medium`.)
   category: String
 
   # Returns the display label and detail for artwork certificate of authenticity
@@ -2615,6 +2627,10 @@ type ArtworkItem implements Node & Searchable & Sellable {
   listPrice: ListPrice
   literature(format: Format): String
   manufacturer(format: Format): String
+
+  # Represents the **materials** used in this work, such as _oil and acrylic on
+  # canvas_. (This should not be confused with the artwork attribute called
+  # `category`, which is commonly referred to as "medium" or "medium type")
   medium: String
   meta: ArtworkMeta
   metric: String
@@ -3047,10 +3063,10 @@ type AuctionsLotStanding implements AuctionsNode {
   # The current leading bid on the lot, whether it is winning or not
   leadingBidAmount: AuctionsMoney!
 
-  # whether this user has the leading bid
+  # Current lot state
   lot: AuctionsLotState!
 
-  # whether this user has the leading bid
+  # Current lot state
   lotState: AuctionsLotState! @deprecated(reason: "prefer `lot`")
   rawId: String!
   saleArtwork: SaleArtwork

_schemaV2.graphql

@@ -1244,13 +1244,17 @@ type Artwork implements Node & Searchable & Sellable {
     last: Int
   ): ArtistSeriesConnection
 
-  # Attribution class object
+  # Represents the "**classification**" of an artwork, such as _limited edition_
   attributionClass: AttributionClass
   availability: String
   cached: Int
 
   # Can a user request a lot conditions report for this artwork?
   canRequestLotConditionsReport: Boolean
+
+  # Represents the "**medium type**", such as _Painting_. (This field is also
+  # commonly referred to as just "medium", but should not be confused with the
+  # artwork attribute called `medium`.)
   category: String
 
   # Returns the display label and detail for artwork certificate of authenticity
@@ -1366,6 +1370,10 @@ type Artwork implements Node & Searchable & Sellable {
   listPrice: ListPrice
   literature(format: Format): String
   manufacturer(format: Format): String
+
+  # Represents the **materials** used in this work, such as _oil and acrylic on
+  # canvas_. (This should not be confused with the artwork attribute called
+  # `category`, which is commonly referred to as "medium" or "medium type")
   medium: String
   meta: ArtworkMeta
 
@@ -1839,10 +1847,10 @@ type AuctionsLotStanding implements AuctionsNode {
   # The current leading bid on the lot, whether it is winning or not
   leadingBidAmount: AuctionsMoney!
 
-  # whether this user has the leading bid
+  # Current lot state
   lot: AuctionsLotState!
 
-  # whether this user has the leading bid
+  # Current lot state
   lotState: AuctionsLotState! @deprecated(reason: "prefer `lot`")
   rawId: String!
   saleArtwork: SaleArtwork
@@ -7605,6 +7613,7 @@ input MyCollectionCreateArtworkInput {
   height: String
   medium: String!
   metric: String
+  provenance: String
   title: String
   width: String
 }
@@ -7648,6 +7657,7 @@ input MyCollectionUpdateArtworkInput {
   height: String
   medium: String
   metric: String
+  provenance: String
   title: String
   width: String
 }

package.json

@@ -137,6 +137,7 @@
     "eslint": "6.7.2",
     "eslint-import-resolver-typescript": "2.0.0",
     "eslint-plugin-import": "2.18.2",
+    "eslint-plugin-jest": "24.1.3",
     "eslint-plugin-promise": "4.0.1",
     "expect.js": "0.3.1",
     "husky": "3.1.0",

src/data/causality.graphql

@@ -104,10 +104,10 @@ type LotStanding implements Node {
   "whether this user has the leading bid"
   isHighestBidder: Boolean!
 
-  "whether this user has the leading bid"
+  "Current lot state"
   lotState: Lot! @deprecated(reason: "prefer `lot`")
 
-  "whether this user has the leading bid"
+  "Current lot state"
   lot: Lot!
 }
 
@@ -154,7 +154,7 @@ type Mutation {
   addIncrementPolicy(
     newIncrementPolicy: NewIncrementPolicyInput!
   ): IncrementPolicy
-  addSale(id: String!): Sale
+  addSale(id: ID!): Sale
   banUserFromSale(saleId: ID!, userId: ID!): Sale
   unbanUserFromSale(userId: ID!, saleId: ID!): Sale
 }
@@ -236,7 +236,7 @@ type Query {
   ): LotStandingConnection!
 
   "Returns an increment policy with specific `id`."
-  incrementPolicy(id: String!): IncrementPolicy
+  incrementPolicy(id: ID!): IncrementPolicy
 
   "Previews a draft of a new increment policy."
   previewIncrementPolicy(
@@ -250,13 +250,13 @@ type Query {
   incrementPolicyGroups: [IncrementPolicyGroup!]!
 
   "Returns a lot with specific `id`."
-  lot(id: String!): Lot
+  lot(id: ID!): Lot
 
   "Returns a list of lots"
-  lots(ids: [String!]!): [Lot!]!
+  lots(ids: [ID!]!): [Lot!]!
 
   "Returns a sale with specific `id`."
-  sale(id: String!): Sale
+  sale(id: ID!): Sale
 
   "Fetches an object given its ID"
   node("The ID of an object" id: ID!): Node