webapp/escalated: default to all time view

On escalated view load, set time range to all. When leaving, reset it back to what it was.
jasonish · Mar 11, 2023 · 30e54fd · 30e54fd
1 parent d1a8b8b
commit 30e54fd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/webapp/src/Alerts.tsx b/webapp/src/Alerts.tsx
@@ -8,7 +8,7 @@ import {
   useNavigate,
   useSearchParams,
 } from "@solidjs/router";
-import { SET_TIME_RANGE, TIME_RANGE, Top } from "./Top";
+import { _SET_TIME_RANGE, SET_TIME_RANGE, TIME_RANGE, Top } from "./Top";
 import {
   Badge,
   Button,
@@ -135,7 +135,7 @@ export function Alerts() {
     if (view == View.Escalated) {
       untrack(() => {
         savedTimeRange = TIME_RANGE();
-        SET_TIME_RANGE("");
+        _SET_TIME_RANGE("");
       });
     }
 
@@ -254,6 +254,7 @@ export function Alerts() {
     idleTimer.stop();
     untrack(() => {
       if (savedTimeRange) {
+        console.log("Restoring time range of " + savedTimeRange);
         SET_TIME_RANGE(savedTimeRange);
       }
     });

diff --git a/webapp/src/Top.tsx b/webapp/src/Top.tsx
@@ -64,9 +64,14 @@ function getInitialTimeRange(): string {
 }
 
 /* START: Init TIME_RANGE */
-export const [TIME_RANGE, SET_TIME_RANGE] =
+export const [TIME_RANGE, _SET_TIME_RANGE] =
   createSignal<string>(DEFAULT_TIME_RANGE);
 
+export function SET_TIME_RANGE(range: string) {
+  _SET_TIME_RANGE(range);
+  localStorage.setItem("TIME_RANGE", range);
+}
+
 export function Top(props: { brand?: string; disableRange?: boolean }) {
   console.log("Top");
   console.log(`Top: disableRange=${props.disableRange}`);
@@ -78,12 +83,7 @@ export function Top(props: { brand?: string; disableRange?: boolean }) {
   // in the dropdown will not cause the dropdown to close.
   let [toolDropDownOpen, setToolDropDownOpen] = createSignal(false);
 
-  SET_TIME_RANGE(getInitialTimeRange());
-
-  function updateTimeRange(range: string) {
-    SET_TIME_RANGE(range);
-    localStorage.setItem("TIME_RANGE", range);
-  }
+  _SET_TIME_RANGE(getInitialTimeRange());
 
   onMount(() => {
     tinykeys(window, {
@@ -208,7 +208,7 @@ export function Top(props: { brand?: string; disableRange?: boolean }) {
                             <>
                               <Dropdown.Item
                                 onClick={(e) => {
-                                  updateTimeRange(o[0] as string);
+                                  SET_TIME_RANGE(o[0] as string);
                                   e.currentTarget.blur();
                                 }}
                               >