From 1edd98f37592938505bd403d34fd4830b4a85894 Mon Sep 17 00:00:00 2001
From: Mark <mark.hall@work.room3b.eu>
Date: Fri, 2 Feb 2024 14:08:57 +0000
Subject: [PATCH] Fix api readyness (#76)

* Fix the list of tables

* Re-added the not-ready display
---
 museum_map/__about__.py                       |  2 +-
 museum_map/server/api/__init__.py             |  1 +
 museum_map/server/frontend/src/Root.svelte    | 38 +++++++++----------
 .../frontend/src/components/NotReady.svelte   | 19 ++++++++++
 4 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 museum_map/server/frontend/src/components/NotReady.svelte

diff --git a/museum_map/__about__.py b/museum_map/__about__.py
index e4f40bb..22318fd 100644
--- a/museum_map/__about__.py
+++ b/museum_map/__about__.py
@@ -1,2 +1,2 @@
 __version__ = "0.9.1"
-__tables__ = {"items", "floors", "rooms", "floors_items", "floor_topics", "groups"}
+__tables__ = {"groups", "users", "floors_items", "floor_topics", "rooms", "floors", "log_entries", "items"}
diff --git a/museum_map/server/api/__init__.py b/museum_map/server/api/__init__.py
index ab7f050..bdc5e6b 100644
--- a/museum_map/server/api/__init__.py
+++ b/museum_map/server/api/__init__.py
@@ -1,4 +1,5 @@
 """The main REST API."""
+
 import logging
 from typing import Annotated
 
diff --git a/museum_map/server/frontend/src/Root.svelte b/museum_map/server/frontend/src/Root.svelte
index d95ce7a..e833d0b 100644
--- a/museum_map/server/frontend/src/Root.svelte
+++ b/museum_map/server/frontend/src/Root.svelte
@@ -9,6 +9,7 @@
   import Research from "./components/Research.svelte";
   import Reload from "./components/Reload.svelte";
   import Demographics from "./routes/Demographics.svelte";
+  import NotReady from "./components/NotReady.svelte";
   import { apiRequest } from "./util";
 
   let Floor = null;
@@ -21,31 +22,28 @@
     queryFn: apiRequest<APIStatus>,
     refetchInterval: 60000,
   });
-
-  const reloadRequired = derived(apiStatus, (apiStatus) => {
-    if (apiStatus.isSuccess && apiStatus.data.version !== "0.9.1") {
-      return true;
-    }
-    return false;
-  });
 </script>
 
 <div class="bg-neutral-600 min-h-screen">
   {#if $apiStatus.isSuccess}
-    <main
-      class="container mx-auto bg-neutral-700 text-white shadow-lg shadow-black font-serif tracking-default"
-    >
-      <Route path="/"><Lobby /></Route>
-      <Route path="/floor/:fid"
-        >{#if Floor !== null}<svelte:component this={Floor} />{/if}</Route
+    {#if $apiStatus.data.ready}
+      <main
+        class="container mx-auto bg-neutral-700 text-white shadow-lg shadow-black font-serif tracking-default"
       >
-      <Route path="/floor/:fid/room/:rid/*"><Room /></Route>
-      <Route path="/demographics"><Demographics /></Route>
-      <NotFoundRoute><Lobby /></NotFoundRoute>
-    </main>
-    <Research />
-    {#if $reloadRequired}
-      <Reload />
+        <Route path="/"><Lobby /></Route>
+        <Route path="/floor/:fid"
+          >{#if Floor !== null}<svelte:component this={Floor} />{/if}</Route
+        >
+        <Route path="/floor/:fid/room/:rid/*"><Room /></Route>
+        <Route path="/demographics"><Demographics /></Route>
+        <NotFoundRoute><Lobby /></NotFoundRoute>
+      </main>
+      <Research />
+      {#if $apiStatus.data.version !== "0.9.1"}
+        <Reload />
+      {/if}
+    {:else}
+      <NotReady />
     {/if}
   {:else if $apiStatus.isLoading}
     <Loading />
diff --git a/museum_map/server/frontend/src/components/NotReady.svelte b/museum_map/server/frontend/src/components/NotReady.svelte
new file mode 100644
index 0000000..ad127c3
--- /dev/null
+++ b/museum_map/server/frontend/src/components/NotReady.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+  import { fade } from "svelte/transition";
+</script>
+
+<svelte:head>
+  <title>The Museum Map is currently not available</title>
+</svelte:head>
+
+<div
+  transition:fade
+  class="fixed left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2 z-50 max-w-full p-4 bg-neutral-700 text-white shadow-2xl rounded-2xl"
+  role="alert"
+>
+  <p class="mb-2">Unfortuantely the Museum Map is currently not available.</p>
+  <p>
+    When the Museum Map becomes available, the interface will load
+    automatically.
+  </p>
+</div>