From b4976e32b39b6fb551e2086011729d1e67b2b8c6 Mon Sep 17 00:00:00 2001 From: frikky Date: Wed, 14 Oct 2020 12:15:53 +0200 Subject: [PATCH] Fixed JSON parser(s) --- backend/go-app/walkoff.go | 14 +++++++------- frontend/src/views/AngularWorkflow.jsx | 22 +++++++++++++--------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go index b86153ab..3b725726 100644 --- a/backend/go-app/walkoff.go +++ b/backend/go-app/walkoff.go @@ -370,13 +370,13 @@ type ExecutionRequestWrapper struct { } type AppExecutionExample struct { - AppName string `json:"app_name"` - AppVersion string `json:"app_version"` - AppAction string `json:"app_action"` - AppId string `json:"app_id"` - ExampleId string `json:"example_id"` - SuccessExamples []string `json:"success_examples"` - FailureExamples []string `json:"failure_examples"` + AppName string `json:"app_name" datastore:"app_name"` + AppVersion string `json:"app_version" datastore:"app_version"` + AppAction string `json:"app_action" datastore:"app_action"` + AppId string `json:"app_id" datastore:"app_id"` + ExampleId string `json:"example_id" datastore:"example_id"` + SuccessExamples []string `json:"success_examples" datastore:"success_examples,noindex"` + FailureExamples []string `json:"failure_examples" datastore:"failure_examples,noindex"` } // This might be... a bit off, but that's fine :) diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index d8faa747..ac5925d0 100644 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -2531,14 +2531,16 @@ const AngularWorkflow = (props) => { foundResult.result = foundResult.result.trim() foundResult.result = foundResult.result.split(" None").join(" \"None\"") + foundResult.result = foundResult.result.split(" False").join(" false") + foundResult.result = foundResult.result.split(" True").join(" true") foundResult.result = foundResult.result.split("\'").join("\"") var jsonvalid = true try { const tmp = String(JSON.parse(foundResult.result)) - if (!tmp.includes("{") && !tmp.includes("[")) { - jsonvalid = false - } + //if (!tmp.includes("{") && !tmp.includes("[")) { + // jsonvalid = false + //} } catch (e) { jsonvalid = false } @@ -2625,9 +2627,9 @@ const AngularWorkflow = (props) => { var jsonvalid = true try { const tmp = String(JSON.parse(actionItem.example)) - if (!tmp.includes("{") && !tmp.includes("[")) { - jsonvalid = false - } + //if (!tmp.includes("{") && !tmp.includes("[")) { + // jsonvalid = false + //} } catch (e) { jsonvalid = false } @@ -5344,13 +5346,15 @@ const AngularWorkflow = (props) => { var showResult = executionData.execution_argument.trim() showResult = showResult.split(" None").join(" \"None\"") showResult = showResult.split("\'").join("\"") + showResult = showResult.split(" False").join(" false") + showResult = showResult.split(" True").join(" true") var jsonvalid = true try { const tmp = String(JSON.parse(showResult)) - if (!tmp.includes("{") && !tmp.includes("[")) { - jsonvalid = false - } + //if (!tmp.includes("{") && !tmp.includes("[")) { + // jsonvalid = false + //} } catch (e) { jsonvalid = false }