From 2374d20dac0158dfd127e9062c368c1c652a33ef Mon Sep 17 00:00:00 2001 From: Benjamin Chrobot Date: Tue, 25 Jun 2019 12:39:15 -0400 Subject: [PATCH] Update resolver to look for script_options column and fall back to script column. --- src/server/api/interaction-step.js | 5 ++++- src/server/models/interaction-step.js | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/server/api/interaction-step.js b/src/server/api/interaction-step.js index d3d73409f..9acf9ea56 100644 --- a/src/server/api/interaction-step.js +++ b/src/server/api/interaction-step.js @@ -6,7 +6,6 @@ export const resolvers = { ...mapFieldsToModel( [ "id", - "script", "answerOption", "answerActions", "parentInteractionId", @@ -14,6 +13,10 @@ export const resolvers = { ], InteractionStep ), + script: async interactionStep => { + const { script, script_options } = interactionStep; + return (script_options && script_options[0]) || script; + }, questionText: async interactionStep => { return interactionStep.question; }, diff --git a/src/server/models/interaction-step.js b/src/server/models/interaction-step.js index 1712580d2..3286a8ea9 100644 --- a/src/server/models/interaction-step.js +++ b/src/server/models/interaction-step.js @@ -14,6 +14,7 @@ const InteractionStep = thinky.createModel( // PROMPTS: question: optionalString(), script: optionalString(), + // script_options: [type.string()], // thinky does not support rethink-style list properties created_at: timestamp(), // Previously there were answer options, and no such thing as