From db60f13216e125a45fab39c599b5bbacf67dcca7 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Fri, 10 Jan 2020 14:20:03 +0100
Subject: [PATCH] Separate visual and app layer in drafts

---
 .../OrderDraftListPage/OrderDraftListPage.tsx | 10 ++--
 .../components/OrderDraftListPage/filters.ts  | 50 +++++++++++++++++++
 .../components/OrderDraftListPage/index.ts    |  1 +
 src/orders/types.ts                           |  6 ---
 .../views/OrderDraftList/OrderDraftList.tsx   |  2 +-
 .../OrderDraftList/{filter.ts => filters.ts}  | 40 ++-------------
 src/orders/views/OrderDraftList/messages.ts   | 14 ------
 7 files changed, 62 insertions(+), 61 deletions(-)
 create mode 100644 src/orders/components/OrderDraftListPage/filters.ts
 delete mode 100644 src/orders/types.ts
 rename src/orders/views/OrderDraftList/{filter.ts => filters.ts} (70%)
 delete mode 100644 src/orders/views/OrderDraftList/messages.ts

diff --git a/src/orders/components/OrderDraftListPage/OrderDraftListPage.tsx b/src/orders/components/OrderDraftListPage/OrderDraftListPage.tsx
index 921fe553e..83b6ec50d 100644
--- a/src/orders/components/OrderDraftListPage/OrderDraftListPage.tsx
+++ b/src/orders/components/OrderDraftListPage/OrderDraftListPage.tsx
@@ -15,14 +15,14 @@ import {
   FilterPageProps
 } from "@saleor/types";
 import { OrderDraftListUrlSortField } from "@saleor/orders/urls";
-import {
-  OrderDraftFilterKeys,
-  createFilterStructure
-} from "@saleor/orders/views/OrderDraftList/filter";
-import { OrderDraftListFilterOpts } from "@saleor/orders/types";
 import FilterBar from "@saleor/components/FilterBar";
 import OrderDraftList from "../OrderDraftList";
 import { OrderDraftList_draftOrders_edges_node } from "../../types/OrderDraftList";
+import {
+  OrderDraftListFilterOpts,
+  OrderDraftFilterKeys,
+  createFilterStructure
+} from "./filters";
 
 export interface OrderDraftListPageProps
   extends PageListProps,
diff --git a/src/orders/components/OrderDraftListPage/filters.ts b/src/orders/components/OrderDraftListPage/filters.ts
new file mode 100644
index 000000000..9824461f8
--- /dev/null
+++ b/src/orders/components/OrderDraftListPage/filters.ts
@@ -0,0 +1,50 @@
+import { IntlShape, defineMessages } from "react-intl";
+
+import { FilterOpts, MinMax } from "@saleor/types";
+import { createDateField, createTextField } from "@saleor/utils/filters/fields";
+import { IFilter } from "@saleor/components/Filter";
+
+export enum OrderDraftFilterKeys {
+  created = "created",
+  customer = "customer"
+}
+
+export interface OrderDraftListFilterOpts {
+  created: FilterOpts<MinMax>;
+  customer: FilterOpts<string>;
+}
+
+const messages = defineMessages({
+  created: {
+    defaultMessage: "Created",
+    description: "draft order"
+  },
+  customer: {
+    defaultMessage: "Customer",
+    description: "draft order"
+  }
+});
+
+export function createFilterStructure(
+  intl: IntlShape,
+  opts: OrderDraftListFilterOpts
+): IFilter<OrderDraftFilterKeys> {
+  return [
+    {
+      ...createDateField(
+        OrderDraftFilterKeys.created,
+        intl.formatMessage(messages.created),
+        opts.created.value
+      ),
+      active: opts.created.active
+    },
+    {
+      ...createTextField(
+        OrderDraftFilterKeys.customer,
+        intl.formatMessage(messages.customer),
+        opts.customer.value
+      ),
+      active: opts.customer.active
+    }
+  ];
+}
diff --git a/src/orders/components/OrderDraftListPage/index.ts b/src/orders/components/OrderDraftListPage/index.ts
index de5e8daab..93b2da611 100644
--- a/src/orders/components/OrderDraftListPage/index.ts
+++ b/src/orders/components/OrderDraftListPage/index.ts
@@ -1,2 +1,3 @@
 export { default } from "./OrderDraftListPage";
 export * from "./OrderDraftListPage";
