diff --git a/schema.graphql b/schema.graphql index d4c73bfde..1c6b82287 100644 --- a/schema.graphql +++ b/schema.graphql @@ -66,6 +66,7 @@ input AccountInput { type AccountRegister { errors: [Error!] + requiresConfirmation: Boolean! accountErrors: [AccountError!] user: User } @@ -73,6 +74,7 @@ type AccountRegister { input AccountRegisterInput { email: String! password: String! + redirectUrl: String! } type AccountRequestDeletion { @@ -287,7 +289,8 @@ input AttributeFilterInput { input AttributeInput { slug: String! - value: String! + value: String + values: [String] } enum AttributeInputTypeEnum { @@ -317,7 +320,7 @@ enum AttributeSortField { input AttributeSortingInput { direction: OrderDirection! - field: AttributeSortField + field: AttributeSortField! } type AttributeTranslatableContent implements Node { @@ -556,6 +559,7 @@ type CategoryDelete { input CategoryFilterInput { search: String + ids: [ID] } input CategoryInput { @@ -576,7 +580,7 @@ enum CategorySortField { input CategorySortingInput { direction: OrderDirection! - field: CategorySortField + field: CategorySortField! } type CategoryTranslatableContent implements Node { @@ -921,6 +925,7 @@ type CollectionDelete { input CollectionFilterInput { published: CollectionPublished search: String + ids: [ID] } input CollectionInput { @@ -960,7 +965,7 @@ enum CollectionSortField { input CollectionSortingInput { direction: OrderDirection! - field: CollectionSortField + field: CollectionSortField! } type CollectionTranslatableContent implements Node { @@ -1027,6 +1032,16 @@ enum ConfigurationTypeFieldEnum { PASSWORD } +type ConfirmAccount { + errors: [Error!] +} + +type ConfirmEmailChange { + errors: [Error!] + user: User + accountErrors: [AccountError!] +} + enum CountryCode { AF AX @@ -1300,12 +1315,6 @@ type CreditCard { expYear: Int! } -type CustomerAddressCreate { - errors: [Error!] - user: User - address: Address -} - type CustomerBulkDelete { errors: [Error!] count: Int! @@ -1339,6 +1348,9 @@ enum CustomerEventsEnum { ACCOUNT_CREATED PASSWORD_RESET_LINK_SENT PASSWORD_RESET + EMAIL_CHANGED_REQUEST + PASSWORD_CHANGED + EMAIL_CHANGED PLACED_ORDER NOTE_ADDED_TO_ORDER DIGITAL_LINK_DOWNLOADED @@ -1366,29 +1378,6 @@ input CustomerInput { note: String } -type CustomerPasswordReset { - errors: [Error!] -} - -input CustomerPasswordResetInput { - email: String! -} - -type CustomerRegister { - errors: [Error!] - user: User -} - -input CustomerRegisterInput { - email: String! - password: String! -} - -type CustomerSetDefaultAddress { - errors: [Error!] - user: User -} - type CustomerUpdate { errors: [Error!] accountErrors: [AccountError!] @@ -1411,8 +1400,6 @@ input DateTimeRangeInput { scalar Decimal -union DefaultTranslationItem = ProductTranslatableContent | CollectionTranslatableContent | CategoryTranslatableContent | AttributeTranslatableContent | AttributeValueTranslatableContent | ProductVariantTranslatableContent | PageTranslatableContent | ShippingMethodTranslatableContent | SaleTranslatableContent | VoucherTranslatableContent | MenuItemTranslatableContent - type DigitalContent implements Node { useDefaultSettings: Boolean! automaticFulfillment: Boolean! @@ -1851,11 +1838,6 @@ type LanguageDisplay { language: String! } -type LoggedUserUpdate { - errors: [Error!] - user: User -} - type Margin { start: Int stop: Int @@ -2006,7 +1988,7 @@ input MenuItemMoveInput { input MenuItemSortingInput { direction: OrderDirection! - field: MenuItemsSortField + field: MenuItemsSortField! } type MenuItemTranslatableContent implements Node { @@ -2044,7 +2026,7 @@ enum MenuSortField { input MenuSortingInput { direction: OrderDirection! - field: MenuSortField + field: MenuSortField! } type MenuUpdate { @@ -2098,11 +2080,25 @@ input MoveProductInput { } type Mutation { + wishlistAddProduct(productId: ID!): WishlistAddProductMutation + wishlistRemoveProduct(productId: ID!): WishlistRemoveProductMutation + wishlistAddVariant(variantId: ID!): WishlistAddProductVariantMutation + wishlistRemoveVariant(variantId: ID!): WishlistRemoveProductVariantMutation webhookCreate(input: WebhookCreateInput!): WebhookCreate webhookDelete(id: ID!): WebhookDelete webhookUpdate(id: ID!, input: WebhookUpdateInput!): WebhookUpdate + createWarehouse(input: WarehouseCreateInput!): WarehouseCreate + updateWarehouse(id: ID!, input: WarehouseUpdateInput!): WarehouseUpdate + deleteWarehouse(id: ID!): WarehouseDelete + createStock(input: StockInput!): StockCreate + updateStock(id: ID!, input: StockInput!): StockUpdate + deleteStock(id: ID!): StockDelete + bulkDeleteStock(ids: [ID]!): StockBulkDelete authorizationKeyAdd(input: AuthorizationKeyInput!, keyType: AuthorizationKeyType!): AuthorizationKeyAdd authorizationKeyDelete(keyType: AuthorizationKeyType!): AuthorizationKeyDelete + staffNotificationRecipientCreate(input: StaffNotificationRecipientInput!): StaffNotificationRecipientCreate + staffNotificationRecipientUpdate(id: ID!, input: StaffNotificationRecipientInput!): StaffNotificationRecipientUpdate + staffNotificationRecipientDelete(id: ID!): StaffNotificationRecipientDelete homepageCollectionUpdate(collection: ID): HomepageCollectionUpdate shopDomainUpdate(input: SiteDomainInput): ShopDomainUpdate shopSettingsUpdate(input: ShopSettingsInput!): ShopSettingsUpdate @@ -2271,7 +2267,7 @@ type Mutation { tokenVerify(token: String!): VerifyToken checkoutAddPromoCode(checkoutId: ID!, promoCode: String!): CheckoutAddPromoCode checkoutBillingAddressUpdate(billingAddress: AddressInput!, checkoutId: ID!): CheckoutBillingAddressUpdate - checkoutComplete(checkoutId: ID!, storeSource: Boolean = false): CheckoutComplete + checkoutComplete(checkoutId: ID!, redirectUrl: String, storeSource: Boolean = false): CheckoutComplete checkoutCreate(input: CheckoutCreateInput!): CheckoutCreate checkoutCustomerAttach(checkoutId: ID!, customerId: ID!): CheckoutCustomerAttach checkoutCustomerDetach(checkoutId: ID!): CheckoutCustomerDetach @@ -2288,8 +2284,11 @@ type Mutation { checkoutUpdatePrivateMetadata(id: ID!, input: MetaInput!): CheckoutUpdatePrivateMeta checkoutClearPrivateMetadata(id: ID!, input: MetaPath!): CheckoutClearPrivateMeta requestPasswordReset(email: String!, redirectUrl: String!): RequestPasswordReset + confirmAccount(email: String!, token: String!): ConfirmAccount setPassword(token: String!, email: String!, password: String!): SetPassword passwordChange(newPassword: String!, oldPassword: String!): PasswordChange + requestEmailChange(newEmail: String!, password: String!, redirectUrl: String!): RequestEmailChange + confirmEmailChange(token: String!): ConfirmEmailChange accountAddressCreate(input: AddressInput!, type: AddressTypeEnum): AccountAddressCreate accountAddressUpdate(id: ID!, input: AddressInput!): AccountAddressUpdate accountAddressDelete(id: ID!): AccountAddressDelete @@ -2299,11 +2298,6 @@ type Mutation { accountRequestDeletion(redirectUrl: String!): AccountRequestDeletion accountDelete(token: String!): AccountDelete accountUpdateMeta(input: MetaInput!): AccountUpdateMeta - customerPasswordReset(input: CustomerPasswordResetInput!): CustomerPasswordReset - customerAddressCreate(input: AddressInput!, type: AddressTypeEnum): CustomerAddressCreate - customerSetDefaultAddress(id: ID!, type: AddressTypeEnum!): CustomerSetDefaultAddress - customerRegister(input: CustomerRegisterInput!): CustomerRegister - loggedUserUpdate(input: UserAddressInput!): LoggedUserUpdate addressCreate(input: AddressInput!, userId: ID!): AddressCreate addressUpdate(id: ID!, input: AddressInput!): AddressUpdate addressDelete(id: ID!): AddressDelete @@ -2330,7 +2324,6 @@ type Mutation { serviceAccountClearPrivateMetadata(id: ID!, input: MetaPath!): ServiceAccountClearPrivateMeta serviceAccountTokenCreate(input: ServiceAccountTokenInput!): ServiceAccountTokenCreate serviceAccountTokenDelete(id: ID!): ServiceAccountTokenDelete - passwordReset(email: String!): PasswordReset } input NameTranslationInput { @@ -2617,7 +2610,7 @@ enum OrderSortField { input OrderSortingInput { direction: OrderDirection! - field: OrderSortField + field: OrderSortField! } enum OrderStatus { @@ -2751,7 +2744,7 @@ enum PageSortField { input PageSortingInput { direction: OrderDirection! - field: PageSortField + field: PageSortField! } type PageTranslatableContent implements Node { @@ -2799,10 +2792,6 @@ type PasswordChange { accountErrors: [AccountError!] } -type PasswordReset { - errors: [Error!] -} - type Payment implements Node { id: ID! gateway: String! @@ -2912,10 +2901,9 @@ enum PermissionEnum { MANAGE_USERS MANAGE_STAFF MANAGE_SERVICE_ACCOUNTS - IMPERSONATE_USERS MANAGE_DISCOUNTS - MANAGE_GIFT_CARD MANAGE_PLUGINS + MANAGE_GIFT_CARD MANAGE_MENUS MANAGE_ORDERS MANAGE_PAGES @@ -2958,7 +2946,7 @@ enum PluginSortField { input PluginSortingInput { direction: OrderDirection! - field: PluginSortField + field: PluginSortField! } type PluginUpdate { @@ -3109,6 +3097,7 @@ input ProductFilterInput { productType: ID search: String minimalPrice: PriceRangeInput + productTypes: [ID] } type ProductImage implements Node { @@ -3303,6 +3292,7 @@ input ProductTypeFilterInput { search: String configurable: ProductTypeConfigurable productType: ProductTypeEnum + ids: [ID] } input ProductTypeInput { @@ -3330,7 +3320,7 @@ enum ProductTypeSortField { input ProductTypeSortingInput { direction: OrderDirection! - field: ProductTypeSortField + field: ProductTypeSortField! } type ProductTypeUpdate { @@ -3375,15 +3365,15 @@ type ProductVariant implements Node { sku: String! product: Product! trackInventory: Boolean! - quantityAllocated: Int! weight: Weight privateMeta: [MetaStore]! meta: [MetaStore]! - quantity: Int! - stockQuantity: Int! + quantity: Int! @deprecated(reason: "This field will be removed in Saleor 2.11. Use the stock field instead.") + quantityAllocated: Int @deprecated(reason: "This field will be removed in Saleor 2.11. Use the stock field instead.") + stockQuantity: Int! @deprecated(reason: "This field will be removed in Saleor 2.11. Use the stock field instead.") priceOverride: Money pricing: VariantPricingInfo - isAvailable: Boolean + isAvailable: Boolean @deprecated(reason: "This field will be removed in Saleor 2.11. Use the stock field instead.") attributes: [SelectedAttribute!]! costPrice: Money margin: Int @@ -3392,6 +3382,7 @@ type ProductVariant implements Node { images: [ProductImage] translation(languageCode: LanguageCodeEnum!): ProductVariantTranslation digitalContent: DigitalContent + stock(country: String): [Stock] } type ProductVariantBulkCreate { @@ -3514,8 +3505,12 @@ type Query { webhooks(sortBy: WebhookSortingInput, filter: WebhookFilterInput, before: String, after: String, first: Int, last: Int): WebhookCountableConnection webhookEvents: [WebhookEvent] webhookSamplePayload(eventType: WebhookEventTypeEnum!): JSONString + warehouse(id: ID!): Warehouse + warehouses(filter: WarehouseFilterInput, before: String, after: String, first: Int, last: Int): WarehouseCountableConnection translations(kind: TranslatableKinds!, before: String, after: String, first: Int, last: Int): TranslatableItemConnection - translation(id: ID!, kind: TranslatableKinds!): DefaultTranslationItem + translation(id: ID!, kind: TranslatableKinds!): TranslatableItem + stock(id: ID!): Stock + stocks(filter: StockFilterInput, before: String, after: String, first: Int, last: Int): StockCountableConnection shop: Shop shippingZone(id: ID!): ShippingZone shippingZones(before: String, after: String, first: Int, last: Int): ShippingZoneCountableConnection @@ -3569,7 +3564,6 @@ type Query { serviceAccounts(filter: ServiceAccountFilterInput, sortBy: ServiceAccountSortingInput, before: String, after: String, first: Int, last: Int): ServiceAccountCountableConnection serviceAccount(id: ID!): ServiceAccount user(id: ID!): User - node(id: ID!): Node _entities(representations: [_Any]): [_Entity] _service: _Service } @@ -3594,6 +3588,12 @@ enum ReportingPeriod { THIS_MONTH } +type RequestEmailChange { + errors: [Error!] + user: User + accountErrors: [AccountError!] +} + type RequestPasswordReset { errors: [Error!] accountErrors: [AccountError!] @@ -3676,7 +3676,7 @@ enum SaleSortField { input SaleSortingInput { direction: OrderDirection! - field: SaleSortField + field: SaleSortField! } type SaleTranslatableContent implements Node { @@ -3776,7 +3776,7 @@ enum ServiceAccountSortField { input ServiceAccountSortingInput { direction: OrderDirection! - field: ServiceAccountSortField + field: ServiceAccountSortField! } type ServiceAccountToken implements Node { @@ -3990,6 +3990,7 @@ type Shop { defaultDigitalUrlValidDays: Int companyAddress: Address customerSetPasswordUrl: String + staffNotificationRecipients: [StaffNotificationRecipient] } type ShopAddressUpdate { @@ -4112,6 +4113,37 @@ enum StaffMemberStatus { DEACTIVATED } +type StaffNotificationRecipient implements Node { + user: User + active: Boolean + id: ID! + email: String +} + +type StaffNotificationRecipientCreate { + errors: [Error!] + shopErrors: [ShopError!] + staffNotificationRecipient: StaffNotificationRecipient +} + +type StaffNotificationRecipientDelete { + errors: [Error!] + shopErrors: [ShopError!] + staffNotificationRecipient: StaffNotificationRecipient +} + +input StaffNotificationRecipientInput { + user: ID + email: String + active: Boolean +} + +type StaffNotificationRecipientUpdate { + errors: [Error!] + shopErrors: [ShopError!] + staffNotificationRecipient: StaffNotificationRecipient +} + type StaffUpdate { errors: [Error!] accountErrors: [AccountError!] @@ -4123,11 +4155,81 @@ input StaffUserInput { search: String } +type Stock implements Node { + warehouse: Warehouse! + productVariant: ProductVariant! + quantity: Int! + quantityAllocated: Int! + id: ID! + stockQuantity: Int! +} + enum StockAvailability { IN_STOCK OUT_OF_STOCK } +type StockBulkDelete { + errors: [Error!] + count: Int! + stockError: [StockError!] +} + +type StockCountableConnection { + pageInfo: PageInfo! + edges: [StockCountableEdge!]! + totalCount: Int +} + +type StockCountableEdge { + node: Stock! + cursor: String! +} + +type StockCreate { + errors: [Error!] + stockErrors: [StockError!] + stock: Stock +} + +type StockDelete { + errors: [Error!] + stock: Stock +} + +enum StockErorrCode { + ALREADY_EXISTS + GRAPHQL_ERROR + INVALID + NOT_FOUND + REQUIRED + UNIQUE +} + +type StockError { + field: String + message: String + code: StockErorrCode +} + +input StockFilterInput { + quantity: Float + quantityAllocated: Float + search: String +} + +input StockInput { + productVariant: ID! + warehouse: ID! + quantity: Int +} + +type StockUpdate { + errors: [Error!] + stockError: [StockError!] + stock: Stock +} + enum TaxRateType { ACCOMMODATION ADMISSION_TO_CULTURAL_EVENTS @@ -4206,7 +4308,7 @@ enum TransactionKind { CONFIRM } -union TranslatableItem = Product | Category | Collection | Attribute | AttributeValue | ProductVariant | Page | ShippingMethod | Sale | Voucher | MenuItem +union TranslatableItem = ProductTranslatableContent | CollectionTranslatableContent | CategoryTranslatableContent | AttributeTranslatableContent | AttributeValueTranslatableContent | ProductVariantTranslatableContent | PageTranslatableContent | ShippingMethodTranslatableContent | SaleTranslatableContent | VoucherTranslatableContent | MenuItemTranslatableContent type TranslatableItemConnection { pageInfo: PageInfo! @@ -4267,11 +4369,7 @@ type User implements Node { avatar(size: Int): Image events: [CustomerEvent] storedPaymentSources: [PaymentSource] -} - -input UserAddressInput { - defaultBillingAddress: AddressInput - defaultShippingAddress: AddressInput + wishlist(before: String, after: String, first: Int, last: Int): WishlistItemCountableConnection } type UserAvatarDelete { @@ -4335,7 +4433,7 @@ enum UserSortField { input UserSortingInput { direction: OrderDirection! - field: UserSortField + field: UserSortField! } type UserUpdateMeta { @@ -4487,7 +4585,7 @@ enum VoucherSortField { input VoucherSortingInput { direction: OrderDirection! - field: VoucherSortField + field: VoucherSortField! } type VoucherTranslatableContent implements Node { @@ -4519,6 +4617,90 @@ type VoucherUpdate { voucher: Voucher } +type Warehouse implements Node { + id: ID! + name: String! + companyName: String! + shippingZones(before: String, after: String, first: Int, last: Int): ShippingZoneCountableConnection! + address: Address! + email: String! +} + +input WarehouseAddressInput { + streetAddress1: String! + streetAddress2: String + city: String! + cityArea: String + postalCode: String + country: CountryCode! + countryArea: String + phone: String +} + +type WarehouseCountableConnection { + pageInfo: PageInfo! + edges: [WarehouseCountableEdge!]! + totalCount: Int +} + +type WarehouseCountableEdge { + node: Warehouse! + cursor: String! +} + +type WarehouseCreate { + errors: [Error!] + warehouseErrors: [WarehouseError!] + warehouse: Warehouse +} + +input WarehouseCreateInput { + name: String! + companyName: String + shippingZones: [ID] + email: String + address: WarehouseAddressInput! +} + +type WarehouseDelete { + errors: [Error!] + warehouseErrors: [WarehouseError!] + warehouse: Warehouse +} + +type WarehouseError { + field: String + message: String + code: WarehouseErrorCode +} + +enum WarehouseErrorCode { + ALREADY_EXISTS + GRAPHQL_ERROR + INVALID + NOT_FOUND + REQUIRED + UNIQUE +} + +input WarehouseFilterInput { + search: String +} + +type WarehouseUpdate { + errors: [Error!] + warehouseErrors: [WarehouseError!] + warehouse: Warehouse +} + +input WarehouseUpdateInput { + name: String! + companyName: String + shippingZones: [ID] + email: String + address: WarehouseAddressInput +} + type Webhook implements Node { name: String serviceAccount: ServiceAccount! @@ -4605,7 +4787,7 @@ enum WebhookSortField { input WebhookSortingInput { direction: OrderDirection! - field: WebhookSortField + field: WebhookSortField! } type WebhookUpdate { @@ -4637,6 +4819,68 @@ enum WeightUnitsEnum { G } +type Wishlist implements Node { + id: ID! + createdAt: DateTime! + items(before: String, after: String, first: Int, last: Int, id: ID): WishlistItemCountableConnection! +} + +type WishlistAddProductMutation { + errors: [Error!] + wishlist: [WishlistItem] + wishlistErrors: [WishlistError!] +} + +type WishlistAddProductVariantMutation { + errors: [Error!] + wishlist: [WishlistItem] + wishlistErrors: [WishlistError!] +} + +type WishlistError { + field: String + message: String + code: WishlistErrorCode +} + +enum WishlistErrorCode { + GRAPHQL_ERROR + INVALID + NOT_FOUND + REQUIRED + UNIQUE +} + +type WishlistItem implements Node { + id: ID! + wishlist: Wishlist! + product: Product! + variants(before: String, after: String, first: Int, last: Int): ProductVariantCountableConnection! +} + +type WishlistItemCountableConnection { + pageInfo: PageInfo! + edges: [WishlistItemCountableEdge!]! + totalCount: Int +} + +type WishlistItemCountableEdge { + node: WishlistItem! + cursor: String! +} + +type WishlistRemoveProductMutation { + errors: [Error!] + wishlist: [WishlistItem] + wishlistErrors: [WishlistError!] +} + +type WishlistRemoveProductVariantMutation { + errors: [Error!] + wishlist: [WishlistItem] + wishlistErrors: [WishlistError!] +} + scalar _Any union _Entity = Address | ServiceAccount | User | ProductVariant | Product | ProductType | Collection | Category | ProductImage diff --git a/src/fixtures.ts b/src/fixtures.ts index 2a4816c93..aff42ef0d 100644 --- a/src/fixtures.ts +++ b/src/fixtures.ts @@ -391,10 +391,6 @@ export const sortPageProps: SortPage = { }; export const permissions: ShopInfo_shop_permissions[] = [ - { - code: PermissionEnum.IMPERSONATE_USERS, - name: "Impersonate customers." - }, { code: PermissionEnum.MANAGE_DISCOUNTS, name: "Manage sales and vouchers." diff --git a/src/products/types/Product.ts b/src/products/types/Product.ts index 92eb979ae..1b7426fc4 100644 --- a/src/products/types/Product.ts +++ b/src/products/types/Product.ts @@ -135,7 +135,7 @@ export interface Product_variants { priceOverride: Product_variants_priceOverride | null; margin: number | null; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; stockQuantity: number; } diff --git a/src/products/types/ProductCreate.ts b/src/products/types/ProductCreate.ts index 3f9632436..d9dea4320 100644 --- a/src/products/types/ProductCreate.ts +++ b/src/products/types/ProductCreate.ts @@ -141,7 +141,7 @@ export interface ProductCreate_productCreate_product_variants { priceOverride: ProductCreate_productCreate_product_variants_priceOverride | null; margin: number | null; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; stockQuantity: number; } diff --git a/src/products/types/ProductDetails.ts b/src/products/types/ProductDetails.ts index 8e6833036..2ebf1cfcc 100644 --- a/src/products/types/ProductDetails.ts +++ b/src/products/types/ProductDetails.ts @@ -135,7 +135,7 @@ export interface ProductDetails_product_variants { priceOverride: ProductDetails_product_variants_priceOverride | null; margin: number | null; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; stockQuantity: number; } diff --git a/src/products/types/ProductImageCreate.ts b/src/products/types/ProductImageCreate.ts index 8f52fb568..3714690b5 100644 --- a/src/products/types/ProductImageCreate.ts +++ b/src/products/types/ProductImageCreate.ts @@ -141,7 +141,7 @@ export interface ProductImageCreate_productImageCreate_product_variants { priceOverride: ProductImageCreate_productImageCreate_product_variants_priceOverride | null; margin: number | null; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; stockQuantity: number; } diff --git a/src/products/types/ProductImageUpdate.ts b/src/products/types/ProductImageUpdate.ts index 1f5ae6984..ab8e5a51e 100644 --- a/src/products/types/ProductImageUpdate.ts +++ b/src/products/types/ProductImageUpdate.ts @@ -141,7 +141,7 @@ export interface ProductImageUpdate_productImageUpdate_product_variants { priceOverride: ProductImageUpdate_productImageUpdate_product_variants_priceOverride | null; margin: number | null; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; stockQuantity: number; } diff --git a/src/products/types/ProductUpdate.ts b/src/products/types/ProductUpdate.ts index 10fb5078b..50e1e6ab5 100644 --- a/src/products/types/ProductUpdate.ts +++ b/src/products/types/ProductUpdate.ts @@ -141,7 +141,7 @@ export interface ProductUpdate_productUpdate_product_variants { priceOverride: ProductUpdate_productUpdate_product_variants_priceOverride | null; margin: number | null; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; stockQuantity: number; } diff --git a/src/products/types/ProductVariant.ts b/src/products/types/ProductVariant.ts index 6ed02523d..2d8091000 100644 --- a/src/products/types/ProductVariant.ts +++ b/src/products/types/ProductVariant.ts @@ -100,5 +100,5 @@ export interface ProductVariant { product: ProductVariant_product; sku: string; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; } diff --git a/src/products/types/ProductVariantDetails.ts b/src/products/types/ProductVariantDetails.ts index ee7b633a6..0f948a9cc 100644 --- a/src/products/types/ProductVariantDetails.ts +++ b/src/products/types/ProductVariantDetails.ts @@ -100,7 +100,7 @@ export interface ProductVariantDetails_productVariant { product: ProductVariantDetails_productVariant_product; sku: string; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; } export interface ProductVariantDetails { diff --git a/src/products/types/SimpleProductUpdate.ts b/src/products/types/SimpleProductUpdate.ts index 695913d23..a7d9599a7 100644 --- a/src/products/types/SimpleProductUpdate.ts +++ b/src/products/types/SimpleProductUpdate.ts @@ -141,7 +141,7 @@ export interface SimpleProductUpdate_productUpdate_product_variants { priceOverride: SimpleProductUpdate_productUpdate_product_variants_priceOverride | null; margin: number | null; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; stockQuantity: number; } @@ -282,7 +282,7 @@ export interface SimpleProductUpdate_productVariantUpdate_productVariant { product: SimpleProductUpdate_productVariantUpdate_productVariant_product; sku: string; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; } export interface SimpleProductUpdate_productVariantUpdate { diff --git a/src/products/types/VariantCreate.ts b/src/products/types/VariantCreate.ts index a466145b4..643ad765c 100644 --- a/src/products/types/VariantCreate.ts +++ b/src/products/types/VariantCreate.ts @@ -109,7 +109,7 @@ export interface VariantCreate_productVariantCreate_productVariant { product: VariantCreate_productVariantCreate_productVariant_product; sku: string; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; } export interface VariantCreate_productVariantCreate { diff --git a/src/products/types/VariantImageAssign.ts b/src/products/types/VariantImageAssign.ts index e8e91b056..ef04cdd1e 100644 --- a/src/products/types/VariantImageAssign.ts +++ b/src/products/types/VariantImageAssign.ts @@ -106,7 +106,7 @@ export interface VariantImageAssign_variantImageAssign_productVariant { product: VariantImageAssign_variantImageAssign_productVariant_product; sku: string; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; } export interface VariantImageAssign_variantImageAssign { diff --git a/src/products/types/VariantImageUnassign.ts b/src/products/types/VariantImageUnassign.ts index e525dc616..6858e294e 100644 --- a/src/products/types/VariantImageUnassign.ts +++ b/src/products/types/VariantImageUnassign.ts @@ -106,7 +106,7 @@ export interface VariantImageUnassign_variantImageUnassign_productVariant { product: VariantImageUnassign_variantImageUnassign_productVariant_product; sku: string; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; } export interface VariantImageUnassign_variantImageUnassign { diff --git a/src/products/types/VariantUpdate.ts b/src/products/types/VariantUpdate.ts index bcc6ade80..503439d37 100644 --- a/src/products/types/VariantUpdate.ts +++ b/src/products/types/VariantUpdate.ts @@ -109,7 +109,7 @@ export interface VariantUpdate_productVariantUpdate_productVariant { product: VariantUpdate_productVariantUpdate_productVariant_product; sku: string; quantity: number; - quantityAllocated: number; + quantityAllocated: number | null; } export interface VariantUpdate_productVariantUpdate { diff --git a/src/types/globalTypes.ts b/src/types/globalTypes.ts index 1ee4b3ef3..136badcd5 100644 --- a/src/types/globalTypes.ts +++ b/src/types/globalTypes.ts @@ -479,7 +479,6 @@ export enum PaymentChargeStatusEnum { } export enum PermissionEnum { - IMPERSONATE_USERS = "IMPERSONATE_USERS", MANAGE_CHECKOUTS = "MANAGE_CHECKOUTS", MANAGE_DISCOUNTS = "MANAGE_DISCOUNTS", MANAGE_GIFT_CARD = "MANAGE_GIFT_CARD", @@ -712,12 +711,13 @@ export interface AttributeFilterInput { export interface AttributeInput { slug: string; - value: string; + value?: string | null; + values?: (string | null)[] | null; } export interface AttributeSortingInput { direction: OrderDirection; - field?: AttributeSortField | null; + field: AttributeSortField; } export interface AttributeUpdateInput { @@ -756,6 +756,7 @@ export interface CatalogueInput { export interface CategoryFilterInput { search?: string | null; + ids?: (string | null)[] | null; } export interface CategoryInput { @@ -770,7 +771,7 @@ export interface CategoryInput { export interface CategorySortingInput { direction: OrderDirection; - field?: CategorySortField | null; + field: CategorySortField; } export interface CollectionCreateInput { @@ -789,6 +790,7 @@ export interface CollectionCreateInput { export interface CollectionFilterInput { published?: CollectionPublished | null; search?: string | null; + ids?: (string | null)[] | null; } export interface CollectionInput { @@ -805,7 +807,7 @@ export interface CollectionInput { export interface CollectionSortingInput { direction: OrderDirection; - field?: CollectionSortField | null; + field: CollectionSortField; } export interface ConfigurationItemInput { @@ -908,7 +910,7 @@ export interface MenuItemMoveInput { export interface MenuSortingInput { direction: OrderDirection; - field?: MenuSortField | null; + field: MenuSortField; } export interface NameTranslationInput { @@ -944,7 +946,7 @@ export interface OrderLineInput { export interface OrderSortingInput { direction: OrderDirection; - field?: OrderSortField | null; + field: OrderSortField; } export interface OrderUpdateInput { @@ -973,7 +975,7 @@ export interface PageInput { export interface PageSortingInput { direction: OrderDirection; - field?: PageSortField | null; + field: PageSortField; } export interface PageTranslationInput { @@ -986,7 +988,7 @@ export interface PageTranslationInput { export interface PluginSortingInput { direction: OrderDirection; - field?: PluginSortField | null; + field: PluginSortField; } export interface PluginUpdateInput { @@ -1010,6 +1012,7 @@ export interface ProductFilterInput { productType?: string | null; search?: string | null; minimalPrice?: PriceRangeInput | null; + productTypes?: (string | null)[] | null; } export interface ProductOrder { @@ -1022,6 +1025,7 @@ export interface ProductTypeFilterInput { search?: string | null; configurable?: ProductTypeConfigurable | null; productType?: ProductTypeEnum | null; + ids?: (string | null)[] | null; } export interface ProductTypeInput { @@ -1037,7 +1041,7 @@ export interface ProductTypeInput { export interface ProductTypeSortingInput { direction: OrderDirection; - field?: ProductTypeSortField | null; + field: ProductTypeSortField; } export interface ProductVariantBulkCreateInput { @@ -1096,7 +1100,7 @@ export interface SaleInput { export interface SaleSortingInput { direction: OrderDirection; - field?: SaleSortField | null; + field: SaleSortField; } export interface SeoInput { @@ -1117,7 +1121,7 @@ export interface ServiceAccountInput { export interface ServiceAccountSortingInput { direction: OrderDirection; - field?: ServiceAccountSortField | null; + field: ServiceAccountSortField; } export interface ServiceAccountTokenInput { @@ -1208,7 +1212,7 @@ export interface UserCreateInput { export interface UserSortingInput { direction: OrderDirection; - field?: UserSortField | null; + field: UserSortField; } export interface VoucherFilterInput { @@ -1240,7 +1244,7 @@ export interface VoucherInput { export interface VoucherSortingInput { direction: OrderDirection; - field?: VoucherSortField | null; + field: VoucherSortField; } export interface WebhookCreateInput { @@ -1259,7 +1263,7 @@ export interface WebhookFilterInput { export interface WebhookSortingInput { direction: OrderDirection; - field?: WebhookSortField | null; + field: WebhookSortField; } export interface WebhookUpdateInput { diff --git a/src/utils/sort.ts b/src/utils/sort.ts index 8f5e7fd77..6288e8191 100644 --- a/src/utils/sort.ts +++ b/src/utils/sort.ts @@ -63,7 +63,7 @@ export function asSortParams< interface SortingInput { direction: OrderDirection; - field?: T | null; + field: T; } type GetSortQueryField = ( sort: TUrlField