diff --git a/.env b/.env index 07deaf4a..b0a6a6cc 100755 --- a/.env +++ b/.env @@ -71,8 +71,8 @@ SHUFFLE_SWARM_BRIDGE_DEFAULT_MTU=1500 # 1500 by default # the container to the docker0 SHUFFLE_SWARM_BRIDGE_DEFAULT_INTERFACE=eth0 -# Used for auto-cleanup of containers. REALLY important at scale. -SHUFFLE_CONTAINER_AUTO_CLEANUP=false +# Used for auto-cleanup of containers. REALLY important at scale. Set to false to see all container info. +SHUFFLE_CONTAINER_AUTO_CLEANUP=true SHUFFLE_ELASTIC=true SHUFFLE_LOGS_DISABLED=false SHUFFLE_CHAT_DISABLED=false # Controls support chat diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index d6e77d3c..b44a20e2 100755 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -1,6 +1,6 @@ module shuffle-shared -//replace github.com/shuffle/shuffle-shared => ../../../../git/shuffle-shared +replace github.com/shuffle/shuffle-shared => ../../../../git/shuffle-shared go 1.19 diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go index d98f922b..74676a45 100755 --- a/backend/go-app/walkoff.go +++ b/backend/go-app/walkoff.go @@ -700,64 +700,6 @@ func handleWorkflowQueue(resp http.ResponseWriter, request *http.Request) { } } - /* - // Removed as UserInput is now handled as an app - if actionResult.Status == "WAITING" && actionResult.Action.AppName == "User Input" { - log.Printf("[INFO] SHOULD WAIT A BIT AND RUN USER INPUT! WAITING!") - - var trigger shuffle.Trigger - err = json.Unmarshal([]byte(actionResult.Result), &trigger) - if err != nil { - log.Printf("[WARNING] Failed unmarshaling actionresult for user input: %s", err) - resp.WriteHeader(401) - resp.Write([]byte(`{"success": false}`)) - return - } - - orgId := workflowExecution.ExecutionOrg - if len(workflowExecution.OrgId) == 0 && len(workflowExecution.Workflow.OrgId) > 0 { - orgId = workflowExecution.Workflow.OrgId - } - - err := handleUserInput(trigger, orgId, workflowExecution.Workflow.ID, workflowExecution.ExecutionId) - if err != nil { - log.Printf("[WARNING] Failed userinput handler: %s", err) - - actionResult.Result = fmt.Sprintf(`{"success": false, "reason": "%s"}`, err) - - workflowExecution.Results = append(workflowExecution.Results, actionResult) - workflowExecution.Status = "ABORTED" - err = shuffle.SetWorkflowExecution(ctx, *workflowExecution, true) - if err != nil { - log.Printf("[WARNING] Failed to set execution during wait: %s", err) - } else { - log.Printf("[INFO] Successfully set the execution %s to waiting.", workflowExecution.ExecutionId) - } - - resp.WriteHeader(401) - resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Error: %s"}`, err))) - return - } else { - log.Printf("[INFO] Successful userinput handler") - resp.WriteHeader(200) - resp.Write([]byte(fmt.Sprintf(`{"success": true, "reason": "CLOUD IS DONE"}`))) - - actionResult.Result = `{"success": True, "reason": "Waiting for user feedback based on configuration"}` - - workflowExecution.Results = append(workflowExecution.Results, actionResult) - workflowExecution.Status = actionResult.Status - err = shuffle.SetWorkflowExecution(ctx, *workflowExecution, true) - if err != nil { - log.Printf("[WARNING] Failed setting userinput: %s", err) - } else { - log.Printf("[DEBUG] Successfully set the execution to waiting.") - } - } - - return - } - */ - runWorkflowExecutionTransaction(ctx, 0, workflowExecution.ExecutionId, actionResult, resp) } diff --git a/frontend/src/components/AppFramework.jsx b/frontend/src/components/AppFramework.jsx index aca62d61..9750ff7f 100644 --- a/frontend/src/components/AppFramework.jsx +++ b/frontend/src/components/AppFramework.jsx @@ -1856,8 +1856,6 @@ const AppFramework = (props) => { //autounselectify={true} var usecasediff = -100 const bgColor = color === undefined || color === null || color.length === 0 ? theme.palette.surfaceColor : color - console.log("Background: ", bgColor) - return (
diff --git a/frontend/src/components/Appsearch.jsx b/frontend/src/components/Appsearch.jsx index 7408dad5..87851541 100644 --- a/frontend/src/components/Appsearch.jsx +++ b/frontend/src/components/Appsearch.jsx @@ -200,7 +200,7 @@ const Appsearch = props => { const CustomHits = connectHits(InputHits) return ( -
+
{/* showSearch === false ? null :
diff --git a/frontend/src/components/AuthenticationItem.jsx b/frontend/src/components/AuthenticationItem.jsx index 593eacb4..eae08e69 100644 --- a/frontend/src/components/AuthenticationItem.jsx +++ b/frontend/src/components/AuthenticationItem.jsx @@ -18,7 +18,6 @@ import { Grid, Paper, Typography, - TextField, Zoom, } from "@mui/material"; diff --git a/frontend/src/components/AuthenticationWindow.jsx b/frontend/src/components/AuthenticationWindow.jsx index d7bcc55a..7d32f597 100755 --- a/frontend/src/components/AuthenticationWindow.jsx +++ b/frontend/src/components/AuthenticationWindow.jsx @@ -294,9 +294,6 @@ const AuthenticationData = (props) => { InputProps={{ style: { color: "white", - marginLeft: "5px", - maxWidth: "95%", - height: 50, fontSize: "1em", }, disableUnderline: true, @@ -386,7 +383,6 @@ const AuthenticationData = (props) => { PaperProps={{ style: { pointerEvents: "auto", - backgroundColor: theme.palette.surfaceColor, color: "white", minWidth: 600, minHeight: 600, @@ -441,9 +437,6 @@ const AuthenticationData = (props) => { InputProps={{ style: { color: "white", - marginLeft: "5px", - maxWidth: "95%", - height: 50, fontSize: "1em", }, }} diff --git a/frontend/src/components/Billing.jsx b/frontend/src/components/Billing.jsx index 71d01789..0b9c484d 100644 --- a/frontend/src/components/Billing.jsx +++ b/frontend/src/components/Billing.jsx @@ -1,316 +1,1010 @@ -import React, { useState, useEffect } from "react"; -import theme from "../theme.jsx"; -import ReactGA from 'react-ga4'; - -import { - Paper, - Typography, - Divider, - Button, - Grid, - Card, -} from "@mui/material"; - -import { useAlert } from "react-alert"; -import { typecost, typecost_single, } from "../views/HandlePaymentNew.jsx"; - -const Billing = (props) => { - const { globalUrl, userdata, serverside, billingInfo, stripeKey, selectedOrganization, handleGetOrg, } = props; - console.log("Billing: ", billingInfo); - const alert = useAlert(); - - const stripe = typeof window === 'undefined' || window.location === undefined ? "" : props.stripeKey === undefined ? "" : window.Stripe ? window.Stripe(props.stripeKey) : "" - console.log("Stripe: ", stripe) - - const paperStyle = { - padding: 20, - height: "100%", - width: "100%", - backgroundColor: theme.palette.surfaceColor, - border: "1px solid rgba(255,255,255,0.3)", - marginRight: 10, - } - - const isCloud = - window.location.host === "localhost:3002" || - window.location.host === "shuffler.io"; - - billingInfo.subscription = { - "active": true, - "name": "Pay as you go", - "price": typecost_single, - "currency": "USD", - "currency_text": "$", - "interval": "app run / month", - "description": "Pay as you go", - "features": [ - "Includes 10.000 app run/month for free. ", - "Pay for what you use with no minimum commitment and cancel anytime.", - ], - "limit": 10000, - } - - - const handleStripeRedirect = () => { - //var priceItem = "price_1MRNF1DzMUgUjxHSfFTUb2Xh" - if (stripe == "") { - console.log("Stripe not loaded") - return - } - - var priceItem = "price_1MROFrDzMUgUjxHShcSxgHO1" - - const successUrl = `${window.location.origin}/admin?admin_tab=billing&payment=success` - const failUrl = `${window.location.origin}/admin?admin_tab=billing&payment=failure` - var checkoutObject = { - lineItems: [ - { - price: priceItem, - quantity: 1 - }, - ], - mode: "subscription", - billingAddressCollection: "auto", - successUrl: successUrl, - cancelUrl: failUrl, - clientReferenceId: props.userdata.active_org.id, - } - //submitType: "donate", - - stripe.redirectToCheckout(checkoutObject) - .then(function (result) { - console.log("SUCCESS STRIPE?: ", result) - - ReactGA.event({ - category: "pricing", - action: "add_card_success", - label: "", - }) - }) - .catch(function(error) { - console.error("STRIPE ERROR: ", error) - - ReactGA.event({ - category: "pricing", - action: "add_card_error", - label: "", - }) - }); - } - - const cancelSubscriptions = (subscription_id) => { - const orgId = selectedOrganization.id; - const data = { - subscription_id: subscription_id, - action: "cancel", - org_id: selectedOrganization.id, - }; - - const url = globalUrl + `/api/v1/orgs/${orgId}/cancel`; - 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(function (response) { - if (response.status !== 200) { - console.log("Error in response"); - } - - if (handleGetOrg != undefined) { - handleGetOrg(selectedOrganization.id); - } - - return response.json(); - }) - .then(function (responseJson) { - if (responseJson.success !== undefined && responseJson.success) { - alert.success("Successfully stopped subscription!"); - } else { - alert.error("Failed stopping subscription. Please contact us."); - } - }) - .catch(function (error) { - console.log("Error: ", error); - alert.error("Failed stopping subscription. Please contact us."); - }); - }; - - const SubscriptionObject = (props) => { - const { globalUrl, userdata, serverside, billingInfo, stripeKey, selectedOrganization, handleGetOrg, subscription, } = props; - - console.log("Sub: ", subscription) - var top_text = "Base Access" - if (subscription.limit === undefined && subscription.level !== undefined) { - - subscription.name = "Enterprise" - subscription.currency_text = "$" - subscription.price = subscription.level*180 - subscription.limit = subscription.level*100000 - subscription.interval = subscription.recurrence - subscription.features = [ - "Includes " + subscription.limit + " app runs/month. ", - "Multi-Tenancy and Region-Selection", - "And all other features from /pricing", - ] - } - - if (subscription.name === "Enterprise" && subscription.active === true) { - top_text = "Current Plan" - } - - return ( - -
- - {top_text} - -
- -
- - {subscription.name} - -
- - {subscription.currency_text}{subscription.price} - - - / {subscription.interval} - -
- - Features - -
    - {subscription.features !== undefined && subscription.features !== null ? - subscription.features.map((feature, index) => { - return ( -
  • - - {feature} - -
    • - ) - }) - : null} -
-
- {/*subscription.name === "Pay as you go" && subscription.limit <= 10000 ? - - - You are not subscribed to any plan and are using the free plan with max 10,000 apps per month. Activate billing to de-activate this limit. - - - - : null*/} - - ) - } - - - return ( -
- - Billing - - - We use Stripe to manage subscriptions and do not store any of your billing information. You can manage your subscription and billing information below. - -
- {billingInfo.subscription !== undefined && billingInfo.subscription !== null ? - - : null} - {isCloud && - selectedOrganization.subscriptions !== undefined && - selectedOrganization.subscriptions !== null && - selectedOrganization.subscriptions.length > 0 ? - - selectedOrganization.subscriptions - .reverse() - .map((sub, index) => { - return ( - - ) - }) - : null} - {/* - - - Quantity: {sub.level} -
- Recurrence: {sub.recurrence} -
- {sub.active ? ( -
- Started:{" "} - {new Date(sub.startdate * 1000).toISOString()} -
- -
- ) : ( -
- Cancelled:{" "} - {new Date( - sub.cancellationdate * 1000 - ).toISOString()} -
- - Status: Deactivated - -
- )} - - - */} -
-
- ) -} - -export default Billing; +import React, { useState, useEffect } from "react"; +import ReactGA from 'react-ga4'; + +import theme from "../theme.jsx"; +import { useTheme } from "@mui/styles"; +import countries from "../components/Countries.jsx"; +import { + Box, + Paper, + Typography, + Divider, + Button, + Grid, + Card, + List, + ListItemText, + ListItem, + Dialog, + DialogTitle, + DialogContent, + TextField, +} from "@mui/material"; + +import { useNavigate, Link } from "react-router-dom"; +import { Autocomplete } from "@mui/material"; +import { toast } from "react-toastify" + +import { + Cached as CachedIcon, +} from "@mui/icons-material"; + +//import { useAlert +import { typecost, typecost_single, } from "../views/HandlePaymentNew.jsx"; +import BillingStats from "../components/BillingStats.jsx"; + +const Billing = (props) => { + const { globalUrl, userdata, serverside, billingInfo, stripeKey, selectedOrganization, handleGetOrg, } = props; + //const alert = useAlert(); + let navigate = useNavigate(); + + const [selectedDealModalOpen, setSelectedDealModalOpen] = React.useState(false); + const [dealList, setDealList] = React.useState([]); + const [dealName, setDealName] = React.useState(""); + const [dealAddress, setDealAddress] = React.useState(""); + const [dealType, setDealType] = React.useState("MSSP"); + const [dealCountry, setDealCountry] = React.useState("United States"); + const [dealCurrency, setDealCurrency] = React.useState("USD"); + const [dealStatus, setDealStatus] = React.useState("initiated"); + const [dealValue, setDealValue] = React.useState(""); + const [dealDiscount, setDealDiscount] = React.useState(""); + const [dealerror, setDealerror] = React.useState(""); + + const stripe = typeof window === 'undefined' || window.location === undefined ? "" : props.stripeKey === undefined ? "" : window.Stripe ? window.Stripe(props.stripeKey) : "" + const products = [ + { code: "", label: "MSSP", phone: "" }, + { code: "", label: "Enterprise", phone: "" }, + { code: "", label: "Consultancy", phone: "" }, + { code: "", label: "Support", phone: "" }, + ]; + + const handleGetDeals = (orgId) => { + console.log("Get deals!"); + + if (orgId.length === 0) { + toast( + "Organization ID not defined (get deals). Please contact us on https://shuffler.io if this persists logout." + ); + return; + } + + const url = `${globalUrl}/api/v1/orgs/${orgId}/deals`; + fetch(url, { + method: "GET", + credentials: "include", + headers: { + "Content-Type": "application/json", + }, + }) + .then((response) => { + if (response.status !== 200) { + console.log("Bad status code in get deals: ", response.status); + } + + return response.json(); + }) + .then((responseJson) => { + console.log("Got deals: ", responseJson); + if (responseJson.success === false) { + toast("Failed loading deals. Contact support if this persists"); + } else { + setDealList(responseJson); + } + }) + .catch((error) => { + console.log("Error getting org deals: ", error); + toast( + "Failed getting deals for your org. Contact support if this persists." + ); + }); + }; + + useEffect(() => { + if (isCloud && selectedOrganization.partner_info !== undefined && selectedOrganization.partner_info.reseller === true) { + handleGetDeals(selectedOrganization.id); + } + }, []) + + const paperStyle = { + padding: 20, + height: "100%", + minHeight: 280, + maxWidth: 400, + width: "100%", + backgroundColor: theme.palette.surfaceColor, + borderRadius: theme.palette.borderRadius, + border: "1px solid rgba(255,255,255,0.3)", + marginRight: 10, + } + + const isCloud = + window.location.host === "localhost:3002" || + window.location.host === "shuffler.io"; + + billingInfo.subscription = { + "active": true, + "name": "Pay as you go", + "price": typecost_single, + "currency": "USD", + "currency_text": "$", + "interval": "app run / month", + "description": "Pay as you go", + "features": [ + "Includes 10.000 app run/month for free. ", + "Pay for what you use with no minimum commitment and cancel anytime.", + ], + "limit": 10000, + } + + + const handleStripeRedirect = () => { + //var priceItem = "price_1MRNF1DzMUgUjxHSfFTUb2Xh" + if (stripe == "") { + console.log("Stripe not loaded") + return + } + + var priceItem = "price_1MROFrDzMUgUjxHShcSxgHO1" + + const successUrl = `${window.location.origin}/admin?admin_tab=billing&payment=success` + const failUrl = `${window.location.origin}/admin?admin_tab=billing&payment=failure` + var checkoutObject = { + lineItems: [ + { + price: priceItem, + quantity: 1 + }, + ], + mode: "subscription", + billingAddressCollection: "auto", + successUrl: successUrl, + cancelUrl: failUrl, + clientReferenceId: props.userdata.active_org.id, + } + //submitType: "donate", + + stripe.redirectToCheckout(checkoutObject) + .then(function (result) { + console.log("SUCCESS STRIPE?: ", result) + + ReactGA.event({ + category: "pricing", + action: "add_card_success", + label: "", + }) + }) + .catch(function(error) { + console.error("STRIPE ERROR: ", error) + + ReactGA.event({ + category: "pricing", + action: "add_card_error", + label: "", + }) + }); + } + + const cancelSubscriptions = (subscription_id) => { + const orgId = selectedOrganization.id; + const data = { + subscription_id: subscription_id, + action: "cancel", + org_id: selectedOrganization.id, + }; + + const url = globalUrl + `/api/v1/orgs/${orgId}/cancel`; + 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(function (response) { + if (response.status !== 200) { + console.log("Error in response"); + } + + if (handleGetOrg != undefined) { + handleGetOrg(selectedOrganization.id); + } + + return response.json(); + }) + .then(function (responseJson) { + if (responseJson.success !== undefined && responseJson.success) { + toast("Successfully stopped subscription!"); + } else { + toast("Failed stopping subscription. Please contact us."); + } + }) + .catch(function (error) { + console.log("Error: ", error); + toast("Failed stopping subscription. Please contact us."); + }); + }; + + const SubscriptionObject = (props) => { + const { globalUrl, userdata, serverside, billingInfo, stripeKey, selectedOrganization, handleGetOrg, subscription, highlight, } = props; + + var top_text = "Base Access" + if (subscription.limit === undefined && subscription.level === undefined || subscription.level === null || subscription.level === 0) { + subscription.name = "Enterprise" + subscription.currency_text = "$" + subscription.price = subscription.level*180 + subscription.limit = subscription.level*100000 + subscription.interval = subscription.recurrence + subscription.features = [ + "Includes " + subscription.limit + " app runs/month. ", + "Multi-Tenancy and Region-Selection", + "And all other features from /pricing", + ] + } + + var newPaperstyle = JSON.parse(JSON.stringify(paperStyle)) + if (subscription.name === "Enterprise" && subscription.active === true) { + top_text = "Current Plan" + + newPaperstyle.border = "1px solid #f85a3e" + } + + var showSupport = false + if (subscription.name.includes("default")) { + top_text = "Custom Contract" + newPaperstyle.border = "1px solid #f85a3e" + showSupport = true + } + + if (subscription.name.includes("App Run Units")) { + top_text = "Cloud Access" + showSupport = true + } + + if (subscription.name.includes("Open Source")) { + top_text = "Open Source" + showSupport = true + } + + if (subscription.name.includes("Scale")) { + top_text = "Scale access" + } + + if (highlight === true) { + // Add an "Upgrade now" button + newPaperstyle.border = "1px solid #f85a3e" + } + + return ( + +
+ + {top_text} + +
+ +
+ + {subscription.name} + + + {subscription.currency_text !== undefined ? +
+ + {subscription.currency_text}{subscription.price} + + + / {subscription.interval} + +
+ : null} + + + Features + +
    + {subscription.features !== undefined && subscription.features !== null ? + subscription.features.map((feature, index) => { + var parsedFeature = feature + if (feature.includes("Documentation: ")) { + parsedFeature = + + Documentation to get started + + } + + if (feature.includes("Licensed Worker: ")) { + parsedFeature = + + Download the licensed worker + + } + + return ( +
  • + + {parsedFeature} + +
    • + ) + }) + : null} +
