fix: stale session ids being displayed in the attach to session dropd…

…own (#1727) * fix: attachSessId placeholder not getting displayed * fix: stale session ids being displayed in the attach session dropdown
appium · Mar 15, 2021 · 03601e7 · 03601e7
1 parent e407bd7
commit 03601e7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/app/renderer/components/Session/AttachToSession.js b/app/renderer/components/Session/AttachToSession.js
@@ -23,7 +23,7 @@ export default class AttachToSession extends Component {
 
   render () {
     let {attachSessId, setAttachSessId, runningAppiumSessions, getRunningSessions, t} = this.props;
-    attachSessId = attachSessId || '';
+    attachSessId = attachSessId || undefined;
     return (<Form>
       <FormItem>
         <Card>

diff --git a/app/renderer/reducers/Session.js b/app/renderer/reducers/Session.js
@@ -68,6 +68,19 @@ const INITIAL_STATE = {
 
 let nextState;
 
+// returns false if the attachSessId is not present in the runningSessions list
+const isAttachSessIdValid = (runningSessions, attachSessId) => {
+  if (!attachSessId || !runningSessions) {
+    return false;
+  }
+  for (const session of runningSessions) {
+    if (session.id === attachSessId) {
+      return true;
+    }
+  }
+  return false;
+};
+
 export default function session (state = INITIAL_STATE, action) {
   switch (action.type) {
     case NEW_SESSION_REQUESTED:
@@ -237,13 +250,15 @@ export default function session (state = INITIAL_STATE, action) {
         gettingSessions: true,
       };
 
-    case GET_SESSIONS_DONE:
+    case GET_SESSIONS_DONE: {
+      const attachSessId = isAttachSessIdValid(action.sessions, state.attachSessId) ? state.attachSessId : null;
       return {
         ...state,
         gettingSessions: false,
-        attachSessId: (action.sessions && action.sessions.length > 0 && !state.attachSessId) ? action.sessions[0].id : state.attachSessId,
+        attachSessId: (action.sessions && action.sessions.length > 0 && !attachSessId) ? action.sessions[0].id : attachSessId,
         runningAppiumSessions: action.sessions || [],
       };
+    }
 
     case ENABLE_DESIRED_CAPS_EDITOR:
       return {