From 3b851e9a22cbc026200c9a4fb21c84ba101679da Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Sat, 26 Sep 2020 16:21:18 +1000
Subject: [PATCH] change service bus topics for dialogs

---
 .../messagedispatcher/messagedispatcher.go    | 37 +------------------
 v2/internal/runtime/goruntime/dialog.go       |  4 +-
 2 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/v2/internal/messagedispatcher/messagedispatcher.go b/v2/internal/messagedispatcher/messagedispatcher.go
index 2d25b9757..54d2e24dc 100644
--- a/v2/internal/messagedispatcher/messagedispatcher.go
+++ b/v2/internal/messagedispatcher/messagedispatcher.go
@@ -333,10 +333,10 @@ func (d *Dispatcher) processDialogMessage(result *servicebus.Message) {
 			filter = splitTopic[4]
 		}
 		switch dialogType {
-		case "file":
+		case "open":
 			responseTopic, ok := result.Data().(string)
 			if !ok {
-				d.logger.Error("Invalid responseTopic for 'dialog:select:file' : %#v", result.Data())
+				d.logger.Error("Invalid responseTopic for 'dialog:select:open' : %#v", result.Data())
 				return
 			}
 			d.logger.Info("Opening File dialog! responseTopic = %s", responseTopic)
@@ -350,39 +350,6 @@ func (d *Dispatcher) processDialogMessage(result *servicebus.Message) {
 
 			// Send dummy response
 			d.servicebus.Publish(responseTopic, result)
-		case "filesave":
-			responseTopic, ok := result.Data().(string)
-			if !ok {
-				d.logger.Error("Invalid responseTopic for 'dialog:select:filesave' : %#v", result.Data())
-				return
-			}
-			d.logger.Info("Opening Save File dialog! responseTopic = %s", responseTopic)
-
-			// TODO: Work out what we mean in a multi window environment...
-			// For now we will just pick the first one
-			var result []string
-			for _, client := range d.clients {
-				result = client.frontend.OpenDialog(title, filter)
-			}
-
-			// Send dummy response
-			d.servicebus.Publish(responseTopic, result)
-		case "directory":
-			responseTopic, ok := result.Data().(string)
-			if !ok {
-				d.logger.Error("Invalid responseTopic for 'dialog:select:directory' : %#v", result.Data())
-				return
-			}
-			d.logger.Info("Opening Directory dialog! responseTopic = %s", responseTopic)
-
-			// TODO: Work out what we mean in a multi window environment...
-			// For now we will just pick the first one
-			var result []string
-			for _, client := range d.clients {
-				result = client.frontend.OpenDialog(title, filter)
-			}
-			// Send dummy response
-			d.servicebus.Publish(responseTopic, result)
 
 		default:
 			d.logger.Error("Unknown dialog command: %s", command)
diff --git a/v2/internal/runtime/goruntime/dialog.go b/v2/internal/runtime/goruntime/dialog.go
index 75b23fc6f..2d46b41b7 100644
--- a/v2/internal/runtime/goruntime/dialog.go
+++ b/v2/internal/runtime/goruntime/dialog.go
@@ -51,14 +51,14 @@ func (r *dialog) OpenDialog(params ...string) []string {
 	uniqueCallback := crypto.RandomID()
 
 	// Subscribe to the respose channel
-	responseTopic := "dialog:directoryselected:" + uniqueCallback
+	responseTopic := "dialog:openselected:" + uniqueCallback
 	dialogResponseChannel, err := r.bus.Subscribe(responseTopic)
 	if err != nil {
 		fmt.Printf("ERROR: Cannot subscribe to bus topic: %+v\n", err.Error())
 	}
 
 	// Publish dialog request
-	message := "dialog:select:directory:" + title
+	message := "dialog:select:open:" + title
 	if filter != "" {
 		message += ":" + filter
 	}