marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved app execution configuration

Browse Source
This commit is contained in:
frikky
2021-04-21 08:20:35 +02:00
parent 00323689e2
commit 2c1d5ba74e
9 changed files with 82 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/go.mod
+2 -1
View File
@@ -2,7 +2,7 @@ module shuffle
go 1.13
//replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
//replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
@@ -14,6 +14,7 @@ require (
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Microsoft/go-winio v0.4.14 // indirect
github.com/basgys/goxml2json v1.1.0
github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013 // indirect
github.com/carlescere/scheduler v0.0.0-20170109141437-ee74d2f83d82
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v1.13.1
backend/go-app/go.sum
+2
View File
@@ -57,6 +57,8 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/basgys/goxml2json v1.1.0 h1:4ln5i4rseYfXNd86lGEB+Vi652IsIXIvggKM/BhUKVw=
github.com/basgys/goxml2json v1.1.0/go.mod h1:wH7a5Np/Q4QoECFIU8zTQlZwZkrilY0itPfecMw41Dw=
github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013 h1:/P9/RL0xgWE+ehnCUUN5h3RpG3dmoMCOONO1CCvq23Y=
github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013/go.mod h1:pccXHIvs3TV/TUqSNyEvF99sxjX2r4FFRIyw6TZY9+w=
github.com/carlescere/scheduler v0.0.0-20170109141437-ee74d2f83d82 h1:9bAydALqAjBfPHd/eAiJBHnMZUYov8m2PkXVr+YGQeI=
github.com/carlescere/scheduler v0.0.0-20170109141437-ee74d2f83d82/go.mod h1:tyA14J0sA3Hph4dt+AfCjPrYR13+vVodshQSM7km9qw=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
backend/go-app/main.go
+6 -1
View File
@@ -5208,9 +5208,14 @@ func runInit(ctx context.Context) {
}
// Fixing workflows to have real activeorg IDs
//workflowQ := datastore.NewQuery("workflow")
//ret, err := dbclient.GetAll(ctx, workflowQ, &workflows)
//log.Printf("[INFO] Found %d workflows during startup", workflowCount)
//log.Printf("%#v, %s", ret, err)
var workflows []shuffle.Workflow
if len(activeOrgs) == 1 {
q := datastore.NewQuery("workflow").Limit(35)
var workflows []shuffle.Workflow
_, err = dbclient.GetAll(ctx, q, &workflows)
if err != nil && len(workflows) == 0 {
log.Printf("Error getting workflows in runinit: %s", err)
docker-compose.yml
+3 -1
View File
@@ -1,7 +1,7 @@
version: '3'
services:
frontend:
#build: ./frontend
build: ./frontend
image: ghcr.io/frikky/shuffle-frontend:0.8.74
container_name: shuffle-frontend
hostname: shuffle-frontend
@@ -79,6 +79,8 @@ services:
- "8000:8000"
networks:
- shuffle
environment:
- _JAVA_OPTIONS="-Xmx2g"
restart: unless-stopped
volumes:
- ${DB_LOCATION}:/etc/shuffle
frontend/src/components/ParsedAction.jsx
+4
View File
@@ -546,6 +546,10 @@ const ParsedAction = (props) => {
var disabled = false
var rows = "5"
var openApiHelperText = "This is an OpenAPI specific field"
if (selectedApp.generated && data.name === "url" && data.required && data.configuration && hideExtraTypes) {
console.log("GENERATED WITH DATA: ", data)
return null
}
if (selectedApp.generated && data.name === "body") {
const regex = /\${(\w+)}/g
const found = placeholder.match(regex)
frontend/src/views/AngularWorkflow.jsx
+38 -8
View File
@@ -688,6 +688,13 @@ const AngularWorkflow = (props) => {
const saveWorkflow = (curworkflow) => {
var success = false
if (isCloud && !isLoggedIn) {
console.log("Should redirect to register with redirect.")
window.location.href = `/register?view=/workflows/${props.match.params.key}&message=You need sign up to use workflows with Shuffle`
return
}
setSavingState(2)
// This might not be the right course of action, but seems logical, as items could be running already
@@ -1163,7 +1170,7 @@ const AngularWorkflow = (props) => {
if (responseJson.public) {
alert.info("This workflow is public. You will have to save it to make it your own!")
setLastSaved(false)
//setLastSaved(false)
}
setWorkflow(responseJson)
@@ -1267,8 +1274,9 @@ const AngularWorkflow = (props) => {
// Comparing locations between nodes and setting views
const onNodeDrag = (event) => {
//console.log("DRAGGING: ", event.target)
//console.log("LEN2: ", event.target.edges.length)
if (Object.getOwnPropertyNames(selectedAction).length === 0) {
return
}
const nodedata = event.target.data()
if (nodedata.app_name == "Shuffle Tools" || nodedata.app_name == "Testing") {
@@ -1281,6 +1289,12 @@ const AngularWorkflow = (props) => {
// 3. If it is, then hide text
}
console.log(nodedata)
var x = event.clientX, y = event.clientY,
elementMouseIsOver = document.elementFromPoint(x, y)
console.log("ELEMENT: ", elementMouseIsOver)
/*
event.target.animate({
@@ -2952,10 +2966,11 @@ const AngularWorkflow = (props) => {
id="appsearch"
onKeyPress={(event) => {
if (event.key === "Enter") {
runSearch(event.target.value)
event.target.blur(event)
}
}}
onBlur={(event) => {
console.log("BLUR: ", event.target.value)
runSearch(event.target.value)
}}
/>
@@ -2971,6 +2986,13 @@ const AngularWorkflow = (props) => {
)
})}
</div>
:
apps.length > 0 ?
<div style={{textAlign: "center", width: leftBarSize, marginTop: 10, }}>
<Typography variant="body1" color="textSecondary">
Couldn't find app. Is it active?
</Typography>
</div>
:
<div style={{textAlign: "center", width: leftBarSize}}>
<CircularProgress style={{marginTop: 25, height: 35, width: 35, marginLeft: "auto", marginRight: "auto", }} />
@@ -5385,6 +5407,7 @@ const AngularWorkflow = (props) => {
<div style={bottomBarStyle}>
{executionButton}
<div style={{marginLeft: "10px", left: boxSize, bottom: 0, position: "absolute"}}>
{workflow.public ? null :
<Tooltip color="primary" title="An argument to be used for execution. This is a variable available to every node in your workflow." placement="top">
<TextField
id="execution_argument_input_field"
@@ -5401,9 +5424,10 @@ const AngularWorkflow = (props) => {
}}
/>
</Tooltip>
}
<Tooltip color="primary" title="Save (ctrl+s)" placement="top">
<span>
<Button disabled={savingState !== 0} color="primary" style={{height: 50, width: 64, marginLeft: 10, }} variant={lastSaved ? "outlined" : "contained"} onClick={() => saveWorkflow()}>
<Button disabled={savingState !== 0} color="primary" style={{height: workflow.public ? 100 : 50, width: workflow.public ? 100 : 64, marginLeft: 10, }} variant={lastSaved && !(workflow.public) ? "outlined" : "contained"} onClick={() => saveWorkflow()}>
{savingState === 2 ? <CircularProgress style={{height: 35, width: 35}} /> : savingState === 1 ? <DoneIcon style={{color: green}} /> : <SaveIcon /> }
</Button>
</span>
@@ -5411,7 +5435,7 @@ const AngularWorkflow = (props) => {
{workflow.public ?
<Tooltip color="secondary" title="Download workflow" placement="top-start">
<span>
<Button color="primary" style={{height: 50, marginLeft: 10, }} variant="contained" onClick={() => {
<Button color="primary" style={{height: 50, marginLeft: 10, }} variant="outlined" onClick={() => {
//setExecutionModalOpen(true)
//getWorkflowExecution(props.match.params.key, "")
//data = sanitizeWorkflow(workflow)
@@ -6519,12 +6543,18 @@ const AngularWorkflow = (props) => {
//return
}
// Automatically mapping fields that already exist (predefined).
// Warning if fields are NOT filled
for (var key in selectedApp.authentication.parameters) {
if (authenticationOption.fields[selectedApp.authentication.parameters[key].name].length === 0) {
if (selectedApp.authentication.parameters[key].value !== undefined && selectedApp.authentication.parameters[key].value !== null && selectedApp.authentication.parameters[key].value.length > 0) {
authenticationOption.fields[selectedApp.authentication.parameters[key].name] = selectedApp.authentication.parameters[key].value
} else {
alert.info("Field "+selectedApp.authentication.parameters[key].name+" can't be empty")
return
}
}
}
console.log("Action: ", selectedAction)
selectedAction.authentication_id = authenticationOption.id
@@ -6597,8 +6627,8 @@ const AngularWorkflow = (props) => {
authenticationOption.label = event.target.value
}}
/>
{selectedApp.link.length > 0 ? <div style={{marginTop: 15}}><EndpointData /></div> : null}
<Divider style={{marginTop: 15, marginBottom: 15, backgroundColor: "rgb(91, 96, 100)"}}/>
{/*selectedApp.link.length > 0 ? <div style={{marginTop: 15}}><EndpointData /></div> : null*/}
<div style={{}}/>
{selectedApp.authentication.parameters.map((data, index) => {
return (
@@ -6619,6 +6649,7 @@ const AngularWorkflow = (props) => {
fullWidth
type={data.example !== undefined && data.example.includes("***") ? "password" : "text"}
color="primary"
defaultValue={data.value !== undefined && data.value !== null ? data.value : ""}
placeholder={data.example}
onChange={(event) => {
authenticationOption.fields[data.name] = event.target.value
@@ -6664,7 +6695,6 @@ const AngularWorkflow = (props) => {
fullWidth
type="text"
color="primary"
disabled={true}
placeholder="Bearer token"
defaultValue={selectedApp.link}
onChange={(event) => {
frontend/src/views/AppCreator.jsx
+1 -1
View File
@@ -1994,7 +1994,7 @@ const AppCreator = (props) => {
setUpdate(Math.random())
} else if (parsedurl.startsWith("curl")) {
const request = parseCurl(event.target.value)
if (request !== event.target.value) {
if (request !== event.target.value && request.method !== undefined && request.method !== null) {
if (request.method.toUpperCase() !== currentAction.Method) {
setCurrentActionMethod(request.method.toUpperCase())
setActionField("method", request.method.toUpperCase())
frontend/src/views/LoginPage.jsx
+1
View File
@@ -110,6 +110,7 @@ const LoginDialog = props => {
}
setIsLoggedIn(true)
window.location.pathname = "/workflows"
}
}),
frontend/src/views/Workflows.jsx
+1 -1
View File
@@ -658,7 +658,7 @@ const Workflows = (props) => {
const exportWorkflow = (data) => {
let exportFileDefaultName = data.name+'.json';
data = sanitizeWorkflow(data)
return
//return
// Add correct ID's for triggers
// Add mag