DBC22-1806: hook and key fixes

bcgov · Feb 27, 2024 · 9aeb7ef · 9aeb7ef
1 parent f5adca8
commit 9aeb7ef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/frontend/src/Components/events/EventsTable.js b/src/frontend/src/Components/events/EventsTable.js
@@ -122,10 +122,10 @@ export default function EventsTable(props) {
     const rows = [];
     for (let i = 0; i < 20; i++) {
       rows.push(
-        <tr>
-          {table.getAllColumns().map((column) => {
+        <tr key={`loader-row-${i}`}>
+          {table.getAllColumns().map((column, j) => {
             return (
-              <td className={`${column.id} loading`} key={`loader-{i}`}>
+              <td className={`${column.id} loading`} key={`loader-column-${i}-${j}`}>
                 <Skeleton />
               </td>
             );

diff --git a/src/frontend/src/pages/EventsListPage.js b/src/frontend/src/pages/EventsListPage.js
@@ -144,7 +144,7 @@ export default function EventsListPage() {
   };
 
   useEffect(() => {
-    loadEvents(selectedRoute);
+    setShowLoader(true);
 
     if (selectedRoute && selectedRoute.routeFound) {
       setRouteEdit(false);
@@ -153,15 +153,15 @@ export default function EventsListPage() {
 
   useEffect(() => {
     if (events) {
-      setShowLoader(true);
+      processEvents();
+      setTimeout(() => setShowLoader(false), 5000);
+//      setShowLoader(false);
     }
   }, [events, eventCategoryFilter]);
 
   useEffect(() => {
     if (showLoader) {
-      processEvents();
-      setTimeout(() => setShowLoader(false), 5000);
-//      setShowLoader(false);
+      loadEvents(selectedRoute);
     }
   }, [showLoader]);