Merge 947f642 into 5fec836

src/views/Article/View.tsx

@@ -13,8 +13,8 @@ import { TypedArticleQuery } from "./query";
 
 import "./scss/index.scss";
 
-const canDisplay = page =>
-  maybe(() => !!page && !!page.title && !!page.content);
+const canDisplay = page => !!page?.title;
+
 const getHeaderImage = (collection: Article_collection) =>
   maybe(() => collection.backgroundImage.url);
 

src/views/Product/View.tsx

@@ -10,22 +10,17 @@ import { channelSlug } from "@temp/constants";
 
 import { MetaWrapper, NotFound } from "../../components";
 import NetworkStatus from "../../components/NetworkStatus";
-import { getGraphqlIdFromDBId, maybe } from "../../core/utils";
+import { getGraphqlIdFromDBId } from "../../core/utils";
 import { ProductDetails_product } from "./gqlTypes/ProductDetails";
 import Page from "./Page";
 import { TypedProductDetailsQuery } from "./queries";
 import { IProps } from "./types";
 
 import "./scss/index.scss";
 
-const canDisplay = (product: ProductDetails_product) =>
-  maybe(
-    () =>
-      !!product.description &&
-      !!product.name &&
-      !!product.# &&
-      !!product.variants
-  );
+const canDisplay = (product?: ProductDetails_product) =>
+  !!product?.name && !!product?.# && !!product?.variants;
+
 const extractMeta = (product: ProductDetails_product, url: string) => ({
   custom: [
     {
@@ -127,6 +122,7 @@ const View: NextPage<ViewProps> = ({ query: { id } }) => {
         <NetworkStatus>
           {isOnline => {
             const { product } = data;
+
             if (canDisplay(product)) {
               return (
                 <MetaWrapper
@@ -152,6 +148,8 @@ const View: NextPage<ViewProps> = ({ query: { id } }) => {
             if (!isOnline) {
               return <OfflinePlaceholder />;
             }
+
+            return <NotFound />;
           }}
         </NetworkStatus>
       )}