Don't even unmarshall _ui section in flows

nyaruka · Mar 15, 2018 · c416b42 · c416b42
1 parent a51d25d
commit c416b42
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/flows/definition/flow.go b/flows/definition/flow.go
@@ -130,13 +130,17 @@ var _ utils.VariableResolver = (*flow)(nil)
 //------------------------------------------------------------------------------------------
 
 type flowEnvelope struct {
-	UUID               flows.FlowUUID         `json:"uuid"               validate:"required,uuid4"`
-	Name               string                 `json:"name"               validate:"required"`
-	Language           utils.Language         `json:"language"`
-	ExpireAfterMinutes int                    `json:"expire_after_minutes"`
-	Localization       localization           `json:"localization"`
-	Nodes              []*node                `json:"nodes"`
-	UI                 map[string]interface{} `json:"_ui,omitempty"`
+	UUID               flows.FlowUUID `json:"uuid"               validate:"required,uuid4"`
+	Name               string         `json:"name"               validate:"required"`
+	Language           utils.Language `json:"language"`
+	ExpireAfterMinutes int            `json:"expire_after_minutes"`
+	Localization       localization   `json:"localization"`
+	Nodes              []*node        `json:"nodes"`
+}
+
+type flowEnvelopeWithUI struct {
+	flowEnvelope
+	UI map[string]interface{} `json:"_ui,omitempty"`
 }
 
 // ReadFlow reads a single flow definition from the passed in byte array
@@ -155,12 +159,14 @@ func ReadFlow(data json.RawMessage) (flows.Flow, error) {
 
 // MarshalJSON marshals this flow into JSON
 func (f *flow) MarshalJSON() ([]byte, error) {
-	var fe = &flowEnvelope{
-		UUID:               f.uuid,
-		Name:               f.name,
-		Language:           f.language,
-		ExpireAfterMinutes: f.expireAfterMinutes,
-		UI:                 f.ui,
+	var fe = &flowEnvelopeWithUI{
+		flowEnvelope: flowEnvelope{
+			UUID:               f.uuid,
+			Name:               f.name,
+			Language:           f.language,
+			ExpireAfterMinutes: f.expireAfterMinutes,
+		},
+		UI: f.ui,
 	}
 
 	if f.localization != nil {