For sales: Create
-
- New Cloud Contract
+
+ EU contract
or
-
- New Onprem Contract
+
+ NOT EU contract
-
@@ -1636,7 +1636,7 @@ const Billing = (props) => {
-
- Sales Process
+ Sales Process (old)
:
diff --git a/frontend/src/components/EditWorkflow.jsx b/frontend/src/components/EditWorkflow.jsx
index e2443664..46be4138 100644
--- a/frontend/src/components/EditWorkflow.jsx
+++ b/frontend/src/components/EditWorkflow.jsx
@@ -6,6 +6,7 @@ import UsecaseSearch from "../components/UsecaseSearch.jsx"
import WorkflowGrid from "../components/WorkflowGrid.jsx"
import dayjs from 'dayjs';
import WorkflowTemplatePopup from "./WorkflowTemplatePopup.jsx";
+import WorkflowValidationTimeline from "../components/WorkflowValidationTimeline.jsx"
import {
Badge,
@@ -206,6 +207,16 @@ const EditWorkflow = (props) => {
+
+
{showUpload === true ?
-
-
-
-
-
-
- Notification Workflow
-
- {/*
-
-
-
- Org Documentation reference
- {
- setDocumentationReference(e.target.value);
- }}
- InputProps={{
- classes: {
- notchedOutline: classes.notchedOutline,
- },
- style: {
- color: "white",
- },
- }}
- />
-
-
+
+ const [workflows, setWorkflows] = React.useState([])
+ const [workflow, setWorkflow] = React.useState({})
+
+ const getAvailableWorkflows = (trigger_index) => {
+ fetch(globalUrl + "/api/v1/workflows", {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ Accept: "application/json",
+ },
+ credentials: "include",
+ })
+ .then((response) => {
+ if (response.status !== 200) {
+ console.log("Status not 200 for workflows :O!");
+ return;
+ }
+ return response.json();
+ })
+ .then((responseJson) => {
+ if (responseJson !== undefined) {
+ setWorkflows(responseJson)
+
+ if (selectedOrganization.defaults !== undefined && selectedOrganization.defaults.notification_workflow !== undefined) {
+
+ const workflow = responseJson.find((workflow) => workflow.id === selectedOrganization.defaults.notification_workflow)
+ if (workflow !== undefined && workflow !== null) {
+ setWorkflow(workflow)
+ }
+ }
+ }
+ })
+ .catch((error) => {
+ console.log("Error getting workflows: " + error);
+ })
+ }
+
+ useEffect(() => {
+ getAvailableWorkflows()
+ }, [])
+
+ const handleEditOrg = (
+ name,
+ description,
+ orgId,
+ image,
+ defaults,
+ sso_config
+ ) => {
+
+ const data = {
+ name: name,
+ description: description,
+ org_id: orgId,
+ image: image,
+ defaults: defaults,
+ sso_config: sso_config,
+ };
+
+ const url = globalUrl + `/api/v1/orgs/${selectedOrganization.id}`;
+ fetch(url, {
+ mode: "cors",
+ method: "POST",
+ body: JSON.stringify(data),
+ credentials: "include",
+ crossDomain: true,
+ withCredentials: true,
+ headers: {
+ "Content-Type": "application/json; charset=utf-8",
+ },
+ })
+ .then((response) =>
+ response.json().then((responseJson) => {
+ if (responseJson["success"] === false) {
+ toast("Failed updating org: ", responseJson.reason);
+ } else {
+ toast("Successfully edited org!");
+ }
+ })
+ )
+ .catch((error) => {
+ toast("Err: " + error.toString());
+ });
+ };
+
+
+ const handleWorkflowSelectionUpdate = (e, isUserinput) => {
+ if (e.target.value === undefined || e.target.value === null || e.target.value.id === undefined) {
+ console.log("Returning as there's no id")
+ return null
+ }
+
+ setWorkflow(e.target.value)
+ setNotificationWorkflow(e.target.value.id)
+ toast("Updated notification workflow. Don't forget to save!")
+ }
+
+ const orgSaveButton = (
+
+
+ );
+
+ const toggleBetweenRequiredOrOptional = (event) => {
+ setSSORequired(event.target.checked);
+ };
+
+ return (
+
+ OpenID connect
+
+
+
+ Client ID
+ 0
+ }
+ id="outlined-with-placeholder"
+ margin="normal"
+ variant="outlined"
+ placeholder="The OpenID client ID from the identity provider"
+ value={openidClientId}
+ onChange={(e) => {
+ setOpenidClientId(e.target.value);
+ }}
+ InputProps={{
+ classes: {
+ notchedOutline: classes.notchedOutline,
+ },
+ style: {
+ color: "white",
+ },
+ }}
+ />
+
+
+
+
+ Client Secret (optional)
+ 0
+ }
+ id="outlined-with-placeholder"
+ margin="normal"
+ variant="outlined"
+ placeholder="The OpenID client secret - DONT use this if dealing with implicit auth / PKCE"
+ value={openidClientSecret}
+ onChange={(e) => {
+ setOpenidClientSecret(e.target.value);
+ }}
+ InputProps={{
+ classes: {
+ notchedOutline: classes.notchedOutline,
+ },
+ style: {
+ color: "white",
+ },
+ }}
+ />
+
+
+
+
+
+
+ Authorization URL
+ {
+ setOpenidAuthorization(e.target.value)
+ }}
+ InputProps={{
+ classes: {
+ notchedOutline: classes.notchedOutline,
+ },
+ style: {
+ color: "white",
+ },
+ }}
+ />
+
+
+
+
+ Token URL
+ {
+ setOpenidToken(e.target.value)
+ }}
+ InputProps={{
+ classes: {
+ notchedOutline: classes.notchedOutline,
+ },
+ style: {
+ color: "white",
+ },
+ }}
+ />
+
+
+
+
+ {/* } */}
+ {/*isCloud ? null : */}
+
+ SAML SSO (v1.1)
+
+
+
+ SSO Entrypoint (IdP)
+ 0
+ }
+ id="outlined-with-placeholder"
+ margin="normal"
+ variant="outlined"
+ placeholder="The entrypoint URL from your provider"
+ value={ssoEntrypoint}
+ onChange={(e) => {
+ setSsoEntrypoint(e.target.value);
+ }}
+ InputProps={{
+ classes: {
+ notchedOutline: classes.notchedOutline,
+ },
+ style: {
+ color: "white",
+ },
+ }}
+ />
+
+
+
+
+ SSO Certificate (X509)
+ {
+ setSsoCertificate(e.target.value);
+ }}
+ InputProps={{
+ classes: {
+ notchedOutline: classes.notchedOutline,
+ },
+ style: {
+ color: "white",
+ },
+ }}
+ />
+
+
+
+ {isCloud ?
+
+ IdP URL for Shuffle: https://shuffler.io/api/v1/login_sso
+
+ : null}
+
+ {isCloud ? null : (
+
+
+ App Download URL
+ {
+ setAppDownloadUrl(e.target.value);
+ }}
+ InputProps={{
+ classes: {
+ notchedOutline: classes.notchedOutline,
+ },
+ style: {
+ color: "white",
+ },
+ }}
+ />
+
+
+ )}
+ {isCloud ? null : (
+
+
+ App Download Branch
+ {
+ setAppDownloadBranch(e.target.value);
+ }}
+ InputProps={{
+ classes: {
+ notchedOutline: classes.notchedOutline,
+ },
+ style: {
+ color: "white",
+ },
+ }}
+ />
+
+
+ )}
+ {isCloud ? null : (
+
+
+ Workflow Download URL
+ {
+ setWorkflowDownloadUrl(e.target.value);
+ }}
+ InputProps={{
+ classes: {
+ notchedOutline: classes.notchedOutline,
+ },
+ style: {
+ color: "white",
+ },
+ }}
+ />
+
+
+ )}
+ {isCloud ? null : (
+
+
+ Workflow Download Branch
+ {
+ setWorkflowDownloadBranch(e.target.value);
+ }}
+ InputProps={{
+ classes: {
+ notchedOutline: classes.notchedOutline,
+ },
+ style: {
+ color: "white",
+ },
+ }}
+ />
+
+
+ )}
+
+
+
+ )
+}
+
export default OrgHeaderexpanded;
diff --git a/frontend/src/components/ParsedAction.jsx b/frontend/src/components/ParsedAction.jsx
index e3cf400c..09635e31 100755
--- a/frontend/src/components/ParsedAction.jsx
+++ b/frontend/src/components/ParsedAction.jsx
@@ -307,7 +307,6 @@ const ParsedAction = (props) => {
(action) =>
action.name.toLowerCase() === selectedAction.name.toLowerCase()
);
- console.log("FOUNDACTION: ", foundAction);
if (foundAction !== null && foundAction !== undefined) {
var foundparams = [];
for (let [paramkey,paramkeyval] in Object.entries(foundAction.parameters)) {
@@ -549,6 +548,11 @@ const ParsedAction = (props) => {
}
}
}
+
+ if (parentNode.label === undefined) {
+ parentNode.label = ""
+ }
+
newActionList.push({
type: "action",
id: parentNode.id,
diff --git a/frontend/src/views/Admin.jsx b/frontend/src/views/Admin.jsx
index 15382695..d7ee12b6 100755
--- a/frontend/src/views/Admin.jsx
+++ b/frontend/src/views/Admin.jsx
@@ -5385,13 +5385,17 @@ If you're interested, please let me know a time that works for you, or set up a
- {workflows !== undefined && workflows !== null && workflows.length > 0 ?
- {
- if (
- option === undefined ||
- option === null ||
- option.name === undefined ||
- option.name === null
- ) {
- return "No Workflow Selected";
- }
-
- const newname = (
- option.name.charAt(0).toUpperCase() + option.name.substring(1)
- ).replaceAll("_", " ");
- return newname;
- }}
- options={workflows}
- fullWidth
- style={{
- backgroundColor: theme.palette.inputColor,
- height: 50,
- borderRadius: theme.palette.borderRadius,
- }}
- onChange={(event, newValue) => {
- console.log("Found value: ", newValue)
-
- var parsedinput = { target: { value: newValue } }
-
- // For variables
- if (typeof newValue === 'string' && newValue.startsWith("$")) {
- parsedinput = {
- target: {
- value: {
- "name": newValue,
- "id": newValue,
- "actions": [],
- "triggers": [],
- }
- }
- }
- }
-
- handleWorkflowSelectionUpdate(parsedinput)
- }}
- renderOption={(props, data, state) => {
- if (data.id === workflow.id) {
- data = workflow;
- }
-
- return (
-
- {data.image !== undefined && data.image !== null && data.image.length > 0 ?
- 
- : null}
-
- Choose {data.name}
-
-
- } placement="bottom">
-
-
- )
- }}
- renderInput={(params) => {
- return (
- {
- setNotificationWorkflow(e.target.value);
- }}
- InputProps={{
- classes: {
- notchedOutline: classes.notchedOutline,
- },
- style: {
- color: "white",
- },
- }}
- />
- }
-
-
-
- {orgSaveButton}
-
-
+
+
+
+
+
+
+ Notification Workflow
+
+ {/*
+
+
+
+ Org Documentation reference
+ {
+ setDocumentationReference(e.target.value);
+ }}
+ InputProps={{
+ classes: {
+ notchedOutline: classes.notchedOutline,
+ },
+ style: {
+ color: "white",
+ },
+ }}
+ />
+
+
Workflow Backup Repository
@@ -663,409 +664,409 @@ const OrgHeaderexpanded = (props) => {
SSO Configuration
-
- OpenID connect
-
-
-
- Client ID
- 0
- }
- id="outlined-with-placeholder"
- margin="normal"
- variant="outlined"
- placeholder="The OpenID client ID from the identity provider"
- value={openidClientId}
- onChange={(e) => {
- setOpenidClientId(e.target.value);
- }}
- InputProps={{
- classes: {
- notchedOutline: classes.notchedOutline,
- },
- style: {
- color: "white",
- },
- }}
- />
-
-
-
-
- Client Secret (optional)
- 0
- }
- id="outlined-with-placeholder"
- margin="normal"
- variant="outlined"
- placeholder="The OpenID client secret - DONT use this if dealing with implicit auth / PKCE"
- value={openidClientSecret}
- onChange={(e) => {
- setOpenidClientSecret(e.target.value);
- }}
- InputProps={{
- classes: {
- notchedOutline: classes.notchedOutline,
- },
- style: {
- color: "white",
- },
- }}
- />
-
-
-
-
-
-
- Authorization URL
- {
- setOpenidAuthorization(e.target.value)
- }}
- InputProps={{
- classes: {
- notchedOutline: classes.notchedOutline,
- },
- style: {
- color: "white",
- },
- }}
- />
-
-
-
-
- Token URL
- {
- setOpenidToken(e.target.value)
- }}
- InputProps={{
- classes: {
- notchedOutline: classes.notchedOutline,
- },
- style: {
- color: "white",
- },
- }}
- />
-
-
-
-
- {/* } */}
- {/*isCloud ? null : */}
-
- SAML SSO (v1.1)
-
-
-
- SSO Entrypoint (IdP)
- 0
- }
- id="outlined-with-placeholder"
- margin="normal"
- variant="outlined"
- placeholder="The entrypoint URL from your provider"
- value={ssoEntrypoint}
- onChange={(e) => {
- setSsoEntrypoint(e.target.value);
- }}
- InputProps={{
- classes: {
- notchedOutline: classes.notchedOutline,
- },
- style: {
- color: "white",
- },
- }}
- />
-
-
-
-
- SSO Certificate (X509)
- {
- setSsoCertificate(e.target.value);
- }}
- InputProps={{
- classes: {
- notchedOutline: classes.notchedOutline,
- },
- style: {
- color: "white",
- },
- }}
- />
-
-
-
- {isCloud ?
-
- IdP URL for Shuffle: https://shuffler.io/api/v1/login_sso
-
- : null}
-
- {isCloud ? null : (
-
-
- App Download URL
- {
- setAppDownloadUrl(e.target.value);
- }}
- InputProps={{
- classes: {
- notchedOutline: classes.notchedOutline,
- },
- style: {
- color: "white",
- },
- }}
- />
-
-
- )}
- {isCloud ? null : (
-
-
- App Download Branch
- {
- setAppDownloadBranch(e.target.value);
- }}
- InputProps={{
- classes: {
- notchedOutline: classes.notchedOutline,
- },
- style: {
- color: "white",
- },
- }}
- />
-
-
- )}
- {isCloud ? null : (
-
-
- Workflow Download URL
- {
- setWorkflowDownloadUrl(e.target.value);
- }}
- InputProps={{
- classes: {
- notchedOutline: classes.notchedOutline,
- },
- style: {
- color: "white",
- },
- }}
- />
-
-
- )}
- {isCloud ? null : (
-
-
- Workflow Download Branch
- {
- setWorkflowDownloadBranch(e.target.value);
- }}
- InputProps={{
- classes: {
- notchedOutline: classes.notchedOutline,
- },
- style: {
- color: "white",
- },
- }}
- />
-
-
- )}
-
-
-
- )
-}
-
+
+ {workflows !== undefined && workflows !== null && workflows.length > 0 ?
+ {
+ if (
+ option === undefined ||
+ option === null ||
+ option.name === undefined ||
+ option.name === null
+ ) {
+ return "No Workflow Selected";
+ }
+
+ const newname = (
+ option.name.charAt(0).toUpperCase() + option.name.substring(1)
+ ).replaceAll("_", " ");
+ return newname;
+ }}
+ options={workflows}
+ fullWidth
+ style={{
+ backgroundColor: theme.palette.inputColor,
+ height: 50,
+ borderRadius: theme.palette.borderRadius,
+ }}
+ onChange={(event, newValue) => {
+ console.log("Found value: ", newValue)
+
+ var parsedinput = { target: { value: newValue } }
+
+ // For variables
+ if (typeof newValue === 'string' && newValue.startsWith("$")) {
+ parsedinput = {
+ target: {
+ value: {
+ "name": newValue,
+ "id": newValue,
+ "actions": [],
+ "triggers": [],
+ }
+ }
+ }
+ }
+
+ handleWorkflowSelectionUpdate(parsedinput)
+ }}
+ renderOption={(props, data, state) => {
+ if (data.id === workflow.id) {
+ data = workflow;
+ }
+
+ return (
+
+ {data.image !== undefined && data.image !== null && data.image.length > 0 ?
+
+ : null}
+
+ Choose {data.name}
+
+
+ } placement="bottom">
+
+
+ )
+ }}
+ renderInput={(params) => {
+ return (
+ {
+ setNotificationWorkflow(e.target.value);
+ }}
+ InputProps={{
+ classes: {
+ notchedOutline: classes.notchedOutline,
+ },
+ style: {
+ color: "white",
+ },
+ }}
+ />
+ }
+
+
+
+ {orgSaveButton}
+
+
- Make SAML SSO or OpenID Authentication Required or Optional for Your Organization.
-
-
-
-
- {orgSaveButton}
-
- {/*
-
- {expanded ?
-
+ Make SAML SSO or OpenID Authentication Required or Optional for Your Organization.
+
+
+
+
+ {orgSaveButton}
+
+ {/*
+
+ {expanded ?
+
+
+ : null}
+
- {executionData.execution_argument !== undefined &&
- executionData.execution_argument.length > 0
+
+ {executionData.execution_argument !== undefined && executionData.execution_argument !== null &&
+ executionData.execution_argument.length > 1
? parsedExecutionArgument()
- : null}
+ :
+ null}
+