reverting changes that are not done by me
This commit is contained in:
@@ -4907,7 +4907,7 @@ func initHandlers() {
|
|||||||
r.HandleFunc("/api/v1/triggers/outlook/{key}", shuffle.HandleGetSpecificTrigger).Methods("GET", "OPTIONS")
|
r.HandleFunc("/api/v1/triggers/outlook/{key}", shuffle.HandleGetSpecificTrigger).Methods("GET", "OPTIONS")
|
||||||
r.HandleFunc("/api/v1/triggers/gmail/register", shuffle.HandleNewGmailRegister).Methods("GET", "OPTIONS")
|
r.HandleFunc("/api/v1/triggers/gmail/register", shuffle.HandleNewGmailRegister).Methods("GET", "OPTIONS")
|
||||||
r.HandleFunc("/api/v1/triggers/gmail/getFolders", shuffle.HandleGetGmailFolders).Methods("GET", "OPTIONS")
|
r.HandleFunc("/api/v1/triggers/gmail/getFolders", shuffle.HandleGetGmailFolders).Methods("GET", "OPTIONS")
|
||||||
//r.HandleFunc("/api/v1/triggers/all", shuffle.HandleGetTriggers).Methods("GET", "OPTIONS")
|
r.HandleFunc("/api/v1/triggers", shuffle.HandleGetTriggers).Methods("GET", "OPTIONS")
|
||||||
//r.HandleFunc("/api/v1/triggers/gmail/routing", handleGmailRouting).Methods("POST", "OPTIONS")
|
//r.HandleFunc("/api/v1/triggers/gmail/routing", handleGmailRouting).Methods("POST", "OPTIONS")
|
||||||
|
|
||||||
r.HandleFunc("/api/v1/triggers/gmail/{key}", shuffle.HandleGetSpecificTrigger).Methods("GET", "OPTIONS")
|
r.HandleFunc("/api/v1/triggers/gmail/{key}", shuffle.HandleGetSpecificTrigger).Methods("GET", "OPTIONS")
|
||||||
|
|||||||
@@ -242,13 +242,13 @@ const Admin = (props) => {
|
|||||||
}, [isDropzone]);
|
}, [isDropzone]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (userdata.orgs !== undefined &&
|
if (
|
||||||
|
userdata.orgs !== undefined &&
|
||||||
userdata.orgs !== null &&
|
userdata.orgs !== null &&
|
||||||
userdata.orgs.length > 0) {
|
userdata.orgs.length > 0
|
||||||
|
) {
|
||||||
handleGetSubOrgs(userdata.active_org.id);
|
handleGetSubOrgs(userdata.active_org.id);
|
||||||
} else {
|
} else console.log("error in user data");
|
||||||
console.log("Bad Userdata with orgs not existing")
|
|
||||||
}
|
|
||||||
}, [userdata]);
|
}, [userdata]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -738,7 +738,7 @@ If you're interested, please let me know a time that works for you, or set up a
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleGetAllTriggers = () => {
|
const handleGetAllTriggers = () => {
|
||||||
fetch(globalUrl + "/api/v1/triggers/all", {
|
fetch(globalUrl + "/api/v1/triggers", {
|
||||||
method: "GET",
|
method: "GET",
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
@@ -933,13 +933,6 @@ If you're interested, please let me know a time that works for you, or set up a
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
if (userdata.support === true && selectedOrganization.id !== "" && selectedOrganization.id !== undefined && selectedOrganization.id !== null && selectedOrganization.id !== userdata.active_org.id) {
|
|
||||||
toast("Refreshing window to fix org support access")
|
|
||||||
window.location.reload()
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
userdata.support === true &&
|
userdata.support === true &&
|
||||||
selectedOrganization.id !== "" &&
|
selectedOrganization.id !== "" &&
|
||||||
@@ -4657,95 +4650,6 @@ If you're interested, please let me know a time that works for you, or set up a
|
|||||||
if (schedule.status === "running") {
|
if (schedule.status === "running") {
|
||||||
deleteSchedule(schedule);
|
deleteSchedule(schedule);
|
||||||
} else startSchedule(schedule);
|
} else startSchedule(schedule);
|
||||||
curTab === 5 ? (
|
|
||||||
<div>
|
|
||||||
<div style={{ marginTop: 20, marginBottom: 20 }}>
|
|
||||||
<h2 style={{ display: "inline" }}>Schedules</h2>
|
|
||||||
<span style={{ marginLeft: 25 }}>
|
|
||||||
Schedules used in Workflows. Makes locating and control easier.{" "}
|
|
||||||
<a
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
href="/docs/organizations#schedules"
|
|
||||||
style={{ textDecoration: "none", color: "#f85a3e" }}
|
|
||||||
>
|
|
||||||
Learn more
|
|
||||||
</a>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<Divider
|
|
||||||
style={{
|
|
||||||
marginTop: 20,
|
|
||||||
marginBottom: 20,
|
|
||||||
backgroundColor: theme.palette.inputColor,
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<List>
|
|
||||||
<ListItem>
|
|
||||||
<ListItemText
|
|
||||||
primary="Interval"
|
|
||||||
style={{ maxWidth: 200, minWidth: 200 }}
|
|
||||||
/>
|
|
||||||
<ListItemText
|
|
||||||
primary="Environment"
|
|
||||||
style={{ maxWidth: 150, minWidth: 150 }}
|
|
||||||
/>
|
|
||||||
<ListItemText
|
|
||||||
primary="Workflow"
|
|
||||||
style={{ maxWidth: 315, minWidth: 315 }}
|
|
||||||
/>
|
|
||||||
<ListItemText
|
|
||||||
primary="Argument"
|
|
||||||
style={{ minWidth: 300, maxWidth: 300, overflow: "hidden" }}
|
|
||||||
/>
|
|
||||||
<ListItemText primary="Actions" />
|
|
||||||
<ListItemText primary="Delegation" />
|
|
||||||
</ListItem>
|
|
||||||
{schedules === undefined || schedules === null
|
|
||||||
? null
|
|
||||||
: schedules.map((schedule, index) => {
|
|
||||||
var bgColor = "#27292d";
|
|
||||||
if (index % 2 === 0) {
|
|
||||||
bgColor = "#1f2023";
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<ListItem key={index} style={{ backgroundColor: bgColor }}>
|
|
||||||
<ListItemText
|
|
||||||
style={{ maxWidth: 200, minWidth: 200 }}
|
|
||||||
primary={
|
|
||||||
schedule.environment === "cloud" ||
|
|
||||||
schedule.environment === "" ||
|
|
||||||
schedule.frequency.length > 0 ? (
|
|
||||||
schedule.frequency
|
|
||||||
) : (
|
|
||||||
<span>{schedule.seconds} seconds</span>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<ListItemText
|
|
||||||
style={{ maxWidth: 150, minWidth: 150 }}
|
|
||||||
primary={schedule.environment}
|
|
||||||
/>
|
|
||||||
<ListItemText
|
|
||||||
style={{ maxWidth: 315, minWidth: 315 }}
|
|
||||||
primary={
|
|
||||||
<a
|
|
||||||
style={{ textDecoration: "none", color: "#f85a3e" }}
|
|
||||||
href={`/workflows/${schedule.workflow_id}`}
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
>
|
|
||||||
{schedule.workflow_id}
|
|
||||||
</a>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<ListItemText
|
|
||||||
primary={schedule.argument.replaceAll('\\"', '"')}
|
|
||||||
style={{
|
|
||||||
minWidth: 300,
|
|
||||||
maxWidth: 300,
|
|
||||||
overflow: "hidden",
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{schedule.status === "running"
|
{schedule.status === "running"
|
||||||
|
|||||||
Reference in New Issue
Block a user