From 9c3fc4ab9f30fdc8669c5f646f8e09dfe140e4f8 Mon Sep 17 00:00:00 2001 From: Paulo Bittencourt Date: Wed, 11 Sep 2019 11:35:51 -0400 Subject: [PATCH] [MM-15220] Add generic error field to SubmitDialogResponse (#12081) This will allow integrations to return an generic error message that is not tied to a specific dialog field. --- app/integration_action_test.go | 2 ++ model/integration_action.go | 1 + model/integration_action_test.go | 1 + 3 files changed, 4 insertions(+) diff --git a/app/integration_action_test.go b/app/integration_action_test.go index d7eaca982a..d204efcd23 100644 --- a/app/integration_action_test.go +++ b/app/integration_action_test.go @@ -430,6 +430,7 @@ func TestSubmitInteractiveDialog(t *testing.T) { assert.Equal(t, "value1", val) resp := model.SubmitDialogResponse{ + Error: "some generic error", Errors: map[string]string{"name1": "some error"}, } @@ -444,6 +445,7 @@ func TestSubmitInteractiveDialog(t *testing.T) { resp, err := th.App.SubmitInteractiveDialog(submit) assert.Nil(t, err) require.NotNil(t, resp) + assert.Equal(t, "some generic error", resp.Error) assert.Equal(t, "some error", resp.Errors["name1"]) submit.URL = "" diff --git a/model/integration_action.go b/model/integration_action.go index 82e402b531..f57611f6d6 100644 --- a/model/integration_action.go +++ b/model/integration_action.go @@ -222,6 +222,7 @@ type SubmitDialogRequest struct { } type SubmitDialogResponse struct { + Error string `json:"error,omitempty"` Errors map[string]string `json:"errors,omitempty"` } diff --git a/model/integration_action_test.go b/model/integration_action_test.go index 80c582b2ef..2c7251af09 100644 --- a/model/integration_action_test.go +++ b/model/integration_action_test.go @@ -141,6 +141,7 @@ func TestSubmitDialogRequestToJson(t *testing.T) { func TestSubmitDialogResponseToJson(t *testing.T) { t.Run("all fine", func(t *testing.T) { request := SubmitDialogResponse{ + Error: "some generic error", Errors: map[string]string{ "text": "some text", "float": "1.2",