+
+ {(highlight === true && subscription.name === "Pay as you go" && subscription.limit <= 10000) || subscription.name.includes("Scale") ? + + + {subscription.name.includes("Scale") ? + "" + : + "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." + } + + + + : null} + {showSupport ? + + : null } + + ) + } + + const addDealModal = ( + { + setSelectedDealModalOpen(false); + }} + PaperProps={{ + style: { + backgroundColor: theme.palette.surfaceColor, + color: "white", + minWidth: "800px", + minHeight: "320px", + }, + }} + > + + Register new deal + + +
+ { + setDealName(e.target.value); + }} + /> + { + setDealAddress(e.target.value); + }} + /> +
+
+ { + setDealValue(e.target.value); + }} + /> + option.label} + onChange={(event, newValue) => { + setDealCountry(newValue.label); + }} + renderOption={(props, option) => ( + img": { mr: 2, flexShrink: 0 } }} + {...props} + > + + {option.label} ({option.code}) +{option.phone} + + )} + renderInput={(params) => ( + + )} + /> + { + setDealType(newValue); + }} + getOptionLabel={(option) => option.label} + renderOption={(props, option) => ( + img": { mr: 2, flexShrink: 0 } }} + {...props} + > + {option.label} + + )} + renderInput={(params) => ( + + )} + /> +
+ {dealerror.length > 0 ? ( + + error registering: {dealerror} + + ) : null} +
+ + +
+ + + ); + + const submitDeal = (dealName, dealAddress, dealCountry, dealValue) => { + if (dealerror.length > 0) { + setDealerror(""); + } + + const orgId = selectedOrganization.id; + const data = { + reseller_org: orgId, + name: dealName, + address: dealAddress, + country: dealCountry, + value: dealValue, + }; + + const url = `${globalUrl}/api/v1/orgs/${orgId}/deals`; + 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(function (response) { + if (response.status !== 200) { + console.log("Error in response"); + } + + return response.json(); + }) + .then(function (responseJson) { + if (responseJson.success === true) { + setSelectedDealModalOpen(false); + toast( + "Added new deal! We will be in touch shortly with an update." + ); + + setDealName(""); + setDealAddress(""); + setDealValue(""); + setDealCountry("United States"); + setDealType("MSSP"); + } else { + setDealerror(responseJson.reason); + } + }) + .catch(function (error) { + //console.log("Error: ", error); + setDealerror(error.toString()); + toast("Failed adding deal reg: ", error); + }); + }; + + return ( +
+ {addDealModal} + + Billing + + + {isCloud ? + "We use Stripe to manage subscriptions and do not store any of your billing information. You can manage your subscription and billing information below." + : + "Shuffle is an Open Source automation platform, and no license is required to use it. You may however activate Cloud Sync, get our Scale license, get help with Kubernetes, or talk to Shuffle's Support team to get automation help." + } + +
+ {isCloud && billingInfo.subscription !== undefined && billingInfo.subscription !== null ? + + : !isCloud ? + + + + + : null} + {isCloud && + selectedOrganization.subscriptions !== undefined && + selectedOrganization.subscriptions !== null && + selectedOrganization.subscriptions.length > 0 ? + + selectedOrganization.subscriptions + .reverse() + .map((sub, index) => { + return ( + + ) + }) + : null} + {/* + + + Quantity: {sub.level} +
+ Recurrence: {sub.recurrence} +
+ {sub.active ? ( +
+ Started:{" "} + {new Date(sub.startdate * 1000).toISOString()} +
+ +
+ ) : ( +
+ Cancelled:{" "} + {new Date( + sub.cancellationdate * 1000 + ).toISOString()} +
+ + Status: Deactivated + +
+ )} + + + */} +
+ {isCloud && + selectedOrganization.partner_info !== undefined && + selectedOrganization.partner_info.reseller === true ? ( +
+ + Reseller dashboard + + + + + + + + + + + + + + + + + + {dealList.length === 0 ? ( + + No deals registered yet. Click "Add deal" to register one + + ) : ( + dealList.map((deal, index) => { + var bgColor = "#27292d"; + if (index % 2 === 0) { + bgColor = "#1f2023"; + } + + return ( + + + + + + + + + + + + + ); + }) + )} + + + + +
+ ) : null} +
+ + Billing Usage Overview + +
+ +
+ ) +} + +export default Billing; diff --git a/frontend/src/components/BillingStats.jsx b/frontend/src/components/BillingStats.jsx new file mode 100644 index 00000000..3f7a7516 --- /dev/null +++ b/frontend/src/components/BillingStats.jsx @@ -0,0 +1,280 @@ +import React, { useState, useEffect } from 'react'; + +import classNames from "classnames"; +import theme from '../theme.jsx'; + +import { + Tooltip, + TextField, + IconButton, + Button, + Typography, + Grid, + Paper, + Chip, + Checkbox, +} from "@mui/material"; + +import { + BarChart, + RadialBarChart, + RadialAreaChart, + RadialAxis, + StackedBarSeries, + TooltipArea, + ChartTooltip, + TooltipTemplate, + RadialAreaSeries, + RadialPointSeries, + RadialArea, + RadialLine, + TreeMap, + TreeMapSeries, + TreeMapLabel, + TreeMapRect, + Line, + LineChart, + LineSeries, + LinearYAxis, + LinearXAxis, + LinearYAxisTickSeries, + LinearXAxisTickSeries, + Area, + AreaChart, + AreaSeries, + AreaSparklineChart, + PointSeries, + GridlineSeries, + Gridline, + Stripes, + Gradient, + GradientStop, + LinearXAxisTickLabel, +} from 'reaviz'; + +const LineChartWrapper = ({keys, inputname, height, width}) => { + const [hovered, setHovered] = useState(""); + const inputdata = keys.data === undefined ? keys : keys.data + + return ( +
+ + {inputname} + + } /> + } + /> +
+ ) +} + + +const AppStats = (defaultprops) => { + const { globalUrl, selectedOrganization, userdata, } = defaultprops; + const [keys, setKeys] = useState([]) + const [searches, setSearches] = useState([]); + const [clickData, setClickData] = useState(undefined); + const [conversionData, setConversionData] = useState(undefined); + const [statistics, setStatistics] = useState(undefined); + const [appRuns, setAppruns] = useState(undefined); + const [workflowRuns, setWorkflowRuns] = useState(undefined); + const [subflowRuns, setSubflowRuns] = useState(undefined); + + const handleDataSetting = (inputdata, grouping) => { + if (inputdata === undefined || inputdata === null) { + return + } + + const dailyStats = inputdata.daily_statistics + if (dailyStats === undefined || dailyStats === null) { + return + } + + console.log("Looking at daily data: ", inputdata) + + var appRuns = { + "key": "App Runs", + "data": [] + } + + var workflowRuns = { + "key": "Workflow Runs (includes subflows)", + "data": [] + } + + var subflowRuns = { + "key": "Subflow Runs", + "data": [] + } + + for (let key in dailyStats) { + // Always skips first one as it has accumulated data in it + if (key === 0) { + continue + } + + const item = dailyStats[key] + + if (item["date"] === undefined) { + console.log("No date: ", item) + continue + } + + // Check if app_executions key in item + if (item["app_executions"] !== undefined && item["app_executions"] !== null) { + appRuns["data"].push({ + key: new Date(item["date"]), + data: item["app_executions"] + }) + } + + // Check if workflow_executions key in item + if (item["workflow_executions"] !== undefined && item["workflow_executions"] !== null) { + workflowRuns["data"].push({ + key: new Date(item["date"]), + data: item["workflow_executions"] + }) + } + + if (item["subflow_executions"] !== undefined && item["subflow_executions"] !== null) { + subflowRuns["data"].push({ + key: new Date(item["date"]), + data: item["subflow_executions"] + }) + } + } + + // Adds data for today + console.log("Inputdata: ", inputdata) + if (inputdata["daily_app_executions"] !== undefined && inputdata["daily_app_executions"] !== null) { + appRuns["data"].push({ + key: new Date(), + data: inputdata["daily_app_executions"] + }) + } + + if (inputdata["daily_workflow_executions"] !== undefined && inputdata["daily_workflow_executions"] !== null) { + workflowRuns["data"].push({ + key: new Date(), + data: inputdata["daily_workflow_executions"] + }) + } + + if (inputdata["daily_subflow_executions"] !== undefined && inputdata["daily_subflow_executions"] !== null) { + subflowRuns["data"].push({ + key: new Date(), + data: inputdata["daily_subflow_executions"] + }) + } + + setSubflowRuns(subflowRuns) + setWorkflowRuns(workflowRuns) + setAppruns(appRuns) + } + + const getStats = () => { + fetch(`${globalUrl}/api/v1/orgs/${selectedOrganization.id}/stats`, { + 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!: ", response.status); + return; + } + + return response.json(); + }) + .then((responseJson) => { + if (responseJson["success"] === false) { + return + } + + setStatistics(responseJson) + handleDataSetting(responseJson, "day") + }) + .catch((error) => { + console.log("error: ", error) + }); + } + + useEffect(() => { + getStats() + }, []) + + const paperStyle = { + textAlign: "center", + padding: 40, + margin: 5, + backgroundColor: theme.palette.surfaceColor, + maxWidth: 300, + } + + const data = ( +
+ + All Stat widgets are monthly and gathered from Your Organization Statistics. + This is a feature to help give you more insight into Shuffle, and will be populating over time. + + {statistics !== undefined ? +
+ + + {statistics.monthly_workflow_executions} + + + Workflow Runs + + + + + {statistics.monthly_app_executions} + + + App Runs + + +
+ : null} + + {appRuns === undefined ? + null + : + + } + + {workflowRuns === undefined ? + null + : + + } + + {subflowRuns === undefined ? + null + : + + } +
+ ) + + const dataWrapper = ( +
{data}
+ ); + + return dataWrapper; +} + +export default AppStats; diff --git a/frontend/src/components/ConfigureWorkflow.jsx b/frontend/src/components/ConfigureWorkflow.jsx index 0e80540c..52a3ac1b 100755 --- a/frontend/src/components/ConfigureWorkflow.jsx +++ b/frontend/src/components/ConfigureWorkflow.jsx @@ -16,11 +16,17 @@ import { ListItem, ListItemText, Collapse, + IconButton, } from "@mui/material"; + import { FavoriteBorder as FavoriteBorderIcon, Error as ErrorIcon, CheckCircleRounded as CheckCircleRoundedIcon, + ExpandMore as ExpandMoreIcon, + ExpandLess as ExpandLessIcon, + Check as CheckIcon, + Visibility as VisibilityIcon, } from "@mui/icons-material"; import { FixName } from "../views/Apps.jsx"; import aa from 'search-insights' @@ -34,27 +40,26 @@ import aa from 'search-insights' // Specifically used for UNSAVED workflows only? const ConfigureWorkflow = (props) => { const { - userdata, - globalUrl, + apps, theme, + isCloud, workflow, + userdata, + globalUrl, + newWebhook, + referenceUrl, + saveWorkflow, + showTriggers, + submitSchedule, + setSelectedApp, + selectedAction, appAuthentication, setSelectedAction, - setAuthenticationModalOpen, - setSelectedApp, - apps, - selectedAction, - setConfigureWorkflowModalOpen, - saveWorkflow, - newWebhook, - submitSchedule, - referenceUrl, - isCloud, + workflowExecutions, + getWorkflowExecution, setAuthenticationType, - alert, - showTriggers, - workflowExecutions, - getWorkflowExecution, + setAuthenticationModalOpen, + setConfigureWorkflowModalOpen, } = props; const [requiredActions, setRequiredActions] = React.useState([]); @@ -64,9 +69,39 @@ const ConfigureWorkflow = (props) => { const [itemChanged, setItemChanged] = React.useState(false); const [firstLoad, setFirstLoad] = React.useState(""); const [showFinalizeAnimation, setShowFinalizeAnimation] = React.useState(false); + const [loopRunning, setLoopRunning] = useState(false) - const [checkStarted, setCheckStarted] = React.useState(false); + const [checkStarted, setCheckStarted] = React.useState(false); + const stop = () => { + setLoopRunning(false) + } + + const start = () => { + setLoopRunning(true) + } + + useEffect(() => { + if (loopRunning) { + const intervalId = setInterval(() => { + if (!loopRunning) { + clearInterval(intervalId); + } + + + if (getWorkflowExecution !== undefined && workflowExecutions !== undefined) { + const paramkey = workflow.id + getWorkflowExecution(paramkey) + } else { + console.log("Executions or getWorkflowExecutions not defined") + } + }, 3000) + + return () => clearInterval(intervalId); + } + }, [loopRunning]) + + /* const { start, stop } = useInterval({ duration: 3000, startImmediate: false, @@ -79,6 +114,7 @@ const ConfigureWorkflow = (props) => { } }, }); + */ // ONLY when component is being unloaded, run stop() function // This is to prevent the interval from running when the component is not being used @@ -92,16 +128,18 @@ const ConfigureWorkflow = (props) => { */ // Where is this from? - if (workflow === undefined || workflow === null) { + if (workflow === undefined || workflow === null || workflow.id === undefined) { return null; } if (apps === undefined || apps === null) { - return null; + console.log("Apps is undefined or null: ", apps) + return null; } if (appAuthentication === undefined || appAuthentication === null) { - return null; + console.log("App authentication is undefined or null: ", appAuthentication) + return null; } const getApp = (actionId, appId) => { @@ -136,13 +174,19 @@ const ConfigureWorkflow = (props) => { if (firstLoad.length === 0 || firstLoad !== workflow.id) { if (apps === undefined || apps === null || apps.length === 0) { console.log("No apps loaded: ", apps); - setConfigureWorkflowModalOpen(false); + + if (setConfigureWorkflowModalOpen !== undefined) { + setConfigureWorkflowModalOpen(false); + } + return null; } setFirstLoad(workflow.id) + const newactions = []; for (let [key, keyval] in Object.entries(workflow.actions)) { + const action = workflow.actions[key]; var newaction = { large_image: action.large_image, @@ -154,34 +198,36 @@ const ConfigureWorkflow = (props) => { auth_done: false, action_ids: [], action: action, - update_version: action.app_version, + update_version: action.app_version, app: {}, - steps: [], - show_steps: false, + steps: [], + show_steps: false, } - //console.log("Action: ", key, keyval) + if (action.app_name.toLowerCase().endsWith("_api")) { + action.app_name = action.app_name.slice(0, -4) + } - const app = apps.find((app) => - app.id === action.app_id || - (app.name === action.app_name && - (app.app_version === action.app_version || (app.loop_versions !== null && app.loop_versions.includes(action.app_version)))) - ) - - //console.log("FOUND APP: ", app) + // ID match OR name match + version match + //const app = apps.find((app) => app.id === action.app_id || (app.name === action.app_name && (app.app_version === action.app_version || (app.loop_versions !== null && app.loop_versions.includes(action.app_version))))) + // + // without version match + const newappname = action.app_name.toLowerCase().replaceAll(" ", "_") + const app = apps.find((app) => app.id === action.app_id || app.name.toLowerCase().replaceAll(" ", "_") === newappname) if (app === undefined || app === null) { + const subapp = apps.find(app => app.name === action.app_name) - if (subapp !== undefined && subapp !== null) { - newaction.update_version = "1.1.0" - } + if (subapp !== undefined && subapp !== null) { + newaction.update_version = "1.1.0" + } newaction.must_activate = true; - newaction.steps.push({ - "title": "Activate app", - "type": "activate", - "required": true, - }) + newaction.steps.push({ + "title": "Activate app", + "type": "activate", + "required": true, + }) } else { if (action.authentication_id === "" && app.authentication.required === true && action.parameters !== undefined && action.parameters !== null) { // Check if configuration is filled or not @@ -199,20 +245,19 @@ const ConfigureWorkflow = (props) => { } } - newaction.steps.push({ - "title": "Authenticate app", - "type": "authenticate", - "required": true, - }) + newaction.steps.push({ + "title": "Authenticate app", + "type": "authenticate", + "required": true, + }) if (!filled) { newaction.must_authenticate = true; newaction.action_ids.push(action.id); } } else if (action.authentication_id !== "" && app.authentication.required === true) { - console.log("Should verify authentication ID ", action.authentication_id) - - } + console.log("Should verify authentication ID ", action.authentication_id) + } newaction.app = app; } @@ -276,80 +321,78 @@ const ConfigureWorkflow = (props) => { } if (workflow.workflow_variables !== undefined && workflow.workflow_variables !== null && workflow.workflow_variables.length !== 0) { - for (let [key,keyval] in Object.entries(workflow.workflow_variables)) { - const variable = workflow.workflow_variables[key]; - if (variable.value === undefined || variable.value === undefined || variable.value.length === 0) { - variable.value = ""; - requiredVariables.push(variable); - } + for (let [key,keyval] in Object.entries(workflow.workflow_variables)) { + const variable = workflow.workflow_variables[key]; - variable.index = key; - } + if (variable.value === undefined || variable.value === undefined || variable.value.length === 0) { + variable.value = ""; + requiredVariables.push(variable); + } + + variable.index = key; + } } if (workflow.triggers !== undefined && workflow.triggers !== null && workflow.triggers.length !== 0) { - for (let [key,keyval] in Object.entries(workflow.triggers)) { - var trigger = workflow.triggers[key]; - trigger.index = key; + for (let [key,keyval] in Object.entries(workflow.triggers)) { + var trigger = workflow.triggers[key]; + trigger.index = key; - if (trigger.trigger_type === "WEBHOOK") { - console.log("Found webhook: ", trigger) - if (trigger.app_association !== undefined && trigger.app_association.name !== null && trigger.app_association.name !== "") { - console.log("Actions: ", newactions) - const findapp = trigger.app_association.name.toLowerCase() - const foundindex = newactions.findIndex(action => action.app_name.toLowerCase() === findapp) + if (trigger.trigger_type === "WEBHOOK") { + console.log("Found webhook: ", trigger) - // Adding webhook to start of it - if (foundindex >= 0) { - const tmpsteps = newactions[foundindex].steps - newactions[foundindex].steps = [ - { - "title": "Configure Webhook", - "type": "webhook", - "required": true, - } - ] + if (trigger.app_association !== undefined && trigger.app_association.name !== null && trigger.app_association.name !== "") { + console.log("Actions: ", newactions) + const findapp = trigger.app_association.name.toLowerCase() + const foundindex = newactions.findIndex(action => action.app_name.toLowerCase() === findapp) - for (let [subkey,subkeyval] in Object.entries(tmpsteps)) { - newactions[foundindex].steps.push(tmpsteps[subkey]) - } - - newactions[foundindex].show_steps = true + // Adding webhook to start of it + if (foundindex >= 0) { + const tmpsteps = newactions[foundindex].steps + newactions[foundindex].steps = [ + { + "title": "Configure Webhook", + "type": "webhook", + "required": true, + } + ] - console.log("CHANGED ACTION: ", newactions[foundindex]) - //console.log("Index: ", newactions[foundindex]) + for (let [subkey,subkeyval] in Object.entries(tmpsteps)) { + newactions[foundindex].steps.push(tmpsteps[subkey]) + } + + newactions[foundindex].show_steps = true - continue - } - } + console.log("CHANGED ACTION: ", newactions[foundindex]) + //console.log("Index: ", newactions[foundindex]) + + continue + } + } + } + + if (trigger.status === "running") { + continue; + } + + if ( + trigger.trigger_type === "SUBFLOW" || + trigger.trigger_type === "USERINPUT" + ) { + continue; + } + + requiredTriggers.push(trigger); } + } - if (trigger.status === "running") { - continue; - } + if (requiredTriggers.length === 0 && requiredVariables.length === 0 && newactions.length === 0 && setConfigureWorkflowModalOpen !== undefined) { + setConfigureWorkflowModalOpen(false); + } - if ( - trigger.trigger_type === "SUBFLOW" || - trigger.trigger_type === "USERINPUT" - ) { - continue; - } - - requiredTriggers.push(trigger); - } -} - - if ( - requiredTriggers.length === 0 && - requiredVariables.length === 0 && - newactions.length === 0 - ) { - setConfigureWorkflowModalOpen(false); - } - - setRequiredTriggers(requiredTriggers); - setRequiredVariables(requiredVariables); - setRequiredActions(newactions); + setRequiredTriggers(requiredTriggers); + setRequiredVariables(requiredVariables); + setRequiredActions(newactions); } if (appAuthentication !== undefined && previousAuth !== undefined && appAuthentication.length !== previousAuth.length) { @@ -381,7 +424,7 @@ const ConfigureWorkflow = (props) => { const { trigger } = props return ( - + { {trigger.status !== "running" ? "Start" : "Running"} ) : null} - {/* - - - ) - }} - fullWidth - color="primary" - type={"text"} - placeholder={`New value for ${trigger.name}`} - onChange={(event) => { - console.log("NEW VALUE ON INDEX", trigger.value) - }} - onBlur={(event) => { - //workflow.variables[variable.index] = event.target.value - }} - /> - } - style={{}} - /> - */} ); }; @@ -488,7 +498,7 @@ const ConfigureWorkflow = (props) => { //Name: {variable.name} - {variable.value}. return ( - + @@ -589,88 +599,312 @@ const ConfigureWorkflow = (props) => { }; + const AppSectionSelfcontained = (props) => { + const { action } = props; + + const [opened, setOpened] = useState(false); + const [filled, setFilled] = useState(false); + const [submitted, setSubmitted] = useState(false); + const [finalized, setFinalized] = useState(false); + + const [authFields, setAuthFields] = useState([]) + const [sensitiveFields, setSensitiveFields] = useState([]) + + if (authFields.length === 0 && opened === true) { + // Loop through fields of the action + + var newfields = [] + const params = action.action.parameters + + var sensitiveIndexes = [] + var index = 0 + for (let key in params) { + const param = params[key] + + if (param.configuration === true) { + if (param.name.toLowerCase().includes("key") || param.name.toLowerCase().includes("token") || param.name.toLowerCase().includes("password")) { + sensitiveIndexes.push(index) + } + + newfields.push({ + "key": param.name, + "example": param.example === undefined ? "" : param.example, + "value": param.name === "url" ? param.example : "", + }) + + index += 1 + } + } + + if (newfields.length > 0) { + setSensitiveFields(sensitiveIndexes) + setAuthFields(newfields) + } + } + + + const submitLocalAuth = (app, fields) => { + const appAuthData = { + active: true, + app: app, + fields: fields, + label: "Authentication for " + app.name, + usage: [{"workflow_id": workflow.id}], + auto_distribute: true, + } + + + fetch(globalUrl + "/api/v1/apps/authentication", { + method: "PUT", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + body: JSON.stringify(appAuthData), + credentials: "include", + }) + .then((response) => { + if (response.status !== 200) { + console.log("Status not 200 for setting app auth :O!"); + } + + setSubmitted(false) + + return response.json(); + }) + .then((responseJson) => { + if (!responseJson.success) { + toast("Failed to set app auth: " + responseJson.reason); + } else { + toast("App auth set for app " + app.name.replace("_", " ")); + setFinalized(true) + setOpened(false) + } + }) + .catch((error) => { + setSubmitted(false) + //toast(error.toString()); + console.log("New auth error: ", error.toString()); + }); + } + + var parsedName = action.app_name.replaceAll("_", " "); + if (action.app_name.toLowerCase().endsWith("_api")) { + parsedName = parsedName.substring(0, parsedName.length - 4); + } + + // Remove _basic at the end if it exists + if (parsedName.toLowerCase().endsWith("_basic")) { + parsedName = parsedName.substring(0, parsedName.length - 6); + } + + parsedName = (parsedName.charAt(0).toUpperCase() + parsedName.slice(1)).replaceAll("_", " "); + + return ( + +
+
{ + setOpened(!opened); + }} + > +
+ + {!opened ? : } + + {parsedName} + + {finalized ? "Authenticated" : `Configure ${parsedName}`} + +
+ {filled ? + + : null} +
+ {opened ? +
+ {authFields.map((field, index) => { + var parsedName = field.key + // Remove _basic at the end if it exists + if (parsedName.toLowerCase().endsWith("_basic")) { + parsedName = parsedName.substring(0, parsedName.length - 6); + } + + parsedName = (parsedName.charAt(0).toUpperCase() + parsedName.slice(1)).replaceAll("_", " "); + + return ( +
+ + {parsedName} + + { + event.preventDefault(); + authFields[index].value = event.target.value; + setAuthFields(authFields); + + var allFilled = true; + authFields.forEach((field) => { + if (field.value.length === 0) { + allFilled = false; + } else { + //console.log("Field is not filled: "+field.key) + } + }) + + if (allFilled) { + console.log("Should test the fields, and submit them") + setFilled(true); + } else { + if (filled) { + setFilled(false); + } + } + }} + + endAdornment={ + // Show item that can show field value if password + //field.name.toLowerCase().includes("key") || field.name.toLowerCase().includes("token") || field.name.toLowerCase().includes("password") ? + field.key.toLowerCase().includes("key") || field.key.toLowerCase().includes("token") || field.key.toLowerCase().includes("password") ? + + { + setSensitiveFields(sensitiveFields.filter((item) => item !== index)) + }} + onMouseDown={(event) => { + event.preventDefault(); + }} + > + + + + : null + } + fullWidth + color="primary" + type={sensitiveFields.includes(index) ? "password" : "text"} + placeholder={field.example ? field.example : `Enter your ${field.key}`} + data-lpignore="true" + dataLPIgnore="true" + autocomplete="off" + /> +
+ ) + })} + +
+ : null} +
+ + ) + } const AppSection = (props) => { const { action } = props; + var parsedName = action.app_name.replaceAll("_", " "); + if (action.app_name.toLowerCase().endsWith("_api")) { + parsedName = parsedName.substring(0, parsedName.length - 4); + } + return ( - {/* - - - {action.app_name} - - - - */} {action.must_authenticate ? - + if (setAuthenticationModalOpen !== undefined) { + setAuthenticationModalOpen(true); + } + }} + > + {action.app_name} + + {action.auth_done ? "Authenticated" : `Authenticate ${action.app_name.replaceAll("_", " ")}`} + + : null} {action.update_version !== action.app_version ? -
: null} @@ -923,10 +1159,10 @@ const ConfigureWorkflow = (props) => {
{clicked === true ? data.steps.map((step, index) => { - var finished = false + var filled = false if (step.type === "activate") { if (data.activation_done === true) { - finished = true + filled = true if (index === activeStep && firstRun === true) { setActiveStep(activeStep+1) @@ -941,10 +1177,10 @@ const ConfigureWorkflow = (props) => { if (step.type === "authenticate") { console.log("AUTH STEP: ", step) if (data.must_authenticate === true ) { - finished = false + filled = false } else { if (data.activation_done === true && data.auth_done === true) { - finished = true + filled = true if (firstRun) { setFinishCount(finishCount+1) @@ -963,7 +1199,7 @@ const ConfigureWorkflow = (props) => { if (exec.execution_argument !== undefined && exec.execution_argument !== null && exec.execution_argument.length > 0 && exec.execution_source === "webhook") { //console.log("Done: ", exec) - finished = true + filled = true if (index === activeStep && firstRun === true) { setActiveStep(activeStep+1) @@ -991,7 +1227,7 @@ const ConfigureWorkflow = (props) => { } return ( - + ) }) : null} @@ -1002,36 +1238,48 @@ const ConfigureWorkflow = (props) => { const topColor = "#f86a3e, #fc3922" return (
-
-
-
- {workflow.name} - - The following configuration makes the workflow ready immediately. + {setConfigureWorkflowModalOpen !== undefined ? +
+ : null} +
+ + + {setConfigureWorkflowModalOpen !== undefined ? + {workflow.name} + : null + } + + + Please configure the following apps for automatic startup of automation: {requiredActions.length > 0 ? ( - - Required Actions - + {setConfigureWorkflowModalOpen !== undefined ? + + Required Actions + + : null} - + {requiredActions.map((data, index) => { return ( -
- {data.steps !== undefined && data.steps !== null && data.show_steps === true ? - - : - - } -
- ) +
+ {data.steps !== undefined && data.steps !== null && data.show_steps === true && setConfigureWorkflowModalOpen !== undefined ? + + : + setConfigureWorkflowModalOpen !== undefined ? + + : + + } +
+ ) })} ) : null} - {requiredVariables.length > 0 ? ( + {setConfigureWorkflowModalOpen !== undefined && requiredVariables.length > 0 ? ( Variables @@ -1044,7 +1292,7 @@ const ConfigureWorkflow = (props) => { ) : null} - {requiredTriggers.length > 0 && showTriggers !== false ? ( + {setConfigureWorkflowModalOpen !== undefined && requiredTriggers.length > 0 && showTriggers !== false ? ( Triggers @@ -1056,51 +1304,52 @@ const ConfigureWorkflow = (props) => { ) : null} - -
- {showFinalizeAnimation ? - finalize workflow animation { - console.log("Img loaded.") + {setConfigureWorkflowModalOpen !== undefined ? +
+ {showFinalizeAnimation ? + finalize workflow animation { + console.log("Img loaded.") + setTimeout(() => { + console.log("Img closing.") + setConfigureWorkflowModalOpen(false); + }, 1250) + + }}/> + : + + {/* + + */} + - */} - - - } -
-
+ } else { + } + }, 1000) + }} + > + Finalize + + + } +
+ : null} +
); }; diff --git a/frontend/src/components/EditWorkflow.jsx b/frontend/src/components/EditWorkflow.jsx index 9971ff3d..81dacd85 100644 --- a/frontend/src/components/EditWorkflow.jsx +++ b/frontend/src/components/EditWorkflow.jsx @@ -5,6 +5,7 @@ import { MuiChipsInput } from "mui-chips-input"; import UsecaseSearch from "../components/UsecaseSearch.jsx" import WorkflowGrid from "../components/WorkflowGrid.jsx" import dayjs from 'dayjs'; +import WorkflowTemplatePopup from "./WorkflowTemplatePopup.jsx"; import { Badge, @@ -57,7 +58,7 @@ import { } from "@mui/icons-material"; const EditWorkflow = (props) => { - const { globalUrl, workflow, setWorkflow, modalOpen, setModalOpen, showUpload, usecases, setNewWorkflow, appFramework, isEditing, userdata, } = props + const { globalUrl, workflow, setWorkflow, modalOpen, setModalOpen, showUpload, usecases, setNewWorkflow, appFramework, isEditing, userdata, apps, } = props const [_, setUpdate] = React.useState(""); // Used for rendering, don't remove @@ -143,7 +144,9 @@ const EditWorkflow = (props) => { return null } - const newWorkflow = isEditing === true ? false : true + const newWorkflow = isEditing === true ? false : true + const priority = userdata === undefined || userdata === null ? null : userdata.priorities.find(prio => prio.type === "usecase" && prio.active === true) + console.log("PRIO: ", priority) var upload = ""; var total_count = 0 @@ -161,6 +164,7 @@ const EditWorkflow = (props) => { maxWidth: isMobile ? "90%" : 650, minHeight: 400, paddingTop: 25, + paddingLeft: 50, //minWidth: isMobile ? "90%" : newWorkflow === true ? 1000 : 550, //maxWidth: isMobile ? "90%" : newWorkflow === true ? 1000 : 550, }, @@ -170,7 +174,7 @@ const EditWorkflow = (props) => {
- + {newWorkflow ? "New" : "Editing"} workflow {newWorkflow === true ? null : @@ -193,7 +197,7 @@ const EditWorkflow = (props) => {
}
- + Workflows can be built from scratch, or from templates. Usecases can help you discover next steps, and you can search for them directly. Learn more {showUpload === true ? @@ -480,7 +484,7 @@ const EditWorkflow = (props) => { - + + {newWorkflow === true ? + + + Relevant Workflows + - {newWorkflow === true && name.length > 5 ? + {priority === null || priority === undefined ? null : +
+ 2 ? priority.description.split("&")[0] : ""} + img1={priority.description.split("&").length > 2 ? priority.description.split("&")[1] : ""} + + dstapp={priority.description.split("&").length > 3 ? priority.description.split("&")[2] : ""} + img2={priority.description.split("&").length > 3 ? priority.description.split("&")[3] : ""} + title={priority.name} + description={priority.description.split("&").length > 4 ? priority.description.split("&")[4] : ""} + + apps={apps} + /> +
+ } + + + : null} + + {newWorkflow === true && name.length > 2 ?
{ + const { userdata, globalUrl } = props + const [activeUsecases, setActiveUsecases] = useState(0); + const [modalOpen, setModalOpen] = React.useState(false); + const [suggestedUsecases, setSuggestedUsecases] = useState([]) + const [usecasesSet, setUsecasesSet] = useState(false) + const [apps, setApps] = useState([]) + const sizing = 475 + + let navigate = useNavigate(); + + const imagestyle = { + height: 40, + borderRadius: 40, + //border: "2px solid rgba(255,255,255,0.3)", + } + + const loadApps = () => { + fetch(`${globalUrl}/api/v1/apps`, { + method: "GET", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + credentials: "include", + }) + .then((response) => { + return response.json(); + }) + .then((responseJson) => { + if (responseJson === null) { + console.log("null-response from server") + const pretend_apps = [{ + "name": "TBD", + "app_name": "TBD", + "app_version": "TBD", + "description": "TBD", + "version": "TBD", + "large_image": "", + }] + + setApps(pretend_apps) + return + } + + if (responseJson.success === false) { + console.log("error loading apps: ", responseJson) + return + } + + setApps(responseJson); + }) + .catch((error) => { + console.log("App loading error: " + error.toString()); + }) + } + + // Find priorities in userdata.priorities and check if the item.type === "usecase" + // If so, set the item.isActive to true + if (usecasesSet === false && userdata.priorities !== undefined && userdata.priorities !== null && userdata.priorities.length > 0 && suggestedUsecases.length === 0) { + + var tmpUsecases = [] + for (let i = 0; i < userdata.priorities.length; i++) { + if (userdata.priorities[i].type !== "usecase" || userdata.priorities[i].active === false) { + continue + } + + tmpUsecases.push(userdata.priorities[i]) + } + + setSuggestedUsecases(tmpUsecases) + setUsecasesSet(true) + loadApps() + } + + const modalView = ( + // console.log("key:", dataValue.key), + //console.log("value:",dataValue.value), + { + setModalOpen(false); + }} + PaperProps={{ + style: { + backgroundColor: theme.palette.surfaceColor, + color: "white", + minWidth: "800px", + minHeight: "320px", + }, + }} + > + +
+ + Sign Up +
+ + Setup +
+ + Explore +
+ + + Here’s a recommended workflow: + + {/*
+
+
+ + { + slidePrev() + }} + > + + + +
+ +
+ + { + slideNext() + }} + > + + + +
+
+
*/} + + + + +
+ ); + + + return ( +
+ {modalView} + + Start using workflows + + + Based on what you selected here’s our recommendations! + + +
+
+
+ + {suggestedUsecases.length === 0 && usecasesSet ? + + All Workflows are already added for your current apps! + + : + suggestedUsecases.map((priority, index) => { + + const srcapp = priority.description.split("&")[0] + var image1 = priority.description.split("&")[1] + var image2 = "" + var dstapp = "" + if (priority.description.split("&").length > 3) { + dstapp = priority.description.split("&")[2] + image2 = priority.description.split("&")[3] + } + + const name = priority.name.replace("Suggested Usecase: ", "") + + var description = "" + if (priority.description.split("&").length > 4) { + description = priority.description[4] + } + + // FIXME: Should have a proper description + description = "" + + return ( + + ) + })} + +
+
+ + + +
+ + + Explore usecases + + +
+
+
+
+
+ ) +} +export default ExploreWorkflow diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx index 5f66af70..d3137674 100644 --- a/frontend/src/components/Header.jsx +++ b/frontend/src/components/Header.jsx @@ -212,7 +212,8 @@ const { globalUrl, setNotifications, notifications, isLoggedIn, removeCookie, ho const notificationWidth = 300 const imagesize = 22; - const boxColor = "#86c142"; + const boxColor = "#86c142"; + const NotificationItem = (props) => { const {data} = props @@ -263,7 +264,7 @@ const { globalUrl, setNotifications, notifications, isLoggedIn, removeCookie, ho {data.reference_url !== undefined && data.reference_url !== null && data.reference_url.length > 0 ? - {data.title} + {data.title} ({data.amount}) : @@ -277,7 +278,7 @@ const { globalUrl, setNotifications, notifications, isLoggedIn, removeCookie, ho : null } - + {data.description} {/*data.tags !== undefined && data.tags !== null && data.tags.length > 0 ? diff --git a/frontend/src/components/ParsedAction.jsx b/frontend/src/components/ParsedAction.jsx index d963ec0b..c069499f 100755 --- a/frontend/src/components/ParsedAction.jsx +++ b/frontend/src/components/ParsedAction.jsx @@ -2278,30 +2278,30 @@ const ParsedAction = (props) => { handleItemClick([innerdata]); }} > - - { - //console.log("HOVER: ", pathdata); - }} - onClick={() => { - handleItemClick([innerdata]); - }} - > - - {innerdata.name} - - + + { + //console.log("HOVER: ", pathdata); + }} + onClick={() => { + handleItemClick([innerdata]); + }} + > + + {innerdata.name} + + {parsedPaths.map((pathdata, index) => { // FIXME: Should be recursive in here // diff --git a/frontend/src/components/Priority.jsx b/frontend/src/components/Priority.jsx index 5e1c1943..e66784ab 100644 --- a/frontend/src/components/Priority.jsx +++ b/frontend/src/components/Priority.jsx @@ -69,7 +69,7 @@ const Priority = (props) => { return ( -
+
{priority.type === "usecase" || priority.type == "apps" ? : null} diff --git a/frontend/src/components/ShuffleCodeEditor.jsx b/frontend/src/components/ShuffleCodeEditor.jsx index fda866b2..5fb9b152 100644 --- a/frontend/src/components/ShuffleCodeEditor.jsx +++ b/frontend/src/components/ShuffleCodeEditor.jsx @@ -26,22 +26,21 @@ import { SetJsonDotnotation } from "../views/AngularWorkflow.jsx"; import { FullscreenExit as FullscreenExitIcon, Extension as ExtensionIcon, - Apps as AppsIcon, - FavoriteBorder as FavoriteBorderIcon, - Schedule as ScheduleIcon, - FormatListNumbered as FormatListNumberedIcon, + Apps as AppsIcon, + FavoriteBorder as FavoriteBorderIcon, + Schedule as ScheduleIcon, + FormatListNumbered as FormatListNumberedIcon, SquareFoot as SquareFootIcon, - Circle as CircleIcon, - Add as AddIcon, + Circle as CircleIcon, + Add as AddIcon, PlayArrow as PlayArrowIcon, -} from '@mui/icons-material'; - -import { AutoFixHigh as AutoFixHighIcon, + Close as CloseIcon, CompressOutlined, QrCodeScannerOutlined, } from '@mui/icons-material'; + import { validateJson } from "../views/Workflows.jsx"; import ReactJson from "react-json-view"; import PaperComponent from "../components/PaperComponent.jsx"; @@ -823,10 +822,6 @@ const CodeEditor = (props) => { } const executeSingleAction = (inputdata) => { - //if (serverside === true) { - // return - //} - if (validation === true) { inputdata = JSON.stringify(inputdata) } @@ -834,7 +829,10 @@ const CodeEditor = (props) => { // Shuffle Tools 1.2.0 (in most cases?) const appid = toolsAppId !== undefined && toolsAppId !== null && toolsAppId.length > 0 ? toolsAppId : "3e2bdf9d5069fe3f4746c29d68785a6a" - const actiondata = {"description":"Repeats the call parameter","id":"","name":"repeat_back_to_me","label":"","node_type":"","environment":"","sharing":false,"private_id":"","public_id":"","app_id": appid,"tags":null,"authentication":[],"tested":false,"parameters":[{"description":"The message to repeat","id":"","name":"call","example":"REPEATING: Hello world","value":inputdata,"multiline":true,"options":null,"action_field":"","variant":"STATIC_VALUE","required":true,"configuration":false,"tags":null,"schema":{"type":"string"},"skip_multicheck":false,"value_replace":null,"unique_toggled":false,"autocompleted":false}],"execution_variable":{"description":"","id":"","name":"","value":""},"returns":{"description":"","example":"","id":"","schema":{"type":"string"}},"authentication_id":"","example":"","auth_not_required":false,"source_workflow":"","run_magic_output":false,"run_magic_input":false,"execution_delay":0,"app_name":"Shuffle Tools","app_version":"1.2.0","selectedAuthentication":{}} + const actionname = selectedAction.name === "execute_python" && !inputdata.replaceAll(" ", "").includes("{%python%}") ? "execute_python" : "repeat_back_to_me" + const params = actionname === "execute_python" ? [{"name": "code", "value":inputdata}] : [{"name":"call", "value": inputdata}] + + const actiondata = {"description":"Repeats the call parameter","id":"","name":actionname,"label":"","node_type":"","environment":"","sharing":false,"private_id":"","public_id":"","app_id": appid,"tags":null,"authentication":[],"tested":false,"parameters": params, "execution_variable":{"description":"","id":"","name":"","value":""},"returns":{"description":"","example":"","id":"","schema":{"type":"string"}},"authentication_id":"","example":"","auth_not_required":false,"source_workflow":"","run_magic_output":false,"run_magic_input":false,"execution_delay":0,"app_name":"Shuffle Tools","app_version":"1.2.0","selectedAuthentication":{}} setExecutionResult({ "valid": false, @@ -924,6 +922,20 @@ const CodeEditor = (props) => { }, }} > + { + setExpansionModalOpen(false) + }} + > + +
{ isFileEditor ? @@ -1555,7 +1567,7 @@ const CodeEditor = (props) => { { executeSingleAction(expOutput) }}> - + {executing ? : } diff --git a/frontend/src/components/WelcomeForm2.jsx b/frontend/src/components/WelcomeForm2.jsx index 83d43e2b..7cc8f052 100644 --- a/frontend/src/components/WelcomeForm2.jsx +++ b/frontend/src/components/WelcomeForm2.jsx @@ -1,78 +1,106 @@ import React, { useState, useEffect } from "react"; -import ReactGA from 'react-ga4'; -import Checkbox from '@mui/material/Checkbox'; +import ReactGA from "react-ga4"; +import Checkbox from "@mui/material/Checkbox"; -import AliceCarousel from 'react-alice-carousel'; -import 'react-alice-carousel/lib/alice-carousel.css'; +import AliceCarousel from "react-alice-carousel"; +import "react-alice-carousel/lib/alice-carousel.css"; -import SearchIcon from '@mui/icons-material/Search'; -import EmailIcon from '@mui/icons-material/Email'; -import NewReleasesIcon from '@mui/icons-material/NewReleases'; -import ExtensionIcon from '@mui/icons-material/Extension'; -import LightbulbIcon from '@mui/icons-material/Lightbulb'; -import ArrowBackIosNewIcon from '@mui/icons-material/ArrowBackIosNew'; -import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos'; - -import theme from '../theme.jsx'; +import SearchIcon from "@mui/icons-material/Search"; +import EmailIcon from "@mui/icons-material/Email"; +import NewReleasesIcon from "@mui/icons-material/NewReleases"; +import ExtensionIcon from "@mui/icons-material/Extension"; +import LightbulbIcon from "@mui/icons-material/Lightbulb"; +import TrendingFlatIcon from "@mui/icons-material/TrendingFlat"; +import theme from "../theme.jsx"; +import CheckBoxSharpIcon from "@mui/icons-material/CheckBoxSharp"; +import AppSearch from "../components/Appsearch.jsx"; +import CloseIcon from "@mui/icons-material/Close"; import { - Button, - Collapse, - IconButton, - FormGroup, - FormControl, - InputLabel, - FormLabel, - FormControlLabel, - Select, - MenuItem, - Grid, - Paper, - Typography, - TextField, - Zoom, - List, - ListItem, - ListItemText, - Divider, - Tooltip, - Chip, - ButtonGroup, + Button, + Collapse, + IconButton, + FormGroup, + FormControl, + InputLabel, + FormLabel, + FormControlLabel, + Select, + MenuItem, + Grid, + Paper, + Typography, + TextField, + Zoom, + List, + ListItem, + ListItemText, + Divider, + Tooltip, + Chip, + ButtonGroup, } from "@mui/material"; -//import { useAlert +//import { useAlert import { useNavigate, Link } from "react-router-dom"; -import WorkflowSearch from '../components/Workflowsearch.jsx'; -import AuthenticationItem from '../components/AuthenticationItem.jsx'; -import WorkflowPaper from "../components/WorkflowPaper.jsx" -import UsecaseSearch from "../components/UsecaseSearch.jsx" - +import WorkflowSearch from "../components/Workflowsearch.jsx"; +import AuthenticationItem from "../components/AuthenticationItem.jsx"; +import WorkflowPaper from "../components/WorkflowPaper.jsx"; +import UsecaseSearch from "../components/UsecaseSearch.jsx"; +import ExploreWorkflow from "../components/ExploreWorkflow.jsx"; const responsive = { - 0: { items: 1 }, + 0: { items: 1 }, +}; + +const imagestyle = { + height: 40, + borderRadius: 40, + //border: "2px solid rgba(255,255,255,0.3)", }; const WelcomeForm = (props) => { - const { userdata, globalUrl, discoveryWrapper, setDiscoveryWrapper, appFramework, getFramework, activeStep, setActiveStep, steps, skipped, setSkipped, getApps, apps, handleSetSearch, usecaseButtons, defaultSearch, setDefaultSearch, selectionOpen, setSelectionOpen, } = props + const { + userdata, + globalUrl, + discoveryWrapper, + setDiscoveryWrapper, + appFramework, + getFramework, + activeStep, + setActiveStep, + steps, + skipped, + setSkipped, + getApps, + apps, + handleSetSearch, + usecaseButtons, + defaultSearch, + setDefaultSearch, + selectionOpen, + setSelectionOpen, + } = props; + const [isActive, setIsActive] = useState(0); - const [usecaseItems, setUsecaseItems] = useState([ - { - "search": "Phishing", - "usecase_search": undefined, - }, - { - "search": "Enrichment", - "usecase_search": undefined, - }, - { - "search": "Enrichment", - "usecase_search": "SIEM alert enrichment", - }, - { - "search": "Build your own", - "usecase_search": undefined, - }]) - - /* + const [usecaseItems, setUsecaseItems] = useState([ + { + search: "Phishing", + usecase_search: undefined, + }, + { + search: "Enrichment", + usecase_search: undefined, + }, + { + search: "Enrichment", + usecase_search: "SIEM alert enrichment", + }, + { + search: "Build your own", + usecase_search: undefined, + }, + ]); + /*
{ const [orgType, setOrgType] = React.useState("") const [finishedApps, setFinishedApps] = React.useState([]) const [authentication, setAuthentication] = React.useState([]); - const [newSelectedApp, setNewSelectedApp] = React.useState({}) - const [thumbIndex, setThumbIndex] = useState(0); + const [newSelectedApp, setNewSelectedApp] = React.useState({}) + const [thumbIndex, setThumbIndex] = useState(0); const [thumbAnimation, setThumbAnimation] = useState(false); const [clickdiff, setclickdiff] = useState(0); - const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io"; + const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io"; //const alert = useAlert(); let navigate = useNavigate(); - const onNodeSelect = (label) => { - if (setDiscoveryWrapper !== undefined) { - setDiscoveryWrapper( - {"id": label} - ) - } + const iconStyles = { + color: "rgba(255, 255, 255, 1)", + }; - if (isCloud) { - ReactGA.event({ - category: "welcome", - action: `click_${label}`, - label: "", - }) - } - - setSelectionOpen(true) - setDefaultSearch(label) + const onNodeSelect = (label) => { + if (setDiscoveryWrapper !== undefined) { + setDiscoveryWrapper({ id: label }); } - useEffect(() => { - if (userdata.id === undefined) { - return - } - - if (userdata.name !== undefined && userdata.name !== null && userdata.name.length > 0) { - setName(userdata.name) - } - - if (userdata.active_org !== undefined && userdata.active_org.name !== undefined && userdata.active_org.name !== null && userdata.active_org.name.length > 0) { - setOrgName(userdata.active_org.name) - } - }, [userdata]) - - useEffect(() => { - if (discoveryWrapper === undefined || discoveryWrapper.id === undefined) { - setDefaultSearch("") - var newfinishedApps = finishedApps - newfinishedApps.push(defaultSearch) - setFinishedApps(finishedApps) - } - }, [discoveryWrapper]) - - useEffect(() => { - if ( - window.location.search !== undefined && - window.location.search !== null - ) { - const urlSearchParams = new URLSearchParams(window.location.search); - const params = Object.fromEntries(urlSearchParams.entries()); - const foundTab = params["tab"]; - if (foundTab !== null && foundTab !== undefined && !isNaN(foundTab)) { - if (foundTab === 3 || foundTab === "3") { - //console.log("Set search!") - } - } else { - //navigate(`/welcome?tab=1`) - } - - const foundTemplate = params["workflow_template"]; - if (foundTemplate !== null && foundTemplate !== undefined) { - console.log("Found workflow template: ", foundTemplate) - - var sourceapp = undefined - var destinationapp = undefined - var action = undefined - const srcapp = params["source_app"]; - if (srcapp !== null && srcapp !== undefined) { - sourceapp = srcapp - } - - const dstapp = params["dest_app"]; - if (dstapp !== null && dstapp !== undefined) { - destinationapp = dstapp - } - - const act = params["action"]; - if (act !== null && act !== undefined) { - action = act - } - - //defaultSearch={foundTemplate} - // - usecaseItems[0] = { - "search": "enrichment", - "usecase_search": foundTemplate, - "sourceapp": sourceapp, - "destinationapp": destinationapp, - "autotry": action === "try", - } - - console.log("Adding: ", usecaseItems[0]) - - setUsecaseItems(usecaseItems) - } - } - }, []) - - const isStepOptional = step => { - return step === 1 + if (isCloud) { + ReactGA.event({ + category: "welcome", + action: `click_${label}`, + label: "", + }); } - const sendUserUpdate = (name, role, userId) => { - const data = { - "tutorial": "welcome", - "firstname": name, - "company_role": role, - "user_id": userId, - } + setSelectionOpen(true); + setDefaultSearch(label); + }; - const url = `${globalUrl}/api/v1/users/updateuser` - fetch(url, { - mode: "cors", - method: "PUT", - 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) { - console.log("Update user success") - //toast("Failed updating org: ", responseJson.reason); - } else { - console.log("Update success!") - //toast("Successfully edited org!"); - } - }) - ) - .catch((error) => { - console.log("Update err: ", error.toString()) - //toast("Err: " + error.toString()); - }); - } - - const sendOrgUpdate = (orgname, company_type, orgId, priority) => { - var data = { - org_id: orgId, - }; - - if (orgname.length > 0) { - data.name = orgname - } - - if (company_type.length > 0) { - data.company_type = company_type - } - - if (priority.length > 0) { - data.priority = priority - } - - const url = globalUrl + `/api/v1/orgs/${orgId}`; - 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) { - console.log("Update of org failed") - //toast("Failed updating org: ", responseJson.reason); - } else { - //toast("Successfully edited org!"); - } - }) - ) - .catch((error) => { - console.log("Update err: ", error.toString()) - //toast("Err: " + error.toString()); - }); - } - - var workflowDelay = -50 - const NewHits = ({ hits }) => { - const [mouseHoverIndex, setMouseHoverIndex] = useState(-1) - var counted = 0 - - const paperAppContainer = { - display: "flex", - flexWrap: "wrap", - alignContent: "space-between", - marginTop: 5, - } - - return ( - - {hits.map((data, index) => { - workflowDelay += 50 - - if (index > 3) { - return null - } - - return ( - - - - - - ) - })} - - ) - } - - const isStepSkipped = step => { - return skipped.has(step) + useEffect(() => { + if (userdata.id === undefined) { + return; } - const handleNext = () => { - setDefaultSearch("") + if ( + userdata.name !== undefined && + userdata.name !== null && + userdata.name.length > 0 + ) { + setName(userdata.name); + } - if (activeStep === 0) { - console.log("Should send basic information about org (fetch)") - setclickdiff(240) - navigate(`/welcome?tab=2`) - - if (isCloud) { - ReactGA.event({ - category: "welcome", - action: "click_page_one_next", - label: "", - }) - } - - if (userdata.active_org !== undefined && userdata.active_org.id !== undefined && userdata.active_org.id !== null && userdata.active_org.id.length > 0) { - sendOrgUpdate(orgName, orgType, userdata.active_org.id, "") - } + if ( + userdata.active_org !== undefined && + userdata.active_org.name !== undefined && + userdata.active_org.name !== null && + userdata.active_org.name.length > 0 + ) { + setOrgName(userdata.active_org.name); + } + }, [userdata]); - if (userdata.id !== undefined && userdata.id !== null && userdata.id.length > 0) { - sendUserUpdate(name, role, userdata.id) - } + useEffect(() => { + if (discoveryWrapper === undefined || discoveryWrapper.id === undefined) { + setDefaultSearch(""); + var newfinishedApps = finishedApps; + newfinishedApps.push(defaultSearch); + setFinishedApps(finishedApps); + } + }, [discoveryWrapper]); - } else if (activeStep === 1) { - console.log("Should send secondary info about apps and other things") - setDiscoveryWrapper({}) - - navigate(`/welcome?tab=3`) - //handleSetSearch("Enrichment", "2. Enrich") - handleSetSearch(usecaseButtons[0].name, usecaseButtons[0].usecase) - getApps() + useEffect(() => { + if ( + window.location.search !== undefined && + window.location.search !== null + ) { + const urlSearchParams = new URLSearchParams(window.location.search); + const params = Object.fromEntries(urlSearchParams.entries()); + const foundTab = params["tab"]; + if (foundTab !== null && foundTab !== undefined && !isNaN(foundTab)) { + if (foundTab === 3 || foundTab === "3") { + //console.log("Set search!") + } + } else { + //navigate(`/welcome?tab=1`) + } - // Make sure it's up to date - if (getFramework !== undefined) { - getFramework() - } - } else if (activeStep === 2) { - console.log("Should send third page with workflows activated and the like") - } + const foundTemplate = params["workflow_template"]; + if (foundTemplate !== null && foundTemplate !== undefined) { + console.log("Found workflow template: ", foundTemplate); - - let newSkipped = skipped; - if (isStepSkipped(activeStep)) { - newSkipped = new Set(newSkipped.values()); - newSkipped.delete(activeStep); + var sourceapp = undefined; + var destinationapp = undefined; + var action = undefined; + const srcapp = params["source_app"]; + if (srcapp !== null && srcapp !== undefined) { + sourceapp = srcapp; } - setActiveStep(prevActiveStep => prevActiveStep + 1); - setSkipped(newSkipped); + const dstapp = params["dest_app"]; + if (dstapp !== null && dstapp !== undefined) { + destinationapp = dstapp; + } + + const act = params["action"]; + if (act !== null && act !== undefined) { + action = act; + } + + //defaultSearch={foundTemplate} + // + usecaseItems[0] = { + search: "enrichment", + usecase_search: foundTemplate, + sourceapp: sourceapp, + destinationapp: destinationapp, + autotry: action === "try", + }; + + console.log("Adding: ", usecaseItems[0]); + + setUsecaseItems(usecaseItems); + } } + }, []); - const handleBack = () => { - setActiveStep(prevActiveStep => prevActiveStep - 1); + const isStepOptional = (step) => { + return step === 1; + }; - if (activeStep === 2) { - setDiscoveryWrapper({}) - - if (getFramework !== undefined) { - getFramework() - } - navigate("/welcome?tab=2") - } else if (activeStep === 1) { - navigate("/welcome?tab=1") - } + const sendUserUpdate = (name, role, userId) => { + const data = { + tutorial: "welcome", + firstname: name, + company_role: role, + user_id: userId, }; - const handleSkip = () => { - setclickdiff(240) - if (!isStepOptional(activeStep)) { - throw new Error("You can't skip a step that isn't optional."); - } - setActiveStep(prevActiveStep => prevActiveStep + 1); - setSkipped(prevSkipped => { - const newSkipped = new Set(prevSkipped.values()); - newSkipped.add(activeStep); - return newSkipped; + const url = `${globalUrl}/api/v1/users/updateuser`; + fetch(url, { + mode: "cors", + method: "PUT", + 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) { + console.log("Update user success"); + //toast("Failed updating org: ", responseJson.reason); + } else { + console.log("Update success!"); + //toast("Successfully edited org!"); + } + }) + ) + .catch((error) => { + console.log("Update err: ", error.toString()); + //toast("Err: " + error.toString()); + }); + }; + + const sendOrgUpdate = (orgname, company_type, orgId, priority) => { + var data = { + org_id: orgId, + }; + + if (orgname.length > 0) { + data.name = orgname; + } + + if (company_type.length > 0) { + data.company_type = company_type; + } + + if (priority.length > 0) { + data.priority = priority; + } + + const url = globalUrl + `/api/v1/orgs/${orgId}`; + 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) { + console.log("Update of org failed"); + //toast("Failed updating org: ", responseJson.reason); + } else { + //toast("Successfully edited org!"); + } + }) + ) + .catch((error) => { + console.log("Update err: ", error.toString()); + //toast("Err: " + error.toString()); + }); + }; + + var workflowDelay = -50; + const NewHits = ({ hits }) => { + const [mouseHoverIndex, setMouseHoverIndex] = useState(-1); + var counted = 0; + + const paperAppContainer = { + display: "flex", + flexWrap: "wrap", + alignContent: "space-between", + marginTop: 5, + }; + + return ( + + {hits.map((data, index) => { + workflowDelay += 50; + + if (index > 3) { + return null; + } + + return ( + + + + + + ); + })} + + ); + }; + + const isStepSkipped = (step) => { + return skipped.has(step); + }; + + const handleNext = () => { + setDefaultSearch(""); + + if (activeStep === 0) { + console.log("Should send basic information about org (fetch)"); + setclickdiff(240); + navigate(`/welcome?tab=2`); + + if (isCloud) { + ReactGA.event({ + category: "welcome", + action: "click_page_one_next", + label: "", }); - }; + } - const handleReset = () => { - setActiveStep(0); - }; + if ( + userdata.active_org !== undefined && + userdata.active_org.id !== undefined && + userdata.active_org.id !== null && + userdata.active_org.id.length > 0 + ) { + sendOrgUpdate(orgName, orgType, userdata.active_org.id, ""); + } - useEffect(() => { - console.log("Selected app changed (effect)") - }, [newSelectedApp]) + if ( + userdata.id !== undefined && + userdata.id !== null && + userdata.id.length > 0 + ) { + sendUserUpdate(name, role, userdata.id); + } + } else if (activeStep === 1) { + console.log("Should send secondary info about apps and other things"); + setDiscoveryWrapper({}); - //const buttonWidth = 145 - const buttonWidth = 450 - const buttonMargin = 10 - const sizing = 475 - const buttonStyle = { - flex: 1, - width: "100%", - padding: 25, - margin: buttonMargin, - fontSize: 18, - } + navigate(`/welcome?tab=3`); + //handleSetSearch("Enrichment", "2. Enrich") + handleSetSearch(usecaseButtons[0].name, usecaseButtons[0].usecase); + getApps(); - const slideNext = () => { - if (!thumbAnimation && thumbIndex < usecaseItems.length - 1) { - //handleSetSearch(usecaseButtons[0].name, usecaseButtons[0].usecase) - setThumbIndex(thumbIndex + 1); - } else if (!thumbAnimation && thumbIndex === usecaseItems.length - 1) { - setThumbIndex(0) - } - }; + // Make sure it's up to date + if (getFramework !== undefined) { + getFramework(); + } + } else if (activeStep === 2) { + console.log( + "Should send third page with workflows activated and the like" + ); + } - const slidePrev = () => { - if (!thumbAnimation && thumbIndex > 0) { - setThumbIndex(thumbIndex - 1); - } else if (!thumbAnimation && thumbIndex === 0) { - setThumbIndex(usecaseItems.length-1) - } - }; + let newSkipped = skipped; + if (isStepSkipped(activeStep)) { + newSkipped = new Set(newSkipped.values()); + newSkipped.delete(activeStep); + } - const newButtonStyle = { - padding: 22, - flex: 1, - margin: buttonMargin, - minWidth: buttonWidth, - maxWidth: buttonWidth, - } + setActiveStep((prevActiveStep) => prevActiveStep + 1); + setSkipped(newSkipped); + }; + const handleBack = () => { + setActiveStep((prevActiveStep) => prevActiveStep - 1); - const formattedCarousel = appFramework === undefined || appFramework === null ? [] : usecaseItems.map((item, index) => { - return ( -
- -
- ) - }) + if (activeStep === 2) { + setDiscoveryWrapper({}); - const getStepContent = (step) => { - switch (step) { - case 0: - return ( - - - {/*isCloud ? null : + if (getFramework !== undefined) { + getFramework(); + } + navigate("/welcome?tab=2"); + } else if (activeStep === 1) { + navigate("/welcome?tab=1"); + } + }; + + const handleSkip = () => { + setclickdiff(240); + if (!isStepOptional(activeStep)) { + throw new Error("You can't skip a step that isn't optional."); + } + setActiveStep((prevActiveStep) => prevActiveStep + 1); + setSkipped((prevSkipped) => { + const newSkipped = new Set(prevSkipped.values()); + newSkipped.add(activeStep); + return newSkipped; + }); + }; + + const handleReset = () => { + setActiveStep(0); + }; + + useEffect(() => { + console.log("Selected app changed (effect)"); + }, [newSelectedApp]); + + //const buttonWidth = 145 + const buttonWidth = 450; + const buttonMargin = 10; + const sizing = 475; + const bottomButtonStyle = { + borderRadius: 200, + height: 51, + width: 464, + fontSize: 16, + // background: "linear-gradient(89.83deg, #FF8444 0.13%, #F2643B 99.84%)", + background: "linear-gradient(90deg, #F86744 0%, #F34475 100%)", + padding: "16px 24px", + // top: 20, + margin: "auto", + itemAlign: "center", + // marginLeft: "65px", + }; + + const buttonStyle = { + flex: 1, + width: 224, + padding: 25, + margin: buttonMargin, + color : "var(--White-text, #F1F1F1)", + fontWeight: 400, + fontSize: 16, + background: "rgba(33, 33, 33, 1)", + borderColor: "rgba(33, 33, 33, 1)", + borderRadius: 8, + }; + + const slideNext = () => { + if (!thumbAnimation && thumbIndex < usecaseItems.length - 1) { + //handleSetSearch(usecaseButtons[0].name, usecaseButtons[0].usecase) + setThumbIndex(thumbIndex + 1); + } else if (!thumbAnimation && thumbIndex === usecaseItems.length - 1) { + setThumbIndex(0); + } + }; + + const slidePrev = () => { + if (!thumbAnimation && thumbIndex > 0) { + setThumbIndex(thumbIndex - 1); + } else if (!thumbAnimation && thumbIndex === 0) { + setThumbIndex(usecaseItems.length - 1); + } + }; + + const newButtonStyle = { + padding: 22, + flex: 1, + margin: buttonMargin, + minWidth: buttonWidth, + maxWidth: buttonWidth, + }; + + const formattedCarousel = + appFramework === undefined || appFramework === null + ? [] + : usecaseItems.map((item, index) => { + return ( +
+ +
+ ); + }); + + const getStepContent = (step) => { + switch (step) { + case 0: + return ( + + + {/*isCloud ? null : This data will be used within the product and NOT be shared unless cloud synchronization is configured. */} - - In order to understand how we best can help you find relevant Usecases, please provide the information below. This is optional, but highly encouraged. - - - { - setName(e.target.value) - }} - /> - - - { - setOrgName(e.target.value) - }} - /> - - - - Your Role - - - - - - Company Type - - - - - - ) - case 1: - return ( - -
- + + In order to understand how we best can help you find relevant + Usecases, please provide the information below. This is + optional, but highly encouraged. + + + { + setName(e.target.value); + }} + /> + + + { + setOrgName(e.target.value); + }} + /> + + + + + Your Role + + + + + + + + Company Type + + + + + + + ); + case 1: + return ( + +
+ {selectionOpen ? ( +
+
+ {defaultSearch} + +
+
+ +
+ ) : null} + {/* Apps for each category are shown based on your activity and can be changed by clicking their icon. We will help you connect them later. - - {/*The app framework helps us access and authenticate the most important APIs for you. */} + */} + {/*
+ { + navigate("/welcome") + }}/> + { + navigate("/welcome") + }}> + Back + +
*/} + + Find your apps + + + Select the apps you work with and we will connect the for you. + + {/*The app framework helps us access and authenticate the most important APIs for you. */} - {/* + {/* What is your development experience? @@ -612,39 +821,104 @@ const WelcomeForm = (props) => { */} - - {/*Find your integrations!*/} -
- -
-
- - -
-
- - -
- {/* + + {/*Find your integrations!*/} +
+ +
+
+ + +
+
+ + +
+ {/* What do you want to automate first ? { */} - {/* - - - What tools do you use? - - - - */} -
- +
+
+ +
+ + ) case 2: return (
- - These are some of our Workflow templates, used to start new Workflows. Use the right and left buttons to find new Usecases, and click the orange button to build it. -
- - { - slidePrev() - }} - > - - - -
- +
- - { - slideNext() - }} - > - - - -
-
+
+
) @@ -762,36 +977,39 @@ const WelcomeForm = (props) => { } } - const extraHeight = isCloud ? -7 : 0 - return ( -
- {/*selectionOpen ? + + const extraHeight = isCloud ? -7 : 0; + return ( +
+ {/*selectionOpen ? : null*/} -
- {activeStep === steps.length ? ( -
- You Will be Redirected to getting Start Page Wait for 5-sec. - - - -
- ) : ( -
- {getStepContent(activeStep)} -
+
+ {activeStep === steps.length ? ( +
+ You Will be Redirected to getting Start Page Wait for 5-sec. + + + +
+ ) : ( +
+ {getStepContent(activeStep)} + {/*
{activeStep === 2 || activeStep === 1 ?
- {/*isStepOptional(activeStep) && ( + // (commented) isStepOptional(activeStep) && ( - )*/} + ) //commented : null}
- } -
- )} -
-
- ); -} + }*/} +
+ )} +
+
+ ); +}; -export default WelcomeForm +export default WelcomeForm; diff --git a/frontend/src/components/WorkflowGrid.jsx b/frontend/src/components/WorkflowGrid.jsx index f99bbc52..589e4f7d 100644 --- a/frontend/src/components/WorkflowGrid.jsx +++ b/frontend/src/components/WorkflowGrid.jsx @@ -154,7 +154,6 @@ const AppGrid = props => { }) .then((responseJson) => { if (responseJson.success !== false) { - console.log("Usecases: ", responseJson) //handleKeysetting(responseJson, workflows) } }) @@ -187,10 +186,10 @@ const AppGrid = props => { }, []) if (localMessage !== inputsearch && inputsearch !== undefined && inputsearch !== null && inputsearch.length > 0) { - console.log("In refinement: ", inputsearch) //setLocalMessage(inputsearch) refine(inputsearch) defaultSearch = inputsearch + return null } else if (onlyResults === true) { // Don't return anything unless refinement works return null @@ -244,9 +243,7 @@ const AppGrid = props => { return (
{onlyResults === true && hits.length > 0 ? - - Relevant Workflows - + null : null} {hits.map((data, index) => { diff --git a/frontend/src/components/WorkflowPaper.jsx b/frontend/src/components/WorkflowPaper.jsx index e07daca6..7ab4c546 100644 --- a/frontend/src/components/WorkflowPaper.jsx +++ b/frontend/src/components/WorkflowPaper.jsx @@ -277,7 +277,7 @@ const WorkflowPaper = (props) => { > {data.tags !== undefined && data.tags !== null ? data.tags.map((tag, index) => { - if (index >= 3) { + if (index >= 2) { return null; } diff --git a/frontend/src/components/WorkflowTemplatePopup.jsx b/frontend/src/components/WorkflowTemplatePopup.jsx new file mode 100644 index 00000000..769ade88 --- /dev/null +++ b/frontend/src/components/WorkflowTemplatePopup.jsx @@ -0,0 +1,382 @@ +import React, { useState, useEffect } from "react"; + +import { toast } from "react-toastify" +import theme from '../theme.jsx'; +import { + Button, + Typography, + Dialog, + DialogTitle, + DialogContent, + DialogActions, + Drawer, + CircularProgress, + IconButton, +} from "@mui/material"; + +import { + Check as CheckIcon, + TrendingFlat as TrendingFlatIcon, + Close as CloseIcon, +} from '@mui/icons-material'; + +import WorkflowTemplatePopup2 from "./WorkflowTemplatePopup.jsx"; +import ConfigureWorkflow from "../components/ConfigureWorkflow.jsx"; + +const WorkflowTemplatePopup = (props) => { + const { userdata, globalUrl, img1, srcapp, img2, dstapp, title, description, visualOnly, apps } = props; + + const [isActive, setIsActive] = useState(false); + const [isHovered, setIsHovered] = useState(false); + const [modalOpen, setModalOpen] = useState(false); + const [errorMessage, setErrorMessage] = useState(""); + const [workflowLoading, setWorkflowLoading] = useState(false); + const [workflow, setWorkflow] = useState({}); + + const [appAuthentication, setAppAuthentication] = React.useState(undefined); + const imagestyle = { + height: 40, + width: 40, + borderRadius: 40, + } + + if (title === undefined || title === null || title === "") { + console.log("No title for workflow template popup!"); + return null + } + + const getWorkflow = (workflowId) => { + fetch(`${globalUrl}/api/v1/workflows/${workflowId}`, { + method: "GET", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + credentials: "include", + }) + .then((response) => { + if (response.status !== 200) { + console.log("Status not 200 for framework!"); + } + + return response.json(); + }) + .then((responseJson) => { + if (responseJson.success === false) { + console.log("Error in workflow loading for ID ", workflowId) + } else { + setWorkflow(responseJson) + } + }) + .catch((error) => { + console.log("err in framework: ", error.toString()); + setWorkflowLoading(false) + }) + } + + const loadAppAuth = () => { + fetch(`${globalUrl}/api/v1/apps/authentication`, { + method: "GET", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + credentials: "include", + }) + .then((response) => { + if (response.status !== 200) { + console.log("Status not 200 for setting app auth :O!"); + } + + return response.json(); + }) + .then((responseJson) => { + if (!responseJson.success) { + toast("Failed to get app auth: " + responseJson.reason); + return + } + + var newauth = []; + for (let authkey in responseJson.data) { + if (responseJson.data[authkey].defined === false) { + continue; + } + + newauth.push(responseJson.data[authkey]); + } + + setAppAuthentication(newauth); + }) + .catch((error) => { + //toast(error.toString()); + console.log("New auth error: ", error.toString()); + }); + } + + const getGeneratedWorkflow = () => { + // POST + // https://shuffler.io/api/v1/workflows/merge + // destination: {app_id: "b9c2feaf99b6309dabaeaa8518c61d3d", app_name: "Servicenow_API", app_version: "",…} + // id: "" + // middle:[] + // name: "Email analysis" + // source:{app_id: "accdaaf2eeba6a6ed43b2efc0112032d", app_name + + setWorkflowLoading(true) + + + // FIXME: Remove hardcoding here after testing, and user srcapp/dstapp + const newsrcapp = srcapp + const newdstapp = dstapp + + const mergedata = { + name: title, + id: "", + source: { + app_name: newsrcapp, + }, + middle: [], + destination: { + app_name: newdstapp, + }, + } + + fetch(globalUrl + "/api/v1/workflows/merge", { + method: "POST", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + credentials: "include", + body: JSON.stringify(mergedata), + }) + .then((response) => { + if (response.status !== 200) { + console.log("Status not 200 for framework!"); + } + + setWorkflowLoading(false) + return response.json(); + }) + .then((responseJson) => { + if (responseJson.success === false) { + console.log("Error in workflow template: ", responseJson.error); + + setErrorMessage("Failed to generate workflow for these tools - the Shuffle team has been notified. Click out of this window to continue. Contact support@shuffler.io for further assistance.") + + setIsActive(true) + //setTimeout(() => { + // setModalOpen(false) + //}, 5000) + } else { + console.log("Success in workflow template: ", responseJson); + setIsActive(true) + if (responseJson.workflow_id === "") { + console.log("Failed to build workflow for these tools. Closing in 3 seconds.") + return + } + + getWorkflow(responseJson.workflow_id) + } + }) + .catch((error) => { + console.log("err in framework: ", error.toString()); + setWorkflowLoading(false) + }) + } + + const isFinished = () => { + // Look for configuration fields being done in the current modal + // 1. Start by finding the modal + const template = document.getElementById("workflow-template") + if (template === null || template == undefined) { + return true + } + + // Find item in template with id app-config + const appconfig = template.getElementsByClassName("app-config") + if (appconfig === null || appconfig == undefined) { + return true + } + + console.log("APPCONFIG: ", appconfig) + + return false + } + + const ModalView = () => { + return ( + { + setModalOpen(false); + }} + PaperProps={{ + style: { + backgroundColor: "black", + color: "white", + minWidth: 700, + maxWidth: 700, + paddingTop: 75, + itemAlign: "center", + }, + }} + > + { + setModalOpen(false); + }} + > + + + + + Configure Workflow + + + Selected Workflow: + +
+ +
+ {workflowLoading ? +
+ Generating the Workflow... + + +
+ : +
+ + {errorMessage !== "" ? errorMessage : ""} + +
+ } + + {errorMessage === "" ? + + : null} + + + ) + } + + var parsedTitle = title + const maxlength = 30 + if (title.length > maxlength) { + parsedTitle = title.substring(0, maxlength) + "..." + } + + parsedTitle.replaceAll("_", " ") + + return ( +
+ +
{ + setIsHovered(true) + }} + onMouseLeave={() => { + setIsHovered(false) + }} + onClick={() => { + if (visualOnly === true) { + console.log("Not showing more than visuals.") + return + } + + //setIsActive(!isActive) + if (errorMessage !== "") { + toast("Already failed to generate workflow for these apps. Please try again later or contact support@shuffler.io.") + } else if (isActive) { + toast("Workflow already generated. Please try another template, or continue to the next page.") + + // FIXME: Remove these? + loadAppAuth() + setModalOpen(true) + //getGeneratedWorkflow() + } else { + + loadAppAuth() + setModalOpen(true) + getGeneratedWorkflow() + } + }} + > +
+
+ + {img2 !== "" ? + + + + + : + + } +
+
+ + {parsedTitle} + + + {description} + +
+
+
+ {isActive === true && errorMessage === "" ? + + : ""} +
+
+
+ ) +} + +export default WorkflowTemplatePopup diff --git a/frontend/src/theme.jsx b/frontend/src/theme.jsx index e24f7a0a..8d13070c 100644 --- a/frontend/src/theme.jsx +++ b/frontend/src/theme.jsx @@ -18,10 +18,12 @@ const theme = createTheme(adaptV4Theme({ secondary: "rgba(255,255,255,0.7)", }, type: "dark", - inputColor: "#383B40", + inputColor: "rgba(39,41,45,1)", + //inputColor: "#383B40", surfaceColor: "#27292d", platformColor: "#1c1c1d", backgroundColor: "#1a1a1a", + green: "#5cc879", borderRadius: 5, defaultBorder: "1px solid rgba(255,255,255,0.3)", jsonTheme: "brewer", @@ -70,11 +72,6 @@ const theme = createTheme(adaptV4Theme({ }, }, overrides: { - MuiPaper: { - root: { - backgroundColor: "#1c1c1d", - }, - }, MuiMenu: { list: { backgroundColor: "#27292d", diff --git a/frontend/src/views/Admin.jsx b/frontend/src/views/Admin.jsx index c8269a52..866f9360 100755 --- a/frontend/src/views/Admin.jsx +++ b/frontend/src/views/Admin.jsx @@ -1692,15 +1692,24 @@ Let me know if you're interested, or set up a call here: https://drift.me/${user const userId = user.id; const data = { user_id: userId }; - fetch(globalUrl + "/api/v1/generateapikey", { + console.log(user, userdata) + + var fetchdata = { method: "POST", headers: { "Content-Type": "application/json", Accept: "application/json", }, - body: JSON.stringify(data), credentials: "include", - }) + } + + if (userId === userdata.id) { + fetchdata.method = "GET" + } else { + fetchdata.body = JSON.stringify(data) + } + + fetch(globalUrl + "/api/v1/generateapikey", fetchdata) .then((response) => { if (response.status !== 200) { console.log("Status not 200 for WORKFLOW EXECUTION :O!"); @@ -1889,8 +1898,11 @@ Let me know if you're interested, or set up a call here: https://drift.me/${user open={selectedUserModalOpen} onClose={() => { setSelectedUserModalOpen(false); - setImage2FA(""); - setSecret2FA(""); + + setImage2FA(""); + setValue2FA(""); + setSecret2FA(""); + setShow2faSetup(false); }} PaperProps={{ style: { @@ -2156,7 +2168,7 @@ Let me know if you're interested, or set up a call here: https://drift.me/${user /> - Billing + Billing (Beta) /> 0 ) { - console.log("In here?"); var active = []; for (var key in userdata.orgs) { - console.log("ORG: ", userdata.orgs[key]); const found = selectedOrganization.child_orgs.find( (item) => item.id === userdata.orgs[key].id @@ -3299,7 +3308,6 @@ Let me know if you're interested, or set up a call here: https://drift.me/${user ) : null; const run2FASetup = (data) => { - console.log("2fa: ", data, show2faSetup); if (!show2faSetup) { get2faCode(data.id); } else { diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index e8ccdde7..1dd3eb87 100755 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -580,15 +580,39 @@ const AngularWorkflow = (defaultprops) => { const cytoscapeWidth = isMobile ? bodyWidth - leftBarSize : bodyWidth - leftBarSize - 25 const [elements, setElements] = useState([]); + const [loopRunning, setLoopRunning] = useState(false) + + const stop = () => { + setLoopRunning(false) + } + + const start = () => { + setLoopRunning(true) + } + + useEffect(() => { + console.log("In useeffect for loopRunning: ", loopRunning) + if (loopRunning) { + const intervalId = setInterval(() => { + if (!loopRunning) { + clearInterval(intervalId); + } + + fetchUpdates() + }, 3000) + + return () => clearInterval(intervalId); + } + }, [loopRunning]) + // No point going as fast, as the nodes aren't realtime anymore, but bulk updated. - // Set it from 2500 to 6000 to reduce overall load - const { start, stop } = useInterval({ - duration: 3000, - startImmediate: false, - callback: () => { - fetchUpdates(); - }, - }); + //const { start, stop } = useInterval({ + // duration: 3000, + // startImmediate: false, + // callback: () => { + // fetchUpdates(); + // }, + //}); const getAppDocs = (appname, location, version) => { fetch(`${globalUrl}/api/v1/docs/${appname}?location=${location}&version=${version}`, { @@ -924,7 +948,7 @@ const AngularWorkflow = (defaultprops) => { }; const getWorkflowExecution = (id, execution_id) => { - fetch(`${globalUrl}/api/v1/workflows/${id}/executions`, { + fetch(`${globalUrl}/api/v2/workflows/${id}/executions`, { method: "GET", headers: { "Content-Type": "application/json", @@ -940,11 +964,10 @@ const AngularWorkflow = (defaultprops) => { return response.json(); }) .then((responseJson) => { - if (responseJson !== undefined && responseJson !== null && responseJson.length > 0) { - // FIXME: Sort this by time + if (responseJson !== undefined && responseJson !== null && responseJson.executions !== undefined && responseJson.executions !== null && responseJson.executions.length > 0) { // - means it's opposite - const newkeys = sortByKey(responseJson, "-started_at"); + const newkeys = sortByKey(responseJson.executions, "-started_at"); setWorkflowExecutions(newkeys); const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search; @@ -1021,6 +1044,7 @@ const AngularWorkflow = (defaultprops) => { }, body: JSON.stringify(executionRequest), credentials: "include", + cors: "no-cors", }) .then((response) => { if (response.status !== 200) { @@ -1279,7 +1303,7 @@ const AngularWorkflow = (defaultprops) => { }; const sendStreamRequest = (body) => { - console.log("Stream not activated yet.") + //console.log("Stream not activated yet.") return // Session may be important here huh @@ -15302,6 +15326,10 @@ const AngularWorkflow = (defaultprops) => { overflow: "hidden", }} onMouseOver={() => { + if (cy == undefined || cy == null) { + return + } + var currentnode = cy.getElementById(data.action.id); if (currentnode !== undefined && currentnode !== null && currentnode.length !== 0) { currentnode.addClass("shuffle-hover-highlight"); @@ -15314,6 +15342,10 @@ const AngularWorkflow = (defaultprops) => { //) }} onMouseOut={() => { + if (cy == undefined || cy == null) { + return + } + var currentnode = cy.getElementById(data.action.id); if (currentnode.length !== 0) { currentnode.removeClass("shuffle-hover-highlight"); diff --git a/frontend/src/views/Apps.jsx b/frontend/src/views/Apps.jsx index 218f9e39..4f9ac5b3 100755 --- a/frontend/src/views/Apps.jsx +++ b/frontend/src/views/Apps.jsx @@ -1354,7 +1354,8 @@ const Apps = (props) => { border: hover ? "1px solid #f85a3e" : "1px solid rgba(255,255,255,0.3)", cursor: hover ? "pointer" : "default", textAlign: "center", - height: 125, + minHeight: 150, + maxHeight: 150, }} > {icon} diff --git a/frontend/src/views/Dashboard.jsx b/frontend/src/views/Dashboard.jsx index fdffa122..96c14d0e 100755 --- a/frontend/src/views/Dashboard.jsx +++ b/frontend/src/views/Dashboard.jsx @@ -6,6 +6,7 @@ import { makeStyles, } from "@mui/styles"; import classNames from "classnames"; import theme from '../theme.jsx'; import { useNavigate, Link, useParams } from "react-router-dom"; +import WorkflowTemplatePopup from "../components/WorkflowTemplatePopup.jsx"; // react plugin used to create charts //import { Line, Bar } from "react-chartjs-2"; @@ -90,7 +91,7 @@ const useStyles = makeStyles({ }, }); -const UsecaseListComponent = ({keys, isCloud, globalUrl, frameworkData, isLoggedIn, workflows, setWorkflows}) => { +const UsecaseListComponent = ({userdata, keys, isCloud, globalUrl, frameworkData, isLoggedIn, workflows, setWorkflows}) => { const [expandedIndex, setExpandedIndex] = useState(-1); const [expandedItem, setExpandedItem] = useState(-1); const [inputUsecase, setInputUsecase] = useState({}); @@ -103,17 +104,69 @@ const UsecaseListComponent = ({keys, isCloud, globalUrl, frameworkData, isLogged const [selectedWorkflows, setSelectedWorkflows] = useState([]) const [firstLoad, setFirstLoad] = useState(true) + const [apps, setApps] = useState([]) - const classes = useStyles(); + const classes = useStyles(); let navigate = useNavigate(); const [mitreTags, setMitreTags] = useState([]); + + const loadApps = () => { + fetch(`${globalUrl}/api/v1/apps`, { + method: "GET", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + credentials: "include", + }) + .then((response) => { + return response.json(); + }) + .then((responseJson) => { + if (responseJson === null) { + console.log("null-response from server") + const pretend_apps = [{ + "name": "TBD", + "app_name": "TBD", + "app_version": "TBD", + "description": "TBD", + "version": "TBD", + "large_image": "", + }] + + setApps(pretend_apps) + return + } + + if (responseJson.success === false) { + console.log("error loading apps: ", responseJson) + return + } + + setApps(responseJson); + }) + .catch((error) => { + console.log("App loading error: " + error.toString()); + }) + } + + useEffect(() => { + loadApps() + }, []) + if (keys === undefined || keys === null || keys.length === 0) { return null } - const getUsecase = (name, index, subindex) => { - fetch(`${globalUrl}/api/v1/workflows/usecases/${escape(name.replaceAll(" ", "_"))}`, { + const parseUsecase = (parsedUsecase, subcase) => { + console.log("parseUsecase: ", parsedUsecase, subcase) + } + + const getUsecase = (subcase, index, subindex) => { + console.log(subcase) + + fetch(`${globalUrl}/api/v1/workflows/usecases/${escape(subcase.name.replaceAll(" ", "_"))}`, { method: "GET", headers: { "Content-Type": "application/json", @@ -129,14 +182,26 @@ const UsecaseListComponent = ({keys, isCloud, globalUrl, frameworkData, isLogged return response.json(); }) .then((responseJson) => { + var parsedUsecase = responseJson if (responseJson.success === false) { - setInputUsecase({ - "name": name, - }) + parsedUsecase = subcase + + //img1={inputUsecase.srcimg} + //srcapp={inputUsecase.srcapp} + //img2={inputUsecase.dstimg} + //dstapp={inputUsecase.dstapp} + //title={inputUsecase.name} + parsedUsecase = parseUsecase(parsedUsecase, subcase) } else { - setInputUsecase(responseJson) + parsedUsecase = responseJson + + parsedUsecase = parseUsecase(parsedUsecase, responseJson) } + // Look for the type of app and fill in img1, srcapp... + + + setInputUsecase(parsedUsecase) setExpandedIndex(index) setExpandedItem(subindex) @@ -289,6 +354,7 @@ const UsecaseListComponent = ({keys, isCloud, globalUrl, frameworkData, isLogged if (selectedItem && subcase.matches.length > 0 && selectedWorkflows.length === 0 && firstLoad === true) { setFirstLoad(false) setSelectedWorkflows(subcase.matches) + } } @@ -316,10 +382,8 @@ const UsecaseListComponent = ({keys, isCloud, globalUrl, frameworkData, isLogged } } - //const backgroundColor = selectedItem ? "inherit" : finished ? "inherit" : usecase.color const finished = subcase.matches.length > 0 const backgroundColor = theme.palette.surfaceColor - //"inherit" const itemBorder = `${selectedItem ? "3px" : expandedItem >= 0 ? "0px" : "1px"} solid ${usecase.color}` const fixedName = subcase.name.toLowerCase().replace("_", " ") @@ -330,14 +394,14 @@ const UsecaseListComponent = ({keys, isCloud, globalUrl, frameworkData, isLogged //setSelectedWorkflows([]) if (selectedItem) { } else { - getUsecase(subcase.name, index, subindex) + getUsecase(subcase, index, subindex) navigate(`/usecases?selected_object=${fixedName}`) //const newitem = removeParam("selected_object", cursearch); //navigate(curpath + newitem) } }}> - { + { }}> {!selectedItem ?
@@ -649,12 +713,12 @@ const UsecaseListComponent = ({keys, isCloud, globalUrl, frameworkData, isLogged : null} {workflows !== undefined && workflows !== null && workflows.length > 0 ? - option.id === value.id} + getOptionSelected={(option, value) => option.id === value.id} getOptionLabel={(option) => { if ( @@ -685,120 +749,120 @@ const UsecaseListComponent = ({keys, isCloud, globalUrl, frameworkData, isLogged borderRadius: theme.palette.borderRadius, }} onChange={(event, newValue) => { - console.log("CLICK: ", newValue) - //handleWorkflowSelectionUpdate({ target: { value: newValue} }) - //setSelectedWorkflows= - //var newvalue = [] - //for (var key in newValue) { - // if (newValue[key].id !== undefined) { - // newvalue.push(newValue[key].id) - // } - //} + console.log("CLICK: ", newValue) + //handleWorkflowSelectionUpdate({ target: { value: newValue} }) + //setSelectedWorkflows= + //var newvalue = [] + //for (var key in newValue) { + // if (newValue[key].id !== undefined) { + // newvalue.push(newValue[key].id) + // } + //} - // Doing this way as you may want to remove some too - for (var key in workflows) { - if (!newValue.find(data => data.id === workflows[key].id)) { - // Check if it has the one in it - if (workflows[key]["usecase_ids"] !== undefined && workflows[key]["usecase_ids"] !== null && workflows[key]["usecase_ids"].includes(subcase.name)) { - const filtered = workflows[key]["usecase_ids"].filter(data => data !== subcase.name) - if (filtered !== undefined && filtered !== null) { - //console.log("Removing: ", workflows[key].name, workflows[key]) - workflows[key]["usecase_ids"] = filtered - - setWorkflow(workflows[key]) - } - } + // Doing this way as you may want to remove some too + for (var key in workflows) { + if (!newValue.find(data => data.id === workflows[key].id)) { + // Check if it has the one in it + if (workflows[key]["usecase_ids"] !== undefined && workflows[key]["usecase_ids"] !== null && workflows[key]["usecase_ids"].includes(subcase.name)) { + const filtered = workflows[key]["usecase_ids"].filter(data => data !== subcase.name) + if (filtered !== undefined && filtered !== null) { + //console.log("Removing: ", workflows[key].name, workflows[key]) + workflows[key]["usecase_ids"] = filtered + + setWorkflow(workflows[key]) + } + } - continue - } + continue + } - if (workflows[key]["usecase_ids"] === undefined || workflows[key]["usecase_ids"] === null) { - workflows[key]["usecase_ids"] = [subcase.name] - console.log("Setting: ", workflows[key].name) - setWorkflow(workflows[key]) + if (workflows[key]["usecase_ids"] === undefined || workflows[key]["usecase_ids"] === null) { + workflows[key]["usecase_ids"] = [subcase.name] + console.log("Setting: ", workflows[key].name) + setWorkflow(workflows[key]) - } else if (!workflows[key]["usecase_ids"].includes(subcase.name)) { - workflows[key]["usecase_ids"].push(subcase.name) - console.log("Adding: ", workflows[key].name) - setWorkflow(workflows[key]) + } else if (!workflows[key]["usecase_ids"].includes(subcase.name)) { + workflows[key]["usecase_ids"].push(subcase.name) + console.log("Adding: ", workflows[key].name) + setWorkflow(workflows[key]) - } - } + } + } - setWorkflows(workflows) - console.log("New: ", newValue) - setSelectedWorkflows(newValue) + setWorkflows(workflows) + console.log("New: ", newValue) + setSelectedWorkflows(newValue) //setUpdate(Math.random()) }} - renderOption={(props, option) => { - //console.log("In options?: ", props, option) + renderOption={(props, data, state) => { + var newname = data.name + if (newname === undefined || newname === null) { + newname = "placeholder" + } - var newname = props.name - if (newname === undefined || newname === null) { - newname = "placeholder" - } - - if (newname.length > 2) { - newname = newname.charAt(0).toUpperCase() + newname.substring(1) - } - return ( -
  • - - {props.image !== undefined && props.image !== null && props.image.length > 0 ? - {newname} - : null} - - Choose {newname} - - - } placement="bottom"> - - } - checkedIcon={} - style={{ marginRight: 8 }} - checked={option.selected} - /> - {newname} - - -
    • - ) - }} + if (newname.length > 2) { + newname = newname.charAt(0).toUpperCase() + newname.substring(1) + } + return ( +
  • + + {data.image !== undefined && data.image !== null && data.image.length > 0 ? + {newname} + : null} + + Choose {newname} + + + } placement="bottom"> + + } + checkedIcon={} + style={{ marginRight: 8 }} + checked={selectedWorkflows.find(wf => wf.id === data.id) !== undefined} + /> + {newname} + + +
    • + ) + }} renderInput={(params) => { return ( - ); }} /> - : null} + : null} + + {}}> + Try it out + + + + {/* - {/*subcase.matches.length > 0 ? - - {subcase.matches.map((workflow, workflowindex) => { - return ( - - - - ) - })} - - : -
    - - No workflow selected yet. - -
    - */} {subcase.extra_buttons !== undefined && subcase.extra_buttons !== null && subcase.extra_buttons.length > 0 ?
    @@ -852,15 +916,9 @@ const UsecaseListComponent = ({keys, isCloud, globalUrl, frameworkData, isLogged {}}> See other Public Workflows for {} - {/* -
    - - No workflows yet. - -
    - */}
    + */}
    }
    { paddingBottom: "30px", paddingTop: "30px", position: "relative", - backgroundColor: theme.palette.inputColor, textAlign: "left", marginTop: 15, }} @@ -331,17 +330,25 @@ const LoginDialog = (props) => { variant="body2" style={{ marginBottom: 20, color: "white" }} > - 1. Make sure shuffle-database folder has correct access:{" "} + 1. Make sure shuffle-database folder has correct access, and that you have a minimum of 2Gb of RAM available:{" "}

    sudo chown 1000:1000 -R shuffle-database - - 2. Restart docker-compose: + 2. Disable memory swap on the host +
    +
    + sudo swapoff -a +     + + 3. Restart docker-compose:

    sudo docker-compose restart @@ -513,7 +520,7 @@ const LoginDialog = (props) => { //id="sso_button" const ssoBtn = document.getElementById("sso_button"); if (ssoBtn !== undefined && ssoBtn !== null) { - console.log("SSO BTN: ", ssoBtn) + //console.log("SSO BTN: ", ssoBtn) const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search; var tmpView = new URLSearchParams(cursearch).get("autologin"); if (tmpView !== undefined && tmpView !== null) { @@ -527,7 +534,7 @@ const LoginDialog = (props) => { }, 200); }, [ssoUrl]) - return
    {loadedCheck}
    ; + return
    {loadedCheck}
    ; }; export default LoginDialog; diff --git a/frontend/src/views/UpdateAuthentication.jsx b/frontend/src/views/UpdateAuthentication.jsx index a0d0f485..054244c3 100644 --- a/frontend/src/views/UpdateAuthentication.jsx +++ b/frontend/src/views/UpdateAuthentication.jsx @@ -26,7 +26,7 @@ const SetAuthentication = (props) => { //const alert = useAlert(); const parseIncomingOpenapiData = (data) => { - if (data.app === undefined || data.app === null) { + if (data.app === undefined || data.app === null) { return } @@ -43,11 +43,11 @@ const SetAuthentication = (props) => { parsedapp.name = parsedapp.name.replaceAll("_", " "); setApp(parsedapp); - document.title = parsedapp.name + " App Auth"; + document.title = parsedapp.name + " App Auth"; } - console.log("App: ", app) + console.log("App: ", app) const getApp = (appid) => { if (serverside === true) { @@ -64,21 +64,21 @@ const SetAuthentication = (props) => { }) .then((response) => { if (response.status !== 200) { - if (isCloud) { - ReactGA.event({ - category: "appauth", - action: `app_not_found`, - label: appid, - }); - } + if (isCloud) { + ReactGA.event({ + category: "appauth", + action: `app_not_found`, + label: appid, + }); + } } else { - if (isCloud) { - ReactGA.event({ - category: "appauth", - action: `app_found`, - label: appid, - }); - } + if (isCloud) { + ReactGA.event({ + category: "appauth", + action: `app_found`, + label: appid, + }); + } } return response.json(); diff --git a/frontend/src/views/Welcome.jsx b/frontend/src/views/Welcome.jsx index 749aa95b..eed2ad8f 100644 --- a/frontend/src/views/Welcome.jsx +++ b/frontend/src/views/Welcome.jsx @@ -23,6 +23,7 @@ import { } from '@mui/material'; import theme from '../theme.jsx'; import { useNavigate, Link } from "react-router-dom"; +import ArrowBackIosIcon from '@mui/icons-material/ArrowBackIos'; import Drift from "react-driftjs"; const Welcome = (props) => { @@ -301,44 +302,47 @@ const Welcome = (props) => { flex: 1, padding: 0, textAlign: "center", - maxWidth: 300, - minWidth: 300, + maxWidth: 275, + minWidth: 275, backgroundColor: theme.palette.surfaceColor, color: "white", borderRadius: theme.palette.borderRadius, } const actionObject = { - padding: "35px", - maxHeight: 300, - minHeight: 300, + padding: "25px", + maxHeight: 280, + minHeight: 280, borderRadius: theme.palette.borderRadius, } const imageStyle = { - width: 150, + width: 70, // height: 150, // margin: "auto", // marginTop: 10, - borderRadius: 75, + marginBottom: 18, + // borderRadius: 75, objectFit: "scale-down", } const buttonStyle = { - borderRadius: 8, + borderRadius: 200, height: 51, width: 464, fontSize: 16, - background: "linear-gradient(89.83deg, #FF8444 0.13%, #F2643B 99.84%)", + // background: "linear-gradient(89.83deg, #FF8444 0.13%, #F2643B 99.84%)", + background: "linear-gradient(90deg, #F86744 0%, #F34475 100%)", padding: "16px 24px", - top: 75, + top: 105, margin: "auto", itemAlign: "center", + marginLeft: "65px", } const defaultImage = "/images/experienced.png" const experienced_image = userdata !== undefined && userdata !== null && userdata.active_org !== undefined && userdata.active_org.image !== undefined && userdata.active_org.image !== null && userdata.active_org.image !== "" ? userdata.active_org.image : defaultImage return ( -
    +
    {/*
    @@ -346,7 +350,7 @@ const Welcome = (props) => { */} {showWelcome === true ?
    -
    + {/*
    { ) })} -
    - +
    */} +
    {/* @@ -414,7 +418,7 @@ const Welcome = (props) => { />
    - {frameworkData === undefined || window.location.href.includes("tab=1") || window.location.href.includes("tab=3") ? null : + {/* {frameworkData === undefined || window.location.href.includes("tab=1") || window.location.href.includes("tab=3") ? null :
    App Framework @@ -439,32 +443,35 @@ const Welcome = (props) => { />
    - } + } */}
    : -
    - {/* -
    - { - navigate("/login") +
    + + {/*
    + { + navigate("/workflows") }}/> - { - navigate("/login") + { + navigate("/workflows") }}> Back -
    - */} - +
    */} + + Help us get to know you - - We will use this information to personalize your automation + + Let us help you create a smoother journey. + {/* + We will use this information to personalize your automation + */}
    -
    +
    { if (isCloud) { ReactGA.event({ @@ -506,7 +513,7 @@ const Welcome = (props) => { navigate("/workflows?message=Skipped intro") }}> - + Experienced @@ -517,17 +524,22 @@ const Welcome = (props) => {
    - {/* -
    + +
    - */} + -
    { + + {/*
    { if (window.drift !== undefined) { window.drift.api.startInteraction({ interactionId: 340045 }) } else { @@ -537,7 +549,7 @@ const Welcome = (props) => { Want a demo instead? -
    +
    */}
    } diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx index 476dd9fc..59ffd078 100755 --- a/frontend/src/views/Workflows.jsx +++ b/frontend/src/views/Workflows.jsx @@ -11,13 +11,13 @@ import { isMobile } from "react-device-detect" import { Badge, - Divider, + Divider, Avatar, Drawer, Grid, - InputLabel, - Select, - ListSubheader, + InputLabel, + Select, + ListSubheader, Paper, Tooltip, Button, @@ -533,7 +533,6 @@ const Workflows = (props) => { document.title = "Shuffle - Workflows"; let navigate = useNavigate(); - //const alert = useAlert(); const classes = useStyles(theme); const imgSize = 60; @@ -590,6 +589,9 @@ const Workflows = (props) => { const [drawerOpen, setDrawerOpen] = React.useState(false) const [videoViewOpen, setVideoViewOpen] = React.useState(false) const [gettingStartedItems, setGettingStartedItems] = React.useState([]) + const [selectedWorkflowIndexes, setSelectedWorkflowIndexes] = React.useState([]) + + const [apps, setApps] = React.useState([]); const drawerWidth = drawerOpen ? 325 : 0 @@ -725,6 +727,30 @@ const Workflows = (props) => { } }; + const getApps = () => { + fetch(`${globalUrl}/api/v1/apps`, { + method: "GET", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + credentials: "include", + }) + .then((response) => { + if (response.status !== 200) { + console.log("Status not 200 for apps :O!"); + } + + return response.json(); + }) + .then((responseJson) => { + setApps(responseJson); + }) + .catch((error) => { + console.log("App loading error: "+error.toString()); + }); + } + const addFilter = (data) => { if (data === null || data === undefined) { console.log("No filter data") @@ -891,13 +917,15 @@ const Workflows = (props) => { backgroundColor: theme.palette.surfaceColor, color: "white", minWidth: 500, + padding: 50, }, }} >
    - Are you sure you want to delete this workflow?
    - Other workflows relying on this one may stop working + Are you sure you want to delete {selectedWorkflowId.length > 0 ? filteredWorkflows.find((w) => w.id === selectedWorkflowId).name : `${selectedWorkflowIndexes.length} workflow${selectedWorkflowIndexes.length === 1 ? '' : 's'}`}?
    + + Other workflows relying on {selectedWorkflowIndexes.length > 0 ? "them" : "it"} one will stop working
    { setTimeout(() => { getAvailableWorkflows(); }, 1000); - } + } else if (selectedWorkflowIndexes.length > 0) { + // Do backwards so it doesn't change + for (var i = selectedWorkflowIndexes.length - 1; i >= 0; i--) { + const workflow = filteredWorkflows[selectedWorkflowIndexes[i]-1] + if (workflow !== undefined && workflow !== null && workflow.id !== undefined && workflow.id !== null) { + deleteWorkflow(workflow.id); + } + } + + setTimeout(() => { + getAvailableWorkflows(); + }, 1000); + + setSelectedWorkflowIndexes([]); + } setDeleteModalOpen(false); }} color="primary" @@ -1115,9 +1157,9 @@ const Workflows = (props) => { // Ensures the zooming happens only once per load setTimeout(() => { - fetchUsecases(newarray) - setFirstLoad(false) - }, 100) + fetchUsecases(newarray) + setFirstLoad(false) + }, 100) } else { if (isLoggedIn) { @@ -1223,8 +1265,9 @@ const Workflows = (props) => { setView(tmpView); } + getApps() getAvailableWorkflows(); - getFramework() + getFramework() } }, []) @@ -1280,6 +1323,7 @@ const Workflows = (props) => { color: "white", margin: "10px", backgroundColor: theme.palette.surfaceColor, + position: "relative", }; const workflowActionStyle = { @@ -1708,21 +1752,22 @@ const Workflows = (props) => { { - event.stopPropagation() - ReactDOM.unstable_batchedUpdates(() => { - setModalOpen(true); - setEditingWorkflow(JSON.parse(JSON.stringify(data))); - setNewWorkflowName(data.name); - setNewWorkflowDescription(data.description); - setDefaultReturnValue(data.default_return_value); - if (data.tags !== undefined && data.tags !== null) { - setNewWorkflowTags(JSON.parse(JSON.stringify(data.tags))); - } + event.stopPropagation() + ReactDOM.unstable_batchedUpdates(() => { + setIsEditing(true) + setModalOpen(true); + setEditingWorkflow(JSON.parse(JSON.stringify(data))); + setNewWorkflowName(data.name); + setNewWorkflowDescription(data.description); + setDefaultReturnValue(data.default_return_value); + if (data.tags !== undefined && data.tags !== null) { + setNewWorkflowTags(JSON.parse(JSON.stringify(data.tags))); + } - if (data.usecase_ids !== undefined && data.usecase_ids !== null && data.usecase_ids.length > 0) { - setSelectedUsecases(data.usecase_ids) - } - }) + if (data.usecase_ids !== undefined && data.usecase_ids !== null && data.usecase_ids.length > 0) { + setSelectedUsecases(data.usecase_ids) + } + }) }} key={"change"} > @@ -2654,6 +2699,7 @@ const Workflows = (props) => { renderCell: (params) => {}, }, ]; + let rows = []; rows = filteredWorkflows.map((data, index) => { let obj = { @@ -2671,17 +2717,55 @@ const Workflows = (props) => { className={classes.datagrid} rows={rows} columns={columns} - pageSize={20} + pageSize={25} checkboxSelection autoHeight density="standard" + onSelectionModelChange={(newSelection) => { + //setSelectedWorkflows(newSelection.selectionModel); + console.log(newSelection) + + setSelectedWorkflowIndexes(newSelection) + }} + selectionModel={selectedWorkflowIndexes} components={{ Toolbar: GridToolbar, }} /> ); } - return
    {workflowData}
    ; + return ( +
    + + { + setModalOpen(true) + setIsEditing(false) + }} + > + + + + {filteredWorkflows.length === 0 ? null : + { + setDeleteModalOpen(true) + }} + > + + + + + } + {workflowData} +
    + ) }; var total_count = 0 @@ -3152,70 +3236,20 @@ const Workflows = (props) => { const WorkflowView = () => { if (workflows.length === 0) { - // Not going there yet - //if ((userdata.tutorials !== undefined && userdata.tutorials !== null && !userdata.tutorials.includes("getting-started")) || userdata.tutorials === null) { - // return ; - //} - //return ( - //
    - // - //
    - //

    Welcome to Shuffle

    - //
    - //
    - //

    - // Shuffle is a flexible, easy to use, automation platform - // allowing users to integrate their services and devices freely. - // It's made to significantly reduce the amount of manual labor, - // and is focused on security applications.{" "} - // - // Click here to learn more. - // - //

    - //
    - //
    - // If you want to jump straight into it, click here to create your - // first workflow: - //
    - //
    - // - // - // - // ..OR - // - // {workflowButtons} - // - //
    - //     - //
    - //) } - var workflowDelay = -150 - var appDelay = -75 + var workflowDelay = -150 + var appDelay = -75 - const foundPriority = userdata === undefined || userdata === null ? null : userdata.priorities.find(prio => prio.type === "usecase" && prio.active === true) + const foundPriority = userdata === undefined || userdata === null ? null : userdata.priorities.find(prio => prio.type === "usecase" && prio.active === true) return (
    - - Workflows - + + Workflows +
    {/*
    @@ -3243,6 +3277,7 @@ const Workflows = (props) => { minWidth: 275, }, }} + rows={1} placeholder="Filter Workflows" color="primary" fullWidth @@ -3268,53 +3303,6 @@ const Workflows = (props) => { {workflowButtons}
    - {/* -
    -
    -
    -
    -
    -
    {workflows.length}
    -
    ACTIVE WORKFLOWS
    -
    -
    -
    -
    -
    -
    -
    -
    {workflows.length}
    -
    AVAILABE WORKFLOWS
    -
    -
    -
    -
    -
    -
    -
    -
    {workflows.length}
    -
    NOTIFICATIONS
    -
    -
    -
    -
    - */} - - {/* - chipRenderer={({ value, isFocused, isDisabled, handleClick, handleRequestDelete }, key) => { - console.log("VALUE: ", value) - - return ( - - {value} - - ) - }} - */}
    {!isMobile && usecases !== null && usecases !== undefined && usecases.length > 0 ? @@ -3772,12 +3760,12 @@ const Workflows = (props) => { } const gettingStartedDrawer = - { {modalOpen === true ? { isEditing={isEditing} workflows={workflows} + apps={apps} setWorkflows={setWorkflows} /> : null} diff --git a/functions/onprem/worker/build.sh b/functions/onprem/worker/build.sh index a379f69c..1c58cfda 100755 --- a/functions/onprem/worker/build.sh +++ b/functions/onprem/worker/build.sh @@ -1,5 +1,5 @@ NAME=shuffle-worker -VERSION=1.2.1 +VERSION=1.2.2 echo "Running docker build with $NAME:$VERSION" #CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker.bin . @@ -11,10 +11,10 @@ docker build . -t frikky/shuffle:$NAME -t frikky/shuffle:$NAME_$VERSION -t docke #docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION #docker tag frikky/shuffle:0.8.51 ghcr.io/frikky/shuffle-worker:0.8.5 #docker tag frikky/shuffle:$NAME ghcr.io/frikky/shuffle-worker:0.8.52 -docker push frikky/shuffle:$NAME -docker push ghcr.io/frikky/$NAME:$VERSION -docker push ghcr.io/frikky/$NAME:nightly - -docker push shuffle/shuffle:$NAME -docker push ghcr.io/shuffle/$NAME:$VERSION -docker push ghcr.io/shuffle/$NAME:nightly +#docker push frikky/shuffle:$NAME +#docker push ghcr.io/frikky/$NAME:$VERSION +#docker push ghcr.io/frikky/$NAME:nightly +# +#docker push shuffle/shuffle:$NAME +#docker push ghcr.io/shuffle/$NAME:$VERSION +#docker push ghcr.io/shuffle/$NAME:nightly diff --git a/functions/onprem/worker/go.mod b/functions/onprem/worker/go.mod index f6b1406e..3916e197 100755 --- a/functions/onprem/worker/go.mod +++ b/functions/onprem/worker/go.mod @@ -11,7 +11,7 @@ require ( github.com/gorilla/mux v1.8.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/satori/go.uuid v1.2.0 - github.com/shuffle/shuffle-shared v0.4.17 + github.com/shuffle/shuffle-shared v0.4.50 ) require ( @@ -47,16 +47,18 @@ require ( github.com/morikuni/aec v1.0.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect + github.com/opensearch-project/opensearch-go v1.1.0 // indirect + github.com/opensearch-project/opensearch-go/v2 v2.3.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect go.opencensus.io v0.24.0 // indirect go4.org v0.0.0-20201209231011-d4a079459e60 // indirect - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect + golang.org/x/crypto v0.1.0 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect + golang.org/x/net v0.7.0 // indirect golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect - golang.org/x/sys v0.1.0 // indirect - golang.org/x/text v0.5.0 // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.1.12 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.106.0 // indirect diff --git a/functions/onprem/worker/go.sum b/functions/onprem/worker/go.sum index 6cfb1be4..23d2ba9e 100755 --- a/functions/onprem/worker/go.sum +++ b/functions/onprem/worker/go.sum @@ -60,17 +60,34 @@ github.com/adrg/strutil v0.2.3 h1:WZVn3ItPBovFmP4wMHHVXUr8luRaHrbyIuLlHt32GZQ= github.com/adrg/strutil v0.2.3/go.mod h1:+SNxbiH6t+O+5SZqIj5n/9i5yUjR+S3XXVrjEcN2mxg= github.com/algolia/algoliasearch-client-go/v3 v3.18.1 h1:FP2Xtqqs/sefR5Qluygp+jVV+juXzEdJaPrZTCDLhDQ= github.com/algolia/algoliasearch-client-go/v3 v3.18.1/go.mod h1:i7tLoP7TYDmHX3Q7vkIOL4syVse/k5VJ+k0i8WqFiJk= +github.com/aws/aws-sdk-go v1.42.27/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= +github.com/aws/aws-sdk-go v1.44.263/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= +github.com/aws/aws-sdk-go-v2/config v1.18.25/go.mod h1:dZnYpD5wTW/dQF0rRNLVypB396zWCcPiBIvdvSWHEg4= +github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk= +github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8= +github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822 h1:hjXJeBcAMS1WGENGqDpzvmgS43oECTx8UXq31UBu0Jw= github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013 h1:/P9/RL0xgWE+ehnCUUN5h3RpG3dmoMCOONO1CCvq23Y= github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013/go.mod h1:pccXHIvs3TV/TUqSNyEvF99sxjX2r4FFRIyw6TZY9+w= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -86,6 +103,7 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/frikky/go-elasticsearch/v8 v8.13.1 h1:GB+Wr0Yx8efG7D1jc9fGGiqjjRRngWJTcMSua3QIDaM= github.com/frikky/go-elasticsearch/v8 v8.13.1/go.mod h1:RPq0JXPQVVSFHTlPwj/go8BZ1hegRf+StaSpT2iGIoQ= @@ -144,6 +162,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-github/v28 v28.1.1 h1:kORf5ekX5qwXO2mGzXXOjMe/g6ap8ahVe0sBEulhSxo= @@ -155,6 +174,7 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1 h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -181,6 +201,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -201,6 +223,10 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opensearch-project/opensearch-go v1.1.0 h1:eG5sh3843bbU1itPRjA9QXbxcg8LaZ+DjEzQH9aLN3M= +github.com/opensearch-project/opensearch-go v1.1.0/go.mod h1:+6/XHCuTH+fwsMJikZEWsucZ4eZMma3zNSeLrTtVGbo= +github.com/opensearch-project/opensearch-go/v2 v2.3.0 h1:nQIEMr+A92CkhHrZgUhcfsrZjibvB3APXf2a1VwCmMQ= +github.com/opensearch-project/opensearch-go/v2 v2.3.0/go.mod h1:8LDr9FCgUTVoT+5ESjc2+iaZuldqE+23Iq0r1XeNue8= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -222,6 +248,8 @@ github.com/shuffle/shuffle-shared v0.4.9 h1:mGCaLcSbrsQCy26pJXPlZAtitEzEEwqotGNj github.com/shuffle/shuffle-shared v0.4.9/go.mod h1:jQrYySmvp/0De5ftrAaY6xwwr7TMfqBmBxQ2AX9yrjQ= github.com/shuffle/shuffle-shared v0.4.17 h1:56ll366bdmIJu/7GFqNC2XTjjl0SGBf430PSq+EB6Ro= github.com/shuffle/shuffle-shared v0.4.17/go.mod h1:jQrYySmvp/0De5ftrAaY6xwwr7TMfqBmBxQ2AX9yrjQ= +github.com/shuffle/shuffle-shared v0.4.50 h1:fJLfhWIJ5mYap4JwHnD/B5aaLyIULwylFSl3FoWlajM= +github.com/shuffle/shuffle-shared v0.4.50/go.mod h1:X613gbo0dT3fnYvXDRwjQZyLC+T49T2nSQOrCV5QMlI= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -235,10 +263,12 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -256,6 +286,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -322,8 +354,14 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -344,6 +382,7 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -375,17 +414,31 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=