Ensure Alert.enterSomething's yes callback's type includes the answer (#3052)gh-1215

3 files changed, 8 insertions, 3 deletions

diff --git a/static/alert.interfaces.ts b/static/alert.interfaces.ts
index 5531f7b3e..f64164c3b 100644
--- a/static/alert.interfaces.ts
+++ b/static/alert.interfaces.ts
@@ -39,6 +39,11 @@ export interface AlertAskOptions {
     onClose?: () => void;
 }
 
+export type AlertEnterTextOptions = {
+    /** The enter text action returns a value which is captured here */
+    yes?: (answer: string) => void;
+} & Partial<Pick<AlertAskOptions, 'no' | 'yesHtml' | 'yesClass' | 'noHtml' | 'noClass' | 'onClose'>>;
+
 export interface AlertNotifyOptions {
     /**
      * Which group this notification is from. Sets data-group attribute value
diff --git a/static/alert.ts b/static/alert.ts
index 1d06e1d47..0099c0e60 100644
--- a/static/alert.ts
+++ b/static/alert.ts
@@ -24,7 +24,7 @@
 
 import $ from 'jquery';
 
-import { AlertAskOptions, AlertNotifyOptions } from "./alert.interfaces";
+import { AlertAskOptions, AlertEnterTextOptions, AlertNotifyOptions } from './alert.interfaces';
 
 export class Alert {
     yesHandler: (answer?: string | string[] | number) => void | null = null;
@@ -137,7 +137,7 @@ export class Alert {
     /**
      * Asks the user a two choice question, where the title, content and buttons are customizable
      */
-    enterSomething(title: string, question: string, defaultValue: string, askOptions: AlertAskOptions) {
+    enterSomething(title: string, question: string, defaultValue: string, askOptions: AlertEnterTextOptions) {
         const modal = $('#enter-something');
         this.yesHandler = askOptions?.yes ?? (() => undefined);
         this.noHandler = askOptions?.no ?? (() => undefined);
diff --git a/static/multifile-service.ts b/static/multifile-service.ts
index 4812e44b0..6d491332c 100644
--- a/static/multifile-service.ts
+++ b/static/multifile-service.ts
@@ -475,7 +475,7 @@ export class MultifileService {
 
         return new Promise((resolve) => {
             this.alertSystem.enterSomething('Rename file', 'Please enter new filename', suggestedFilename, {
-                yes: (value) => {
+                yes: (value: string) => {
                     if (value !== '' && value[0] !== '/') {
                         if (!this.fileExists(value, file)) {
                             file.filename = value;