From 42040cb6bd07737b165ec1c8f2466efc1c974a51 Mon Sep 17 00:00:00 2001 From: frikky Date: Fri, 22 Oct 2021 18:41:52 +0200 Subject: [PATCH] Fixed shuffle-shared version in worker and orborus and bumped versions --- backend/go-app/go.mod | 2 +- frontend/src/components/OrgHeader.js | 33 ++- frontend/src/views/AngularWorkflow.jsx | 12 +- frontend/src/views/Workflows.jsx | 4 +- functions/onprem/orborus/build.sh | 2 +- functions/onprem/orborus/go.mod | 37 +-- functions/onprem/orborus/go.sum | 266 +------------------ functions/onprem/orborus/orborus.go | 2 +- functions/onprem/worker/Dockerfile | 3 +- functions/onprem/worker/build.sh | 2 +- functions/onprem/worker/go.mod | 38 +-- functions/onprem/worker/go.sum | 346 +------------------------ functions/onprem/worker/worker.go | 4 +- 13 files changed, 72 insertions(+), 679 deletions(-) diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index bd9760cb..c175d626 100644 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -2,7 +2,7 @@ module main go 1.15 -//replace github.com/shuffle/shuffle-shared => ../../../../git/shuffle-shared +replace github.com/shuffle/shuffle-shared => ../../../../git/shuffle-shared //replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi //replace github.com/frikky/go-elasticsearch => ../../../../git/go-elasticsearch diff --git a/frontend/src/components/OrgHeader.js b/frontend/src/components/OrgHeader.js index 65dd6e97..8730ed59 100644 --- a/frontend/src/components/OrgHeader.js +++ b/frontend/src/components/OrgHeader.js @@ -38,6 +38,7 @@ const OrgHeader = (props) => { const [workflowDownloadBranch, setWorkflowDownloadBranch] = React.useState(selectedOrganization.defaults === undefined ? defaultBranch : selectedOrganization.defaults.workflow_download_branch === undefined || selectedOrganization.defaults.workflow_download_branch.length === 0 ? defaultBranch : selectedOrganization.defaults.workflow_download_branch) const [ssoEntrypoint, setSsoEntrypoint] = React.useState(selectedOrganization.sso_config === undefined ? "" : selectedOrganization.sso_config.sso_entrypoint === undefined || selectedOrganization.sso_config.sso_entrypoint.length === 0 ? "" : selectedOrganization.sso_config.sso_entrypoint) const [ssoCertificate, setSsoCertificate] = React.useState(selectedOrganization.sso_config === undefined ? "" : selectedOrganization.sso_config.sso_certificate === undefined || selectedOrganization.sso_config.sso_certificate.length === 0 ? "" : selectedOrganization.sso_config.sso_certificate) + const [notificationWorkflow, setNotificationWorkflow] = React.useState(selectedOrganization.defaults === undefined ? "" : selectedOrganization.defaults.notification_workflow === undefined || selectedOrganization.defaults.notification_workflow.length === 0 ? "" : selectedOrganization.defaults.notification_workflow) const [file, setFile] = React.useState("") const [fileBase64, setFileBase64] = React.useState(selectedOrganization.image) @@ -113,7 +114,7 @@ const OrgHeader = (props) => { setFile(fileObject) } - console.log("USER: ", userdata) + //console.log("USER: ", userdata) const orgSaveButton =