From 5a33135dd70f33ed5f51be7d9dbb9d09a2943c96 Mon Sep 17 00:00:00 2001 From: Frikky Date: Thu, 19 Oct 2023 14:19:34 +0200 Subject: [PATCH] Changed go.mod slightly --- .env | 3 ++- backend/go-app/go.mod | 2 +- backend/go-app/main.go | 1 - frontend/src/components/WorkflowTemplatePopup.jsx | 7 ++++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 2b8a6a44..3fcb68b8 100755 --- a/.env +++ b/.env @@ -69,11 +69,12 @@ SHUFFLE_SWARM_BRIDGE_DEFAULT_MTU=1500 # 1500 by default # Used for auto-cleanup of containers. REALLY important at scale. Set to false to see all container info. SHUFFLE_CONTAINER_AUTO_CLEANUP=true SHUFFLE_ORBORUS_EXECUTION_CONCURRENCY=3 # The amount of concurrent executions Orborus can handle. This is a soft limit, but it's recommended to keep it low. +SHUFFLE_HEALTHCHECK_DISABLED=false SHUFFLE_ELASTIC=true SHUFFLE_LOGS_DISABLED=false SHUFFLE_CHAT_DISABLED=false # Controls support chat -SHUFFLE_RERUN_SCHEDULE=300 SHUFFLE_DISABLE_RERUN_AND_ABORT=false +SHUFFLE_RERUN_SCHEDULE=300 SHUFFLE_WORKER_SERVER_URL= # Definition in case Worker & Orborus is talking to the wrong server SHUFFLE_ORBORUS_PULL_TIME= # Definition in case Orborus is pulling too often/not often enough diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index 109796ed..e5cc3345 100755 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -1,6 +1,6 @@ module shuffle-shared -replace github.com/shuffle/shuffle-shared => ../../../../git/shuffle-shared +replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared go 1.19 diff --git a/backend/go-app/main.go b/backend/go-app/main.go index ba444b10..c1256808 100755 --- a/backend/go-app/main.go +++ b/backend/go-app/main.go @@ -5861,7 +5861,6 @@ func initHandlers() { r := mux.NewRouter() r.HandleFunc("/api/v1/_ah/health", shuffle.HealthCheckHandler) r.HandleFunc("/api/v1/health", shuffle.RunOpsHealthCheck).Methods("GET", "OPTIONS") - r.HandleFunc("/api/v1/health/stats", shuffle.GetOpsDashboardStats).Methods("GET", "OPTIONS") // Make user related locations diff --git a/frontend/src/components/WorkflowTemplatePopup.jsx b/frontend/src/components/WorkflowTemplatePopup.jsx index a0d7842f..f1367092 100644 --- a/frontend/src/components/WorkflowTemplatePopup.jsx +++ b/frontend/src/components/WorkflowTemplatePopup.jsx @@ -171,8 +171,13 @@ const WorkflowTemplatePopup = (props) => { // name: "Email analysis" // source:{app_id: "accdaaf2eeba6a6ed43b2efc0112032d", app_name - setWorkflowLoading(true) + + if (srcapp.includes(":default") || dstapp.includes(":default")) { + toast("You need to select both a source and destination app before generating this workflow.") + return + } + setWorkflowLoading(true) // FIXME: Remove hardcoding here after testing, and user srcapp/dstapp const newsrcapp = srcapp