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

Bugfixes for subflows and user inputs

Browse Source
This commit is contained in:
frikky
2023-05-17 00:08:40 +02:00
parent 70ebbc909e
commit cb6df863c9
10 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/UsecaseSearch.jsx
+2 -2
View File
@@ -85,7 +85,7 @@ export const usecaseTypes = [{
},
{
"name": "phishing",
"aliases": ["ransomware", "phish"],
"aliases": ["ransomware", "ransomware handling"],
"value": [
{
"name": "Email analysis",
@@ -123,7 +123,7 @@ export const usecaseTypes = [{
},
{
"name": "response",
"aliases": ["response", "respond", "exploits"],
"aliases": ["response", "respond", "exploits", "eradication",],
"value": [
{
"name": "EDR host isolation",
frontend/src/views/AngularWorkflow.jsx
+5 -2
View File
@@ -555,7 +555,8 @@ const AngularWorkflow = (defaultprops) => {
const isCloud =
window.location.host === "localhost:3002" ||
window.location.host === "shuffler.io";
const appBarSize = isCloud ? 75 : 60;
const appBarSize = isCloud ? 75 : 72;
const triggerEnvironments = isCloud ? ["cloud"] : ["onprem", "cloud"];
const unloadText = "Are you sure you want to leave without saving (CTRL+S)?";
const classes = useStyles();
@@ -13141,6 +13142,8 @@ const AngularWorkflow = (defaultprops) => {
</Button>
</div>
: null}
</div>
: isMobile && leftViewOpen ?
<div
@@ -14757,7 +14760,7 @@ const AngularWorkflow = (defaultprops) => {
{curapp === null ? null : (
<img
alt={selectedResult.action.app_name}
src={selectedResult === undefined ? theme.palette.defaultImage : selectedResult.action.app_name === "shuffle-subflow" ? triggers[4].large_image : selectedResult.action.app_name === "User Input" ? triggers[5].large_image : curapp.large_image}
src={selectedResult === undefined ? theme.palette.defaultImage : selectedResult.action.app_name === "shuffle-subflow" ? triggers[4].large_image : selectedResult.action.app_name === "User Input" ? triggers[5].large_image : selectedResult.action.large_image}
style={{
marginRight: 20,
width: imgsize,
frontend/src/views/RunWorkflow.jsx
+14 -4
View File
@@ -586,14 +586,17 @@ const RunWorkflow = (defaultprops) => {
const buttonBackground = "linear-gradient(to right, #f86a3e, #f34079)"
const buttonStyle = {borderRadius: 25, height: 50, fontSize: 18, backgroundImage: handleValidateForm(executionArgument) || executionLoading ? buttonBackground : "grey", color: "white"}
console.log("execdata: ", executionData)
const disabledButtons = message.length > 0 || executionData.status === "FINISHED" || executionData.status === "ABORTED"
const organization = selectedOrganization !== undefined && selectedOrganization !== null ? selectedOrganization.name : "Unknown"
const contact = selectedOrganization !== undefined && selectedOrganization !== null && selectedOrganization.org !== undefined && selectedOrganization.org !== null? selectedOrganization.org : "support@shuffler.io"
//const contact = selectedOrganization !== undefined && selectedOrganization !== null && selectedOrganization.contact !== undefined && selectedOrganization.contact !== null? selectedOrganization.contact : "support@shuffler.io"
const image = selectedOrganization !== undefined && selectedOrganization !== null ? selectedOrganization.image : theme.palette.defaultImage
const image = selectedOrganization !== undefined && selectedOrganization !== null && selectedOrganization.image !== undefined && selectedOrganization.image !== null && selectedOrganization.image !== "" ? selectedOrganization.image : theme.palette.defaultImage
console.log("IMG: ", image, "ORG: ", selectedOrganization)
//<Button fullWidth id="continue_execution" variant="contained" disabled={disabledButtons} color="primary" style={{border: answer === "true" ? "2px solid rgba(255,255,255,0.6)" : null, flex: 1,}} onClick={() => {
if (!disabledButtons && answer !== undefined && answer !== null && organization !== "Unknown" && buttonClicked.length === 0) {
console.log("Finding button!")
// Find the button
@@ -692,7 +695,13 @@ const RunWorkflow = (defaultprops) => {
</span>
}
{executionRunning ?
<CircularProgress style={{marginTop: 20, marginBottom: 20, textAlign: "center", }}/>
<span style={{width: 50, height: 50, margin: "auto", alignItems: "center", justifyContent: "center", textAlign: "center", }}>
<CircularProgress style={{marginTop: 20, marginBottom: 20, marginLeft: 185, }}/>
<Typography variant="body2" style={{margin: "auto", marginTop: 20, marginBottom: 20, textAlign: "center", alignItem: "center", }} color="textSecondary">
Status: {executionData.status}
</Typography>
</span>
:
answer !== undefined && answer !== null ?
<span style={{marginTop: 20, }}>
@@ -729,7 +738,8 @@ const RunWorkflow = (defaultprops) => {
:
<div style={{display: "flex", marginTop: "15px"}}>
<Button variant="contained" type="submit" color="primary" fullWidth disabled={!handleValidateForm(executionArgument) || executionLoading}>
{executionLoading ? <CircularProgress color="secondary" style={{color: "white",}} /> : "Run Workflow"}
{executionLoading ?
<CircularProgress color="secondary" style={{color: "white",}} /> : "Run Workflow"}
</Button>
</div>
}