Rename the "SwitchToTab" message to just "OpenOrFocus"

Author: nedtwigg

src/components/BadgePopups/OpenTabPopup.tsx

@@ -1,12 +1,12 @@
-import { switchToTab } from '@/entrypoints/popup/popup'
+import { openOrFocusComment } from '@/entrypoints/popup/popup'
 
 interface OpenTabPopupProps {
   uniqueKey: string
 }
 
 export function OpenTabPopup({ uniqueKey }: OpenTabPopupProps) {
   const handleClick = () => {
-    switchToTab(uniqueKey)
+    openOrFocusComment(uniqueKey)
   }
 
   return (

src/components/CommentRow.tsx

@@ -1,7 +1,7 @@
 import Badge from '@/components/Badge'
 import { timeAgo } from '@/components/misc'
 import type { CommentTableRow } from '@/entrypoints/background'
-import { switchToTab } from '@/entrypoints/popup/popup'
+import { openOrFocusComment } from '@/entrypoints/popup/popup'
 import { EnhancerRegistry } from '@/lib/registries'
 
 const enhancers = new EnhancerRegistry()
@@ -18,7 +18,7 @@ export function CommentRow({ row, selectedIds, toggleSelection }: CommentRowProp
   const enhancer = enhancers.enhancerFor(row.spot)
 
   const handleTitleClick = () => {
-    switchToTab(row.spot.unique_key)
+    openOrFocusComment(row.spot.unique_key)
   }
   return (
     <tr className='hover:bg-gray-50'>

src/entrypoints/background.ts

@@ -6,7 +6,7 @@ import {
   CLOSE_MESSAGE_PORT,
   isContentToBackgroundMessage,
   isGetOpenSpotsMessage,
-  isSwitchToTabMessage,
+  isOpenOrFocusMessage,
   KEEP_PORT_OPEN,
 } from '@/lib/messages'
 
@@ -106,7 +106,7 @@ export function handlePopupMessage(
     const response: GetTableRowsResponse = { rows }
     sendResponse(response)
     return KEEP_PORT_OPEN
-  } else if (isSwitchToTabMessage(message)) {
+  } else if (isOpenOrFocusMessage(message)) {
     logger.debug('received switch tab message', message)
     const storage = openSpots.get(message.uniqueKey)
     if (storage) {
@@ -119,7 +119,7 @@ export function handlePopupMessage(
           console.error('Error switching to tab:', error)
         })
     } else {
-      console.error('No tab found for unique key:', message.uniqueKey)
+      console.error('TODO: implement opening a previous comment', message.uniqueKey)
     }
     return CLOSE_MESSAGE_PORT
   } else {

src/entrypoints/popup/popup.tsx

@@ -3,7 +3,7 @@ import { createRoot } from 'react-dom/client'
 import { PopupRoot } from '@/components/PopupRoot'
 import type { CommentTableRow } from '@/entrypoints/background'
 import { logger } from '@/lib/logger'
-import type { GetOpenSpotsMessage, GetTableRowsResponse, SwitchToTabMessage } from '@/lib/messages'
+import type { GetOpenSpotsMessage, GetTableRowsResponse, OpenOrFocusMessage } from '@/lib/messages'
 
 export interface FilterState {
   sentFilter: 'both' | 'sent' | 'unsent'
@@ -24,9 +24,9 @@ async function getOpenSpots(): Promise<CommentTableRow[]> {
   }
 }
 
-export function switchToTab(uniqueKey: string): void {
-  const message: SwitchToTabMessage = {
-    type: 'SWITCH_TO_TAB',
+export function openOrFocusComment(uniqueKey: string): void {
+  const message: OpenOrFocusMessage = {
+    type: 'OPEN_OR_FOCUS_COMMENT',
     uniqueKey,
   }
   browser.runtime.sendMessage(message)

src/lib/messages.ts

@@ -13,12 +13,12 @@ export interface GetOpenSpotsMessage {
   type: 'GET_OPEN_SPOTS'
 }
 
-export interface SwitchToTabMessage {
-  type: 'SWITCH_TO_TAB'
+export interface OpenOrFocusMessage {
+  type: 'OPEN_OR_FOCUS_COMMENT'
   uniqueKey: string
 }
 
-export type PopupToBackgroundMessage = GetOpenSpotsMessage | SwitchToTabMessage
+export type PopupToBackgroundMessage = GetOpenSpotsMessage | OpenOrFocusMessage
 
 // All messages sent to background
 export type ToBackgroundMessage = ContentToBackgroundMessage | PopupToBackgroundMessage
@@ -62,8 +62,10 @@ export function isGetOpenSpotsMessage(message: any): message is GetOpenSpotsMess
   return message && message.type === 'GET_OPEN_SPOTS'
 }
 
-export function isSwitchToTabMessage(message: any): message is SwitchToTabMessage {
-  return message && message.type === 'SWITCH_TO_TAB' && typeof message.uniqueKey === 'string'
+export function isOpenOrFocusMessage(message: any): message is OpenOrFocusMessage {
+  return (
+    message && message.type === 'OPEN_OR_FOCUS_COMMENT' && typeof message.uniqueKey === 'string'
+  )
 }
 
 // Message handler types