From 52fad1171a030746993bcd9584d9476c9ea6cc7d Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Fri, 11 Jun 2021 15:38:23 +1000
Subject: [PATCH] Remove worker loading from map and token data contexts

---
 src/contexts/MapDataContext.js   | 18 +++---------------
 src/contexts/TokenDataContext.js | 17 +++--------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/src/contexts/MapDataContext.js b/src/contexts/MapDataContext.js
index f29c713..9b4e636 100644
--- a/src/contexts/MapDataContext.js
+++ b/src/contexts/MapDataContext.js
@@ -1,5 +1,4 @@
 import React, { useEffect, useState, useContext, useCallback } from "react";
-import { decode } from "@msgpack/msgpack";
 
 import { useAuth } from "./AuthContext";
 import { useDatabase } from "./DatabaseContext";
@@ -19,7 +18,7 @@ const defaultMapState = {
 };
 
 export function MapDataProvider({ children }) {
-  const { database, databaseStatus, worker } = useDatabase();
+  const { database, databaseStatus } = useDatabase();
   const { userId } = useAuth();
 
   const [maps, setMaps] = useState([]);
@@ -34,18 +33,7 @@ export function MapDataProvider({ children }) {
     }
 
     async function loadMaps() {
-      let storedMaps = [];
-      // Try to load maps with worker, fallback to database if failed
-      const packedMaps = await worker.loadData("maps");
-      // let packedMaps;
-      if (packedMaps) {
-        storedMaps = decode(packedMaps);
-      } else {
-        console.warn("Unable to load maps with worker, loading may be slow");
-        await database.table("maps").each((map) => {
-          storedMaps.push(map);
-        });
-      }
+      const storedMaps = await database.table("maps").toArray();
       setMaps(storedMaps);
       const storedStates = await database.table("states").toArray();
       setMapStates(storedStates);
@@ -56,7 +44,7 @@ export function MapDataProvider({ children }) {
     }
 
     loadMaps();
-  }, [userId, database, databaseStatus, worker]);
+  }, [userId, database, databaseStatus]);
 
   const getMap = useCallback(
     async (mapId) => {
diff --git a/src/contexts/TokenDataContext.js b/src/contexts/TokenDataContext.js
index a72722a..9c98490 100644
--- a/src/contexts/TokenDataContext.js
+++ b/src/contexts/TokenDataContext.js
@@ -1,5 +1,4 @@
 import React, { useEffect, useState, useContext, useCallback } from "react";
-import { decode } from "@msgpack/msgpack";
 
 import { useAuth } from "./AuthContext";
 import { useDatabase } from "./DatabaseContext";
@@ -10,7 +9,7 @@ import { removeGroupsItems } from "../helpers/group";
 const TokenDataContext = React.createContext();
 
 export function TokenDataProvider({ children }) {
-  const { database, databaseStatus, worker } = useDatabase();
+  const { database, databaseStatus } = useDatabase();
   const { userId } = useAuth();
 
   const [tokens, setTokens] = useState([]);
@@ -23,17 +22,7 @@ export function TokenDataProvider({ children }) {
     }
 
     async function loadTokens() {
-      let storedTokens = [];
-      // Try to load tokens with worker, fallback to database if failed
-      const packedTokens = await worker.loadData("tokens");
-      if (packedTokens) {
-        storedTokens = decode(packedTokens);
-      } else {
-        console.warn("Unable to load tokens with worker, loading may be slow");
-        await database.table("tokens").each((token) => {
-          storedTokens.push(token);
-        });
-      }
+      const storedTokens = await database.table("tokens").toArray();
       setTokens(storedTokens);
       const group = await database.table("groups").get("tokens");
       const storedGroups = group.items;
@@ -42,7 +31,7 @@ export function TokenDataProvider({ children }) {
     }
 
     loadTokens();
-  }, [userId, database, databaseStatus, worker]);
+  }, [userId, database, databaseStatus]);
 
   const getToken = useCallback(
     async (tokenId) => {