Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy #2862

Merged
merged 20 commits into from Dec 8, 2020
Merged

Deploy #2862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
203b874
chore(deps): update hokusai orb from 0.7.6 to v0.7.7
renovate-bot Dec 2, 2020
764edb6
chore(eslint): adds jest plugin
dzucconi Nov 30, 2020
e0a24e9
chore(eslint): passes lint
dzucconi Dec 1, 2020
0a2024c
Merge pull request #2858 from artsy/dzucconi/chore/FX-2514--no-focus
dzucconi Dec 2, 2020
00f5508
chore(deps): pin dep eslint-plugin-jest from ^24.1.3 to 24.1.3
renovate-bot Dec 2, 2020
7650069
fix: allow listPrice to be queried on CommerceOrder line items
iskounen Dec 2, 2020
86e6705
Update eigen query map
artsyit Dec 3, 2020
e4d135e
Update eigen query map (#2865)
artsy-peril[bot] Dec 3, 2020
e2785c3
chore: Add provenance to My Collection Artwork mutations
Dec 3, 2020
cba17f2
Merge pull request #2866 from artsy/bhoggard/cx-602-my-collection-pro…
pepopowitz Dec 3, 2020
b1a67f5
Merge pull request #2864 from iskounen/fix-price-range-on-commerce-or…
sweir27 Dec 3, 2020
8b3d08a
update causality schema
erikdstock Dec 4, 2020
e7e280c
Merge pull request #2867 from artsy/erikdstock/causality-schema
starsirius Dec 4, 2020
f71556a
docs: describe artwork's medium and category fields
anandaroop Dec 4, 2020
ccbd28b
docs: describe classification too
anandaroop Dec 4, 2020
f462380
Merge pull request #2868 from artsy/roop/medium-category-documentation
sweir27 Dec 4, 2020
10ed99b
Update eigen query map
artsyit Dec 5, 2020
7880b84
Update eigen query map (#2869)
artsy-peril[bot] Dec 5, 2020
c729277
Update eigen query map
artsyit Dec 8, 2020
9fe3a9b
Update eigen query map (#2870)
artsy-peril[bot] Dec 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .eslintignore
@@ -1,4 +1,4 @@
node_modules/*
build/*
scripts/*
**/__tests__/*

18 changes: 15 additions & 3 deletions .eslintrc.json
Expand Up @@ -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": {
Expand All @@ -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,
Expand Down
24 changes: 20 additions & 4 deletions _schema.graphql
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 13 additions & 3 deletions _schemaV2.graphql
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -7605,6 +7613,7 @@ input MyCollectionCreateArtworkInput {
height: String
medium: String!
metric: String
provenance: String
title: String
width: String
}
Expand Down Expand Up @@ -7648,6 +7657,7 @@ input MyCollectionUpdateArtworkInput {
height: String
medium: String
metric: String
provenance: String
title: String
width: String
}
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions src/data/causality.graphql
Expand Up @@ -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!
}

Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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(
Expand All @@ -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
Expand Down