Fixed workflow UI bugs
This commit is contained in:
@@ -2,6 +2,8 @@ module shuffle
|
|||||||
|
|
||||||
go 1.22.0
|
go 1.22.0
|
||||||
|
|
||||||
|
//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
|
||||||
|
|
||||||
toolchain go1.22.2
|
toolchain go1.22.2
|
||||||
|
|
||||||
require (
|
require (
|
||||||
@@ -18,7 +20,7 @@ require (
|
|||||||
github.com/gorilla/mux v1.8.1
|
github.com/gorilla/mux v1.8.1
|
||||||
github.com/h2non/filetype v1.1.3
|
github.com/h2non/filetype v1.1.3
|
||||||
github.com/satori/go.uuid v1.2.0
|
github.com/satori/go.uuid v1.2.0
|
||||||
github.com/shuffle/shuffle-shared v0.6.24
|
github.com/shuffle/shuffle-shared v0.6.27
|
||||||
golang.org/x/crypto v0.22.0
|
golang.org/x/crypto v0.22.0
|
||||||
google.golang.org/api v0.176.1
|
google.golang.org/api v0.176.1
|
||||||
google.golang.org/grpc v1.63.2
|
google.golang.org/grpc v1.63.2
|
||||||
|
|||||||
@@ -437,6 +437,10 @@ github.com/shuffle/shuffle-shared v0.6.18 h1:mKc3vGuCz9ubdqMwaLocSbEUZyso620CY73
|
|||||||
github.com/shuffle/shuffle-shared v0.6.18/go.mod h1:00QOcSPlUWMXzJj1D7pjcV9h6nVRWfSWqTM10+fhTd0=
|
github.com/shuffle/shuffle-shared v0.6.18/go.mod h1:00QOcSPlUWMXzJj1D7pjcV9h6nVRWfSWqTM10+fhTd0=
|
||||||
github.com/shuffle/shuffle-shared v0.6.24 h1:gSUsI7o7DG0Z/AYtDQuSvhivWVV4MQPa5JU08YKAy2U=
|
github.com/shuffle/shuffle-shared v0.6.24 h1:gSUsI7o7DG0Z/AYtDQuSvhivWVV4MQPa5JU08YKAy2U=
|
||||||
github.com/shuffle/shuffle-shared v0.6.24/go.mod h1:rWkh1eWdIx7OqQzJ1+JzF3Hck1X/Ty1WkUtjLrp+CU4=
|
github.com/shuffle/shuffle-shared v0.6.24/go.mod h1:rWkh1eWdIx7OqQzJ1+JzF3Hck1X/Ty1WkUtjLrp+CU4=
|
||||||
|
github.com/shuffle/shuffle-shared v0.6.26 h1:UZ4o3s+GPULLv/gy31SdhUw1ttvF+f1FfP18bxD7+Bw=
|
||||||
|
github.com/shuffle/shuffle-shared v0.6.26/go.mod h1:rWkh1eWdIx7OqQzJ1+JzF3Hck1X/Ty1WkUtjLrp+CU4=
|
||||||
|
github.com/shuffle/shuffle-shared v0.6.27 h1:q4qZD6bGZFIvZ5Y10unGr3N3rZ7OryWyvvaGgANZJZU=
|
||||||
|
github.com/shuffle/shuffle-shared v0.6.27/go.mod h1:rWkh1eWdIx7OqQzJ1+JzF3Hck1X/Ty1WkUtjLrp+CU4=
|
||||||
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
||||||
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||||
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
||||||
|
|||||||
@@ -434,7 +434,7 @@ const Admin = (props) => {
|
|||||||
const createAppAuthenticationGroup = (name, description, appAuthIds) => {
|
const createAppAuthenticationGroup = (name, description, appAuthIds) => {
|
||||||
let app_auths = appAuthIds.map((appAuthId) => {
|
let app_auths = appAuthIds.map((appAuthId) => {
|
||||||
return { id: appAuthId };
|
return { id: appAuthId };
|
||||||
});
|
})
|
||||||
|
|
||||||
fetch(globalUrl + "/api/v1/apps/authentication/group", {
|
fetch(globalUrl + "/api/v1/apps/authentication/group", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
@@ -2090,6 +2090,9 @@ If you're interested, please let me know a time that works for you, or set up a
|
|||||||
};
|
};
|
||||||
|
|
||||||
const getAppAuthenticationGroups = () => {
|
const getAppAuthenticationGroups = () => {
|
||||||
|
console.log("DEBUG: Skipping app auth group loading")
|
||||||
|
return
|
||||||
|
|
||||||
fetch(globalUrl + "/api/v1/apps/authentication/group", {
|
fetch(globalUrl + "/api/v1/apps/authentication/group", {
|
||||||
method: "GET",
|
method: "GET",
|
||||||
headers: {
|
headers: {
|
||||||
|
|||||||
@@ -208,10 +208,10 @@ export const triggers = [
|
|||||||
id: "",
|
id: "",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Pipelines by Tenzir",
|
name: "Pipelines",
|
||||||
type: "TRIGGER",
|
type: "TRIGGER",
|
||||||
status: "uninitialized",
|
status: "uninitialized",
|
||||||
description: "BETA: Support only for Tenzir pipelines - trigger",
|
description: "Run a pipeline trigger",
|
||||||
trigger_type: "PIPELINE",
|
trigger_type: "PIPELINE",
|
||||||
errors: null,
|
errors: null,
|
||||||
is_valid: true,
|
is_valid: true,
|
||||||
@@ -7510,7 +7510,11 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
})
|
})
|
||||||
.then((responseJson) => {
|
.then((responseJson) => {
|
||||||
if (!responseJson.success) {
|
if (!responseJson.success) {
|
||||||
toast("Failed to set pipeline: " + responseJson.reason);
|
if (responseJson.reason !== undefined) {
|
||||||
|
toast("Failed to set pipeline: " + responseJson.reason);
|
||||||
|
} else {
|
||||||
|
toast.error("Failed to stop pipeline")
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
if (data.type === "create") {
|
if (data.type === "create") {
|
||||||
toast("Pipeline will be created!");
|
toast("Pipeline will be created!");
|
||||||
@@ -8016,11 +8020,13 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
<div style={appScrollStyle}>
|
<div style={appScrollStyle}>
|
||||||
{triggers.map((trigger, index) => {
|
{triggers.map((trigger, index) => {
|
||||||
|
|
||||||
|
/*
|
||||||
if (trigger.trigger_type === "PIPELINE") {
|
if (trigger.trigger_type === "PIPELINE") {
|
||||||
if (userdata.support !== true) {
|
if (userdata.support !== true) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
// Hiding since March 2024
|
// Hiding since March 2024
|
||||||
if (trigger.trigger_type === "EMAIL") {
|
if (trigger.trigger_type === "EMAIL") {
|
||||||
@@ -8051,7 +8057,7 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
return (
|
return (
|
||||||
<span>
|
<span>
|
||||||
{title.length > 0 ?
|
{title.length > 0 ?
|
||||||
<Typography variant="h6" style={{ marginTop: 10, marginBottom: 10, marginLeft: 10, marginRight: 10 }}>
|
<Typography variant="h6" style={{ marginTop: 10, marginBottom: 10, marginLeft: 10, }}>
|
||||||
{title}
|
{title}
|
||||||
</Typography>
|
</Typography>
|
||||||
: null}
|
: null}
|
||||||
@@ -8083,7 +8089,7 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
></div>
|
></div>
|
||||||
<Grid
|
<Grid
|
||||||
container
|
container
|
||||||
style={{ margin: isMobile ? "10px 0px 0px 0px" : "10px 10px 10px 10px", flex: "10" }}
|
style={{ margin: isMobile ? "10px 0px 0px 0px" : "10px 10px 10px 10px", flex: "10", overflow: "hidden", }}
|
||||||
>
|
>
|
||||||
<Grid item>
|
<Grid item>
|
||||||
<ButtonBase>{imageline}</ButtonBase>
|
<ButtonBase>{imageline}</ButtonBase>
|
||||||
@@ -8094,16 +8100,17 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
display: "flex",
|
display: "flex",
|
||||||
flexDirection: "column",
|
flexDirection: "column",
|
||||||
marginLeft: 20,
|
marginLeft: 20,
|
||||||
overflow: "hidden",
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Grid item style={{ flex: "1", overflow: "hidden", }}>
|
<Grid item style={{ flex: "1", overflow: "hidden", }}>
|
||||||
<h3 style={{ marginTop: 0, marginBottom: 0, overflow: "hidden" }}>
|
<Typography variant="body1" style={{ marginTop: 0, marginBottom: 0, overflow: "hidden" }}>
|
||||||
{trigger.name}
|
{trigger.name}
|
||||||
</h3>
|
</Typography>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid item style={{ flex: "1" }}>
|
<Grid item style={{ flex: "1" }}>
|
||||||
{trigger.description}
|
<Typography variant="body2" color="textSecondary" style={{ marginTop: 0, marginBottom: 0, overflow: "hidden", }}>
|
||||||
|
{trigger.description}
|
||||||
|
</Typography>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user