diff --git a/schema.graphql b/schema.graphql index 5490d13e7..8b13a6034 100644 --- a/schema.graphql +++ b/schema.graphql @@ -143,8 +143,8 @@ type AssignNavigation { type Attribute implements Node { id: ID! - productTypes(before: String, after: String, first: Int, last: Int): ProductTypeCountableConnection - productVariantTypes(before: String, after: String, first: Int, last: Int): ProductTypeCountableConnection + productTypes(before: String, after: String, first: Int, last: Int): ProductTypeCountableConnection! + productVariantTypes(before: String, after: String, first: Int, last: Int): ProductTypeCountableConnection! privateMeta: [MetaStore]! meta: [MetaStore]! inputType: AttributeInputTypeEnum @@ -228,6 +228,7 @@ input AttributeFilterInput { filterableInDashboard: Boolean availableInGrid: Boolean search: String + ids: [ID] } input AttributeInput { @@ -518,7 +519,8 @@ type Checkout implements Node { shippingAddress: Address shippingMethod: ShippingMethod note: String! - discountAmount: Money + discountAmount: Money @deprecated(reason: "Use discount instead.") + discount: Money discountName: String translatedDiscountName: String voucherCode: String @@ -969,7 +971,6 @@ enum CountryCode { LT LU MO - MK MG MW MY @@ -1003,6 +1004,7 @@ enum CountryCode { NU NF KP + MK MP NO OM @@ -1867,6 +1869,7 @@ type Mutations { paymentCapture(amount: Decimal, paymentId: ID!): PaymentCapture paymentRefund(amount: Decimal, paymentId: ID!): PaymentRefund paymentVoid(paymentId: ID!): PaymentVoid + paymentSecureConfirm(paymentId: ID!): PaymentSecureConfirm pageCreate(input: PageInput!): PageCreate pageDelete(id: ID!): PageDelete pageBulkDelete(ids: [ID]!): PageBulkDelete @@ -1909,7 +1912,7 @@ type Mutations { giftCardCreate(input: GiftCardCreateInput!): GiftCardCreate giftCardDeactivate(id: ID!): GiftCardDeactivate giftCardUpdate(id: ID!, input: GiftCardUpdateInput!): GiftCardUpdate - pluginConfigurationUpdate(id: ID!, input: PluginConfigurationUpdateInput!): PluginConfigurationUpdate + pluginUpdate(id: ID!, input: PluginUpdateInput!): PluginUpdate saleCreate(input: SaleInput!): SaleCreate saleDelete(id: ID!): SaleDelete saleBulkDelete(ids: [ID]!): SaleBulkDelete @@ -1946,8 +1949,9 @@ type Mutations { checkoutClearMetadata(id: ID!, input: MetaPath!): CheckoutClearStoredMeta checkoutUpdatePrivateMetadata(id: ID!, input: MetaInput!): CheckoutUpdatePrivateMeta checkoutClearPrivateMetadata(id: ID!, input: MetaPath!): CheckoutClearStoredPrivateMeta - requestPasswordReset(email: String!): RequestPasswordReset - setPassword(id: ID!, input: SetPasswordInput!): SetPassword + requestPasswordReset(email: String!, redirectUrl: String!): RequestPasswordReset + setPassword(token: String!, email: String!, password: String!): SetPassword + passwordChange(newPassword: String!, oldPassword: String!): PasswordChange userUpdateMetadata(id: ID!, input: MetaInput!): UserUpdateMeta userClearStoredMetadata(id: ID!, input: MetaPath!): UserClearStoredMeta accountAddressCreate(input: AddressInput!, type: AddressTypeEnum): AccountAddressCreate @@ -1956,7 +1960,7 @@ type Mutations { accountSetDefaultAddress(id: ID!, type: AddressTypeEnum!): AccountSetDefaultAddress accountRegister(input: AccountRegisterInput!): AccountRegister accountUpdate(input: AccountInput!): AccountUpdate - accountRequestDeletion: AccountRequestDeletion + accountRequestDeletion(redirectUrl: String!): AccountRequestDeletion accountDelete(token: String!): AccountDelete customerPasswordReset(input: CustomerPasswordResetInput!): CustomerPasswordReset customerAddressCreate(input: AddressInput!, type: AddressTypeEnum): CustomerAddressCreate @@ -2011,12 +2015,12 @@ type Order implements Node { billingAddress: Address shippingAddress: Address shippingMethod: ShippingMethod - shippingPrice: TaxedMoney shippingMethodName: String + shippingPrice: TaxedMoney token: String! voucher: Voucher giftCards: [GiftCard] - discountAmount: Money + discount: Money discountName: String! translatedDiscountName: String! displayGrossPrices: Boolean! @@ -2041,6 +2045,7 @@ type Order implements Node { totalBalance: Money! userEmail: String isShippingRequired: Boolean! + discountAmount: Money! @deprecated(reason: "Deprecated: use discount instead.") } enum OrderAction { @@ -2341,6 +2346,11 @@ type PageUpdate { page: Page } +type PasswordChange { + errors: [Error!] + user: User +} + type PasswordReset { errors: [Error!] } @@ -2404,6 +2414,11 @@ type PaymentRefund { payment: Payment } +type PaymentSecureConfirm { + errors: [Error!] + payment: Payment +} + type PaymentSource { gateway: String! creditCardInfo: CreditCard @@ -2435,7 +2450,7 @@ enum PermissionEnum { MANAGE_TRANSLATIONS } -type PluginConfiguration implements Node { +type Plugin implements Node { name: String! description: String! active: Boolean! @@ -2443,23 +2458,23 @@ type PluginConfiguration implements Node { id: ID! } -type PluginConfigurationCountableConnection { +type PluginCountableConnection { pageInfo: PageInfo! - edges: [PluginConfigurationCountableEdge!]! + edges: [PluginCountableEdge!]! totalCount: Int } -type PluginConfigurationCountableEdge { - node: PluginConfiguration! +type PluginCountableEdge { + node: Plugin! cursor: String! } -type PluginConfigurationUpdate { +type PluginUpdate { errors: [Error!] - pluginConfiguration: PluginConfiguration + plugin: Plugin } -input PluginConfigurationUpdateInput { +input PluginUpdateInput { active: Boolean configuration: [ConfigurationItemInput] } @@ -2493,6 +2508,7 @@ type Product implements Node { isAvailable: Boolean basePrice: Money price: Money @deprecated(reason: "Has been replaced by 'basePrice'") + minimalVariantPrice: Money taxRate: TaxRateType @deprecated(reason: "taxRate is deprecated. Use taxType to obtain taxCode for given tax gateway") taxType: TaxType attributes: [SelectedAttribute!]! @@ -2579,6 +2595,7 @@ input ProductFilterInput { stockAvailability: StockAvailability productType: ID search: String + minimalPrice: PriceRangeInput } type ProductImage implements Node { @@ -2656,6 +2673,7 @@ input ProductOrder { enum ProductOrderField { NAME PRICE + MINIMAL_PRICE DATE } @@ -2748,6 +2766,7 @@ enum ProductTypeEnum { } input ProductTypeFilterInput { + search: String configurable: ProductTypeConfigurable productType: ProductTypeEnum } @@ -2925,7 +2944,7 @@ type Query { product(id: ID!): Product products(filter: ProductFilterInput, attributes: [AttributeScalar], categories: [ID], collections: [ID], priceLte: Float, priceGte: Float, sortBy: ProductOrder, stockAvailability: StockAvailability, query: String, before: String, after: String, first: Int, last: Int): ProductCountableConnection productType(id: ID!): ProductType - productTypes(filter: ProductTypeFilterInput, before: String, after: String, first: Int, last: Int): ProductTypeCountableConnection + productTypes(filter: ProductTypeFilterInput, query: String, before: String, after: String, first: Int, last: Int): ProductTypeCountableConnection productVariant(id: ID!): ProductVariant productVariants(ids: [ID], before: String, after: String, first: Int, last: Int): ProductVariantCountableConnection reportProductSales(period: ReportingPeriod!, before: String, after: String, first: Int, last: Int): ProductVariantCountableConnection @@ -2946,8 +2965,8 @@ type Query { menuItems(query: String, before: String, after: String, first: Int, last: Int): MenuItemCountableConnection giftCard(id: ID!): GiftCard giftCards(before: String, after: String, first: Int, last: Int): GiftCardCountableConnection - pluginConfiguration(id: ID!): PluginConfiguration - pluginConfigurations(before: String, after: String, first: Int, last: Int): PluginConfigurationCountableConnection + plugin(id: ID!): Plugin + plugins(before: String, after: String, first: Int, last: Int): PluginCountableConnection sale(id: ID!): Sale sales(filter: SaleFilterInput, query: String, before: String, after: String, first: Int, last: Int): SaleCountableConnection voucher(id: ID!): Voucher @@ -2957,7 +2976,7 @@ type Query { checkouts(before: String, after: String, first: Int, last: Int): CheckoutCountableConnection checkoutLine(id: ID): CheckoutLine checkoutLines(before: String, after: String, first: Int, last: Int): CheckoutLineCountableConnection - addressValidationRules(countryCode: CountryCode, countryArea: String, cityArea: String): AddressValidationData + addressValidationRules(countryCode: CountryCode!, countryArea: String, city: String, cityArea: String): AddressValidationData customers(filter: CustomerFilterInput, query: String, before: String, after: String, first: Int, last: Int): UserCountableConnection me: User staffUsers(filter: StaffUserInput, query: String, before: String, after: String, first: Int, last: Int): UserCountableConnection @@ -3089,15 +3108,11 @@ input SeoInput { } type SetPassword { - errors: [Error!] + token: String + errors: [Error]! user: User } -input SetPasswordInput { - token: String! - password: String! -} - type ShippingMethod implements Node { id: ID! name: String! @@ -3418,6 +3433,7 @@ enum TransactionKind { REFUND CAPTURE VOID + CONFIRM } union TranslatableItem = Product | Category | Collection | Attribute | AttributeValue | ProductVariant | Page | ShippingMethod | Sale | Voucher | MenuItem @@ -3466,7 +3482,6 @@ type User implements Node { firstName: String! lastName: String! isStaff: Boolean! - token: UUID! isActive: Boolean! note: String dateJoined: DateTime! @@ -3592,13 +3607,14 @@ type Voucher implements Node { applyOncePerCustomer: Boolean! discountValueType: DiscountValueTypeEnum! discountValue: Float! - minAmountSpent: Money + minSpent: Money minCheckoutItemsQuantity: Int categories(before: String, after: String, first: Int, last: Int): CategoryCountableConnection collections(before: String, after: String, first: Int, last: Int): CollectionCountableConnection products(before: String, after: String, first: Int, last: Int): ProductCountableConnection countries: [CountryDisplay] translation(languageCode: LanguageCodeEnum!): VoucherTranslation + minAmountSpent: Money @deprecated(reason: "Use the minSpent field instead.") } type VoucherAddCatalogues { diff --git a/src/plugins/components/PluginsList/PluginsList.tsx b/src/plugins/components/PluginsList/PluginsList.tsx index d6a575a43..1c2244465 100644 --- a/src/plugins/components/PluginsList/PluginsList.tsx +++ b/src/plugins/components/PluginsList/PluginsList.tsx @@ -21,10 +21,10 @@ import TablePagination from "@saleor/components/TablePagination"; import i18n from "@saleor/i18n"; import { maybe, renderCollection } from "@saleor/misc"; import { ListActionsWithoutToolbar, ListProps } from "@saleor/types"; -import { PluginConfigurations_pluginConfigurations_edges_node } from "../../types/pluginConfigurations"; +import { Plugins_plugins_edges_node } from "../../types/Plugins"; export interface PluginListProps extends ListProps, ListActionsWithoutToolbar { - plugins: PluginConfigurations_pluginConfigurations_edges_node[]; + plugins: Plugins_plugins_edges_node[]; } const styles = (theme: Theme) => diff --git a/src/plugins/components/PluginsListPage/PluginsListPage.tsx b/src/plugins/components/PluginsListPage/PluginsListPage.tsx index 81d0553f5..14fa2d467 100644 --- a/src/plugins/components/PluginsListPage/PluginsListPage.tsx +++ b/src/plugins/components/PluginsListPage/PluginsListPage.tsx @@ -5,13 +5,13 @@ import Container from "@saleor/components/Container"; import PageHeader from "@saleor/components/PageHeader"; import i18n from "@saleor/i18n"; import { ListActionsWithoutToolbar, PageListProps } from "@saleor/types"; -import { PluginConfigurations_pluginConfigurations_edges_node } from "../../types/PluginConfigurations"; +import { Plugins_plugins_edges_node } from "../../types/Plugins"; import PluginsList from "../PluginsList/PluginsList"; export interface PluginsListPageProps extends PageListProps, ListActionsWithoutToolbar { - plugins: PluginConfigurations_pluginConfigurations_edges_node[]; + plugins: Plugins_plugins_edges_node[]; onBack: () => void; } diff --git a/src/plugins/fixtures.ts b/src/plugins/fixtures.ts index 9859b843d..4da3ce27b 100644 --- a/src/plugins/fixtures.ts +++ b/src/plugins/fixtures.ts @@ -1,10 +1,10 @@ import { ConfigurationTypeFieldEnum } from "@saleor/types/globalTypes"; -import { PluginConfiguration_pluginConfiguration } from "./types/pluginConfiguration"; -import { PluginConfigurations_pluginConfigurations_edges_node } from "./types/pluginConfigurations"; +import { Plugin_plugin } from "./types/Plugin"; +import { Plugins_plugins_edges_node } from "./types/Plugins"; -export const pluginList: PluginConfigurations_pluginConfigurations_edges_node[] = [ +export const pluginList: Plugins_plugins_edges_node[] = [ { - __typename: "PluginConfiguration", + __typename: "Plugin", active: true, description: "Lorem ipsum dolor sit amet enim. Etiam ullamcorper. Suspendisse a pellentesque dui, non felis. Maecenas malesuada elit lectus felis, malesuada ultricies. Curabitur et ligula. Ut molestie a, ultricies porta urna. Vestibulum commodo volutpat a, convallis ac, laoreet enim. Phasellus fermentum in, dolor. Pellentesque facilisis. Nulla imperdiet sit amet magna.", @@ -12,7 +12,7 @@ export const pluginList: PluginConfigurations_pluginConfigurations_edges_node[] name: "Avalara" }, { - __typename: "PluginConfiguration", + __typename: "Plugin", active: false, description: "Lorem ipsum dolor sit amet enim. Etiam ullamcorper. Suspendisse a pellentesque dui, non felis. Maecenas malesuada elit lectus felis, malesuada ultricies. Curabitur et ligula. Ut molestie a, ultricies porta urna. Vestibulum commodo volutpat a, convallis ac, laoreet enim. Phasellus fermentum in, dolor. Pellentesque facilisis. Nulla imperdiet sit amet magna.", @@ -20,8 +20,8 @@ export const pluginList: PluginConfigurations_pluginConfigurations_edges_node[] name: "VatLayer" } ]; -export const plugin: PluginConfiguration_pluginConfiguration = { - __typename: "PluginConfiguration", +export const plugin: Plugin_plugin = { + __typename: "Plugin", active: true, configuration: [ { diff --git a/src/plugins/mutations.ts b/src/plugins/mutations.ts index a5f1834a9..d7939eef7 100644 --- a/src/plugins/mutations.ts +++ b/src/plugins/mutations.ts @@ -2,29 +2,23 @@ import gql from "graphql-tag"; import { TypedMutation } from "../mutations"; import { pluginsDetailsFragment } from "./queries"; -import { - PluginConfigurationUpdate, - PluginConfigurationUpdateVariables -} from "./types/pluginConfigurationUpdate"; +import { PluginUpdate, PluginUpdateVariables } from "./types/pluginUpdate"; -const pluginConfigurationUpdate = gql` +const pluginUpdate = gql` ${pluginsDetailsFragment} - mutation PluginConfigurationUpdate( - $id: ID! - $input: PluginConfigurationUpdateInput! - ) { - pluginConfigurationUpdate(id: $id, input: $input) { + mutation PluginUpdate($id: ID!, $input: PluginUpdateInput!) { + pluginUpdate(id: $id, input: $input) { errors { field message } - pluginConfiguration { + plugin { ...pluginsDetailsFragment } } } `; -export const TypedPluginConfigurationUpdate = TypedMutation< - PluginConfigurationUpdate, - PluginConfigurationUpdateVariables ->(pluginConfigurationUpdate); +export const TypedPluginUpdate = TypedMutation< + PluginUpdate, + PluginUpdateVariables +>(pluginUpdate); diff --git a/src/plugins/queries.ts b/src/plugins/queries.ts index 518895048..965244f73 100644 --- a/src/plugins/queries.ts +++ b/src/plugins/queries.ts @@ -1,17 +1,11 @@ import gql from "graphql-tag"; import { TypedQuery } from "../queries"; -import { - PluginConfiguration, - PluginConfigurationVariables -} from "./types/pluginConfiguration"; -import { - PluginConfigurations, - PluginConfigurationsVariables -} from "./types/pluginConfigurations"; +import { Plugin, PluginVariables } from "./types/Plugin"; +import { Plugins, PluginsVariables } from "./types/Plugins"; export const pluginsFragment = gql` - fragment pluginFragment on PluginConfiguration { + fragment pluginFragment on Plugin { id name description @@ -21,7 +15,7 @@ export const pluginsFragment = gql` export const pluginsDetailsFragment = gql` ${pluginsFragment} - fragment pluginsDetailsFragment on PluginConfiguration { + fragment pluginsDetailsFragment on Plugin { ...pluginFragment configuration { name @@ -35,18 +29,8 @@ export const pluginsDetailsFragment = gql` const pluginsList = gql` ${pluginsFragment} - query PluginConfigurations( - $first: Int - $after: String - $last: Int - $before: String - ) { - pluginConfigurations( - before: $before - after: $after - first: $first - last: $last - ) { + query Plugins($first: Int, $after: String, $last: Int, $before: String) { + plugins(before: $before, after: $after, first: $first, last: $last) { edges { node { ...pluginFragment @@ -61,20 +45,18 @@ const pluginsList = gql` } } `; -export const TypedPluginsListQuery = TypedQuery< - PluginConfigurations, - PluginConfigurationsVariables ->(pluginsList); +export const TypedPluginsListQuery = TypedQuery( + pluginsList +); const pluginsDetails = gql` ${pluginsDetailsFragment} - query PluginConfiguration($id: ID!) { - pluginConfiguration(id: $id) { + query Plugin($id: ID!) { + plugin(id: $id) { ...pluginsDetailsFragment } } `; -export const TypedPluginsDetailsQuery = TypedQuery< - PluginConfiguration, - PluginConfigurationVariables ->(pluginsDetails); +export const TypedPluginsDetailsQuery = TypedQuery( + pluginsDetails +); diff --git a/src/plugins/types/pluginConfiguration.ts b/src/plugins/types/Plugin.ts similarity index 54% rename from src/plugins/types/pluginConfiguration.ts rename to src/plugins/types/Plugin.ts index 9a339ce17..66fc7b47f 100644 --- a/src/plugins/types/pluginConfiguration.ts +++ b/src/plugins/types/Plugin.ts @@ -5,10 +5,10 @@ import { ConfigurationTypeFieldEnum } from "./../../types/globalTypes"; // ==================================================== -// GraphQL query operation: PluginConfiguration +// GraphQL query operation: Plugin // ==================================================== -export interface PluginConfiguration_pluginConfiguration_configuration { +export interface Plugin_plugin_configuration { __typename: "ConfigurationItem"; name: string; type: ConfigurationTypeFieldEnum | null; @@ -17,19 +17,19 @@ export interface PluginConfiguration_pluginConfiguration_configuration { label: string | null; } -export interface PluginConfiguration_pluginConfiguration { - __typename: "PluginConfiguration"; +export interface Plugin_plugin { + __typename: "Plugin"; id: string; name: string; description: string; active: boolean; - configuration: (PluginConfiguration_pluginConfiguration_configuration | null)[] | null; + configuration: (Plugin_plugin_configuration | null)[] | null; } -export interface PluginConfiguration { - pluginConfiguration: PluginConfiguration_pluginConfiguration | null; +export interface Plugin { + plugin: Plugin_plugin | null; } -export interface PluginConfigurationVariables { +export interface PluginVariables { id: string; } diff --git a/src/plugins/types/PluginUpdate.ts b/src/plugins/types/PluginUpdate.ts new file mode 100644 index 000000000..90337d98d --- /dev/null +++ b/src/plugins/types/PluginUpdate.ts @@ -0,0 +1,48 @@ +/* tslint:disable */ +/* eslint-disable */ +// This file was automatically generated and should not be edited. + +import { PluginUpdateInput, ConfigurationTypeFieldEnum } from "./../../types/globalTypes"; + +// ==================================================== +// GraphQL mutation operation: PluginUpdate +// ==================================================== + +export interface PluginUpdate_pluginUpdate_errors { + __typename: "Error"; + field: string | null; + message: string | null; +} + +export interface PluginUpdate_pluginUpdate_plugin_configuration { + __typename: "ConfigurationItem"; + name: string; + type: ConfigurationTypeFieldEnum | null; + value: string; + helpText: string | null; + label: string | null; +} + +export interface PluginUpdate_pluginUpdate_plugin { + __typename: "Plugin"; + id: string; + name: string; + description: string; + active: boolean; + configuration: (PluginUpdate_pluginUpdate_plugin_configuration | null)[] | null; +} + +export interface PluginUpdate_pluginUpdate { + __typename: "PluginUpdate"; + errors: PluginUpdate_pluginUpdate_errors[] | null; + plugin: PluginUpdate_pluginUpdate_plugin | null; +} + +export interface PluginUpdate { + pluginUpdate: PluginUpdate_pluginUpdate | null; +} + +export interface PluginUpdateVariables { + id: string; + input: PluginUpdateInput; +} diff --git a/src/plugins/types/Plugins.ts b/src/plugins/types/Plugins.ts new file mode 100644 index 000000000..c8861ad45 --- /dev/null +++ b/src/plugins/types/Plugins.ts @@ -0,0 +1,45 @@ +/* tslint:disable */ +/* eslint-disable */ +// This file was automatically generated and should not be edited. + +// ==================================================== +// GraphQL query operation: Plugins +// ==================================================== + +export interface Plugins_plugins_edges_node { + __typename: "Plugin"; + id: string; + name: string; + description: string; + active: boolean; +} + +export interface Plugins_plugins_edges { + __typename: "PluginCountableEdge"; + node: Plugins_plugins_edges_node; +} + +export interface Plugins_plugins_pageInfo { + __typename: "PageInfo"; + hasPreviousPage: boolean; + hasNextPage: boolean; + startCursor: string | null; + endCursor: string | null; +} + +export interface Plugins_plugins { + __typename: "PluginCountableConnection"; + edges: Plugins_plugins_edges[]; + pageInfo: Plugins_plugins_pageInfo; +} + +export interface Plugins { + plugins: Plugins_plugins | null; +} + +export interface PluginsVariables { + first?: number | null; + after?: string | null; + last?: number | null; + before?: string | null; +} diff --git a/src/plugins/types/pluginConfigurationUpdate.ts b/src/plugins/types/pluginConfigurationUpdate.ts deleted file mode 100644 index fbd7db2a9..000000000 --- a/src/plugins/types/pluginConfigurationUpdate.ts +++ /dev/null @@ -1,48 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -// This file was automatically generated and should not be edited. - -import { PluginConfigurationUpdateInput, ConfigurationTypeFieldEnum } from "./../../types/globalTypes"; - -// ==================================================== -// GraphQL mutation operation: PluginConfigurationUpdate -// ==================================================== - -export interface PluginConfigurationUpdate_pluginConfigurationUpdate_errors { - __typename: "Error"; - field: string | null; - message: string | null; -} - -export interface PluginConfigurationUpdate_pluginConfigurationUpdate_pluginConfiguration_configuration { - __typename: "ConfigurationItem"; - name: string; - type: ConfigurationTypeFieldEnum | null; - value: string; - helpText: string | null; - label: string | null; -} - -export interface PluginConfigurationUpdate_pluginConfigurationUpdate_pluginConfiguration { - __typename: "PluginConfiguration"; - id: string; - name: string; - description: string; - active: boolean; - configuration: (PluginConfigurationUpdate_pluginConfigurationUpdate_pluginConfiguration_configuration | null)[] | null; -} - -export interface PluginConfigurationUpdate_pluginConfigurationUpdate { - __typename: "PluginConfigurationUpdate"; - errors: PluginConfigurationUpdate_pluginConfigurationUpdate_errors[] | null; - pluginConfiguration: PluginConfigurationUpdate_pluginConfigurationUpdate_pluginConfiguration | null; -} - -export interface PluginConfigurationUpdate { - pluginConfigurationUpdate: PluginConfigurationUpdate_pluginConfigurationUpdate | null; -} - -export interface PluginConfigurationUpdateVariables { - id: string; - input: PluginConfigurationUpdateInput; -} diff --git a/src/plugins/types/pluginConfigurations.ts b/src/plugins/types/pluginConfigurations.ts deleted file mode 100644 index cf8b48ce9..000000000 --- a/src/plugins/types/pluginConfigurations.ts +++ /dev/null @@ -1,45 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -// This file was automatically generated and should not be edited. - -// ==================================================== -// GraphQL query operation: PluginConfigurations -// ==================================================== - -export interface PluginConfigurations_pluginConfigurations_edges_node { - __typename: "PluginConfiguration"; - id: string; - name: string; - description: string; - active: boolean; -} - -export interface PluginConfigurations_pluginConfigurations_edges { - __typename: "PluginConfigurationCountableEdge"; - node: PluginConfigurations_pluginConfigurations_edges_node; -} - -export interface PluginConfigurations_pluginConfigurations_pageInfo { - __typename: "PageInfo"; - hasPreviousPage: boolean; - hasNextPage: boolean; - startCursor: string | null; - endCursor: string | null; -} - -export interface PluginConfigurations_pluginConfigurations { - __typename: "PluginConfigurationCountableConnection"; - edges: PluginConfigurations_pluginConfigurations_edges[]; - pageInfo: PluginConfigurations_pluginConfigurations_pageInfo; -} - -export interface PluginConfigurations { - pluginConfigurations: PluginConfigurations_pluginConfigurations | null; -} - -export interface PluginConfigurationsVariables { - first?: number | null; - after?: string | null; - last?: number | null; - before?: string | null; -} diff --git a/src/plugins/types/pluginFragment.ts b/src/plugins/types/pluginFragment.ts index a1e6f5f6c..52d893eb5 100644 --- a/src/plugins/types/pluginFragment.ts +++ b/src/plugins/types/pluginFragment.ts @@ -7,7 +7,7 @@ // ==================================================== export interface pluginFragment { - __typename: "PluginConfiguration"; + __typename: "Plugin"; id: string; name: string; description: string; diff --git a/src/plugins/types/pluginsDetailsFragment.ts b/src/plugins/types/pluginsDetailsFragment.ts index 3a925ef75..35158f77f 100644 --- a/src/plugins/types/pluginsDetailsFragment.ts +++ b/src/plugins/types/pluginsDetailsFragment.ts @@ -18,7 +18,7 @@ export interface pluginsDetailsFragment_configuration { } export interface pluginsDetailsFragment { - __typename: "PluginConfiguration"; + __typename: "Plugin"; id: string; name: string; description: string; diff --git a/src/plugins/views/PluginsDetails.tsx b/src/plugins/views/PluginsDetails.tsx index 840ba1f16..ca2240bdc 100644 --- a/src/plugins/views/PluginsDetails.tsx +++ b/src/plugins/views/PluginsDetails.tsx @@ -4,7 +4,7 @@ import { WindowTitle } from "@saleor/components/WindowTitle"; import useNavigator from "@saleor/hooks/useNavigator"; import { getMutationState, maybe } from "../../misc"; import PluginsDetailsPage from "../components/PluginsDetailsPage"; -import { TypedPluginConfigurationUpdate } from "../mutations"; +import { TypedPluginUpdate } from "../mutations"; import { TypedPluginsDetailsQuery } from "../queries"; import { pluginsListUrl, PluginsListUrlQueryParams } from "../urls"; @@ -19,37 +19,29 @@ export const PluginsDetails: React.StatelessComponent = ({ const navigate = useNavigator(); return ( - - {(pluginConfigurationUpdate, pluginConfigurationUpdateOpts) => ( + + {(pluginUpdate, pluginUpdateOpts) => ( {PluginDetails => { const formTransitionState = getMutationState( - pluginConfigurationUpdateOpts.called, - pluginConfigurationUpdateOpts.loading, - maybe( - () => - pluginConfigurationUpdateOpts.data.pluginConfigurationUpdate - .errors - ) + pluginUpdateOpts.called, + pluginUpdateOpts.loading, + maybe(() => pluginUpdateOpts.data.pluginUpdate.errors) ); return ( <> PluginDetails.data.pluginConfiguration.name - )} + title={maybe(() => PluginDetails.data.plugin.name)} /> - pluginConfigurationUpdateOpts.data - .pluginConfigurationUpdate.errors, + () => pluginUpdateOpts.data.pluginUpdate.errors, [] )} saveButtonBarState={formTransitionState} - plugin={maybe(() => PluginDetails.data.pluginConfiguration)} + plugin={maybe(() => PluginDetails.data.plugin)} onBack={() => navigate(pluginsListUrl())} onSubmit={formData => { const configurationInput = []; @@ -59,7 +51,7 @@ export const PluginsDetails: React.StatelessComponent = ({ value: item.value.toString() }); }); - pluginConfigurationUpdate({ + pluginUpdate({ variables: { id, input: { @@ -75,7 +67,7 @@ export const PluginsDetails: React.StatelessComponent = ({ }} )} - + ); }; PluginsDetails.displayName = "PluginsDetails"; diff --git a/src/plugins/views/PluginsList.tsx b/src/plugins/views/PluginsList.tsx index 58d2ea0c4..fdda7d422 100644 --- a/src/plugins/views/PluginsList.tsx +++ b/src/plugins/views/PluginsList.tsx @@ -33,7 +33,7 @@ export const PluginsList: React.StatelessComponent = ({ {({ data, loading }) => { const { loadNextPage, loadPreviousPage, pageInfo } = paginate( - maybe(() => data.pluginConfigurations.pageInfo), + maybe(() => data.plugins.pageInfo), paginationState, params ); @@ -42,9 +42,7 @@ export const PluginsList: React.StatelessComponent = ({ - data.pluginConfigurations.edges.map(edge => edge.node) - )} + plugins={maybe(() => data.plugins.edges.map(edge => edge.node))} pageInfo={pageInfo} onAdd={() => navigate(configurationMenuUrl)} onBack={() => navigate(configurationMenuUrl)} diff --git a/src/types/globalTypes.ts b/src/types/globalTypes.ts index 35cf5faaf..6fa1712cc 100644 --- a/src/types/globalTypes.ts +++ b/src/types/globalTypes.ts @@ -476,7 +476,7 @@ export interface PageTranslationInput { contentJson?: any | null; } -export interface PluginConfigurationUpdateInput { +export interface PluginUpdateInput { active?: boolean | null; configuration?: (ConfigurationItemInput | null)[] | null; } @@ -495,6 +495,7 @@ export interface ProductFilterInput { stockAvailability?: StockAvailability | null; productType?: string | null; search?: string | null; + minimalPrice?: PriceRangeInput | null; } export interface ProductTypeInput {