FE: watcher - remove 'top'

andreipradan · Feb 19, 2025 · 54ea1d5 · 54ea1d5
1 parent ce161c2
commit 54ea1d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/frontend/src/app/commands/Watchers.js b/frontend/src/app/commands/Watchers.js
@@ -32,7 +32,6 @@ const Watchers = () =>  {
   const [logLevel, setLogLevel] = useState(null);
   const [name, setName] = useState("");
   const [selector, setSelector] = useState("");
-  const [top, setTop] = useState(selectedItem?.top || true);
   const [url, setUrl] = useState("");
 
   const [latest, setLatest] = useState(null);
@@ -55,7 +54,6 @@ const Watchers = () =>  {
       setName(selectedItem.name)
       setRequest(JSON.stringify(selectedItem.request, null, "\t"))
       setSelector(selectedItem.selector)
-      setTop(selectedItem.top)
       setUrl(selectedItem.url)
     }
   }, [selectedItem]);
@@ -95,7 +93,6 @@ const Watchers = () =>  {
     setName("")
     setRequest("{}")
     setSelector("")
-    setTop(true)
     setUrl("")
   }
   const closeModal = () => {
@@ -112,7 +109,6 @@ const Watchers = () =>  {
     setName(watcher.name)
     setRequest(JSON.stringify(watcher.request, null, "\t"))
     setSelector(watcher.selector)
-    setTop(watcher.top)
     setUrl(watcher.url)
   }
 
@@ -414,15 +410,6 @@ const Watchers = () =>  {
                   onChange={e => setSelector(e.target.value)}
                 />
               </Form.Group>
-              <Form.Group className="mb-3">
-                <Form.Check
-                  type="switch"
-                  id="top-switch"
-                  label="Top search"
-                  checked={top}
-                  onChange={() => {setTop(!top)}}
-                />
-              </Form.Group>
               <Form.Group className="mb-3">
                 <Form.Label>Latest data</Form.Label>
                 <AceEditor
@@ -520,7 +507,6 @@ const Watchers = () =>  {
                         name,
                         request: JSON.parse(request.replace(/[\r\n\t]/g, "")),
                         selector,
-                        top,
                         url,
                       }))
                   }}>
@@ -539,7 +525,6 @@ const Watchers = () =>  {
                       name,
                       request: JSON.parse(request.replace(/[\r\n\t]/g, "")),
                       selector,
-                      top,
                       url,
                     }))
                 }}>

diff --git a/frontend/src/redux/authSlice.js b/frontend/src/redux/authSlice.js
@@ -21,7 +21,8 @@ export const authSlice = createSlice({
     },
     logout: (state, action) => {
       state.errors = null;
-      state.redirectUrl = window.location.pathname
+      if (window.location.pathname !== '/login')
+        state.redirectUrl = window.location.pathname
       state.token = null;
       state.user = null;
       Cookie.remove('expires_at');