USEPA · shapiromatron · Jul 9, 2024 · Jun 27, 2024 · Jun 27, 2024 · Jun 27, 2024
diff --git a/bmds_ui/desktop/actions.py b/bmds_ui/desktop/actions.py
@@ -33,17 +33,10 @@ def setup_django_environment(db: Database):
     django.setup()
 
 
-def _create_django_db(db):
-    """Create a django database and sync persistent state with application."""
+def create_django_db(db: Database):
+    log.info(f"Creating {db}")
     setup_django_environment(db)
     sync_persistent_data()
-
-
-def create_django_db(config: DesktopConfig, db: Database):
-    log.info(f"Creating {db}")
-    thread = Thread(target=_create_django_db, args=(db,), daemon=True)
-    thread.start()
-    thread.join()
     log.info(f"Creation successful {db}")
 
 

diff --git a/bmds_ui/desktop/components/database_form.py b/bmds_ui/desktop/components/database_form.py
@@ -2,7 +2,7 @@
 from typing import Any
 
 from django.utils.text import slugify
-from textual import on
+from textual import on, work
 from textual.app import ComposeResult
 from textual.containers import Grid, Horizontal
 from textual.reactive import reactive
@@ -138,6 +138,7 @@ def compose(self) -> ComposeResult:
                 Button("Cancel", variant="default", id="db-edit-cancel"),
                 delete_btn,
                 classes="btn-holder span4",
+                id="actions-row",
             ),
             id="grid-db-form",
         )
@@ -154,10 +155,17 @@ async def on_db_create(self) -> None:
         db_path = (Path(path).expanduser().resolve() / db).absolute()
         config = Config.get()
         db = Database(name=name, description=description, path=db_path)
+        self._create_django_db(config, db)
+
+    @work(exclusive=True, thread=True)
+    def _create_django_db(self, config, db):
+        # sleeps are required for loading indicator to show/hide properly
+        self.app.call_from_thread(self.set_loading, True)
         config.add_db(db)
         Config.sync()
-        create_django_db(config, db)
-        self.dismiss(True)
+        create_django_db(db)
+        self.app.call_from_thread(self.set_loading, False)
+        self.app.call_from_thread(self.dismiss, True)
 
     @on(Button.Pressed, "#db-update")
     async def on_db_update(self) -> None:
@@ -193,3 +201,6 @@ async def on_db_delete(self) -> None:
     @on(Button.Pressed, "#db-edit-cancel")
     def on_db_create_cancel(self) -> None:
         self.dismiss(False)
+
+    def set_loading(self, status: bool):
+        self.get_widget_by_id("actions-row").loading = status
diff --git a/pyproject.toml b/pyproject.toml
@@ -40,7 +40,7 @@ dependencies = [
 
   # desktop
   "packaging~=24.0",
-  "textual~=0.62.0",
+  "textual~=0.72.0",
   "whitenoise~=6.6.0",
 ]
 

diff --git a/tests/desktop/test_app.py b/tests/desktop/test_app.py
@@ -148,7 +148,13 @@ async def test_db_form(self, rollback_get_app):
                 # create a new db
                 app.query_one("#path").value = resolved_temp_dir
                 await pilot.click("#db-create")
-                await pilot.pause()
+                # wait for db creation to finish or max of 60 seconds
+                max = 1
+                while max < 60 and isinstance(
+                    app.screen, components.database_form.DatabaseFormModel
+                ):
+                    await pilot.pause(delay=1)
+                    max += 1
                 assert app.screen.name == "main"
 
                 # make sure a new one appears on the list page