Merge pull request #156 from r00tat/bugfix/empty-group-assignment

Bugfix empty group assignment
r00tat · Sep 29, 2024 · c36ecec · c36ecec
2 parents af35e79 + a43bc3b
commit c36ecec
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 2 deletions.
diff --git a/src/app/error.tsx b/src/app/error.tsx
@@ -0,0 +1,32 @@
+'use client'; // Error boundaries must be Client Components
+
+// see https://nextjs.org/docs/app/building-your-application/routing/error-handling#uncaught-exceptions
+
+import { useEffect } from 'react';
+
+export default function Error({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  useEffect(() => {
+    // Log the error to an error reporting service
+    console.error('Failed to render: ', error);
+  }, [error]);
+
+  return (
+    <div>
+      <h2>Something went wrong!</h2>
+      <button
+        onClick={
+          // Attempt to recover by trying to re-render the segment
+          () => reset()
+        }
+      >
+        Try again
+      </button>
+    </div>
+  );
+}
diff --git a/src/app/global-error.tsx b/src/app/global-error.tsx
@@ -0,0 +1,28 @@
+'use client';
+import { useEffect } from 'react';
+
+// Error boundaries must be Client Components
+// see https://nextjs.org/docs/app/building-your-application/routing/error-handling#uncaught-exceptions
+
+export default function GlobalError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  useEffect(() => {
+    // Log the error to an error reporting service
+    console.error('Global Error: ', error);
+  }, [error]);
+
+  return (
+    // global-error must include html and body tags
+    <html>
+      <body>
+        <h2>Something went wrong!</h2>
+        <button onClick={() => reset()}>Try again</button>
+      </body>
+    </html>
+  );
+}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,8 +1,8 @@
+import 'leaflet/dist/leaflet.css';
 import type { Metadata, Viewport } from 'next';
 import React from 'react';
 import AppProviders from '../components/providers/AppProviders';
 import '../styles/globals.css';
-import 'leaflet/dist/leaflet.css';
 
 const APP_NAME = 'Einsatzkarte FFN';
 const APP_DEFAULT_TITLE = 'Einsatzkarte FFN';

diff --git a/src/hooks/useFirebaseLoginObserver.ts b/src/hooks/useFirebaseLoginObserver.ts
@@ -55,7 +55,7 @@ export default function useFirebaseLoginObserver(): LoginStatus {
             isAdmin: prev.isAdmin || userData?.isAdmin === true,
             messagingTokens: userData.messaging,
             chatNotifications: userData.chatNotifications,
-            groups: userData.groups || [],
+            groups: [...(userData.groups || []), 'allUsers'],
             isRefreshing: false,
           }));
         } else {