tighten typing of select box webview messages

Author: jankuca

src/notebooks/deepnote/selectInputSettingsWebview.ts

@@ -17,7 +17,7 @@ import { inject, injectable } from 'inversify';
 import { IExtensionContext } from '../../platform/common/types';
 import { LocalizedMessages } from '../../messageTypes';
 import * as localize from '../../platform/common/utils/localize';
-import { SelectInputSettings } from '../../platform/notebooks/deepnote/types';
+import { SelectInputSettings, SelectInputWebviewMessage } from '../../platform/notebooks/deepnote/types';
 
 /**
  * Manages the webview panel for select input settings
@@ -145,10 +145,10 @@ export class SelectInputSettingsWebviewProvider {
         });
     }
 
-    private async handleMessage(message: { type: string; settings?: SelectInputSettings }): Promise<void> {
+    private async handleMessage(message: SelectInputWebviewMessage): Promise<void> {
         switch (message.type) {
             case 'save':
-                if (message.settings && this.currentCell) {
+                if (this.currentCell) {
                     try {
                         await this.saveSettings(message.settings);
                         if (this.resolvePromise) {
@@ -174,6 +174,11 @@ export class SelectInputSettingsWebviewProvider {
                 }
                 this.currentPanel?.dispose();
                 break;
+
+            case 'init':
+            case 'locInit':
+                // These messages are sent from extension to webview, not handled here
+                break;
         }
     }
 

src/platform/notebooks/deepnote/types.ts

@@ -17,11 +17,11 @@ export interface SelectInputSettings {
 /**
  * Message types for select input settings webview
  */
-export interface SelectInputWebviewMessage {
-    type: 'init' | 'save' | 'locInit' | 'cancel';
-    settings?: SelectInputSettings;
-    locStrings?: Record<string, string>;
-}
+export type SelectInputWebviewMessage =
+    | { type: 'init'; settings: SelectInputSettings }
+    | { type: 'save'; settings: SelectInputSettings }
+    | { type: 'locInit'; locStrings: Record<string, string> }
+    | { type: 'cancel' };
 
 export const IIntegrationStorage = Symbol('IIntegrationStorage');
 export interface IIntegrationStorage extends IDisposable {

src/webviews/webview-side/selectInputSettings/SelectInputSettingsPanel.tsx

@@ -28,15 +28,16 @@ export const SelectInputSettingsPanel: React.FC<ISelectInputSettingsPanelProps>
 
             switch (message.type) {
                 case 'init':
-                    if (message.settings) {
-                        setSettings(message.settings);
-                    }
+                    setSettings(message.settings);
                     break;
 
                 case 'locInit':
-                    if (message.locStrings) {
-                        storeLocStrings(message.locStrings);
-                    }
+                    storeLocStrings(message.locStrings);
+                    break;
+
+                case 'save':
+                case 'cancel':
+                    // These messages are sent from webview to extension, not handled here
                     break;
             }
         };