@newskit-render/core 1.34.0 → 1.42.3

package/pages/_error.tsx

@@ -1,8 +1,8 @@
 import React from 'react'
 import { NotFound, GenericError } from '@newskit-render/my-account'
 import Error from 'next/error'
-import FourOhFour from '../components/404/404'
 import { getCircularReplacer } from '../helpers/getCircularReplacer'
+import ErrorPage from '../components/ErrorPage/ErrorPage'
 
 CustomError.getInitialProps = ({ res, err, asPath }) => {
   let statusCode = 404
@@ -33,8 +33,24 @@ function CustomError({ statusCode, asPath }) {
     return <GenericError />
   }
   if (statusCode === 404) {
-    return <FourOhFour />
+    return (
+      <ErrorPage
+        title="Page not found"
+        errorMassage={`
+      We can't seem to find what you're looking for. If you typed a URL
+      into your browser, it might be worth checking and trying again.`}
+      />
+    )
   }
+  if (statusCode === 500 || statusCode === 502) {
+    return (
+      <ErrorPage
+        title="Server-side error occurred"
+        errorMassage="We could not fetch the data from the server"
+      />
+    )
+  }
+
   return <Error statusCode={statusCode} />
 }
 

package/pages/preview/[articleId]/version/[versionId]/index.tsx

@@ -61,21 +61,23 @@ const PreviewArticle = ({
 
   return (
     <PageWithAuth onDenied={accessDeniedPage} isLoading={showOnLoading}>
-      <CookieView>
-        <Button size="medium" onClick={signOut}>
-          sign out
-        </Button>
-      </CookieView>
-      <ArticlePage
-        section={section}
-        articleURL={articleURL}
-        {...universalArticle}
-        siteHost={siteHost}
-        gscId={gscId}
-        twitterUsername={twitterUsername}
-        highlights={highlights}
-        relatedArticles={relatedArticles}
-      />
+      <>
+        <CookieView>
+          <Button size="medium" onClick={() => signOut()}>
+            sign out
+          </Button>
+        </CookieView>
+        <ArticlePage
+          section={section}
+          articleURL={articleURL}
+          {...universalArticle}
+          siteHost={siteHost}
+          gscId={gscId}
+          twitterUsername={twitterUsername}
+          highlights={highlights}
+          relatedArticles={relatedArticles}
+        />
+      </>
     </PageWithAuth>
   )
 }