+export * from "./filters";
diff --git a/src/orders/types.ts b/src/orders/types.ts
deleted file mode 100644
index e6fbd6d44..000000000
--- a/src/orders/types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { FilterOpts, MinMax } from "@saleor/types";
-
-export interface OrderDraftListFilterOpts {
-  created: FilterOpts<MinMax>;
-  customer: FilterOpts<string>;
-}
diff --git a/src/orders/views/OrderDraftList/OrderDraftList.tsx b/src/orders/views/OrderDraftList/OrderDraftList.tsx
index b4965c480..81e816d9a 100644
--- a/src/orders/views/OrderDraftList/OrderDraftList.tsx
+++ b/src/orders/views/OrderDraftList/OrderDraftList.tsx
@@ -46,7 +46,7 @@ import {
   saveFilterTab,
   getFilterQueryParam,
   getFilterOpts
-} from "./filter";
+} from "./filters";
 import { getSortQueryVariables } from "./sort";
 
 interface OrderDraftListProps {
diff --git a/src/orders/views/OrderDraftList/filter.ts b/src/orders/views/OrderDraftList/filters.ts
similarity index 70%
rename from src/orders/views/OrderDraftList/filter.ts
rename to src/orders/views/OrderDraftList/filters.ts
index 034952559..151583a0e 100644
--- a/src/orders/views/OrderDraftList/filter.ts
+++ b/src/orders/views/OrderDraftList/filters.ts
@@ -1,10 +1,10 @@
-import { IntlShape } from "react-intl";
-
 import { OrderDraftFilterInput } from "@saleor/types/globalTypes";
 import { maybe } from "@saleor/misc";
-import { OrderDraftListFilterOpts } from "@saleor/orders/types";
-import { IFilter, IFilterElement } from "@saleor/components/Filter";
-import { createTextField, createDateField } from "@saleor/utils/filters/fields";
+import { IFilterElement } from "@saleor/components/Filter";
+import {
+  OrderDraftFilterKeys,
+  OrderDraftListFilterOpts
+} from "@saleor/orders/components/OrderDraftListPage";
 import {
   OrderDraftListUrlFilters,
   OrderDraftListUrlFiltersEnum,
@@ -14,15 +14,9 @@ import {
   createFilterTabUtils,
   createFilterUtils
 } from "../../../utils/filters";
-import messages from "./messages";
 
 export const ORDER_DRAFT_FILTERS_KEY = "orderDraftFilters";
 
-export enum OrderDraftFilterKeys {
-  created = "created",
-  customer = "customer"
-}
-
 export function getFilterOpts(
   params: OrderDraftListUrlFilters
 ): OrderDraftListFilterOpts {
@@ -47,30 +41,6 @@ export function getFilterOpts(
   };
 }
 
-export function createFilterStructure(
-  intl: IntlShape,
-  opts: OrderDraftListFilterOpts
-): IFilter<OrderDraftFilterKeys> {
-  return [
-    {
-      ...createDateField(
-        OrderDraftFilterKeys.created,
-        intl.formatMessage(messages.created),
-        opts.created.value
-      ),
-      active: opts.created.active
-    },
-    {
-      ...createTextField(
-        OrderDraftFilterKeys.customer,
-        intl.formatMessage(messages.customer),
-        opts.customer.value
-      ),
-      active: opts.customer.active
-    }
-  ];
-}
-
 export function getFilterVariables(
   params: OrderDraftListUrlFilters
 ): OrderDraftFilterInput {
diff --git a/src/orders/views/OrderDraftList/messages.ts b/src/orders/views/OrderDraftList/messages.ts
deleted file mode 100644
index 6403bbd02..000000000
--- a/src/orders/views/OrderDraftList/messages.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { defineMessages } from "react-intl";
-
-const messages = defineMessages({
-  customer: {
-    defaultMessage: "Customer",
-    description: "draft order"
-  },
-  created: {
-    defaultMessage: "Created",
-    description: "draft order"
-  }
-});
-
-export default messages;