Fix for issue #33: Change the name of the space from the quick-switch-space mode of popup

Author: codedread

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.9] - 2025-12-??
+
+### Changes
+
+- Fixed [issue #33](https://github.com/codedread/spaces/issues/33): Allow setting the Active space name from quick-switch mode.
+- Increased unit test coverage from 23.62% to 23.91%.
+
 ## [1.1.8] - 2025-12-03
 
 ### Changes

js/popup.js

@@ -14,7 +14,7 @@ const NO_HOTKEY = 'no hotkey set';
  * @param {string} action The popup action ('switch' or 'move')
  */
 export async function handlePopupMenuClick(action) {
-    const params = await chrome.runtime.sendMessage({'action': 'generatePopupParams', 'popupAction': action});
+    const params = await chrome.runtime.sendMessage({ 'action': 'generatePopupParams', 'popupAction': action });
     if (!params) return;
     window.location.hash = params;
     window.location.reload();
@@ -32,14 +32,44 @@ export function setGlobalCurrentSpace(space) {
     globalCurrentSpace = space;
 }
 
+/**
+ * Determines the window ID to use based on URL hash and current window.
+ * This is the core logic for the bug fix that ensures correct window ID selection.
+ * @param {string} urlString - The full URL string including hash
+ * @param {number|null} currentWindowId - The ID of the current window, or null if not available yet
+ * @returns {number|false} The window ID to use, or false if invalid
+ */
+export function getWindowIdFromContext(urlString, currentWindowId) {
+    // First check if windowId is in the URL hash (e.g., when opened in quick-switch mode)
+    // This ensures we use the original browser window, not the popup window itself
+    const windowIdFromHash = getHashVariable('windowId', urlString);
+    let windowId;
+
+    if (windowIdFromHash && windowIdFromHash !== 'false') {
+        windowId = parseInt(windowIdFromHash, 10);
+    } else if (currentWindowId !== null) {
+        // Fallback to current window if not in hash (e.g., when opened from extension icon)
+        windowId = currentWindowId;
+    } else {
+        // No window ID available
+        return false;
+    }
+
+    // Validate the window ID (must be a positive integer)
+    return !isNaN(windowId) && windowId > 0 ? windowId : false;
+}
+
 /** Initialize the popup window. */
-function initializePopup() {
+export function initializePopup() {
     document.addEventListener('DOMContentLoaded', async () => {
         const url = getHashVariable('url', window.location.href);
         globalUrl = url !== '' ? decodeURIComponent(url) : false;
+
+        // Get the current window ID if needed (for fallback when no hash parameter exists)
         const currentWindow = await chrome.windows.getCurrent({ populate: true });
-        const windowId = currentWindow.id;
-        globalWindowId = windowId !== '' ? windowId : false;
+
+        // Determine which window ID to use (from hash or current window)
+        globalWindowId = getWindowIdFromContext(window.location.href, currentWindow.id);
         globalTabId = getHashVariable('tabId', window.location.href);
         const sessionName = getHashVariable(
             'sessionName',

manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "Spaces",
     "description": "Intuitive tab management",
-    "version": "1.1.8",
+    "version": "1.1.9.0",
     "permissions": [
         "contextMenus",
         "downloads",

tests/getWindowIdFromContext.test.js

@@ -0,0 +1,103 @@
+/**
+ * Unit tests for getWindowIdFromContext function in popup.js
+ * Tests the window ID bug fix that ensures the correct window ID is selected
+ * based on URL hash parameters (quick-switch mode) vs current window (extension icon).
+ */
+
+import { getWindowIdFromContext } from '../js/popup.js';
+
+describe('getWindowIdFromContext', () => {
+    describe('Window ID from URL hash (quick-switch mode)', () => {
+        it('should use windowId from hash when present and valid', () => {
+            const urlString = 'popup.html#windowId=456&action=switch';
+            const currentWindowId = 100;
+
+            const result = getWindowIdFromContext(urlString, currentWindowId);
+
+            expect(result).toBe(456);
+        });
+
+        it('should handle parameters in different order', () => {
+            const urlString = 'popup.html#action=switch&tabId=10&windowId=777&sessionName=test';
+            const currentWindowId = 100;
+
+            const result = getWindowIdFromContext(urlString, currentWindowId);
+
+            expect(result).toBe(777);
+        });
+    });
+
+    describe('Fallback to current window', () => {
+        it('should use current window when windowId is not in hash', () => {
+            const urlString = 'popup.html#action=switch';
+            const currentWindowId = 100;
+
+            const result = getWindowIdFromContext(urlString, currentWindowId);
+
+            expect(result).toBe(100);
+        });
+
+        it('should use current window when windowId is "false"', () => {
+            const urlString = 'popup.html#windowId=false';
+            const currentWindowId = 100;
+
+            const result = getWindowIdFromContext(urlString, currentWindowId);
+
+            expect(result).toBe(100);
+        });
+
+        it('should use current window when no hash present', () => {
+            const urlString = 'popup.html';
+            const currentWindowId = 100;
+
+            const result = getWindowIdFromContext(urlString, currentWindowId);
+
+            expect(result).toBe(100);
+        });
+    });
+
+    describe('Invalid window ID values', () => {
+        it('should return false when windowId is NaN', () => {
+            const urlString = 'popup.html#windowId=invalid';
+            const currentWindowId = 100;
+
+            const result = getWindowIdFromContext(urlString, currentWindowId);
+
+            expect(result).toBe(false);
+        });
+
+        it('should return false when windowId is zero or negative', () => {
+            expect(getWindowIdFromContext('popup.html#windowId=0', 100)).toBe(false);
+            expect(getWindowIdFromContext('popup.html#windowId=-5', 100)).toBe(false);
+        });
+
+        it('should return false when current window ID is invalid', () => {
+            expect(getWindowIdFromContext('popup.html', 0)).toBe(false);
+            expect(getWindowIdFromContext('popup.html', -1)).toBe(false);
+        });
+
+        it('should return false when currentWindowId is null and no hash value', () => {
+            const result = getWindowIdFromContext('popup.html', null);
+            expect(result).toBe(false);
+        });
+    });
+
+    describe('Bug fix verification', () => {
+        it('BUG FIX: should prioritize hash windowId over currentWindowId in quick-switch mode', () => {
+            // This is the core bug that was fixed
+            // The popup window itself has ID 100, but we want to use the original window ID 456
+            const urlString = 'popup.html#windowId=456&action=switch';
+            const currentWindowId = 100; // This would be the popup window's ID
+
+            const result = getWindowIdFromContext(urlString, currentWindowId);
+
+            // MUST use 456 from hash, NOT 100 from currentWindowId
+            expect(result).toBe(456);
+        });
+
+        it('should use currentWindowId when opened from extension icon (no hash)', () => {
+            const result = getWindowIdFromContext('popup.html', 200);
+            expect(result).toBe(200);
+        });
+    });
+});