add error case for missing valuesets

eu-digital-green-certificates · Jun 23, 2021 · 6ef17de · 6ef17de
1 parent 6dffe69
commit 6ef17de
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/src/components/error-page.component.tsx b/src/components/error-page.component.tsx
@@ -65,7 +65,7 @@ const ErrorPage = (props: any) => {
                     <hr />
                     <p className='text-center'>
                         <span className='font-weight-bold'>{t('translation:serverError')}</span>
-                        <span>{props?.error?.message}</span>
+                        <span>{props?.error ? props?.error?.message : props.message}</span>
                     </p>
 
                     <hr />

diff --git a/src/misc/error.tsx b/src/misc/error.tsx
@@ -20,7 +20,7 @@
  */
 
 export default interface IError {
-    error: any;
-    message: string;
-    onCancel: () => void;
+    error?: any;
+    message?: string;
+    onCancel?: () => void;
 }
diff --git a/src/misc/useValueSet.tsx b/src/misc/useValueSet.tsx
@@ -79,7 +79,7 @@ export const useGetDateFormats = () => {
     return dateFormats
 }
 
-export const useGetValueSets = (onInit?: (isInit: boolean) => void) => {
+export const useGetValueSets = (onInit?: (isInit: boolean) => void, onError?: (msg: string) => void) => {
 
     const [valueSetHashList, setValueSetHashList] = React.useState<IValueSetHashListItem[]>();
 
@@ -91,8 +91,20 @@ export const useGetValueSets = (onInit?: (isInit: boolean) => void) => {
         const uri = '/valuesets';
 
         valueSetApi.get(uri).then((response) => {
-            setValueSetHashList(response.data);
-        });
+            if (response && response.data && response.data.length > 0) {
+                setValueSetHashList(response.data);
+            }
+            else {
+                if (onError) {
+                    onError('failed to request valuesets');
+                }
+            }
+        })
+            .catch((error) => {
+                if (onError) {
+                    onError(error.message);
+                }
+            });
 
     }, [])
 

diff --git a/src/routing.component.tsx b/src/routing.component.tsx
@@ -59,7 +59,7 @@ const Routing = () => {
 
     const context: IAppContext = {
         navigation: useNavigation(),
-        valueSets: useGetValueSets(),
+        valueSets: useGetValueSets(undefined, (msg) => { setError({ message: msg }) }),
         utils: utils
     }
 
@@ -85,7 +85,7 @@ const Routing = () => {
     */}
                 <Route path={context.navigation.routes.root}>
                     <Header />
-                    <ErrorPage error={error} show={errorShow} onCancel={error?.onCancel} onHide={() => setErrorShow(false)} />
+                    <ErrorPage error={error} show={errorShow} onCancel={error?.onCancel ? error?.onCancel : context.navigation.toLanding} onHide={() => setErrorShow(false)} />
                     <DataprivacyPage show={dataPrivacyShow} setShow={setDataPrivacyShow} />
                     <ImprintPage show={imprintShow} setShow={setImprintShow} />
                 </Route>