- {hits.map((data, index) => {
- const appUrl =
- isCloud
- ? `/apps/${data.objectID}?queryID=${data.__queryID}`
- : `https://shuffler.io/apps/${data.objectID}?queryID=${data.__queryID}`;
+
+ {hits.length === 0 && searchQuery.length >= 0 && showNoAppFound ? (
+ No App Found
+ ) : (
+
+
+ {hits.map((data, index) => {
+ const appUrl =
+ isCloud
+ ? `/apps/${data.objectID}?queryID=${data.__queryID}`
+ : `https://shuffler.io/apps/${data.objectID}?queryID=${data.__queryID}`;
- return (
-
-
-
- {
- setMouseHoverIndex(index);
- }}
- onMouseLeave={() => {
- setMouseHoverIndex(-1);
- }}
- >
-
-
{
height: "100%",
}}
>
-
);
@@ -889,13 +926,6 @@ const AppGrid = (props) => {
//Search box for the orgs and users apps
const SearchBoxForOrgAndUserApp = ({ searchQuery, setSearchQuery }) => {
- const updateUrl = (query) => {
- const urlSearchParams = new URLSearchParams(window.location.search);
- urlSearchParams.set("q", query);
- const newUrl = `${window.location.pathname}?${urlSearchParams.toString()}`;
- window.history.pushState({ path: newUrl }, "", newUrl);
- };
-
return (
@@ -1560,201 +1632,208 @@ const AppGrid = (props) => {
) : (
,
@@ -917,6 +920,7 @@ const ConfigureWorkflow = (props) => {
parsedName = parsedName.substring(0, parsedName.length - 4);
}
+
return (
{action.must_authenticate ?
@@ -1061,7 +1065,7 @@ const ConfigureWorkflow = (props) => {
src={action.large_image}
/>
- Activate
+ Activate {action.app_name.replaceAll("_", " ")}
:
diff --git a/frontend/src/components/NewHeader.jsx b/frontend/src/components/NewHeader.jsx
index e830467e..edf0ae24 100644
--- a/frontend/src/components/NewHeader.jsx
+++ b/frontend/src/components/NewHeader.jsx
@@ -18,11 +18,11 @@ import {
MenuItem,
Select,
Button,
+ ButtonGroup,
Grid,
IconButton,
Divider,
LinearProgress,
-
AppBar,
} from "@mui/material";
@@ -50,13 +50,14 @@ const Header = (props) => {
globalUrl,
setNotifications,
notifications,
- isLoaded,
+ isLoaded,
isLoggedIn,
removeCookie,
homePage,
userdata,
- isMobile,
+ isMobile,
serverside,
+ setModalOpen,
} = props;
const [HomeHoverColor, setHomeHoverColor] = useState(hoverOutColor);
@@ -80,7 +81,7 @@ const Header = (props) => {
setAnchorElAvatar(null);
};
// Should be based on some path
- const logoCheck = !homePage ? null : null
+ const logoCheck = !homePage ? null : null
const hrefStyle = {
color: hoverOutColor,
@@ -88,25 +89,25 @@ const Header = (props) => {
};
const menuText = {
- textTransform: "none",
- color: "#FFF",
- textAlign: "center",
- fontSize: 16,
- fontStyle: "normal",
- fontWeight: 400,
- lineHeight: "normal",
+ textTransform: "none",
+ color: "#FFF",
+ textAlign: "center",
+ fontSize: 16,
+ fontStyle: "normal",
+ fontWeight: 400,
+ lineHeight: "normal",
}
const isCloud =
serverside === true || typeof window === "undefined"
? true
: window.location.host === "localhost:3002" ||
- window.location.host === "shuffler.io" ||
- window.location.host === "localhost:5002";
+ window.location.host === "shuffler.io" ||
+ window.location.host === "localhost:5002";
const clearNotifications = () => {
// Don't really care about the logout
-
+
toast("Clearing notifications")
fetch(`${globalUrl}/api/v1/notifications/clear`, {
credentials: "include",
@@ -235,12 +236,12 @@ const Header = (props) => {
setLoginHoverColor(hoverOutColor);
};
- const notificationWidth = 335
- const imagesize = 22;
- const boxColor = "#86c142";
+ const notificationWidth = 335
+ const imagesize = 22;
+ const boxColor = "#86c142";
- const NotificationItem = (props) => {
- const {data} = props
+ const NotificationItem = (props) => {
+ const { data } = props
var image = "";
var orgName = "";
@@ -279,7 +280,7 @@ const Header = (props) => {
alt={foundOrg.name}
src={foundOrg.image}
style={imageStyle}
- onClick={() => {}}
+ onClick={() => { }}
/>
);
@@ -297,31 +298,31 @@ const Header = (props) => {
borderBottom: "1px solid rgba(255,255,255,0.4)",
}}
>
- {data.reference_url !== undefined && data.reference_url !== null && data.reference_url.length > 0 ?
-
-
- {data.title} ({data.amount})
-
-
- :
-
- {data.title}
-
- }
+ {data.reference_url !== undefined && data.reference_url !== null && data.reference_url.length > 0 ?
+
+
+ {data.title} ({data.amount})
+
+
+ :
+
+ {data.title}
+
+ }
- {data.image !== undefined && data.image !== null && data.image.length > 0 ?
- 
- :
- null
- }
-
- {data.description}
-
+ {data.image !== undefined && data.image !== null && data.image.length > 0 ?
+
+ :
+ null
+ }
+
+ {data.description}
+
-
-
+ {/*
*/}
-
-
-
{isLoggedIn ? (
-
-
@@ -1862,6 +1940,9 @@ const AppGrid = (props) => {
selectedCategoryForUsersAndOgsApps={selectedCategoryForUsersAndOgsApps}
selectedTagsForUserAndOrgApps={selectedTagsForUserAndOrgApps}
selectedOptionOfCreatedWith={selectedOptionOfCreatedWith}
+ setselectedCategoryForUsersAndOgsApps={setselectedCategoryForUsersAndOgsApps}
+ setSelectedTagsForUserAndOrgApps={setSelectedTagsForUserAndOrgApps}
+ setSelectedOptionOfCreatedWith={setSelectedOptionOfCreatedWith}
/>
-
- Please login to your account first to view {`${currTab === 1 ? "Organization" : "My"}`} Apps.
@@ -1767,8 +1846,7 @@ const AppGrid = (props) => { }; - const AppTab = ({ selectedCategoryForUsersAndOgsApps, selectedTagsForUserAndOrgApps, selectedOptionOfCreatedWith }) => { - + const AppTab = ({ selectedCategoryForUsersAndOgsApps, selectedTagsForUserAndOrgApps, selectedOptionOfCreatedWith, setselectedCategoryForUsersAndOgsApps, setSelectedTagsForUserAndOrgApps, setSelectedOptionOfCreatedWith }) => { const [isAnyAppActivated, setIsAnyAppActivated] = useState(false); return ( @@ -1827,7 +1905,7 @@ const AppGrid = (props) => { {currTab === 0 ? (
- {filteredUserAppdata.map((data, index) => {
- const isMouseOverOnCloudIcon = false;
- const xs = 12;
- const rowHandler = 12;
- const searchClient = {};
- const userdata = {};
+
) : (
+ No App Found
+ ) : (
+
+ )}
+
+
+
+
-
-
+ {filteredUserAppdata.map((data, index) => {
+ const isMouseOverOnCloudIcon = false;
+ const xs = 12;
+ const rowHandler = 12;
+ const searchClient = {};
+ const userdata = {};
- const paperStyle = {
- backgroundColor: mouseHoverIndex === index ? "rgba(26, 26, 26, 1)" : "#1A1A1A",
- color: "rgba(241, 241, 241, 1)",
- padding: isHeader ? null : 15,
- cursor: "pointer",
- position: "relative",
- width: 339,
- height: 96,
- borderRadius: 8,
- };
+ const paperStyle = {
+ backgroundColor: mouseHoverIndex === index ? "rgba(26, 26, 26, 1)" : "#1A1A1A",
+ color: "rgba(241, 241, 241, 1)",
+ padding: isHeader ? null : 15,
+ cursor: "pointer",
+ position: "relative",
+ width: 339,
+ height: 96,
+ borderRadius: 8,
+ };
- var parsedname = "";
- for (var key = 0; key < data.name.length; key++) {
- var character = data.name.charAt(key);
- if (character === character.toUpperCase()) {
- if (
- data.name.charAt(key + 1) !== undefined &&
- data.name.charAt(key + 1) ===
- data.name.charAt(key + 1).toUpperCase()
- ) {
- } else {
- parsedname += " ";
+ var parsedname = "";
+ for (var key = 0; key < data.name.length; key++) {
+ var character = data.name.charAt(key);
+ if (character === character.toUpperCase()) {
+ if (
+ data.name.charAt(key + 1) !== undefined &&
+ data.name.charAt(key + 1) ===
+ data.name.charAt(key + 1).toUpperCase()
+ ) {
+ } else {
+ parsedname += " ";
+ }
+ }
+ parsedname += character;
}
- }
- parsedname += character;
- }
- parsedname = (
- parsedname.charAt(0).toUpperCase() + parsedname.substring(1)
- ).replaceAll("_", " ");
+ parsedname = (
+ parsedname.charAt(0).toUpperCase() + parsedname.substring(1)
+ ).replaceAll("_", " ");
- const normalizedString = (name) => {
- if (typeof name === 'string') {
- return name.replace(/_/g, ' ');
- } else {
- return name;
- }
- };
+ const normalizedString = (name) => {
+ if (typeof name === 'string') {
+ return name.replace(/_/g, ' ');
+ } else {
+ return name;
+ }
+ };
- const appUrl =
- isCloud === true
- ? `/apps/${data.id}`
- : `https://shuffler.io/apps/${data.id}`;
+ const appUrl =
+ isCloud === true
+ ? `/apps/${data.id}`
+ : `https://shuffler.io/apps/${data.id}`;
- return (
-
-
-
- {
- setMouseHoverIndex(index);
- }}
- onMouseOut={() => {
- setMouseHoverIndex(-1);
- }}
- >
-
+
- 
{
+ setMouseHoverIndex(index);
}}
- />
-
-
-
-
-
- );
- })
- }
+
+
+
+ {
+ setMouseHoverIndex(-1);
}}
>
-
-
- {normalizedString(data.name)}
-
-
- {data.categories !== null
- ? normalizedString(data.categories).join(", ")
- : "NA"}
-
-
- {data.tags &&
- data.tags.map((tag, tagIndex) => (
-
- {normalizedString(tag)}
- {tagIndex < data.tags.length - 1 ? ", " : ""}
-
- ))}
-
- {/* )} */}
-
+
+
+
+
+
+
+ );
+ })
+ }
+
+ {normalizedString(data.name)}
+
+
+ {data.categories !== null
+ ? normalizedString(data.categories).join(", ")
+ : "NA"}
+
+
+ {data.tags &&
+ data.tags.map((tag, tagIndex) => (
+
+ {normalizedString(tag)}
+ {tagIndex < data.tags.length - 1 ? ", " : ""}
+
+ ))}
+
+ {/* )} */}
+ @@ -1767,8 +1846,7 @@ const AppGrid = (props) => { }; - const AppTab = ({ selectedCategoryForUsersAndOgsApps, selectedTagsForUserAndOrgApps, selectedOptionOfCreatedWith }) => { - + const AppTab = ({ selectedCategoryForUsersAndOgsApps, selectedTagsForUserAndOrgApps, selectedOptionOfCreatedWith, setselectedCategoryForUsersAndOgsApps, setSelectedTagsForUserAndOrgApps, setSelectedOptionOfCreatedWith }) => { const [isAnyAppActivated, setIsAnyAppActivated] = useState(false); return ( @@ -1827,7 +1905,7 @@ const AppGrid = (props) => { {currTab === 0 ? (
{data.read === false ? (
) : (
@@ -830,91 +841,91 @@ const Header = (props) => {
style={{ color: HomeHoverColor, cursor: "pointer" }}
>
-
+
![logo]({"/images/logos/orange_logo.svg"})
- {/*
+
+
-
-
+
+
+
- {/*
+
+ Apps
+
+
+
+
+ {/*
- Workflows
-
-
-
-
-
- {/*
+
+ Workflows
+
+
+
+
+ {/*
- Apps
-
-
-
- Dashboard
- {/*
+
+
+
+
+ Docs
+
+
+
+
+ {/*
- Docs
-
-
-
-
-
+
-
+
- {
marginRight: 10,
marginLeft:
data.creator_org !== undefined &&
- data.creator_org !== null &&
- data.creator_org.length > 0
+ data.creator_org !== null &&
+ data.creator_org.length > 0
? data.id === userdata.active_org.id
? 0
: 20
@@ -1021,8 +1032,8 @@ const Header = (props) => {
const parsedTitle =
data.creator_org !== undefined &&
- data.creator_org !== null &&
- data.creator_org.length > 0
+ data.creator_org !== null &&
+ data.creator_org.length > 0
? `Suborg of ${data.creator_org}`
: "";
@@ -1056,11 +1067,11 @@ const Header = (props) => {
regiontag = namesplit[namesplit.length - 1];
- if (regiontag === "california") {
- regiontag = "us"
- } else if (regiontag === "frankfurt") {
- regiontag = "fr"
- }
+ if (regiontag === "california") {
+ regiontag = "us"
+ } else if (regiontag === "frankfurt") {
+ regiontag = "fr"
+ }
}
}
@@ -1134,61 +1145,62 @@ const Header = (props) => {
{/* Show on cloud, if not suborg and if not customer/pov/internal */}
{
- userdata.licensed !== undefined &&
- userdata.licensed !== null &&
- userdata.licensed === false ?
-
-
- {loginTextBrowser}
-
-
- :
- */
- return !isMobile ?
-
+
+ {loginTextBrowser}
+
+
+ :
+ */
+ return !isMobile ?
+
+
+
+
+ :
+
+ {loginTextBrowser}
+
+
{isIntegration ?
apps !== undefined && apps !== null && apps.length > 0 ?
-
+
+
{
+
+ selectedAction.example = "noapp"
+ selectedAction.large_image = newimage
+ if (cy !== undefined && cy !== null) {
+ const foundnode = cy.getElementById(selectedAction.id)
+ if (foundnode !== undefined && foundnode !== null) {
+ foundnode.data("large_image", newimage)
+ }
+ }
+
+ const iconInfo = GetIconInfo(selectedAction)
+ if (iconInfo !== undefined && iconInfo !== null) {
+ selectedAction.fillGradient = iconInfo.fillGradient
+
+ selectedAction.iconBackground = iconInfo.iconBackgroundColor
+ selectedAction.fillstyle = "linear-gradient"
+ }
+
+ if (paramIndex === -1) {
+ console.log("Couldn't find app_name parameter")
+ selectedAction.parameters.push({
+ name: "app_name",
+ value: wrapperapp.name,
+ autocompleted: false,
+ })
+ } else {
+ selectedAction.parameters[paramIndex].value = wrapperapp.name
+ }
+
+ setSelectedAction(selectedAction)
+ setUpdate(Math.random())
+
+ }}>
+
+
+
{apps.map((app, appIndex) => {
if (app.categories === undefined || app.categories === null || app.categories.length === 0) {
return null
}
var found = false
- var actionname = selectedAction.name.toLowerCase()
- if (actionname === "email") {
- actionname = "communication"
- }
for (var key in app.categories) {
@@ -1129,16 +1249,14 @@ const ParsedAction = (props) => {
return (
+ 
+
+ {
+ selectedAction.example = ""
selectedAction.large_image = app.large_image
-
- /*
- if (cy !== undefined) {
- const foundnode = cy.getElementById(selectedAction.id)
- if (foundnode !== undefined && foundnode !== null) {
- foundnode.data("large_image", app.large_image)
- }
- }
- */
+ if (cy !== undefined && cy !== null) {
+ const foundnode = cy.getElementById(selectedAction.id)
+ if (foundnode !== undefined && foundnode !== null) {
+ foundnode.data("large_image", app.large_image)
+ }
+ }
if (paramIndex === -1) {
console.log("Couldn't find app_name parameter")
@@ -1155,7 +1273,7 @@ const ParsedAction = (props) => {
setUpdate(Math.random())
}}>
-
+
{
const [showDismissed, setShowDismissed] = React.useState(false);
const [showRead, setShowRead] = React.useState(false);
const [appFramework, setAppFramework] = React.useState({});
+ const [selectedWorkflow, setSelectedWorkflow] = React.useState("");
+ const [selectedExecutionId, setSelectedExecutionId] = React.useState("");
let navigate = useNavigate();
useEffect(() => {
getFramework()
+
+ // Check "workflow" and "execution_id" in URL
+ const urlParams = new URLSearchParams(window.location.search)
+ const workflow = urlParams.get("workflow")
+ const execution_id = urlParams.get("execution_id")
+
+ if (execution_id !== null) {
+ setSelectedExecutionId(execution_id)
+
+ //toast.info("Execution-related notifications are highlighted.")
+ }
+
+ if (workflow !== null) {
+ setSelectedWorkflow(workflow)
+
+ toast.info("Workflow-related notifications are highlighted.")
+ }
}, [])
if (userdata === undefined || userdata === null) {
@@ -157,6 +176,10 @@ const Priorities = (props) => {
var image = "";
var orgName = "";
var orgId = "";
+
+
+ const highlighted = data.reference_url === undefined || data.reference_url === null || data.reference_url.length === 0 ? false : data.reference_url.includes(selectedExecutionId) || data.reference_url.includes(selectedWorkflow)
+
if (userdata.orgs !== undefined) {
const foundOrg = userdata.orgs.find((org) => org.id === data["org_id"]);
if (foundOrg !== undefined && foundOrg !== null) {
@@ -207,6 +230,8 @@ const Priorities = (props) => {
padding: 30,
borderBottom: "1px solid rgba(255,255,255,0.4)",
marginBottom: 20,
+ border: highlighted ? "2px solid #f85a3e" : null,
+ borderRadius: theme.palette.borderRadius,
}}
>
{
minWidth: viewWidth,
maxWidth: viewWidth,
color: "white",
- borderRadius: 5,
+ borderRadius: theme.palette.borderRadius,
//display: "flex",
marginBottom: 10,
overflow: "hidden",
diff --git a/frontend/src/views/Search.jsx b/frontend/src/views/Search.jsx
index b9b65f06..8994dbed 100644
--- a/frontend/src/views/Search.jsx
+++ b/frontend/src/views/Search.jsx
@@ -98,9 +98,11 @@ const Search = (props) => {
display: 'none',
},
customTab: {
- justifyContent: 'center',
- gap: '46px',
- }
+ justifyContent: "center",
+ "& .MuiButtonBase-root": {
+ color: "white",
+ },
+ },
});
const classes = useStyles();
@@ -128,7 +130,6 @@ const Search = (props) => {
display: "flex",
flexDirection: "column",
overflowX: "hidden",
- width: "100%",
minHeight: 400,
};
@@ -150,6 +151,8 @@ const Search = (props) => {
document.title = "Shuffle - search - documentation";
} else if (newValue === 3) {
document.title = "Shuffle - search - creators";
+ } else if (newValue === 4) {
+ document.title = "Shuffle - search - Discord Chat";
} else {
document.title = "Shuffle - search";
}
@@ -202,14 +205,12 @@ const Search = (props) => {
color: 'white'
}
-
// Random names for type & autoComplete. Didn't research :^)
const landingpageDataBrowser = (
@@ -313,7 +338,42 @@ const Priorities = (props) => {
return (
Generating the Workflow...
- {
{isMobile ? null : Triggers }
}
- style={tabStyle}
+ style={{
+ maxWidth: isMobile ? leftBarSize : leftBarSize / 3,
+ minWidth: isMobile ? leftBarSize : leftBarSize / 3,
+ flex: 1,
+ textTransform: "none",
+ padding: 0,
+ }}
/>
{
/>
- );
- };
+ )
+ }
const TriggersView = () => {
const triggersViewStyle = {
- marginLeft: "10px",
- marginRight: "10px",
+ marginLeft: 10,
+ marginRight: 10,
display: "flex",
flexDirection: "column",
- };
+ }
// Predefined hurr
-
return (
- {
+ setShowRead(!showRead);
+ }}
+ /> Show read
+ {notifications === null || notifications === undefined || notifications.length === 0 ? null :
+
These range from simple configurations in Shuffle to Usecases you may have missed. { ) }) } - {clickedFromOrgTab?null: {
- setShowRead(!showRead);
- }}
- /> Show read
- {notifications === null || notifications === undefined || notifications.length === 0 ? null :
-
)
diff --git a/frontend/src/components/WorkflowTemplatePopup.jsx b/frontend/src/components/WorkflowTemplatePopup.jsx
index 6df11b9b..13a6735f 100644
--- a/frontend/src/components/WorkflowTemplatePopup.jsx
+++ b/frontend/src/components/WorkflowTemplatePopup.jsx
@@ -42,7 +42,7 @@ const WorkflowTemplatePopup = (props) => {
const [appAuthentication, setAppAuthentication] = React.useState(undefined);
const [missingSource, setMissingSource] = React.useState(undefined)
const [missingDestination, setMissingDestination] = React.useState(undefined);
- const [configurationFinished, setConfigurationFinished] = React.useState(false);
+ const [configurationFinished, setConfigurationFinished] = React.useState(false)
const [appSetupDone, setAppSetupDone] = React.useState(false)
const [requestSent, setRequestSent] = React.useState(false)
@@ -75,6 +75,16 @@ const WorkflowTemplatePopup = (props) => {
}
}, [modalOpen, missingSource, missingDestination])
+ useEffect(() => {
+ //console.log("IN USEEFFECT FOR CONFIG: ", configurationFinished)
+ if (configurationFinished === true && workflow.id !== undefined && workflow.id !== null && workflow.id !== "") {
+ toast.success("Generation Successful. Redirecting to the workflow..")
+ setTimeout(() => {
+ navigate("/workflows/" + workflow.id)
+ }, 2000)
+ }
+ }, [configurationFinished, workflow])
+
const imagestyleWrapper = {
height: 40,
@@ -305,13 +315,13 @@ const WorkflowTemplatePopup = (props) => {
if (srcapp.includes(":default") || dstapp.includes(":default")) {
toast("You need to select both a source and destination app before generating this workflow.")
- if (srcapp.includes(":default")) {
+ if (srcapp !== undefined && srcapp !== null && srcapp.includes(":default")) {
setMissingSource({
"type": srcapp.split(":")[0],
})
}
- if (dstapp.includes(":default")) {
+ if (dstapp !== undefined && dstapp !== null && dstapp.includes(":default")) {
setMissingDestination({
"type": dstapp.split(":")[0],
})
@@ -490,7 +500,7 @@ const WorkflowTemplatePopup = (props) => {
Suggestions
+Notifications
+ + Notifications help you find potential problems with your workflows and apps. + + Learn more + + + +
+ {notifications.map((notification, index) => {
+ if (showRead === false && notification.read === true) {
+ return null
+ }
+
+ return (
+
+ }
+
+ {clickedFromOrgTab? null : Suggestions
Suggestions are tasks identified by Shuffle to help you discover ways to protect your and customers' company.These range from simple configurations in Shuffle to Usecases you may have missed. { ) }) } - {clickedFromOrgTab?null:
Notifications
- - Notifications help you find potential problems with your workflows and apps. - - Learn more - - - -
- {notifications.map((notification, index) => {
- if (showRead === false && notification.read === true) {
- return null
- }
-
- return (
-
- }
@@ -572,18 +582,7 @@ const WorkflowTemplatePopup = (props) => {
setConfigurationFinished={setConfigurationFinished}
/>
-
- {/*workflow !== undefined && workflow !== null && workflow.id !== undefined && workflow.id !== null && workflow.id !== "" ?
-
{
window.open("/workflows/" + workflow.id, "_blank")
}}
>
- {/*
Workflow Successfully Generated!
- : null}
-
- {/*errorMessage === "" ?
-
: null*/}
+
)
diff --git a/frontend/src/defaultCytoscapeStyle.jsx b/frontend/src/defaultCytoscapeStyle.jsx
index ca66ef3c..76840b9c 100644
--- a/frontend/src/defaultCytoscapeStyle.jsx
+++ b/frontend/src/defaultCytoscapeStyle.jsx
@@ -2,7 +2,16 @@ const data = [
{
selector: "node",
css: {
- label: "data(label)",
+ label: function(element) {
+ var elementname = element.data("label")
+ if (elementname === null || elementname === undefined) {
+ return ""
+ }
+
+ elementname = elementname.replace("_", " ", -1)
+ elementname = elementname.charAt(0).toUpperCase() + elementname.slice(1)
+ return elementname
+ },
"text-valign": "center",
"font-family": "Segoe UI, Tahoma, Geneva, Verdana, sans-serif, sans-serif",
"font-weight": "lighter",
@@ -79,6 +88,36 @@ const data = [
"text-wrap": "wrap",
},
},
+ {
+ selector: `node[app_name="Integration Framework"]`,
+ css: {
+ width: "60px",
+ height: "60px",
+ "z-index": 5000,
+
+ //'border-width': 3,
+ //'border-color': 'transparent',
+ //'border-style': 'solid',
+ //'border-gradient': 'linear-gradient(to right, #FF0000, #FF7F00, #FFFF00, #00FF00, #0000FF, #4B0082, #8A2BE2)'
+ },
+ },
+ {
+ selector: `node[example="noapp"]`,
+ css: {
+ // Make background image padding on the left side 20px
+ "background-width": "75%",
+ "background-height": "75%",
+ "background-position-x": "17px",
+ "background-position-y": "17px",
+
+ "background-color": "data(iconBackground)",
+ "background-fill": "data(fillstyle)",
+ "background-gradient-direction": "to-bottom-right",
+ "background-gradient-stop-colors": "data(fillGradient)",
+ // Change transparency of background
+ "background-opacity": "0.3",
+ },
+ },
{
selector: `node[app_name="Shuffle Tools"]`,
css: {
diff --git a/frontend/src/theme.jsx b/frontend/src/theme.jsx
index 99649e48..b183a1e4 100644
--- a/frontend/src/theme.jsx
+++ b/frontend/src/theme.jsx
@@ -24,12 +24,12 @@ const theme = createTheme(adaptV4Theme({
platformColor: "#1c1c1d",
backgroundColor: "#1a1a1a",
green: "#5cc879",
- borderRadius: 5,
+ borderRadius: 10,
defaultBorder: "1px solid rgba(255,255,255,0.3)",
jsonTheme: "brewer",
reactJsonStyle: {
padding: 5,
- width: "100%",
+ width: "98%",
borderRadius: 5,
border: "1px solid rgba(255,255,255,0.7)",
overflowX: "auto",
@@ -53,8 +53,7 @@ const theme = createTheme(adaptV4Theme({
boxShadow: 1,
fontSize: 11,
},
- defaultImage:
- "data:image/png;base64,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",
+ defaultImage: "/images/no_image.png",
},
typography: {
fontFamily: `"Roboto", "Helvetica", "Arial", sans-serif`,
diff --git a/frontend/src/views/Admin.jsx b/frontend/src/views/Admin.jsx
index ceebabdd..a6c35e7f 100755
--- a/frontend/src/views/Admin.jsx
+++ b/frontend/src/views/Admin.jsx
@@ -6262,23 +6262,15 @@ If you're interested, please let me know a time that works for you, or set up a
/>
{
- setCloudSyncModalOpen(true);
- setSelectedOrganization(data);
- console.log("INVERT CLOUD SYNC");
- }}
- />
- style={{ minWidth: 150, maxWidth: 150 }}
- />
-
- );
+ style={{ minWidth: 200, maxWidth: 200 }}
+ primary={
+
+ }
+ />
+
+ )
})}
) : null}
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index af90c8d9..3f25507b 100755
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -73,6 +73,7 @@ import {
import {
Folder as FolderIcon,
+ VerifiedUser as VerifiedUserIcon,
Insights as InsightsIcon,
LibraryBooks as LibraryBooksIcon,
OpenInNew as OpenInNewIcon,
@@ -118,6 +119,7 @@ import {
QueryStats as QueryStatsIcon,
AutoAwesome as AutoAwesomeIcon,
Add as AddIcon,
+ ErrorOutline as ErrorOutlineIcon,
} from "@mui/icons-material";
//import * as cytoscape from "cytoscape";
@@ -139,6 +141,7 @@ import PaperComponent from "../components/PaperComponent.jsx"
import ExtraApps from "../components/ExtraApps.jsx"
import EditWorkflow from "../components/EditWorkflow.jsx"
// import AppStats from "../components/AppStats.jsx";
+const noImage = "/public/no_image.png";
cytoscape.use(edgehandles);
@@ -154,14 +157,14 @@ export const triggers = [
is_valid: true,
label: "Webhook",
environment: "onprem",
- description: "Custom HTTP input",
+ description: "Custom HTTP input trigger",
long_description: "Execute a workflow with an unauthicated POST request",
+ id: "",
},
{
name: "Schedule",
type: "TRIGGER",
status: "uninitialized",
- description: "Specify time",
trigger_type: "SCHEDULE",
errors: null,
large_image:
@@ -169,9 +172,11 @@ export const triggers = [
label: "Schedule",
is_valid: true,
environment: "onprem",
+ description: "Schedule time trigger",
long_description: "Create a schedule based on cron",
+ id: "",
},
- {
+ /*{
name: "Office365",
type: "TRIGGER",
status: "uninitialized",
@@ -184,6 +189,7 @@ export const triggers = [
large_image:
"data:image/jpg;base64,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",
long_description: "Execute a workflow when you get an email",
+ id: "",
},
{
name: "Gmail",
@@ -198,7 +204,8 @@ export const triggers = [
large_image:
"data:image/jpg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/hAzFodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QTIyMjgyMEYwMDJDMTFFQkJBOEE5OUJBM0MzMTA2RDIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QTIyMjgyMTAwMDJDMTFFQkJBOEE5OUJBM0MzMTA2RDIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozQTMwMDQxRTAwMEUxMUVCQkE4QTk5QkEzQzMxMDZEMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBMjIyODIwRTAwMkMxMUVCQkE4QTk5QkEzQzMxMDZEMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pv/bAEMAAwICAwICAwMCAwMDAwMEBwUEBAQECQYHBQcKCQsL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",
long_description: "Execute a workflow when you get an email",
- },
+ id: "",
+ },*/
{
name: "Shuffle Workflow",
type: "TRIGGER",
@@ -210,27 +217,29 @@ export const triggers = [
is_valid: true,
label: "Subflow",
environment: "onprem",
- description: "Control a workflow",
+ description: "Run a Subflow trigger",
long_description: "Execute another workflow from this workflow",
+ id: "",
},
{
name: "User Input",
type: "TRIGGER",
status: "running",
large_image: "/images/workflows/UserInput2.svg",
- description: "Wait for user input",
+ description: "Wait for user input trigger",
trigger_type: "USERINPUT",
is_valid: true,
errors: null,
label: "User input",
environment: "cloud",
long_description: "Take user input to continue execution",
+ id: "",
},
{
name: "Pipelines by Tenzir",
type: "TRIGGER",
status: "uninitialized",
- description: "BETA: Support only",
+ description: "BETA: Support only for Tenzir pipelines - trigger",
trigger_type: "PIPELINE",
errors: null,
is_valid: true,
@@ -238,6 +247,7 @@ export const triggers = [
environment: "onprem",
large_image: "/images/workflows/tenzir2.png",
long_description: "Controls a pipeline to run things",
+ id: "",
},
];
@@ -423,7 +433,7 @@ const AngularWorkflow = (defaultprops) => {
const [subworkflow, setSubworkflow] = React.useState({});
const [subworkflowStartnode, setSubworkflowStartnode] = React.useState("");
const [leftViewOpen, setLeftViewOpen] = React.useState(isMobile ? false : true);
- const [leftBarSize, setLeftBarSize] = React.useState(isMobile ? 0 : 350);
+ const [leftBarSize, setLeftBarSize] = React.useState(isMobile ? 0 : 325)
const [creatorProfile, setCreatorProfile] = React.useState({});
const [usecases, setUsecases] = React.useState([]);
const [files, setFiles] = React.useState({
@@ -500,7 +510,7 @@ const AngularWorkflow = (defaultprops) => {
const [apps, setApps] = React.useState([]);
const [filteredApps, setFilteredApps] = React.useState([]);
- const [prioritizedApps, setPrioritizedApps] = React.useState([]);
+ const [prioritizedApps, setPrioritizedApps] = React.useState([])
const [environments, setEnvironments] = React.useState([]);
const [established, setEstablished] = React.useState(false);
@@ -512,7 +522,10 @@ const AngularWorkflow = (defaultprops) => {
const [selectedAction, setSelectedAction] = React.useState({});
const [selectedActionEnvironment, setSelectedActionEnvironment] = React.useState({});
- const [streamDisabled, setStreamDisabled] = React.useState(false);
+ // Disabled streaming for now
+ const [streamDisabled, setStreamDisabled] = React.useState(true)
+
+
const [executionRequest, setExecutionRequest] = React.useState({});
const [executionRunning, setExecutionRunning] = React.useState(false);
@@ -750,7 +763,6 @@ const AngularWorkflow = (defaultprops) => {
useEffect(() => {
// Current variable + future state controlled
// This is so that the loop can stop itself as well
- console.log("In useeffect for loopRunning: ", loopRunning, loopRunning2)
if (loopRunning && loopRunning2) {
const intervalId = setInterval(() => {
if (!loopRunning) {
@@ -2180,9 +2192,9 @@ const AngularWorkflow = (defaultprops) => {
}]
setAppsLoaded(true)
- setApps(pretend_apps)
setFilteredApps(pretend_apps)
- setPrioritizedApps(pretend_apps);
+ setApps(Array.prototype.concat.apply(pretend_apps, triggers))
+ setPrioritizedApps(pretend_apps)
if (isLoggedIn) {
toast("Something went wrong while loading apps. Please refresh the window to try again.")
@@ -2207,9 +2219,9 @@ const AngularWorkflow = (defaultprops) => {
}]
setAppsLoaded(true)
- setApps(pretend_apps)
setFilteredApps(pretend_apps)
- setPrioritizedApps(pretend_apps);
+ setApps(Array.prototype.concat.apply(pretend_apps, triggers))
+ setPrioritizedApps(pretend_apps)
return
}
@@ -2223,8 +2235,8 @@ const AngularWorkflow = (defaultprops) => {
setToolsApp(foundTools)
}
- setApps(responseJson);
// Set localstorage for the apps in the "apps" key
+ setApps(Array.prototype.concat.apply(responseJson, triggers))
if (responseJson !== undefined && responseJson !== null && responseJson.length > 0) {
try {
localStorage.setItem("apps", JSON.stringify(responseJson))
@@ -2237,11 +2249,11 @@ const AngularWorkflow = (defaultprops) => {
handledPrioritizedApps = [].concat(integrationApps, handledPrioritizedApps)
if (isCloud) {
- setFilteredApps(responseJson.filter((app) => !internalIds.includes(app.name.toLowerCase())));
+ setFilteredApps(responseJson.filter((app) => !internalIds.includes(app.name.toLowerCase())))
setPrioritizedApps(handledPrioritizedApps)
} else {
- var tmpFiltered = responseJson.filter((app) => !internalIds.includes(app.name.toLowerCase()))
+ const tmpFiltered = responseJson.filter((app) => !internalIds.includes(app.name.toLowerCase()))
setFilteredApps(tmpFiltered)
setPrioritizedApps(handledPrioritizedApps)
}
@@ -2924,8 +2936,8 @@ const AngularWorkflow = (defaultprops) => {
}
}
- // Read text from stream
- //return response.text();
+ // Read text from stream
+ //return response.text();
return response.json();
})
.then((responseJson) => {
@@ -2950,6 +2962,10 @@ const AngularWorkflow = (defaultprops) => {
if (responseJson.triggers === undefined || responseJson.triggers === null) {
responseJson.triggers = [];
}
+
+ if (responseJson.org_id !== undefined && responseJson.org_id !== null) {
+ listOrgCache(responseJson.org_id)
+ }
// Wait for this to finish
fetchRecommendations(responseJson)
@@ -3477,6 +3493,7 @@ const AngularWorkflow = (defaultprops) => {
((nodedata.app_name !== "Shuffle Tools" &&
nodedata.app_name !== "Testing" &&
nodedata.app_name !== "Shuffle Workflow" &&
+ nodedata.app_name !== "Integration Framework" &&
nodedata.app_name !== "User Input") ||
nodedata.isStartNode)
) {
@@ -4424,9 +4441,6 @@ const AngularWorkflow = (defaultprops) => {
}
}
-
- console.log("TRIGGER: ", data)
-
setTimeout(() => {
setSelectedTriggerIndex(trigger_index);
setSelectedTrigger(data)
@@ -6534,7 +6548,7 @@ const AngularWorkflow = (defaultprops) => {
const node = {};
if (!action.isStartNode && action.app_name === "Shuffle Tools") {
- const iconInfo = GetIconInfo(action);
+ const iconInfo = GetIconInfo(action)
const svg_pin = ``;
const svgpin_Url = encodeURI("data:image/svg+xml;utf-8," + svg_pin);
action.large_image = svgpin_Url;
@@ -6549,7 +6563,15 @@ const AngularWorkflow = (defaultprops) => {
} else {
action.iconBackground = iconInfo.iconBackgroundColor;
}
- }
+ } else if (action.app_name === "Integration Framework") {
+ const iconInfo = GetIconInfo(action)
+ console.log("FOUND INTEGRATION: iconInfo: ", iconInfo)
+ if (iconInfo !== undefined && iconInfo !== null) {
+ action.fillGradient = iconInfo.fillGradient
+ action.iconBackground = iconInfo.iconBackgroundColor
+ action.fillstyle = "linear-gradient"
+ }
+ }
node.position = action.position;
node.data = action;
@@ -6581,9 +6603,11 @@ const AngularWorkflow = (defaultprops) => {
const decoratorNodes = inputworkflow.actions.map((action) => {
if (!action.isStartNode) {
if (action.app_name === "Testing") {
- return null;
+ return null
} else if (action.app_name === "Shuffle Tools") {
- return null;
+ return null
+ } else if (action.app_name === "Integration Framework") {
+ return null
}
}
@@ -6727,19 +6751,16 @@ const AngularWorkflow = (defaultprops) => {
return edge;
});
- if (
- inputworkflow.visual_branches !== undefined &&
- inputworkflow.visual_branches !== null &&
- inputworkflow.visual_branches.length > 0
- ) {
+ console.log("VISUAL BRANCHES: ", inputworkflow.visual_branches)
+ if (inputworkflow.visual_branches !== undefined && inputworkflow.visual_branches !== null && inputworkflow.visual_branches.length > 0) {
const visualedges = inputworkflow.visual_branches.map((branch, index) => {
const edge = {};
if (inputworkflow.branches[index] === undefined) {
- return {};
+ return {}
}
- var conditions = inputworkflow.branches[index].conditions;
+ var conditions = inputworkflow.branches[index].conditions
if (conditions === undefined || conditions === null) {
conditions = [];
}
@@ -6752,12 +6773,12 @@ const AngularWorkflow = (defaultprops) => {
target: branch.destination_id,
label: label,
decorator: true,
- };
+ }
- return edge;
+ return edge
});
- edges = edges.concat(visualedges);
+ edges = edges.concat(visualedges)
}
@@ -6996,7 +7017,7 @@ const AngularWorkflow = (defaultprops) => {
setFirstrequest(false);
getWorkflow(props.match.params.key, {});
getRevisionHistory(props.match.params.key)
- getApps();
+ getApps()
fetchUsecases()
const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
@@ -7129,6 +7150,10 @@ const AngularWorkflow = (defaultprops) => {
}
});
+ cy.on('grab', 'edge', (e) => {
+ console.log("Edge grabbed: ", e.target.data())
+ })
+
cy.on("select", "node", (e) => {
onNodeSelect(e, appAuthentication);
});
@@ -7337,8 +7362,8 @@ const AngularWorkflow = (defaultprops) => {
const paperAppStyle = {
borderRadius: theme.palette.borderRadius,
- minHeight: isMobile ? 50 : 100,
- maxHeight: isMobile ? 50 : 100,
+ minHeight: isMobile ? 50 : 70,
+ maxHeight: isMobile ? 50 : 70,
minWidth: isMobile ? 50 : "100%",
maxWidth: isMobile ? 50 : "100%",
marginTop: "5px",
@@ -7665,7 +7690,7 @@ const AngularWorkflow = (defaultprops) => {
>
{thisview}
-
-
- : null*/}
-
- {errorMessage === "" && configurationFinished === true && workflow.id !== undefined && workflowLoading === false ?
+ {/*errorMessage === "" && configurationFinished === true && workflow.id !== undefined && workflowLoading === false ?
@@ -7740,8 +7770,8 @@ const AngularWorkflow = (defaultprops) => {
return null
}
- const imagesize = isMobile ? 40 : trigger.large_image.includes("svg") ? 80 : 80
- var imageline = trigger.large_image.length === 0 ? ![]()
+ const imagesize = isMobile ? 40 : trigger.large_image.includes("svg") ? 50 : 50
+ var imageline = trigger.large_image.length === 0 ? ![]()
:
![]()
{
style={{
display: "flex",
flexDirection: "column",
- marginLeft: "20px",
+ marginLeft: 20,
overflow: "hidden",
}}
>
-
+
@@ -8025,6 +8055,12 @@ const AngularWorkflow = (defaultprops) => {
const handleAppDrag = (e, app) => {
const cycontainer = cy.container();
+
+ if (app.type === "TRIGGER") {
+ handleTriggerDrag(e, app)
+ return
+ }
+
//console.log("e: ", e)
//console.log("Offset: ", cycontainer)
@@ -8045,25 +8081,17 @@ const AngularWorkflow = (defaultprops) => {
return;
}
- currentnode[0].renderedPosition("x", e.pageX - cycontainer.offsetLeft);
- currentnode[0].renderedPosition("y", e.pageY - cycontainer.offsetTop);
+ currentnode[0].renderedPosition("x", e.pageX - cycontainer.offsetLeft)
+ currentnode[0].renderedPosition("y", e.pageY - cycontainer.offsetTop)
} else {
if (workflow.public) {
- console.log("workflow is public - not adding");
+ console.log("workflow is public - not adding")
return;
}
- if (
- app.actions === undefined ||
- app.actions === null ||
- app.actions.length === 0
- ) {
- toast(
- "App " +
- app.name +
- " currently has no actions to perform. Please go to https://shuffler.io/apps to edit it."
- );
- return;
+ if (app.actions === undefined || app.actions === null || app.actions.length === 0) {
+ toast("App " + app.name + " currently has no actions to perform. Please go to https://shuffler.io/apps to edit it.")
+ return
}
newNodeId = uuidv4();
@@ -8209,7 +8237,10 @@ const AngularWorkflow = (defaultprops) => {
const [visibleApps, setVisibleApps] = React.useState(
Array.prototype.concat.apply(
prioritizedApps,
- filteredApps.filter((innerapp) => !internalIds.includes(innerapp.id.toLowerCase()))
+ Array.prototype.concat.apply(
+ filteredApps.filter((innerapp) => !internalIds.includes(innerapp.id.toLowerCase())),
+ triggers
+ )
)
)
@@ -8220,18 +8251,18 @@ const AngularWorkflow = (defaultprops) => {
const app = props.app;
const [hover, setHover] = React.useState(false);
- if (app.id === "" || app.name === "") {
+ if (app.type !== "TRIGGER" && (app.id === "" || app.name === "")) {
return null
}
- const maxlen = 24;
- var newAppname = app.name;
- newAppname = newAppname.charAt(0).toUpperCase() + newAppname.substring(1);
+ const maxlen = 35
+ var newAppname = app.name
+ newAppname = newAppname.charAt(0).toUpperCase() + newAppname.substring(1)
if (newAppname.length > maxlen) {
- newAppname = newAppname.slice(0, maxlen) + "..";
+ newAppname = newAppname.slice(0, maxlen) + ".."
}
- newAppname = newAppname.replaceAll("_", " ");
+ newAppname = newAppname.replaceAll("_", " ")
if (app.large_image === undefined || app.large_image === null || app.large_image === "") {
app.large_image = theme.palette.defaultImage
@@ -8239,14 +8270,14 @@ const AngularWorkflow = (defaultprops) => {
const image = app.large_image !== undefined && app.large_image !== null && app.large_image !== "" ? app.large_image : theme.palette.defaultImage
- const newAppStyle = JSON.parse(JSON.stringify(paperAppStyle));
+ const newAppStyle = JSON.parse(JSON.stringify(paperAppStyle))
const pixelSize = !hover ? "2px" : "4px";
//newAppStyle.borderLeft = app.is_valid && app.actions !== null && app.actions !== undefined && app.actions.length > 0 && !(app.activated && app.generated)
newAppStyle.borderLeft = app.is_valid && app.actions !== null && app.actions !== undefined && app.actions.length > 0
? `${pixelSize} solid ${green}`
: `${pixelSize} solid ${yellow}`;
- if (app.id == highlightedApp) {
+ if (app.id == highlightedApp && app.id !== "") {
//console.log("Found correct appid to highlight: ", app.id)
newAppStyle.border = "3px solid " + green
@@ -8372,7 +8403,7 @@ const AngularWorkflow = (defaultprops) => {
>
![]()
{
userDrag: "none",
userSelect: "none",
borderRadius: theme.palette.borderRadius,
- height: isMobile ? 40 : 80,
- width: isMobile ? 40 : 80,
+ height: isMobile ? 40 : 55,
+ width: isMobile ? 40 : 55,
}}
/>
@@ -8403,29 +8434,16 @@ const AngularWorkflow = (defaultprops) => {
20 ? -1 : 12,
+ fontSize: 19,
+ }}
>
{newAppname}
-
-
- Version: {app.app_version}
-
-
-
-
- {app.description}
-
-
}
@@ -8435,32 +8453,39 @@ const AngularWorkflow = (defaultprops) => {
};
const runSearch = (value) => {
+ value = value.trim().toLowerCase()
if (value.length > 0) {
- var newApps = allApps.filter(
+ // Dedup based on name
+ const preppedApps = Array.prototype.concat.apply(allApps, triggers).filter((app, index, self) => {
+ return index === self.findIndex((t) => (
+ t.name === app.name
+ ))
+ })
+
+ var newApps = preppedApps.filter(
(app) =>
- app.name.toLowerCase().includes(value.trim().toLowerCase())
+ app.name.toLowerCase().includes(value)
||
- app.description.toLowerCase().includes(value.trim().toLowerCase())
+ app.description.toLowerCase().includes(value)
)
// Extend search
if (newApps.length === 0) {
- const searchvalue = value.trim().toLowerCase();
newApps = allApps.filter((app) => {
- if (app.actions !== undefined && app.actions !== null) {
- for (let actionkey in app.actions) {
- const inneraction = app.actions[actionkey];
- if (inneraction.name.toLowerCase().includes(searchvalue)) {
- return true;
- }
- }
- }
+ if (app.actions !== undefined && app.actions !== null) {
+ for (let actionkey in app.actions) {
+ const inneraction = app.actions[actionkey]
+ if (inneraction.name.toLowerCase().includes(value)) {
+ return true;
+ }
+ }
+ }
return false;
- });
+ })
}
- setVisibleApps(newApps);
+ setVisibleApps(newApps)
} else {
setVisibleApps(
prioritizedApps.concat(
@@ -8468,7 +8493,7 @@ const AngularWorkflow = (defaultprops) => {
(innerapp) => !internalIds.includes(innerapp.id.toLowerCase())
)
)
- );
+ )
}
};
@@ -8755,16 +8780,20 @@ const AngularWorkflow = (defaultprops) => {
{
style={{
backgroundColor: bgColor,
color: "white",
- borderRadius: 5,
+ borderRadius: theme.shape.borderRadius,
minWidth: 80,
marginRight: 10,
marginTop: 2,
diff --git a/frontend/src/views/Apps.jsx b/frontend/src/views/Apps.jsx
index ae4c9b93..a1515105 100755
--- a/frontend/src/views/Apps.jsx
+++ b/frontend/src/views/Apps.jsx
@@ -418,7 +418,7 @@ const Apps = (props) => {
minWidth: "100%",
maxWidth: 612.5,
marginBottom: 5,
- borderRadius: 5,
+ borderRadius: theme.palette.borderRadius,
color: "white",
backgroundColor: surfaceColor,
cursor: "pointer",
@@ -600,8 +600,8 @@ const Apps = (props) => {
// dropdown with copy etc I guess
const AppPaper = (props) => {
- const { app } = props
- const data = app
+ const { app } = props
+ const data = app
if (data.name === "" && data.id === "") {
return null;
@@ -631,6 +631,7 @@ const Apps = (props) => {
data.large_image === undefined || data.large_image.length === 0 ? (
{
minWidth: viewWidth,
maxWidth: viewWidth,
color: "white",
- borderRadius: 5,
+ borderRadius: theme.palette.borderRadius,
backgroundColor: surfaceColor,
//display: "flex",
marginBottom: 10,
@@ -2132,7 +2133,7 @@ const Apps = (props) => {
+
{trigger.name}
{visibleApps.map((app, index) => {
if (app.invalid) {
- return null;
+ return null
}
+ if (app.trigger_type === "PIPELINE" && userdata.support !== true) {
+ return null
+ }
+
if (app.id === "integration" && userdata.support !== true) {
return null
}
var extraMessage = ""
if (index == 2) {
- extraMessage =
+ extraMessage =
}
delay += 75
@@ -9744,11 +9773,11 @@ const AngularWorkflow = (defaultprops) => {
- Please provide an execution argument
+ Provide a runtime argument
- At least one node in this workflow requires an execution argument. Please select one below, or provide a custom one in the text field next to the run button.
+ At least one node in this workflow requires a runtime argument ($exec). Please select one below, or provide a custom one in the text field next to the run button.
{/*
+ {
+ e.preventDefault()
+ e.stopPropagation()
+ window.open(`/admin?admin_tab=priorities&workflow=${data.workflow.id}&execution_id=${data.execution_id}`, "_blank")
+ }}
+ />
+
+ : null}
+
{lastExecution === data.execution_id ? (
{
) : (
-
@@ -11709,13 +11738,78 @@ const AngularWorkflow = (defaultprops) => {
}
+ const subflowtypes = [
+ {
+ name: "Any",
+ },
+ {
+ name: "Enrich",
+ }
+ ]
return (
+
+ {data.execution_source !== "default" && foundnotifications > 0 ?
+
-
+
+
+
+ {
},
}}
filterOptions={(options, { inputValue }) => {
- console.log("Option contains?: ", inputValue, options)
const lowercaseValue = inputValue.toLowerCase()
options = options.filter(x => x.name.replaceAll("_", " ").toLowerCase().includes(lowercaseValue) || x.description.toLowerCase().includes(lowercaseValue))
@@ -12533,6 +12626,15 @@ const AngularWorkflow = (defaultprops) => {
parsedvalue.actions = []
parsedvalue.authentication = {}
selectedTrigger.app_association = parsedvalue
+ selectedTrigger.large_image = app.large_image
+
+ if (cy !== undefined && cy !== null) {
+ const foundnode = cy.getElementById(selectedTrigger.id)
+ if (foundnode !== undefined && foundnode !== null) {
+ foundnode.data("large_image", app.large_image)
+ }
+ }
+
setUpdate(Math.random());
}
}}
@@ -14618,10 +14720,22 @@ const AngularWorkflow = (defaultprops) => {
document.removeEventListener('keydown', handleKeyDown);
}
}, [executeWorkflow, executionText, workflow, lastSaved, executionRequestStarted])
+
+ if (isMobile) {
+ return null
+ }
+
return (
- {selectedTrigger.app_name} -
- ++ {selectedTrigger.app_name} +
+ {
>
Explore runs
- {/*
)
}
@@ -15074,6 +15187,7 @@ const AngularWorkflow = (defaultprops) => {
setLastSaved={setLastSaved}
lastSaved={lastSaved}
aiSubmit={aiSubmit}
+ listCache={listCache}
apps={apps}
expansionModalOpen={codeEditorModalOpen}
@@ -15155,6 +15269,7 @@ const AngularWorkflow = (defaultprops) => {
};
const unPublishWorkflow = (data) => {
+ data.id = props.match.params.key
if (!isCloud) {
toast("Function only supported on cloud")
return
@@ -15167,7 +15282,7 @@ const AngularWorkflow = (defaultprops) => {
// This ALWAYS talks to Shuffle cloud
data = JSON.parse(JSON.stringify(data));
- const url = `${globalUrl}/api/v1/workflows/${data.id}/unpublish`;
+ const url = `${globalUrl}/api/v1/workflows/${props.match.params.key}/unpublish`;
fetch(url, {
method: "POST",
headers: {
@@ -15214,12 +15329,19 @@ const AngularWorkflow = (defaultprops) => {
const leftView = workflow.public === true ?
-
- {workflow.name}
-
+
+
+
+ {workflow.name}
+
+ {workflow.validated === true ?
+
+
+ : null}
+
This workflow is public and {
saveWorkflow(workflow)
@@ -15445,8 +15567,7 @@ const AngularWorkflow = (defaultprops) => {
getSettings();
getFiles()
- // For loading datastore
- // listOrgCache(workflow.org_id)
+ // For loading datastore
setUpdate(Math.random());
}}
@@ -15470,6 +15591,29 @@ const AngularWorkflow = (defaultprops) => {
>
Unpublish Workflow
+
+ {userdata.support === true ?
+
+
+ Manual Verification: {workflow.validated === undefined || workflow.validated === null || workflow.validated === false ? "Not valided" : "Validated"}
+
+
: null}
@@ -15966,7 +16110,10 @@ const AngularWorkflow = (defaultprops) => {
const newitem = removeParam("execution_id", cursearch);
navigate(curpath + newitem)
}}
- style={{ resize: "both", overflow: "auto", }}
+ style={{
+ resize: "both",
+ overflow: "auto",
+ }}
hideBackdrop={false}
variant="temporary"
BackdropProps={{
@@ -15978,8 +16125,8 @@ const AngularWorkflow = (defaultprops) => {
style: {
resize: "both",
overflow: "auto",
- minWidth: isMobile ? "100%" : 420,
- maxWidth: isMobile ? "100%" : 420,
+ minWidth: isMobile ? "100%" : 490,
+ maxWidth: isMobile ? "100%" : 490,
color: "white",
fontSize: 18,
borderLeft: theme.palette.defaultBorder,
@@ -16033,7 +16180,7 @@ const AngularWorkflow = (defaultprops) => {
+
+ Validate Workflow:
+
+ {
+ workflow.validated = event.target.checked
+ workflow.user_editing = true
+ //setUserediting(true)
+
+ saveWorkflow(workflow)
+ }}
+ />
+
+
+ : null}
+
{
if (data.action.app_name === "Shuffle Tools" && data.action.id !== undefined && cy !== undefined) {
const nodedata = cy.getElementById(data.action.id).data();
- if (nodedata !== undefined && nodedata !== null && nodedata.fillstyle === "linear-gradient") {
+ //if (nodedata !== undefined && nodedata !== null && nodedata.fillstyle === "linear-gradient") {
+ if (nodedata !== undefined && nodedata !== null) {
var imgStyle = {
marginRight: 20,
width: imgsize,
@@ -16696,7 +16865,7 @@ const AngularWorkflow = (defaultprops) => {
actionimg = (
{
) : null}
- {
app.
- Want help help making or using this app?{" "}
+ Want to help the making of, or imrpvoe this app?{" "}
{
/>
) : (
-
+
-
- Status
-
-
- {data.status}
-
- {similarActionsView}
-
+
+ { data.status !== "SUCCESS" ?
+
+
+ Status
+
+
+ {data.status}
+
+ {similarActionsView}
+
+ : null}
+
{validate.valid ? (
+
+ Loading Workflow & Apps...
+
+
);
// Awful way of handling scroll
diff --git a/frontend/src/views/AppCreator.jsx b/frontend/src/views/AppCreator.jsx
index 6a1c577d..04e0d6be 100755
--- a/frontend/src/views/AppCreator.jsx
+++ b/frontend/src/views/AppCreator.jsx
@@ -2813,7 +2813,7 @@ const AppCreator = (defaultprops) => {
paddingLeft: "10px",
color: "white",
height: 50,
- borderRadius: 5,
+ borderRadius: theme.shape.borderRadius,
}}
inputProps={{
name: "age",
@@ -3195,7 +3195,7 @@ const AppCreator = (defaultprops) => {
}}
value={parameterLocation}
style={{
- borderRadius: 5,
+ borderRadius: theme.shape.borderRadius,
backgroundColor: inputColor,
paddingLeft: 10,
color: "white",
@@ -3883,7 +3883,7 @@ const AppCreator = (defaultprops) => {
@@ -286,7 +287,7 @@ const Search = (props) => {
label={
Discord Chat
+ Discord Chat
}
/>
diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx
index 707249e7..bd655685 100755
--- a/frontend/src/views/Workflows.jsx
+++ b/frontend/src/views/Workflows.jsx
@@ -129,6 +129,7 @@ export const GetIconInfo = (action) => {
// Finds the icon based on the action. Should be verbs.
const iconList = [
{ key: "cases", values: ["cases"] },
+ { key: "communication", values: ["communication", "comms", "email",] },
{ key: "cache_add", values: ["set_cache"] },
{ key: "cache_get", values: ["get_cache"] },
{ key: "filter", values: ["filter"] },
@@ -200,18 +201,20 @@ export const GetIconInfo = (action) => {
{ key: "close", values: ["close", "stop", "cancel", "block"] },
];
- var selectedKey = "";
- if (action.name === undefined || action.name === null) {
+ var selectedKey = ""
+ if (action.app_name == "Integration Framework") {
+ selectedKey = "magic"
+ }else if (action.name === undefined || action.name === null) {
} else {
- const actionname = action.name.toLowerCase();
+ const actionname = action.name.toLowerCase()
for (var key in iconList) {
//console.log(iconList[key], actionname)
const found = iconList[key].values.find((value) =>
actionname.includes(value)
- );
+ )
if (found !== null && found !== undefined) {
- selectedKey = iconList[key].key;
- break;
+ selectedKey = iconList[key].key
+ break
}
}
}
@@ -223,8 +226,22 @@ export const GetIconInfo = (action) => {
const defaultColor = "#f76b1c";
const defaultGradient = ["#fad961", "#f76b1c"];
const parsedIcons = {
+ magic: {
+ icon: "M7.5 5.6 10 7 8.6 4.5 10 2 7.5 3.4 5 2l1.4 2.5L5 7zm12 9.8L17 14l1.4 2.5L17 19l2.5-1.4L22 19l-1.4-2.5L22 14zM22 2l-2.5 1.4L17 2l1.4 2.5L17 7l2.5-1.4L22 7l-1.4-2.5zm-7.63 5.29a.9959.9959 0 0 0-1.41 0L1.29 18.96c-.39.39-.39 1.02 0 1.41l2.34 2.34c.39.39 1.02.39 1.41 0L16.7 11.05c.39-.39.39-1.02 0-1.41zm-1.03 5.49-2.12-2.12 2.44-2.44 2.12 2.12z",
+ iconColor: "white",
+ iconBackgroundColor: "red",
+ originalIcon: "",
+ fillGradient: ["#FF0000", "#FF7F00", "#FFFF00", "#00FF00", "#0000FF", "#4B0082", "#8A2BE2"],
+ },
+ communication: {
+ icon: "M9.89516 7.71433H8.60945V5.1429H9.89516V7.71433ZM9.89516 10.2858H8.60945V9.00004H9.89516V10.2858ZM14.3952 2.57147H4.10944C3.76845 2.57147 3.44143 2.70693 3.20031 2.94805C2.95919 3.18917 2.82373 3.51619 2.82373 3.85719V15.4286L5.39516 12.8572H14.3952C14.7362 12.8572 15.0632 12.7217 15.3043 12.4806C15.5454 12.2395 15.6809 11.9125 15.6809 11.5715V3.85719C15.6809 3.14361 15.1023 2.57147 14.3952 2.57147Z",
+ iconColor: "white",
+ iconBackgroundColor: "#8acc3f",
+ originalIcon: "",
+ fillGradient: ["#8acc3f", "#459622"],
+ },
cases: {
- icon: "M11 3C6.58 3 3 4.79 3 7C3 9.21 6.58 11 11 11C15.42 11 19 9.21 19 7C19 4.79 15.42 3 11 3ZM3 9V12C3 14.21 6.58 16 11 16C15.42 16 19 14.21 19 12V9C19 11.21 15.42 13 11 13C6.58 13 3 11.21 3 9ZM3 14V17C3 19.21 6.58 21 11 21C12.41 21 13.79 20.81 15 20.46V17.46C13.79 17.81 12.41 18 11 18C6.58 18 3 16.21 3 14ZM20 14V17H17V19H20V22H22V19H25V17H22V14",
+ icon: "M15.6408 8.39233H18.0922V10.0287H15.6408V8.39233ZM0.115234 8.39233H2.56663V10.0287H0.115234V8.39233ZM9.92083 0.21051V2.66506H8.28656V0.21051H9.92083ZM3.31839 2.25596L5.05889 4.00687L3.89856 5.16051L2.15807 3.42596L3.31839 2.25596ZM13.1485 3.99869L14.8808 2.25596L16.0493 3.42596L14.3088 5.16051L13.1485 3.99869ZM9.10369 4.30142C10.404 4.30142 11.651 4.81863 12.5705 5.73926C13.4899 6.65989 14.0065 7.90854 14.0065 9.21051C14.0065 11.0269 13.0178 12.6141 11.5551 13.4651V14.9378C11.5551 15.1548 11.469 15.3629 11.3158 15.5163C11.1625 15.6698 10.9547 15.756 10.738 15.756H7.46943C7.25271 15.756 7.04487 15.6698 6.89163 15.5163C6.73839 15.3629 6.6523 15.1548 6.6523 14.9378V13.4651C5.18963 12.6141 4.2009 11.0269 4.2009 9.21051C4.2009 7.90854 4.71744 6.65989 5.63689 5.73926C6.55635 4.81863 7.80339 4.30142 9.10369 4.30142ZM10.738 16.5741V17.3923C10.738 17.6093 10.6519 17.8174 10.4986 17.9709C10.3454 18.1243 10.1375 18.2105 9.92083 18.2105H8.28656C8.06984 18.2105 7.862 18.1243 7.70876 17.9709C7.55552 17.8174 7.46943 17.6093 7.46943 17.3923V16.5741H10.738ZM8.28656 14.1196H9.92083V12.3769C11.3345 12.0169 12.3722 10.7323 12.3722 9.21051C12.3722 8.34253 12.0279 7.5101 11.4149 6.89634C10.8019 6.28259 9.97056 5.93778 9.10369 5.93778C8.23683 5.93778 7.40546 6.28259 6.79249 6.89634C6.17953 7.5101 5.83516 8.34253 5.83516 9.21051C5.83516 10.7323 6.87292 12.0169 8.28656 12.3769V14.1196Z",
iconColor: "white",
iconBackgroundColor: "#8acc3f",
originalIcon: "",
@@ -1318,10 +1335,10 @@ const Workflows = (props) => {
width: "100%",
color: "white",
padding: "12px 12px 0px 15px",
- borderRadius: 5,
display: "flex",
boxSizing: "border-box",
position: "relative",
+ borderRadius: theme.palette.borderRadius,
backgroundColor: theme.palette.surfaceColor,
};
@@ -3423,9 +3440,14 @@ const Workflows = (props) => {
}
if (data.app_name.toLowerCase() === "shuffle tools") {
- data.large_image = theme.palette.defaultImage;
+ //data.large_image = theme.palette.defaultImage
}
+ if (data.app_name.toLowerCase() === "integration framework") {
+ console.log("Skipping: ", data.app_name)
+ return null
+ }
+
const returnData =