fix errors after rebase

saleor · May 19, 2020 · 0f88ecf · 0f88ecf
1 parent 9ff63d2
commit 0f88ecf
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 31 deletions.
diff --git a/src/views/Product/Page.tsx b/src/views/Product/Page.tsx
@@ -7,7 +7,6 @@ import Media from "react-media";
 import { Breadcrumbs, ProductDescription } from "../../components";
 import { generateCategoryUrl, generateProductUrl } from "../../core/utils";
 import GalleryCarousel from "./GalleryCarousel";
-import { ProductDetails_product } from "./gqlTypes/ProductDetails";
 import OtherProducts from "./Other";
 
 import { ProductDescription as NewProductDescription } from "../../@next/components/molecules";

diff --git a/src/views/Product/View.tsx b/src/views/Product/View.tsx
@@ -6,14 +6,14 @@ import React, { useEffect, useState } from "react";
 import { RouteComponentProps } from "react-router";
 import { useHistory } from "react-router-dom";
 
-import { ProductDetails_product } from "@sdk/queries/types/ProductDetails";
-import { useCart, useProductDetails } from "@sdk/react";
+import { useCart } from "@sdk/react";
 
 import { MetaWrapper, NotFound, OfflinePlaceholder } from "../../components";
 import NetworkStatus from "../../components/NetworkStatus";
 import { getGraphqlIdFromDBId, maybe } from "../../core/utils";
 import { ProductDetails_product } from "./gqlTypes/ProductDetails";
 import Page from "./Page";
+import { TypedProductDetailsQuery } from "./queries";
 import { IProps } from "./types";
 
 const canDisplay = (product: ProductDetails_product) =>
@@ -110,37 +110,43 @@ const PageWithQueryAttributes: React.FC<IProps> = props => {
 
 const View: React.FC<RouteComponentProps<{ id: string }>> = ({ match }) => {
   const { addItem, items } = useCart();
-  const { data: product } = useProductDetails(
-    {
-      id: getGraphqlIdFromDBId(match.params.id, "Product"),
-    },
-    { errorPolicy: "all" }
-  );
 
   return (
-    <NetworkStatus>
-      {isOnline => {
-        if (canDisplay(product)) {
-          return (
-            <MetaWrapper meta={extractMeta(product)}>
-              <PageWithQueryAttributes
-                product={product}
-                add={addItem}
-                items={items}
-              />
-            </MetaWrapper>
-          );
-        }
+    <TypedProductDetailsQuery
+      loaderFull
+      variables={{
+        id: getGraphqlIdFromDBId(match.params.id, "Product"),
+      }}
+      errorPolicy="all"
+      key={match.params.id}
+    >
+      {({ data }) => (
+        <NetworkStatus>
+          {isOnline => {
+            const { product } = data;
+            if (canDisplay(product)) {
+              return (
+                <MetaWrapper meta={extractMeta(product)}>
+                  <PageWithQueryAttributes
+                    product={product}
+                    add={addItem}
+                    items={items}
+                  />
+                </MetaWrapper>
+              );
+            }
 
-        if (product === null) {
-          return <NotFound />;
-        }
+            if (product === null) {
+              return <NotFound />;
+            }
 
-        if (!isOnline) {
-          return <OfflinePlaceholder />;
-        }
-      }}
-    </NetworkStatus>
+            if (!isOnline) {
+              return <OfflinePlaceholder />;
+            }
+          }}
+        </NetworkStatus>
+      )}
+    </TypedProductDetailsQuery>
   );
 };
 

diff --git a/src/views/Product/types.ts b/src/views/Product/types.ts
@@ -1,5 +1,5 @@
-import { ProductDetails_product } from "@sdk/queries/types/ProductDetails";
 import { ICheckoutModelLine } from "@sdk/repository";
+import { ProductDetails_product } from "./gqlTypes/ProductDetails";
 
 export interface IProps {
   product: ProductDetails_product;