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

Workflow fixes

Browse Source
This commit is contained in:
Frikky
2024-06-29 15:39:08 +02:00
parent eb11ea320d
commit e2ce0d4f67
3 changed files with 326 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/Billing.jsx
+307 -1
View File
@@ -26,7 +26,8 @@ import {
Tooltip,
DialogContentText,
DialogActions,
LinearProgress
LinearProgress,
Slider
} from "@mui/material";
import { useNavigate, Link, json } from "react-router-dom";
@@ -880,6 +881,305 @@ const Billing = (props) => {
</Paper>
)
}
const ConsultationManagement = (props) => {
const { globalUrl, userdata, selectedOrganization, } = props;
const [inputHour, setInputHour] = React.useState(
selectedOrganization.Billing &&
selectedOrganization.Billing.Consultation &&
selectedOrganization.Billing.Consultation.hours !== undefined &&
selectedOrganization.Billing.Consultation.hours !== ""
? selectedOrganization.Billing.Consultation.hours
: 0
);
const [inputMinutes, setInputMinutes] = React.useState(
selectedOrganization.Billing &&
selectedOrganization.Billing.Consultation &&
selectedOrganization.Billing.Consultation.minutes !== undefined &&
selectedOrganization.Billing.Consultation.minutes !== ""
? selectedOrganization.Billing.Consultation.minutes
: 0
);
const [editConsultation, setEditConsultation] = React.useState(false);
const [openUpgradePlan, setOpenUpgradePlan] = React.useState(false);
const [consultationHours, setConsultationHours] = React.useState(5);
const [message, setMessage] = React.useState("");
const [hovered, setHovered] = React.useState(false)
const formatedHours = String(inputHour).padStart(2, "0")
const formatedMinutes = String(inputMinutes).padStart(2, "0")
const handleHourChange = (event) => {
setInputHour(parseInt(event.target.value, 10));
};
const handleMinuteChange = (event) => {
setInputMinutes(parseInt(event.target.value, 10));
};
const toggleEditMode = () => {
setEditConsultation(!editConsultation);
};
const handleCancel = () => {
setEditConsultation(false);
};
const handleSave = () => {
toast("Saving consultation hours. Please wait.")
const url = `${globalUrl}/api/v1/orgs/${selectedOrganization.id}`;
const data = {
org_id: selectedOrganization.id,
Billing: {
Consultation: {
hours: String(inputHour),
minutes: String(inputMinutes),
},
}
};
fetch(url, {
body: JSON.stringify(data),
mode: "cors",
method: "POST",
credentials: "include",
crossDomain: true,
withCredentials: true,
headers: {
"Content-Type": "application/json; charset=utf-8",
},
})
.then((response) => {
if (response.status !== 200) {
console.log("Error in response");
}
return response.json();
})
.then((responseJson) => {
console.log("Response from consultation save: ", responseJson);
if (responseJson.success === true) {
toast.success("Consultation hours saved successfully");
setEditConsultation(false);
} else {
toast.error("Failed saving consultation hours.");
}
})
.catch((error) => {
console.log("Error: ", error);
});
}
const handleUpgradeConsultation = () => {
toast("Sending request for consultation hours. Please wait.")
const url = `${globalUrl}/api/v1/orgs/${selectedOrganization.id}/consultation`;
const data = {
org_id: selectedOrganization.id,
consultationHours: String(consultationHours),
message: message,
};
fetch(url, {
body: JSON.stringify(data),
mode: "cors",
method: "POST",
credentials: "include",
crossDomain: true,
withCredentials: true,
headers: {
"Content-Type": "application/json; charset=utf-8",
},
})
.then((response) => {
if (response.status !== 200) {
console.log("Error in response");
}
return response.json();
})
.then((responseJson) => {
console.log("Response from consultation save: ", responseJson);
if (responseJson.success === true) {
toast.success("Thank you for your request. We will get back to you soon.");
setOpenUpgradePlan(false);
setEditConsultation(false);
} else {
toast.error("Failed sending consultation hours request. Please try again later.");
}
})
.catch((error) => {
console.log("Error: ", error);
});
}
var newPaperstyle = JSON.parse(JSON.stringify(paperStyle))
return (
<Paper style={{
padding: 20,
height: "100%",
minHeight: 280,
maxWidth: 400,
width: "100%",
backgroundColor: hovered ? "#232427" : theme.palette.platformColor,
borderRadius: theme.palette.borderRadius * 2,
border: "1px solid rgba(255,255,255,0.3)",
marginRight: 10,
marginTop: 15,
}}
onMouseEnter={() => setHovered(true)}
onMouseLeave={() => setHovered(false)}>
<Typography variant="h6" style={{ marginTop: 10, marginBottom: 10, }}>
Professional Services
</Typography>
<Divider />
<Typography variant="body1" style={{ marginTop: 10, }}>
Consultation & Management
</Typography>
<div>
<Typography variant="body2" color="textSecondary" style={{ marginTop: 10, }}>
Current Plan includes total {inputHour} hours and {inputMinutes} minutes of consultation and management by our experts.
</Typography>
<div style={{ display: "flex", width: 'auto', justifyContent: 'center', marginTop: 10 }}>
{editConsultation ?
<>
<TextField
type="number"
value={formatedHours}
onChange={handleHourChange}
style={{ width: 60, marginRight: 10 }}
inputProps={{ min: 0, max: 23 }}
/>
<span style={{ margin: "auto 0" }}>:</span>
<TextField
type="number"
value={formatedMinutes}
onChange={handleMinuteChange}
style={{ width: 60, marginLeft: 10 }}
inputProps={{ min: 0, max: 59 }}
/>
</>
:
<Typography variant="h3" style={{ marginTop: 10, }}>
{`${formatedHours}h:${formatedMinutes}m`}
</Typography>}
</div>
{userdata.support === true ?
<div style={{ display: "flex", marginTop: 20, }}>
{editConsultation ? (
<Button
variant="contained"
color="primary"
onClick={handleCancel}
>
Cancel
</Button>
) : (
<Button
variant="contained"
color="primary"
onClick={toggleEditMode}
>
Edit
</Button>
)}
{editConsultation && <Button variant="contained" color="primary" style={{ marginLeft: 5 }} onClick={handleSave}>Save</Button>}
</div>
: null}
<Typography variant="body2" color="textSecondary" style={{ marginTop: 10, }}>
Features
</Typography>
<ul>
<li>
<Typography variant="body2" color="textPrimary" style={{}}>
Debug/Create workflows with our experts
</Typography>
</li>
<li>
<Typography variant="body2" color="textPrimary" style={{}}>
Ask questions and get help with your workflows and integrations by our experts
</Typography>
</li>
</ul>
</div>
<Button
fullWidth
disabled={false}
variant="outlined"
color="primary"
style={{
marginTop: 10,
borderRadius: 25,
height: 40,
fontSize: 14,
color: "white",
backgroundImage: "linear-gradient(to right, #f86a3e, #f34079)",
}}
onClick={() => {
setOpenUpgradePlan(true)
}}
>
Upgrade plan
</Button>
<Dialog open={openUpgradePlan}
onClose={() => setOpenUpgradePlan(false)}
fullWidth
style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}
PaperProps={{
style: {
width: 500,
margin: 0,
}
}}
>
<DialogTitle style={{ marginTop: 10, textAlign: 'center', fontWeight: 'bold' }}>
Upgrade Consultation Plan
</DialogTitle>
<DialogContent style={{ padding: '24px', }}>
<Typography variant="body1" color="textSecondary" style={{ marginBottom: '16px', textAlign: 'left' }}>
Enter the total hours of consultation you want to include in your plan.
</Typography>
<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', marginTop: '16px' }}>
<Slider
value={consultationHours}
onChange={(e, val) => setConsultationHours(val)}
aria-labelledby="continuous-slider"
step={5}
min={5}
max={50}
style={{ width: '80%', color: theme.palette.primary.main }} // Adding primary color for better visibility
marks
valueLabelDisplay="auto"
/>
</div>
<Typography variant="body1" color="textSecondary" style={{ marginTop: '24px', textAlign: 'left' }}>
If you have any additional requirements or questions, please leave a message below.
</Typography>
<TextField
variant="outlined"
fullWidth
multiline
rows={4}
placeholder="Your message"
style={{ marginTop: '16px', borderRadius: '8px' }}
onChange={(e) => setMessage(e.target.value)}
/>
<Button
variant="contained"
color="primary"
style={{ marginTop: '24px', display: 'block', marginLeft: 'auto', marginRight: 'auto', padding: '12px 24px' }}
onClick={handleUpgradeConsultation}
>
Submit Request
</Button>
</DialogContent>
</Dialog>
</Paper >
)
}
const addDealModal = (
<Dialog
@@ -1405,6 +1705,12 @@ const Billing = (props) => {
/>
</span>
: null}
{isCloud && billingInfo.subscription !== undefined && billingInfo.subscription !== null ? isChildOrg ? null :
<ConsultationManagement
globalUrl={globalUrl}
userdata={userdata}
selectedOrganization={selectedOrganization}
/> : null}
{isCloud &&
selectedOrganization.subscriptions !== undefined &&
frontend/src/components/ParsedAction.jsx
-1
View File
@@ -1751,7 +1751,6 @@ const ParsedAction = (props) => {
}
const params = workflow.actions[key].parameters
console.log(params)
if (params === null || params === undefined) {
continue
}
frontend/src/views/AngularWorkflow.jsx
+19 -22
View File
@@ -6731,7 +6731,8 @@ const releaseToConnectLabel = "Release to Connect"
const parentlabel = parentNode.data("label").toLowerCase().replace(" ", "_")
const parentname = parentNode.data("app_name").toLowerCase().replace(" ", "_")
if (!parentlabel.startsWith(parentname)) {
if (!parentlabel.startsWith(parentname)+"_") {
console.log("Return 1")
return
}
@@ -6755,13 +6756,14 @@ const releaseToConnectLabel = "Release to Connect"
}
if (curapp.actions[startIndex].name !== parentActionname) {
console.log("Return 2")
return
}
break
}
//const parentAction = parentNode.data("name")
console.log("CONTINUE EVEN WHEN FIELDS ARE FILLED")
const iconInfo = {
icon: "M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm-1 4l6 6v10c0 1.1-.9 2-2 2H7.99C6.89 23 6 22.1 6 21l.01-14c0-1.1.89-2 1.99-2h7zm-1 7h5.5L14 6.5V12z",
@@ -12491,15 +12493,10 @@ const releaseToConnectLabel = "Release to Connect"
let appIdsInWorkflow = [];
Object.entries(workflowApps).forEach(([key, value]) => {
console.log("VALUE: ", value)
appIdsInWorkflow.push(value.app_id);
})
appIdsInWorkflow = [...new Set(appIdsInWorkflow)];
console.log("appIdsInWorkflow: ", appIdsInWorkflow)
console.log("authData: ", authData, "workflowApps: ", workflowApps)
// loop through the authData and create transformedData which looks like:
// appId: [auth1, auth2, ...]
@@ -12518,8 +12515,6 @@ const releaseToConnectLabel = "Release to Connect"
});
console.log("transformedData: ", transformedData)
return transformedData;
};
@@ -12535,7 +12530,6 @@ const releaseToConnectLabel = "Release to Connect"
const handleShowingValue = (appName) => {
let mappingWithName = {}
let listWithValues = workflow.triggers[selectedTriggerIndex].parameters[5]?.value.split(";").filter(e => e).map(e => e.split("="))
console.log("LIST WITH VALUES: ", listWithValues)
if (listWithValues === undefined || listWithValues === null || listWithValues.length === 0) {
return "no-overrides";
}
@@ -12614,10 +12608,15 @@ const releaseToConnectLabel = "Release to Connect"
return (
<div className="auth-container" style={{ padding: '20px', backgroundColor: '#26292D', borderRadius: '8px' }}>
{Object.entries(transformedAuthData).map(([appId, authList]) => (
{Object.entries(transformedAuthData).map(([appId, authList]) => {
if (authList === undefined || authList === null || authList.length < 2) {
return null;
}
return (
<div key={appId} className="auth-item" style={{ marginBottom: '20px' }}>
<label className="auth-label" style={{ display: 'block', marginBottom: '10px', fontWeight: 'bold', color: '#E8E8E8' }}>
Select Authentication for {authList[0].app.name}:
{authList[0].app.name} Authentication:
</label>
<select
value={handleShowingValue(authList[0].app.name)}
@@ -12652,7 +12651,7 @@ const releaseToConnectLabel = "Release to Connect"
)}
</select>
</div>
))}
)})}
</div>
);
};
@@ -13053,7 +13052,7 @@ const releaseToConnectLabel = "Release to Connect"
<div style={{ flex: 1, marginLeft: 5, }}>
<Tooltip
color="primary"
title={"Delay before action executes (in seconds)"}
title={"Delay before action runs (in seconds)"}
placement="top"
>
<span>
@@ -13758,9 +13757,9 @@ const releaseToConnectLabel = "Release to Connect"
<div>
<div>
<div className="app">
<div style={{ display: "flex", marginTop: 10 }}>
<div style={{ display: "flex", marginTop: 50 }}>
<div style={{ flex: "10" }}>
<b>Auth Override</b>
<b>Authentication Override</b>
</div>
</div>
@@ -15815,7 +15814,7 @@ const releaseToConnectLabel = "Release to Connect"
<div style={topBarStyle}>
<div style={{
margin: "0px 10px 0px 10px",
pointerEvents: "auto",
pointerEvents: "none",
}}>
<Breadcrumbs
aria-label="breadcrumb"
@@ -15917,7 +15916,7 @@ const releaseToConnectLabel = "Release to Connect"
}
{originalWorkflow.suborg_distribution === undefined || originalWorkflow.suborg_distribution === null || originalWorkflow.suborg_distribution.length === 0 || originalWorkflow.suborg_distribution.includes("none") ? null :
<FormControl fullWidth style={{marginTop: 10, }}>
<FormControl fullWidth style={{marginTop: 10, maxWidth: 250, pointerEvents: "auto", }}>
<InputLabel
id="suborg-changer"
@@ -16074,7 +16073,7 @@ const releaseToConnectLabel = "Release to Connect"
title="Configure Authentication Groups. The amount of auth groups selected is the amount of replications of any execution of this workflow."
placement="top"
>
<span>
<span style={{pointerEvents: "auto", }}>
<Button
onMouseEnter={() => {
if (cy !== undefined && cy !== null) {
@@ -16138,7 +16137,7 @@ const releaseToConnectLabel = "Release to Connect"
}}
disabled={workflow.public}
color="secondary"
style={{ height: 40, marginTop: 10, }}
style={{ height: 40, marginTop: 15, marginLeft: 5, }}
variant={"outlined"}
onClick={() => {
setAuthgroupModalOpen(true)
@@ -21608,8 +21607,6 @@ const releaseToConnectLabel = "Release to Connect"
)
}
//! Logs
console.log("Workflow state", workflow)
console.log("All revision", allRevisions)
const drawerData = originalWorkflow !== undefined && originalWorkflow !== null ?
<div style={{ height: "100%"}}>
<Typography variant="h5" style={{ paddingLeft: 25, paddingTop:25, backgroundColor: theme.palette.surfaceColor, height: "8%" }}>