From 102cd8885cec8098c2029dc6037cb9076627453c Mon Sep 17 00:00:00 2001
From: Kamran Ahmed <kamranahmed.se@gmail.com>
Date: Mon, 6 Dec 2021 22:18:19 +0100
Subject: [PATCH] Add interactive roadmap error handling and loading

---
 components/roadmap/roadmap-error.tsx  | 26 ++++++++++++++++
 components/roadmap/roadmap-loader.tsx | 20 +++++++++++++
 pages/[roadmap]/interactive.tsx       | 43 +++++++++------------------
 3 files changed, 60 insertions(+), 29 deletions(-)
 create mode 100644 components/roadmap/roadmap-error.tsx
 create mode 100644 components/roadmap/roadmap-loader.tsx

diff --git a/components/roadmap/roadmap-error.tsx b/components/roadmap/roadmap-error.tsx
new file mode 100644
index 000000000..be26e35f1
--- /dev/null
+++ b/components/roadmap/roadmap-error.tsx
@@ -0,0 +1,26 @@
+import { RoadmapType } from '../../lib/roadmap';
+import { Container, Heading, Link, Text } from '@chakra-ui/react';
+import siteConfig from '../../content/site.json';
+
+type RoadmapProps = {
+  roadmap: RoadmapType;
+};
+
+export function RoadmapError(props: RoadmapProps) {
+  const { roadmap } = props;
+
+  return (
+    <Container
+      bg={'red.600'}
+      maxW={'container.md'}
+      position="relative"
+      mt="50px"
+      p='20px'
+      rounded='5px'
+      color='white'
+    >
+      <Heading mb='4px' size='md'>Oops! There's an error</Heading>
+      <Text>Try refreshing or <Link target='_blank' fontWeight={700} textDecoration={'underline'} fontSize='14px' href={siteConfig.url.issue}>report a bug</Link> and use the <Link fontWeight={700} textDecoration={'underline'} href={`/${roadmap.id}`}>non-interactive version</Link></Text>
+    </Container>
+  );
+}
diff --git a/components/roadmap/roadmap-loader.tsx b/components/roadmap/roadmap-loader.tsx
new file mode 100644
index 000000000..e683b49e8
--- /dev/null
+++ b/components/roadmap/roadmap-loader.tsx
@@ -0,0 +1,20 @@
+import { Container, Spinner } from '@chakra-ui/react';
+
+export function RoadmapLoader() {
+  return (
+    <Container
+      maxW={'container.md'}
+      position="relative"
+      mt="60px"
+      textAlign="center"
+    >
+      <Spinner
+        thickness="7px"
+        speed="0.65s"
+        emptyColor="gray.200"
+        color="gray.500"
+        size="xl"
+      />
+    </Container>
+  );
+}
diff --git a/pages/[roadmap]/interactive.tsx b/pages/[roadmap]/interactive.tsx
index a28e897b7..d0db6a4e2 100644
--- a/pages/[roadmap]/interactive.tsx
+++ b/pages/[roadmap]/interactive.tsx
@@ -1,52 +1,33 @@
-import { Box, Container, Flex, Heading, Spinner, Text } from '@chakra-ui/react';
+import { useFetch } from 'use-http';
+import { useEffect, useRef, useState } from 'react';
+import { Box, Container } from '@chakra-ui/react';
 import { GlobalHeader } from '../../components/global-header';
 import { OpensourceBanner } from '../../components/opensource-banner';
 import { UpdatesBanner } from '../../components/updates-banner';
 import { Footer } from '../../components/footer';
 import { getAllRoadmaps, getRoadmapById, RoadmapType } from '../../lib/roadmap';
 import Helmet from '../../components/helmet';
-import { useEffect, useRef, useState } from 'react';
 import { wireframeJSONToSVG } from '../../lib/renderer';
 import { RoadmapPageHeader } from '../../components/roadmap/roadmap-page-header';
 import { ContentDrawer } from '../../components/roadmap/content-drawer';
-import { useFetch } from 'use-http';
-import { Simulate } from 'react-dom/test-utils';
-import load = Simulate.load;
+import { RoadmapError } from '../../components/roadmap/roadmap-error';
+import { RoadmapLoader } from '../../components/roadmap/roadmap-loader';
 
 type RoadmapProps = {
   roadmap: RoadmapType;
 };
 
-function RoadmapLoader() {
-  return (
-    <Container
-      maxW={'container.md'}
-      position="relative"
-      mt="60px"
-      textAlign="center"
-    >
-      <Spinner
-        thickness="7px"
-        speed="0.65s"
-        emptyColor="gray.200"
-        color="gray.500"
-        size="xl"
-      />
-    </Container>
-  );
-}
-
 function RoadmapRenderer(props: RoadmapProps) {
   const { roadmap } = props;
 
-  const { loading: isLoading, error, get } = useFetch();
+  const { loading: isLoading, error: hasErrorLoading, get } = useFetch();
 
   const roadmapRef = useRef(null);
 
   const [isRendering, setIsRendering] = useState(false);
   const [roadmapJson, setRoadmapJson] = useState(null);
   const [groupId, setGroupId] = useState('');
-  const [hasError, setHasError] = useState(false);
+  const [hasErrorRendering, setHasErrorRendering] = useState(false);
 
   useEffect(() => {
     get(`/project/${roadmap.id}.json`)
@@ -55,7 +36,7 @@ function RoadmapRenderer(props: RoadmapProps) {
       })
       .catch((err) => {
         console.error(err);
-        setHasError(true);
+        setHasErrorRendering(true);
       });
   }, [get, roadmap.id]);
 
@@ -113,16 +94,20 @@ function RoadmapRenderer(props: RoadmapProps) {
         container.appendChild(svgElement);
       })
       .catch((err) => {
-        setHasError(true);
+        setHasErrorRendering(true);
       })
       .finally(() => {
         setIsRendering(false);
       });
   }, [roadmapJson]);
 
+  if (hasErrorLoading || hasErrorRendering) {
+    return <RoadmapError roadmap={roadmap} />
+  }
+
   return (
     <Container maxW={'container.lg'} position="relative">
-      {(isLoading || isRendering) && <RoadmapLoader /> }
+      {(isLoading || isRendering) && <RoadmapLoader />}
       <ContentDrawer
         roadmap={roadmap}
         groupId={groupId}