djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix types

Browse source
This commit is contained in:
dominik-zeglen 2019-11-22 16:52:19 +01:00
parent e6dfd5c3e5
commit 340e00f030
2 changed files with 267 additions and 270 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/orders/views/OrderDraftList/OrderDraftList.tsx
View file

@ -21,7 +21,7 @@ import { ListViews } from "@saleor/types";
import OrderDraftListPage from "../../components/OrderDraftListPage"; import OrderDraftListPage from "../../components/OrderDraftListPage";
import { import {
TypedOrderDraftBulkCancelMutation, TypedOrderDraftBulkCancelMutation,
TypedOrderDraftCreateMutation useOrderDraftCreateMutation
} from "../../mutations"; } from "../../mutations";
import { TypedOrderDraftListQuery } from "../../queries"; import { TypedOrderDraftListQuery } from "../../queries";
import { OrderDraftBulkCancel } from "../../types/OrderDraftBulkCancel"; import { OrderDraftBulkCancel } from "../../types/OrderDraftBulkCancel";
@ -58,6 +58,19 @@ export const OrderDraftList: React.FC<OrderDraftListProps> = ({ params }) => {
); );
const intl = useIntl(); const intl = useIntl();
const handleCreateOrderCreateSuccess = (data: OrderDraftCreate) => {
notify({
text: intl.formatMessage({
defaultMessage: "Order draft succesfully created"
})
});
navigate(orderUrl(data.draftOrderCreate.order.id));
};
const [createOrder] = useOrderDraftCreateMutation({
onCompleted: handleCreateOrderCreateSuccess
});
const tabs = getFilterTabs(); const tabs = getFilterTabs();
const currentTab = const currentTab =
@ -88,15 +101,6 @@ export const OrderDraftList: React.FC<OrderDraftListProps> = ({ params }) => {
true true
); );
const handleCreateOrderCreateSuccess = (data: OrderDraftCreate) => {
notify({
text: intl.formatMessage({
defaultMessage: "Order draft succesfully created"
})
});
navigate(orderUrl(data.draftOrderCreate.order.id));
};
const openModal = (action: OrderDraftListUrlDialog, ids?: string[]) => const openModal = (action: OrderDraftListUrlDialog, ids?: string[]) =>
navigate( navigate(
orderDraftListUrl({ orderDraftListUrl({
@ -137,8 +141,6 @@ export const OrderDraftList: React.FC<OrderDraftListProps> = ({ params }) => {
); );
return ( return (
<TypedOrderDraftCreateMutation onCompleted={handleCreateOrderCreateSuccess}>
{createOrder => (
<TypedOrderDraftListQuery displayLoader variables={queryVariables}> <TypedOrderDraftListQuery displayLoader variables={queryVariables}>
{({ data, loading, refetch }) => { {({ data, loading, refetch }) => {
const { loadNextPage, loadPreviousPage, pageInfo } = paginate( const { loadNextPage, loadPreviousPage, pageInfo } = paginate(
@ -170,8 +172,7 @@ export const OrderDraftList: React.FC<OrderDraftListProps> = ({ params }) => {
orderDraftBulkDeleteOpts.loading, orderDraftBulkDeleteOpts.loading,
maybe( maybe(
() => () =>
orderDraftBulkDeleteOpts.data.draftOrderBulkDelete orderDraftBulkDeleteOpts.data.draftOrderBulkDelete.errors
.errors
) )
); );
const onOrderDraftBulkDelete = () => const onOrderDraftBulkDelete = () =>
@ -241,9 +242,7 @@ export const OrderDraftList: React.FC<OrderDraftListProps> = ({ params }) => {
values={{ values={{
counter: maybe(() => params.ids.length), counter: maybe(() => params.ids.length),
displayQuantity: ( displayQuantity: (
<strong> <strong>{maybe(() => params.ids.length)}</strong>
{maybe(() => params.ids.length)}
</strong>
) )
}} }}
/> />
@ -269,8 +268,6 @@ export const OrderDraftList: React.FC<OrderDraftListProps> = ({ params }) => {
); );
}} }}
</TypedOrderDraftListQuery> </TypedOrderDraftListQuery>
)}
</TypedOrderDraftCreateMutation>
); );
}; };

28
src/orders/views/OrderList/OrderList.tsx
View file

@ -21,7 +21,7 @@ import OrderBulkCancelDialog from "../../components/OrderBulkCancelDialog";
import OrderListPage from "../../components/OrderListPage/OrderListPage"; import OrderListPage from "../../components/OrderListPage/OrderListPage";
import { import {
TypedOrderBulkCancelMutation, TypedOrderBulkCancelMutation,
TypedOrderDraftCreateMutation useOrderDraftCreateMutation
} from "../../mutations"; } from "../../mutations";
import { TypedOrderListQuery } from "../../queries"; import { TypedOrderListQuery } from "../../queries";
import { OrderBulkCancel } from "../../types/OrderBulkCancel"; import { OrderBulkCancel } from "../../types/OrderBulkCancel";
@ -62,6 +62,19 @@ export const OrderList: React.FC<OrderListProps> = ({ params }) => {
); );
const intl = useIntl(); const intl = useIntl();
const handleCreateOrderCreateSuccess = (data: OrderDraftCreate) => {
notify({
text: intl.formatMessage({
defaultMessage: "Order draft succesfully created"
})
});
navigate(orderUrl(data.draftOrderCreate.order.id));
};
const [createOrder] = useOrderDraftCreateMutation({
onCompleted: handleCreateOrderCreateSuccess
});
const tabs = getFilterTabs(); const tabs = getFilterTabs();
const currentTab = const currentTab =
@ -130,15 +143,6 @@ export const OrderList: React.FC<OrderListProps> = ({ params }) => {
const paginationState = createPaginationState(settings.rowNumber, params); const paginationState = createPaginationState(settings.rowNumber, params);
const currencySymbol = maybe(() => shop.defaultCurrency, "USD"); const currencySymbol = maybe(() => shop.defaultCurrency, "USD");
const handleCreateOrderCreateSuccess = (data: OrderDraftCreate) => {
notify({
text: intl.formatMessage({
defaultMessage: "Order draft succesfully created"
})
});
navigate(orderUrl(data.draftOrderCreate.order.id));
};
const queryVariables = React.useMemo( const queryVariables = React.useMemo(
() => ({ () => ({
...paginationState, ...paginationState,
@ -148,8 +152,6 @@ export const OrderList: React.FC<OrderListProps> = ({ params }) => {
); );
return ( return (
<TypedOrderDraftCreateMutation onCompleted={handleCreateOrderCreateSuccess}>
{createOrder => (
<TypedOrderListQuery displayLoader variables={queryVariables}> <TypedOrderListQuery displayLoader variables={queryVariables}>
{({ data, loading, refetch }) => { {({ data, loading, refetch }) => {
const { loadNextPage, loadPreviousPage, pageInfo } = paginate( const { loadNextPage, loadPreviousPage, pageInfo } = paginate(
@ -271,8 +273,6 @@ export const OrderList: React.FC<OrderListProps> = ({ params }) => {
); );
}} }}
</TypedOrderListQuery> </TypedOrderListQuery>
)}
</TypedOrderDraftCreateMutation>
); );
}; };