fix: Quick action errors and device reloads

smarthome-go · Oct 25, 2024 · d7649ed · d7649ed
1 parent 8269000
commit d7649ed
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/web/src/pages/dash/QuickActions/Action.svelte b/web/src/pages/dash/QuickActions/Action.svelte
@@ -65,8 +65,14 @@
             hmsExecutionResults = [
                 ...hmsExecutionResults,
                 {
-                    response: hmsRes,
                     modeRun: true,
+                    response: {
+                        title: data.data.data.name,
+                        success: hmsRes.success,
+                        output: hmsRes.output,
+                        fileContents: new Map(),
+                        errors: hmsRes.errors,
+                    },
                 },
             ]
         } catch (err) {
@@ -88,10 +94,20 @@
 {/if}
 
 {#if hmsExecutionResults[0] !== undefined}
+
+                        <!-- bind:open={errorsOpen} -->
+                        <!-- data={{ -->
+                        <!--     modeRun: true, -->
+                        <!--     response: { -->
+                        <!--     }, -->
+                        <!-- }} -->
+                        <!-- on:close={() => { -->
+                        <!--     // This hack is required so that the window still remains scrollable after removal -->
+                        <!-- }} -->
+
     <ExecutionResultPopup
         open={hmsExecutionResults[0] !== undefined}
         data={hmsExecutionResults[0]}
-        scriptId={data.data.data.id}
         on:close={() => {
             // This hack is required so that the window still remains scrollable after removal
             setTimeout(() => (hmsExecutionResults = hmsExecutionResults.slice(1)), 1000)

diff --git a/web/src/pages/rooms/App.svelte b/web/src/pages/rooms/App.svelte
@@ -90,13 +90,16 @@
                 for (const room of rooms) {
                     room.devices = (res as Room[]).find(r => r.data.id === room.data.id).devices
                 }
+                currentRoom = currentRoom
             } else {
                 rooms = res
             }
+
             const roomId = window.localStorage.getItem('current_room')
             const room = roomId === null ? undefined : rooms.find(r => r.data.id === roomId)
             currentRoom = room === undefined ? rooms[0] : room
             loadedData = true
+            refreshCounter++
         } catch {
             $createSnackbar('Could not load rooms', [
                 {
@@ -294,6 +297,8 @@
         $requests--
     }
 
+    let refreshCounter = 0
+
     onMount(async () => {
         // This call is non-blocking on purpose.
         loadDriverDeviceCapabilities()
@@ -374,6 +379,7 @@
                     {#each currentRoom !== undefined ? currentRoom.devices : [] as device, i (device.id)}
                         <Device
                             style={''}
+                            {refreshCounter}
                             capabilities={
                                 capabilities.find(
                                     c => c.modelId === device.modelId

diff --git a/web/src/pages/rooms/Device.svelte b/web/src/pages/rooms/Device.svelte
@@ -23,6 +23,8 @@
 
     let deviceInfoOpen = false
     let deviceEditOpen = false
+    export let refreshCounter = 0
+    $: if (refreshCounter) { console.log("RELOAD"); loadExtractions() }
 
     export let style = ''