From ee29f3c5991dc57cc46ccabb1f8de531f5cc362b Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Mon, 17 May 2021 16:33:34 -0400 Subject: [PATCH 1/2] refactor: change isActive to isRunning and related language to reduce confusion with the API concept of session status "active" --- ui/desktop/electron-app/src/models/session-manager.js | 6 +++--- ui/desktop/electron-app/src/models/session.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/desktop/electron-app/src/models/session-manager.js b/ui/desktop/electron-app/src/models/session-manager.js index b6e0d0939..311d86899 100644 --- a/ui/desktop/electron-app/src/models/session-manager.js +++ b/ui/desktop/electron-app/src/models/session-manager.js @@ -4,11 +4,11 @@ class SessionManager { #sessions = []; /** - * Checks for active sessions + * Checks for running sessions * @returns {boolean} */ - get hasActiveSessions() { - return Boolean(this.#sessions.find((session) => session.isActive)); + get hasRunningSessions() { + return Boolean(this.#sessions.find((session) => session.isRunning)); } /** diff --git a/ui/desktop/electron-app/src/models/session.js b/ui/desktop/electron-app/src/models/session.js index 6ec9d3ce8..a59316f7f 100644 --- a/ui/desktop/electron-app/src/models/session.js +++ b/ui/desktop/electron-app/src/models/session.js @@ -36,7 +36,7 @@ class Session { /** * @return {boolean} */ - get isActive() { + get isRunning() { return !this.#process.killed; } @@ -60,12 +60,12 @@ class Session { */ stop() { return new Promise((resolve, reject) => { - if (this.isActive) { + if (this.isRunning) { this.#process.on('close', () => resolve()); this.#process.on('error', (e) => reject(e)); this.#process.kill(); } else { - // Do nothing when process isn't active + // Do nothing when process isn't running resolve(); } }); From 4fed7f3d94d75f28101d26d8ba7bd02e0217427f Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Mon, 17 May 2021 17:23:18 -0400 Subject: [PATCH 2/2] refactor: rename to "running" --- ui/desktop/electron-app/src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/desktop/electron-app/src/index.js b/ui/desktop/electron-app/src/index.js index 3b0b79f0d..0de2bfb54 100644 --- a/ui/desktop/electron-app/src/index.js +++ b/ui/desktop/electron-app/src/index.js @@ -188,7 +188,7 @@ app.on('ready', async () => { * Prompt for closing spawned processes */ app.on('before-quit', (event) => { - if (sessionManager.hasActiveSessions) { + if (sessionManager.hasRunningSessions) { const dialogOpts = { type: 'question', buttons: ['Close', 'Cancel'],