- {isCloud &&
+ {/* {isCloud &&
selectedOrganization.subscriptions !== undefined &&
selectedOrganization.subscriptions !== null &&
selectedOrganization.subscriptions.length > 0 &&
@@ -2043,7 +2043,7 @@ const Billing = memo((props) => {
/>
)
})
- : null}
+ : null} */}
{workflows === undefined ||
@@ -15239,13 +15194,36 @@ const AngularWorkflow = (defaultprops) => {
}}
renderInput={(params) => {
return (
-
{isCloud && billingInfo.subscription !== undefined && billingInfo.subscription !== null ? isChildOrg ? null :
diff --git a/frontend/src/components/CacheView.jsx b/frontend/src/components/CacheView.jsx
index 34b4608f..f4b8b9cb 100644
--- a/frontend/src/components/CacheView.jsx
+++ b/frontend/src/components/CacheView.jsx
@@ -151,13 +151,16 @@ const CacheView = memo((props) => {
if (fileCategories.length === 1 && fileCategories[0] === "default") {
var newcategories = ["default"]
for (var key in responseJson.keys) {
- if (responseJson.keys[key].category !== undefined && responseJson.keys[key].category !== null && responseJson.keys[key].category !== "" && !fileCategories.includes(responseJson.keys[key].category)) {
- newcategories.push(responseJson.keys[key].category);
+ var category = responseJson.keys[key].category
+ if (category !== undefined && category !== null && category !== ""){
+ category = category.replaceAll(" ", "_")
+
+ if (!newcategories.includes(category)) {
+ newcategories.push(category)
+ }
}
}
- console.log("CATEGORIES: ", newcategories)
-
setFileCategories(newcategories)
}
}
@@ -357,6 +360,7 @@ const CacheView = memo((props) => {
{ editCache ? "Edit Key" : "Add Key"}{selectedCategory === "" || selectedCategory === "default" ? "" : ` in category '${selectedCategory}'`}
+
-
- {workflow.triggers[selectedTriggerIndex].parameters[0].value
- .length === 0 ? null : workflow.triggers[selectedTriggerIndex]
- .parameters[0].value === props.match.params.key ?
- null
- : (
-
Key
@@ -1041,13 +1045,13 @@ const CacheView = memo((props) => {
{
deleteCache(orgId, data.key);
//deleteFile(orgId);
diff --git a/frontend/src/components/LeftSideBar.jsx b/frontend/src/components/LeftSideBar.jsx
index baf60f06..92aeabe4 100644
--- a/frontend/src/components/LeftSideBar.jsx
+++ b/frontend/src/components/LeftSideBar.jsx
@@ -774,8 +774,8 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
}, [window?.location?.pathname]);
const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
-
-
+ const showPartnerLogo = userdata?.org_status?.includes("integration_partner") && userdata?.active_org?.image !== undefined && userdata?.active_org?.image !== null && userdata?.active_org?.image.length > 0
+
return (
- {subscription.name.includes("Scale") ?
- ""
- :
-
- userdata.has_card_available === true ?
- "While you have a card attached to your account, Shuffle will no longer prevent workflows from running. Billing will occur at the start of each month."
- :
+ {
isCloud ?
- userdata?.app_execution_limit && userdata?.app_execution_limit >= 300000 ?
- "You have subscribed to the Enterprise plan, which includes " + (userdata?.app_execution_limit/1000) + "K app runs/month. You can increase the limit by upgrading current plan. Contact support@shuffler.io for more information." :
- `You are not subscribed to any plan and are using the free plan with max 10,000 app runs per month. Upgrade to deactivate this limit.`
+ userdata?.app_execution_limit && userdata?.app_execution_limit !== 10000 ?
+ "You have already subscribed to the Scale plan, which includes " + (userdata?.app_execution_limit/1000) + "K app runs/month. You can increase the limit by upgrading current plan. Contact support@shuffler.io for more information." :
+ `You are using free Starter plan with max ${userdata?.app_execution_limit === 10000 ? "10,000" : "2,000"} runs per month. Upgrade to increase this limit.`
:
`You are not subscribed to any plan and are using the free, open source plan. This plan has no enforced limits, but scale issues may occur due to CPU congestion.`
}
- {isCloud && (userdata.has_card_available === true || selectedOrganization?.Billing?.Email?.length > 0 )?
+ {/* {isCloud && (userdata.has_card_available === true || selectedOrganization?.Billing?.Email?.length > 0 )?
{isCloud ? (
) : null}
{
}
}}
>
-
+
@@ -1611,7 +1613,7 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
}}
>
- {expandLeftNav &&
+ {userdata?.licensed !== true && !userdata?.org_status?.includes("integration_partner") && expandLeftNav &&
- {subscription.active === true && !isScale && }
+ {subscription.active === true && !isScale && }
{top_text === "Base Cloud Access" && userdata.has_card_available === true && !isScale ?
{
color="primary"
/>
: null}
-
+
{top_text}
@@ -396,7 +453,7 @@ const LicencePopup = (props) => {
}}
/>
: null}
- {isCloud && highlight === true && top_text !== "Base Cloud Access" ?
+ {isCloud && highlight === true && top_text !== "Starter Plan" ?
{
{subscription.currency_text}{subscription.price}
- / {subscription.interval}
+ {subscription.interval.length > 0 ? `/ ${subscription.interval}` : ""}
: null}
@@ -517,23 +574,17 @@ const LicencePopup = (props) => {
: null}
Billing email: {BillingEmail}
- : null}
+ : null} */}
-
-
- )}
+
+ )
}}
/>
)}
@@ -17465,12 +17443,32 @@ const AngularWorkflow = (defaultprops) => {
}}
renderInput={(params) => {
return (
-
+
+
+ )}
+
+
+
+
+ }
+
);
}}
/>
@@ -17542,7 +17540,6 @@ const AngularWorkflow = (defaultprops) => {
workflow?.triggers[selectedTriggerIndex].parameters[2] &&
workflow?.triggers[selectedTriggerIndex].parameters[2].value &&
(
- workflow?.triggers[selectedTriggerIndex].parameters[2].value.includes("email") ||
workflow?.triggers[selectedTriggerIndex].parameters[2].value.includes("sms")
) ? (
{
- const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
const newitem = removeParam("execution_id", cursearch);
navigate(curpath + newitem)
setExecutionRunning(false);
@@ -21397,7 +21391,7 @@ const AngularWorkflow = (defaultprops) => {
Rerun workflow. Uses same startnode as the original. Runs from scratch.
}
- placement="top"
+ placement="left"
style={{ zIndex: 50000 }}
>
@@ -21752,6 +21746,7 @@ const AngularWorkflow = (defaultprops) => {
}
/>
) : null}
+
{executionData.status !== undefined &&
@@ -21774,6 +21769,7 @@ const AngularWorkflow = (defaultprops) => {
) : null}
+
{
executionData.results === undefined ||
executionData.results === null ||
@@ -21794,6 +21790,14 @@ const AngularWorkflow = (defaultprops) => {
return null;
}
+ const showRerun = new URLSearchParams(cursearch).get("rerun")
+ if (showRerun === "true") {
+ const showNode = new URLSearchParams(cursearch).get("node")
+ if (data.action.id !== showNode) {
+ return null
+ }
+ }
+
// FIXME: The latter replace doens't really work if ' is used in a string
var showResult = data.result.trim();
const validate = validateJson(showResult);
@@ -21873,10 +21877,10 @@ const AngularWorkflow = (defaultprops) => {
);
}
- if (data.action.app_name === "User Input") {
+ if (data?.action?.app_name === "User Input" || data?.action?.name === "run_userinput") {
actionimg = (
{
}
}
- const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
const chosenNodeId = new URLSearchParams(cursearch).get("node");
const highlightNode = chosenNodeId !== null && chosenNodeId !== undefined && chosenNodeId !== "" && chosenNodeId === data.action.id
var relevant_errors = []
@@ -22081,7 +22084,7 @@ const AngularWorkflow = (defaultprops) => {
color="primary"
title={
- Expand result window. Errors: {relevant_errors.length}
+ Expand debug window. Errors: {relevant_errors.length}
}
placement="top"
@@ -22720,7 +22723,7 @@ const AngularWorkflow = (defaultprops) => {
{curapp === null ? null : (
{
// Automatically mapping fields that already exist (predefined).
// Warning if fields are NOT filled
for (let paramkey in selectedApp.authentication.parameters) {
- if (
- authenticationOption.fields[
- selectedApp.authentication.parameters[paramkey].name
- ].length === 0
- ) {
+ if (authenticationOption.fields[selectedApp.authentication.parameters[paramkey].name].length === 0) {
+
if (
selectedApp.authentication.parameters[paramkey].value !== undefined &&
selectedApp.authentication.parameters[paramkey].value !== null &&
@@ -23538,8 +23538,30 @@ const AngularWorkflow = (defaultprops) => {
var newAuthOption = JSON.parse(JSON.stringify(authenticationOption));
var newFields = [];
+
+ var warningsent = false
for (let authkey in newAuthOption.fields) {
- const value = newAuthOption.fields[authkey];
+ var value = newAuthOption.fields[authkey];
+
+ if (value?.toLowerCase().includes("secret. replace")) {
+ value = ""
+
+ if (authkey === "url") {
+ // Use default value of the url
+ const urlparam = selectedApp.authentication.parameters.find((data) => data.name === "url")
+ if (urlparam !== undefined && urlparam !== null) {
+ if (urlparam.example !== undefined && urlparam.example !== null && urlparam.example.length > 0) {
+ value = urlparam.example
+ }
+ }
+ } else {
+ if (!warningsent) {
+ warningsent = true
+ toast("Warning: As you didn't fill in all fields, be aware that the authentication may fail.")
+ }
+ }
+ }
+
newFields.push({
"key": authkey,
"value": value,
@@ -23692,18 +23714,18 @@ const AngularWorkflow = (defaultprops) => {
}}
fullWidth
type={
- data.example !== undefined && data.example.includes("***")
+ data.example !== undefined && data.example.includes("**")
? "password"
: "text"
}
color="primary"
defaultValue={
- data.value !== undefined && data.value !== null && !data.value.includes("Secret. Replace") ? data.value : ""
+ data.value !== undefined && data.value !== null && !data.value.includes("Secret. Replace") ? data.value :
+ data?.example !== undefined && data?.example !== null && data?.example !== "" && !data?.example.includes("*") ? data.example : ""
}
placeholder={data.example}
onChange={(event) => {
- authenticationOption.fields[data.name] =
- event.target.value;
+ authenticationOption.fields[data.name] = event.target.value;
}}
id={`${data.name}_auth`}
/>
diff --git a/frontend/src/views/RunWorkflow.jsx b/frontend/src/views/RunWorkflow.jsx
index 919d3551..6a9e7442 100644
--- a/frontend/src/views/RunWorkflow.jsx
+++ b/frontend/src/views/RunWorkflow.jsx
@@ -19,6 +19,7 @@ import RecentWorkflow from "../components/RecentWorkflow.jsx";
import {
Tooltip,
+ Fade,
Select,
IconButton,
CircularProgress,
@@ -462,6 +463,8 @@ const RunWorkflow = (defaultprops) => {
} else {
console.log("Started execution")
+ start()
+ setExecutionRunning(true);
if (answer !== undefined && answer !== null) {
console.log("Skipping start")
} else {
@@ -1055,7 +1058,7 @@ const RunWorkflow = (defaultprops) => {
if (parsedresult.click_info !== undefined && parsedresult.click_info !== null) {
if (parsedresult.click_info.user !== undefined && parsedresult.click_info.user !== null && parsedresult.click_info.user.length > 0) {
- setMessage("Already answered by " + parsedresult.click_info.user)
+ setMessage("Answered by " + parsedresult.click_info.user)
}
} else {
@@ -1325,7 +1328,8 @@ const RunWorkflow = (defaultprops) => {
})}
{executionData.status !== undefined &&
@@ -21774,6 +21769,7 @@ const AngularWorkflow = (defaultprops) => {
) : null}