From 7a20b49aeb32a269d4bb8b587630d890a45dfc0c Mon Sep 17 00:00:00 2001
From: David Carley <dacarley@gmail.com>
Date: Tue, 23 Aug 2022 13:09:58 +0000
Subject: [PATCH] Rebuilt a couple more dialog boxes in Svelte.

---
 src/js/admin-general-view.js                  | 32 +++++++++----------
 src/js/control-view.js                        |  2 +-
 src/pug/templates/admin-general-view.pug      |  7 ----
 .../src/dialogs/ChangeHostnameDialog.svelte   |  2 +-
 .../src/dialogs/DialogHost.svelte             | 20 ++++++------
 .../src/dialogs/MessageDialog.svelte          | 18 +++++++++--
 .../src/dialogs/ScreenRotationDialog.svelte   |  2 +-
 .../src/dialogs/ToolpathMessageDialog.svelte  | 22 -------------
 .../src/dialogs/WifiConnectionDialog.svelte   |  9 +++---
 9 files changed, 50 insertions(+), 64 deletions(-)
 delete mode 100644 src/svelte-components/src/dialogs/ToolpathMessageDialog.svelte

diff --git a/src/js/admin-general-view.js b/src/js/admin-general-view.js
index 795bd1b..02aac51 100644
--- a/src/js/admin-general-view.js
+++ b/src/js/admin-general-view.js
@@ -46,9 +46,7 @@ module.exports = {
 
   data: function () {
     return {
-      configRestored: false,
       confirmReset: false,
-      configReset: false,
       autoCheckUpgrade: true,
       reset_variant: ''
     }
@@ -71,29 +69,31 @@ module.exports = {
     },
 
     restore: function (e) {
-      var files = e.target.files || e.dataTransfer.files;
-      if (!files.length) return;
+      const files = e.target.files || e.dataTransfer.files;
+      if (!files.length) {
+        return;
+      }
 
-      var fr = new FileReader();
-      fr.onload = function (e) {
-        var config;
+      const fileReader = new FileReader();
+      fileReader.onload = async ({ target }) => {
+        let config;
         try {
-          config = JSON.parse(e.target.result);
+          config = JSON.parse(target.result);
         } catch (ex) {
           api.alert("Invalid config file");
           return;
         }
 
-        api.put('config/save', config).done(function (data) {
+        try {
+          await api.put('config/save', config);
           this.$dispatch('update');
-          this.configRestored = true;
-
-        }.bind(this)).fail(function (error) {
+          SvelteComponents.showDialog("Message", { title: "Success", message: "Configuration restored" })
+        } catch (error) {
           api.alert('Restore failed', error);
-        })
-      }.bind(this);
+        }
+      }
 
-      fr.readAsText(files[0]);
+      fileReader.readAsText(files[0]);
     },
 
     reset: async function () {
@@ -107,7 +107,7 @@ module.exports = {
         await api.put('config/save', config)
         this.confirmReset = false;
         this.$dispatch('update');
-        this.configRestored = true;
+        SvelteComponents.showDialog("Message", { title: "Success", message: "Configuration restored" })
       } catch (err) {
         api.alert('Restore failed');
         console.error('Restore failed', err);
diff --git a/src/js/control-view.js b/src/js/control-view.js
index abf61e1..57f60ac 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -418,7 +418,7 @@ module.exports = {
     },
 
     showToolpathMessageDialog: function (axis) {
-      SvelteComponents.showDialog("ToolpathMessage", { msg: this[axis].toolmsg });
+      SvelteComponents.showDialog("Message", { title: this[axis].toolmsg });
     },
 
     set_position: function (axis, position) {
diff --git a/src/pug/templates/admin-general-view.pug b/src/pug/templates/admin-general-view.pug
index d90a20c..8eb358a 100644
--- a/src/pug/templates/admin-general-view.pug
+++ b/src/pug/templates/admin-general-view.pug
@@ -45,9 +45,6 @@ script#admin-general-view-template(type="text/x-template")
     label.pure-button.pure-button-primary(@click="restore_config") Restore
     form.restore-config.file-upload
       input(type="file", accept=".json", @change="restore")
-    message(:show.sync="configRestored")
-      h3(slot="header") Success
-      p(slot="body") Configuration restored.
 
     button.pure-button.pure-button-primary(@click="confirmReset = true") Reset    
     message(:show.sync="confirmReset")
@@ -70,10 +67,6 @@ script#admin-general-view-template(type="text/x-template")
         button.pure-button(@click="confirmReset = false") Cancel
         button.pure-button.pure-button-primary(@click="reset") Reset
         
-    message(:show.sync="configReset")
-      h3(slot="header") Success
-      p(slot="body") Configuration reset.
-
     h2 Debugging
     a(href="/api/log", target="_blank")
       button.pure-button.pure-button-primary View Log
diff --git a/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte b/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
index c04a40c..1cc79cb 100644
--- a/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
+++ b/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
@@ -58,7 +58,7 @@
   }
 </script>
 
-<MessageDialog open={rebooting} title="Rebooting">
+<MessageDialog open={rebooting} title="Rebooting" noaction>
   Rebooting to apply the hostname change...
 </MessageDialog>
 
diff --git a/src/svelte-components/src/dialogs/DialogHost.svelte b/src/svelte-components/src/dialogs/DialogHost.svelte
index b8275d3..0dadf2f 100644
--- a/src/svelte-components/src/dialogs/DialogHost.svelte
+++ b/src/svelte-components/src/dialogs/DialogHost.svelte
@@ -9,7 +9,7 @@
   import SetAxisPositionDialog from "./SetAxisPositionDialog.svelte";
   import MoveToZeroDialog from "./MoveToZeroDialog.svelte";
   import ShutdownDialog from "./ShutdownDialog.svelte";
-  import ToolpathMessageDialog from "./ToolpathMessageDialog.svelte";
+  import MessageDialog from "./MessageDialog.svelte";
 
   const HomeMachineDialogProps = writable<HomeMachineDialogPropsType>();
   type HomeMachineDialogPropsType = {
@@ -63,10 +63,12 @@
     open: boolean;
   };
 
-  const ToolpathMessageDialogProps = writable<ToolpathMessageDialogPropsType>();
-  type ToolpathMessageDialogPropsType = {
+  const MessageDialogProps = writable<MessageDialogPropsType>();
+  type MessageDialogPropsType = {
     open: boolean;
-    msg: string;
+    title: string;
+    message: string;
+    noaction: boolean;
   };
 
   export function showDialog(
@@ -115,8 +117,8 @@
   );
 
   export function showDialog(
-    dialog: "ToolpathMessage",
-    props: Omit<ToolpathMessageDialogPropsType, "open">
+    dialog: "Message",
+    props: Omit<MessageDialogPropsType, "open">
   );
 
   export function showDialog(dialog: string, props: any) {
@@ -157,8 +159,8 @@
         ShutdownDialogProps.set({ ...props, open: true });
         break;
 
-      case "ToolpathMessage":
-        ToolpathMessageDialogProps.set({ ...props, open: true });
+      case "Message":
+        MessageDialogProps.set({ ...props, open: true });
         break;
 
       default:
@@ -236,4 +238,4 @@
 <SetAxisPositionDialog {...$SetAxisPositionDialogProps} />
 <MoveToZeroDialog {...$MoveToZeroDialogProps} />
 <ShutdownDialog {...$ShutdownDialogProps} />
-<ToolpathMessageDialog {...$ToolpathMessageDialogProps} />
+<MessageDialog {...$MessageDialogProps} />
diff --git a/src/svelte-components/src/dialogs/MessageDialog.svelte b/src/svelte-components/src/dialogs/MessageDialog.svelte
index 0cf3ea1..735341c 100644
--- a/src/svelte-components/src/dialogs/MessageDialog.svelte
+++ b/src/svelte-components/src/dialogs/MessageDialog.svelte
@@ -1,8 +1,11 @@
 <script lang="ts">
-  import Dialog, { Title, Content } from "@smui/dialog";
+  import Dialog, { Title, Content, Actions } from "@smui/dialog";
+  import Button, { Label } from "@smui/button";
 
   export let open: boolean;
-  export let title: string;
+  export let title = "";
+  export let message = "";
+  export let noaction = false;
 </script>
 
 <Dialog
@@ -13,7 +16,16 @@
   aria-describedby="message-dialog-content"
 >
   <Title id="message-dialog-title">{title}</Title>
+
   <Content id="message-dialog-content">
-    <slot />
+    <slot>{message}</slot>
   </Content>
+
+  {#if !noaction}
+    <Actions>
+      <Button defaultAction>
+        <Label>OK</Label>
+      </Button>
+    </Actions>
+  {/if}
 </Dialog>
diff --git a/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte b/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte
index 4f02231..7cb7415 100644
--- a/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte
+++ b/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte
@@ -29,7 +29,7 @@
   }
 </script>
 
-<MessageDialog open={rebooting} title="Rebooting">
+<MessageDialog open={rebooting} title="Rebooting" noaction>
   Rebooting to apply the new screen rotation...
 </MessageDialog>
 
diff --git a/src/svelte-components/src/dialogs/ToolpathMessageDialog.svelte b/src/svelte-components/src/dialogs/ToolpathMessageDialog.svelte
deleted file mode 100644
index 6304698..0000000
--- a/src/svelte-components/src/dialogs/ToolpathMessageDialog.svelte
+++ /dev/null
@@ -1,22 +0,0 @@
-<script lang="ts">
-  import Dialog, { Title, Content, Actions, InitialFocus } from "@smui/dialog";
-  import Button, { Label } from "@smui/button";
-
-  export let open: boolean;
-  export let msg: string;
-</script>
-
-<Dialog
-  bind:open
-  scrimClickAction=""
-  aria-labelledby="toolpath-message-dialog-title"
-  aria-describedby="toolpath-message-dialog-content"
->
-  <Title id="toolpath-message-dialog-title">{msg || ""}</Title>
-
-  <Actions>
-    <Button defaultAction use={[InitialFocus]}>
-      <Label>OK</Label>
-    </Button>
-  </Actions>
-</Dialog>
diff --git a/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte b/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
index 644c1e5..0c167c1 100644
--- a/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
+++ b/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
@@ -39,7 +39,7 @@
   }
 </script>
 
-<MessageDialog open={rebooting} title="Rebooting">
+<MessageDialog open={rebooting} title="Rebooting" noaction>
   Rebooting to apply Wifi changes...
 </MessageDialog>
 
@@ -49,9 +49,10 @@
   aria-labelledby="wifi-connection-dialog-title"
   aria-describedby="wifi-connection-dialog-content"
 >
-  <Title id="wifi-connection-dialog-title"
-    >{connectToOrDisconnectFrom} {network.Name}</Title
-  >
+  <Title id="wifi-connection-dialog-title">
+    {connectToOrDisconnectFrom}
+    {network.Name}
+  </Title>
 
   <Content id="wifi-connection-dialog-content">
     {#if needPassword}