Merge pull request #137 from onattech/Pipeline_Struct_Add_JSON

json field added to pipelines table for the original flows json.
dataplane-app · Feb 28, 2022 · 61bc9ec · 61bc9ec
2 parents d663201 + 8067807
commit 61bc9ec
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 4 deletions.
diff --git a/app/mainapp/database/models/pipelines.go b/app/mainapp/database/models/pipelines.go
@@ -24,7 +24,8 @@ type Pipelines struct {
 	Current     string         `json:"current"` //current history
 	WorkerGroup string         `json:"worker_group"`
 	Meta        datatypes.JSON `json:"meta"`
-	UpdateLock  bool           `gorm:"default:false;" json:"name"`
+	Json        datatypes.JSON `json:"json"`
+	UpdateLock  bool           `gorm:"default:false;" json:"update_lock"`
 	CreatedAt   time.Time      `json:"created_at"`
 	UpdatedAt   *time.Time     `json:"updated_at"`
 	DeletedAt   *time.Time     `json:"deleted_at,omitempty"`

diff --git a/app/mainapp/graphql/private/generated.go b/app/mainapp/graphql/private/generated.go
diff --git a/app/mainapp/graphql/private/models.go b/app/mainapp/graphql/private/models.go
diff --git a/app/mainapp/graphql/private/resolvers/pipelines.graphqls b/app/mainapp/graphql/private/resolvers/pipelines.graphqls
@@ -56,6 +56,7 @@ input PipelineEdgesInput {
 input PipelineFlowInput {
   nodesInput: [PipelineNodesInput!]!
   edgesInput: [PipelineEdgesInput!]!
+  json: Any!
 }
 
 # ----- Get flow

diff --git a/app/mainapp/graphql/private/resolvers/pipelines.resolvers.go b/app/mainapp/graphql/private/resolvers/pipelines.resolvers.go
@@ -5,7 +5,7 @@ package privateresolvers
 
 import (
 	"context"
-	"dataplane/mainapp/auth_permissions"
+	permissions "dataplane/mainapp/auth_permissions"
 	"dataplane/mainapp/config"
 	"dataplane/mainapp/database"
 	"dataplane/mainapp/database/models"
@@ -269,6 +269,25 @@ func (r *mutationResolver) AddUpdatePipelineFlow(ctx context.Context, input *pri
 		return "", errors.New("add pipeline flow node database error")
 	}
 
+	// Records original JSON information in database
+	JSON, err := json.Marshal(input.JSON)
+	if err != nil {
+		logging.PrintSecretsRedact(err)
+	}
+
+	e := models.Pipelines{
+		Json: JSON,
+	}
+
+	err = database.DBConn.Where("pipeline_id = ?", pipelineID).Updates(&e).Error
+
+	if err != nil {
+		if os.Getenv("debug") == "true" {
+			logging.PrintSecretsRedact(err)
+		}
+		return "", errors.New("Update pipeline database error.")
+	}
+
 	// ----- unlock the pipeline
 	err = database.DBConn.Model(&models.Pipelines{}).Where("pipeline_id = ?", pipelineID).Update("update_lock", false).Error
 	if err != nil {

diff --git a/app/mainapp/graphql/private/resolvers/runpipelines.resolvers.go b/app/mainapp/graphql/private/resolvers/runpipelines.resolvers.go
@@ -5,7 +5,7 @@ package privateresolvers
 
 import (
 	"context"
-	permissions "dataplane/mainapp/auth_permissions"
+	"dataplane/mainapp/auth_permissions"
 	"dataplane/mainapp/config"
 	"dataplane/mainapp/database"
 	"dataplane/mainapp/database/models"

diff --git a/frontend/src/pages/Flow.jsx b/frontend/src/pages/Flow.jsx
@@ -459,5 +459,5 @@ function prepareInputForBackend(input) {
         }
     }
 
-    return { nodesInput, edgesInput };
+    return { nodesInput, edgesInput, json: input };
 }