+
+ {/*
-
-
-
-
-
+
+
+
+
+ */}
+
+
+
);
});
diff --git a/frontend/src/components/AppCreationModal.jsx b/frontend/src/components/AppCreationModal.jsx
index f5a25169..a9f8f598 100644
--- a/frontend/src/components/AppCreationModal.jsx
+++ b/frontend/src/components/AppCreationModal.jsx
@@ -22,7 +22,6 @@ import CreateIcon from '@mui/icons-material/Create'
import { toast } from 'react-toastify'
import YAML from "yaml";
-
const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
const [openApiModal, setOpenApiModal] = useState(false)
const [generateAppModal, setGenerateAppModal] = useState(false)
@@ -59,6 +58,7 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
: "1px solid rgba(255,255,255,0.3)",
borderImage: makeFancy ? "linear-gradient(to right, #ff8544 0%, #ec517c 50%, #9c5af2 100%) 1" : "none",
transition: 'all 0.2s ease-in-out',
+ paddingBottom: isCloud ? 0 : 175,
}
return (
@@ -256,26 +256,27 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
body: openApidata,
credentials: "include",
})
- .then((response) => {
+ .then((response) => {
- setValidation(false);
- return response.json();
- })
- .then((responseJson) => {
- if (responseJson.success) {
- setAppValidation(responseJson.id);
- } else {
- if (responseJson.reason !== undefined) {
- setOpenApiError(responseJson.reason);
- }
- toast("An error occurred in the response");
- }
- })
- .catch((error) => {
- setValidation(false);
- toast(error.toString());
- setOpenApiError(error.toString());
- });
+ setValidation(false);
+ return response.json();
+ })
+ .then((responseJson) => {
+ if (responseJson?.success === true) {
+ setAppValidation(responseJson?.id)
+ navigate(`/apps/new?id=${responseJson?.id}`)
+ } else {
+ if (responseJson.reason !== undefined) {
+ setOpenApiError(responseJson.reason)
+ }
+ toast("An error occurred in the response");
+ }
+ })
+ .catch((error) => {
+ setValidation(false);
+ toast(error.toString());
+ setOpenApiError(error.toString());
+ });
};
const redirectOpenApi = () => {
@@ -416,7 +417,7 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
App Authentication Groups
@@ -1415,13 +1420,14 @@ const AppAuthTab = memo((props) => { ); } )} - -
+
{
diff --git a/frontend/src/components/Billing.jsx b/frontend/src/components/Billing.jsx
index 577d249c..39e15706 100644
--- a/frontend/src/components/Billing.jsx
+++ b/frontend/src/components/Billing.jsx
@@ -77,6 +77,8 @@ const Billing = memo((props) => {
const [currentIndex, setCurrentIndex] = useState(0);
const [deleteAlertIndex, setDeleteAlertIndex] = useState(-1);
const [deleteAlertVerification, setDeleteAlertVerification] = useState(false);
+ const [isScale, setIsScale] = useState(false);
+
useEffect(() => {
if (userdata.app_execution_limit !== undefined && userdata.app_execution_usage !== undefined) {
const percentage = (userdata.app_execution_usage / userdata.app_execution_limit) * 100;
@@ -176,11 +178,10 @@ const Billing = memo((props) => {
padding: 20,
// maxWidth: 400,
width: 340,
- height: 480,
+ height: 'auto',
// width: "100%",
- backgroundColor: theme.palette.backgroundColor,
- borderRadius: theme.palette?.borderRadius * 2,
- border: "1px solid rgba(255,255,255,0.3)",
+ backgroundColor: "#1e1e1e",
+ borderRadius: 10,
marginRight: 10,
marginTop: 15,
}
@@ -361,7 +362,7 @@ const Billing = memo((props) => {
var showSupport = false
if (subscription.name.includes("default")) {
top_text = "Custom Contract"
- newPaperstyle.border = "1px solid rgba(255,255,255,0.3)"
+ // newPaperstyle.border = "1px solid rgba(255,255,255,0.3)"
showSupport = true
}
@@ -377,16 +378,17 @@ const Billing = memo((props) => {
if (subscription.name.includes("Scale")) {
top_text = "Scale access"
+ setIsScale(true)
}
if (highlight === true) {
// Add an "Upgrade now" button
- newPaperstyle.border = "1px solid rgba(255,255,255,0.3)"
+ // newPaperstyle.border = "1px solid rgba(255,255,255,0.3)"
}
- if (hovered) {
- newPaperstyle.backgroundColor = "#2b2b2b"
- }
+ // if (hovered) {
+ // newPaperstyle.backgroundColor = "#2b2b2b"
+ // }
const handleClickOpen = () => {
setOpenChangeEmailBox(true);
@@ -556,6 +558,7 @@ const Billing = memo((props) => {
+
{top_text === "Base Cloud Access" && userdata.has_card_available === true ?
{
{ }}
@@ -2013,7 +2016,33 @@ const Billing = memo((props) => {
: null}
-
+
Multi-Tenancy, Backups & Security
-
- Multi-Tenant Workflows. Make one workflow, and keep a separate, synced copy in all your tenants. Control distributed auth, runtime locations, files, datastore keys etc. (contact support@shuffler.io if you want a demo. Please try it!)
+ Control mechanisms for multi-tenancy, backups, and security.
- {userdata !== undefined && userdata !== null && userdata.orgs !== undefined && userdata.orgs !== null && userdata.orgs.length > 0 ?
+
+ Multi-Tenant Workflows
+
+
+
+ Make one workflow, and keep a separate, synced copy in your other tenants. Control distributed auth, runtime locations, files, datastore keys etc. Can only distribute from parent org to child org. Need help trying it? Contact us for a demo
+
+
+ {userdata !== undefined && userdata !== null && userdata.orgs !== undefined && userdata.orgs !== null && userdata.orgs.length > 0 ?
+
userdata.orgs.filter(org => org.creator_org === userdata.active_org.id).length === 0 ?
userdata.active_org.creator_org === undefined || userdata.active_org.creator_org === null || userdata.active_org.creator_org === "" ?
@@ -602,6 +610,7 @@ const EditWorkflow = (props) => {
multiple
style={{ marginTop: 10, }}
value={innerWorkflow.suborg_distribution === undefined || innerWorkflow.suborg_distribution === null ? ["none"] : innerWorkflow.suborg_distribution}
+ disabled={workflow?.parentorg_workflow !== undefined && workflow?.parentorg_workflow !== null && workflow?.parentorg_workflow.length > 0}
onChange={(e) => {
var newvalue = e.target.value
if (newvalue.length > 1 && newvalue[0] === "none") {
diff --git a/frontend/src/components/EnvironmentTab.jsx b/frontend/src/components/EnvironmentTab.jsx
index cd0a9416..15efd2fc 100644
--- a/frontend/src/components/EnvironmentTab.jsx
+++ b/frontend/src/components/EnvironmentTab.jsx
@@ -1420,7 +1420,7 @@ const EnvironmentTab = memo((props) => {
-
+
{
*/}
-
{/*isCloud &&
selectedOrganization.partner_info !== undefined &&
selectedOrganization.partner_info.reseller === true ? (
diff --git a/frontend/src/components/EditWorkflow.jsx b/frontend/src/components/EditWorkflow.jsx
index db9e073a..5f571110 100644
--- a/frontend/src/components/EditWorkflow.jsx
+++ b/frontend/src/components/EditWorkflow.jsx
@@ -579,12 +579,20 @@ const EditWorkflow = (props) => {
+ {isCloud &&
+ selectedOrganization.subscriptions !== undefined &&
+ selectedOrganization.subscriptions !== null &&
+ selectedOrganization.subscriptions.length > 0 &&
+ !isChildOrg ?
+ selectedOrganization.subscriptions
+ .reverse()
+ .map((sub, index) => {
+ return (
+
- {isCloud &&
- selectedOrganization.subscriptions !== undefined &&
- selectedOrganization.subscriptions !== null &&
- selectedOrganization.subscriptions.length > 0 &&
- !isChildOrg ?
- selectedOrganization.subscriptions
- .reverse()
- .map((sub, index) => {
- return (
-
{isCloud && billingInfo.subscription !== undefined && billingInfo.subscription !== null ? isChildOrg ? null :
{
isCloud={isCloud}
userdata={userdata}
stripeKey={stripeKey}
+ isScale={isScale}
{...props}
/>
: !isCloud ?
@@ -2061,6 +2091,7 @@ const Billing = memo((props) => {
isCloud={isCloud}
userdata={userdata}
stripeKey={stripeKey}
+ isScale={isScale}
/>
{/* {
/> */}
: null}
+
+
+
Self-Hosted Orborus instance
diff --git a/frontend/src/components/LeftSideBar.jsx b/frontend/src/components/LeftSideBar.jsx
index 432075ec..3c999dbe 100644
--- a/frontend/src/components/LeftSideBar.jsx
+++ b/frontend/src/components/LeftSideBar.jsx
@@ -87,21 +87,21 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
return orgOptions.find((option) => option.name === selectedOrg);
}, [selectedOrg, orgOptions]);
-//With this code it is opening search bar on google chrome search bar as well which is not required
-useEffect(() => {
- const handleKeyDown = (event) => {
- if ((event.ctrlKey || event.metaKey) && event.key === "k") {
- event.preventDefault();
- setSearchBarModalOpen((prev)=> !prev);
- }
- };
+ //With this code it is opening search bar on google chrome search bar as well which is not required
+ useEffect(() => {
+ const handleKeyDown = (event) => {
+ if ((event.ctrlKey || event.metaKey) && event.key === "k") {
+ event.preventDefault();
+ setSearchBarModalOpen((prev)=> !prev);
+ }
+ };
- window.addEventListener("keydown", handleKeyDown);
+ window.addEventListener("keydown", handleKeyDown);
- return () => {
- window.removeEventListener("keydown", handleKeyDown);
- };
-}, [setSearchBarModalOpen]);
+ return () => {
+ window.removeEventListener("keydown", handleKeyDown);
+ };
+ }, [setSearchBarModalOpen]);
const CustomPopper = (props) => {
return (
@@ -155,6 +155,7 @@ useEffect(() => {
>
{props.children}
+
{
marginLeft: 5,
}}
>
+
+ {expandLeftNav &&
+
+ }
{
};
export default LeftSideBar;
-
-
const ModalView = memo(({searchBarModalOpen, setSearchBarModalOpen, globalUrl, serverside, userdata}) => {
return (
(
diff --git a/frontend/src/components/LicencePopup.jsx b/frontend/src/components/LicencePopup.jsx
index c29095e4..9492ae99 100644
--- a/frontend/src/components/LicencePopup.jsx
+++ b/frontend/src/components/LicencePopup.jsx
@@ -46,7 +46,7 @@ import { handlePayasyougo } from "../views/HandlePaymentNew.jsx"
import Billing from "./Billing.jsx";
const LicencePopup = (props) => {
- const { globalUrl, userdata, serverside, billingInfo, stripeKey, setModalOpen, isLoggedIn, isMobile, selectedOrganization, isCloud } = props;
+ const { globalUrl, userdata, serverside, billingInfo, stripeKey, setModalOpen, isScale, isLoggedIn, isMobile, selectedOrganization, isCloud } = props;
//const alert = useAlert();
let navigate = useNavigate();
const [selectedDealModalOpen, setSelectedDealModalOpen] = React.useState(false);
@@ -165,11 +165,25 @@ const LicencePopup = (props) => {
]
}
+ if (userdata?.app_execution_limit >= 300000) {
+ subscription.name = "Enterprise"
+ subscription.currency_text = "$"
+ subscription.price = typecost_single
+ subscription.limit = userdata?.app_execution_limit
+ subscription.interval = "app run / month"
+ subscription.features = [
+ "Includes " + (userdata?.app_execution_limit/1000) + "K 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"
+ top_text = "Enterprise Plan"
- newPaperstyle.border = "1px solid #f85a3e"
+ // newPaperstyle.border = "1px solid #f85a3e"
}
var showSupport = false
@@ -255,7 +269,7 @@ const LicencePopup = (props) => {
style={{ borderRadius: theme.palette?.borderRadius, }}
placement="bottom"
>
- {
+ if (isCloud) {
+ ReactGA.event({
+ category: "navbar",
+ action: "search_icon_click",
+ label: "search_icon_click",
+ })
+ }
+ setSearchBarModalOpen(true);
+ }}
+ >
+
+
+
+
+ )}
+
+
+
+ );
+};
+
+export default Navbar;
diff --git a/frontend/src/components/RuntimeDebugger.jsx b/frontend/src/components/RuntimeDebugger.jsx
index 2209ad4c..62f8de0e 100644
--- a/frontend/src/components/RuntimeDebugger.jsx
+++ b/frontend/src/components/RuntimeDebugger.jsx
@@ -359,7 +359,7 @@ const RuntimeDebugger = (props) => {
imageSource = "/images/no_image.png"
}
}else {
- if (userdata.active_org.image?.length > 0){
+ if (userdata?.active_org.image?.length > 0){
imageSource = userdata?.active_org?.image
}else {
imageSource = "/images/no_image.png"
diff --git a/frontend/src/components/TenantsTab.jsx b/frontend/src/components/TenantsTab.jsx
index 0d8c3df2..907c982e 100644
--- a/frontend/src/components/TenantsTab.jsx
+++ b/frontend/src/components/TenantsTab.jsx
@@ -497,7 +497,9 @@ const TenantsTab = memo((props) => {
response.json().then((responseJson) => {
if (responseJson["success"] === false) {
if (responseJson.reason !== undefined) {
- toast(responseJson.reason);
+ toast.error(responseJson.reason, {
+ autoClose: 5000,
+ })
} else {
toast("Failed creating suborg. Please try again");
}
@@ -781,9 +783,9 @@ const TenantsTab = memo((props) => {
+
setHovered(true)}
@@ -343,9 +357,9 @@ const LicencePopup = (props) => {
-
+ {subscription.active === true && !isScale && }
{
+ if (isCloud) {
+ ReactGA.event({
+ category: "navbar",
+ action: "search_icon_click",
+ label: "search_icon_click",
+ })
+ }
+ setSearchBarModalOpen(true);
+ }}
+ >
+
+
+ {isCloud && (userdata.org_status === undefined || userdata.org_status === null || userdata.org_status.length === 0) ?
+
+ : null}
+
+
+ {/* Organization Dropdown */}
+ {/* */}
+
+ {/* User Avatar Menu */}
+ {
+ if (isCloud) {
+ ReactGA.event({
+ category: "navbar",
+ action: "click_user_menu",
+ label: "open_user_dropdown"
+ });
+ }
+ handleOpenUserMenu(e);
+ }}
+ sx={{
+ padding: 0,
+ "&:hover": {
+ backgroundColor: "rgba(47, 47, 47, 0.5)",
+ },
+ }}
+ >
+
+
+
+
+
+
+ )}
+
+ ) : (
+ <>
+
+
+ }
+ placement="bottom"
+ arrow
+ componentsProps={{
+ tooltip: {
+ sx: {
+ backgroundColor: "rgba(33, 33, 33, 1)",
+ color: "rgba(241, 241, 241, 1)",
+ fontSize: 12,
+ border: "1px solid rgba(73, 73, 73, 1)",
+ fontFamily: theme?.typography?.fontFamily,
+ }
+ },
+ popper: {
+ sx: {
+ zIndex: 1000019,
+ }
+ }
+ }}
+ >
+
- {top_text === "Base Cloud Access" && userdata.has_card_available === true ?
+ {top_text === "Base Cloud Access" && userdata.has_card_available === true && !isScale ?
{
"While you have a card attached to your account, Shuffle will no longer prevent workflows from running. Billing will occur at the start of each month."
:
isCloud ?
- `You are not subscribed to any plan and are using the free plan with max 10,000 app runs per month. Upgrade to deactivate this limit.`
+ userdata?.app_execution_limit && userdata?.app_execution_limit >= 300000 ?
+ "You have subscribed to the Enterprise plan, which includes " + (userdata?.app_execution_limit/1000) + "K app runs/month. You can increase the limit by upgrading current plan. Contact support@shuffler.io for more information." :
+ `You are not subscribed to any plan and are using the free plan with max 10,000 app runs per month. Upgrade to deactivate this limit.`
+
:
`You are not subscribed to any plan and are using the free, open source plan. This plan has no enforced limits, but scale issues may occur due to CPU congestion.`
}
@@ -699,8 +716,33 @@ const LicencePopup = (props) => {
setCalculatedCost("$960")
setSelectedValue(8)
} else {
- setCalculatedCost("$960")
- setSelectedValue(300)
+ if (userdata && userdata?.app_execution_limit) {
+ if (userdata.app_execution_limit >= 300000 && userdata.app_execution_limit < 400000) {
+ setSelectedValue(400)
+ setCalculatedCost("$1280")
+ }else if (userdata?.app_execution_limit >= 400000 && userdata?.app_execution_limit < 500000) {
+ setSelectedValue(500)
+ setCalculatedCost("$1600")
+ } else if (userdata?.app_execution_limit >= 500000 && userdata?.app_execution_limit < 600000) {
+ setSelectedValue(600)
+ setCalculatedCost("$1920")
+ } else if (userdata?.app_execution_limit >= 600000 && userdata?.app_execution_limit < 700000) {
+ setSelectedValue(700)
+ setCalculatedCost("$2240")
+ } else if (userdata?.app_execution_limit >= 700000 && userdata?.app_execution_limit < 800000) {
+ setSelectedValue(800)
+ setCalculatedCost("$2560")
+ } else if (userdata?.app_execution_limit >= 800000 && userdata?.app_execution_limit < 900000) {
+ setSelectedValue(900)
+ setCalculatedCost("$2880")
+ }else {
+ setCalculatedCost("$960")
+ setSelectedValue(300)
+ }
+ }else {
+ setCalculatedCost("$960")
+ setSelectedValue(300)
+ }
}
}, [shuffleVariant])
@@ -864,10 +906,14 @@ const LicencePopup = (props) => {
return
}
- const priceItem = window.location.origin === "https://shuffler.io" ?
- shuffleVariant === 0 ? "app_executions" : "cores"
- :
- shuffleVariant === 0 ? "price_1PZPSSEJjT17t98NLJoTMYja" : "price_1PZPQuEJjT17t98N3yORUtd9"
+ const priceItem =
+ window.location.origin === "https://shuffler.io/" || "https://sandbox.shuffler.io/"
+ ? shuffleVariant === 0
+ ? "app_executions"
+ : "cores"
+ : shuffleVariant === 0
+ ? "price_1PZPSSEJjT17t98NLJoTMYja"
+ : "price_1PZPQuEJjT17t98N3yORUtd9";
const successUrl = `${window.location.origin}/admin?admin_tab=billingstats&payment=success`
const failUrl = `${window.location.origin}/admin?admin_tab=billingstats&payment=failure`
@@ -973,7 +1019,7 @@ const LicencePopup = (props) => {
: null}
- {isCloud &&
+ {/* {isCloud &&
selectedOrganization.subscriptions !== undefined &&
selectedOrganization.subscriptions !== null &&
selectedOrganization.subscriptions.length > 0 ?
@@ -994,7 +1040,7 @@ const LicencePopup = (props) => {
/>
)
})
- : null}
+ : null} */}
@@ -1002,12 +1048,12 @@ const LicencePopup = (props) => {
{shuffleVariant === 1 ? "Scale" : "Enterprise"}
diff --git a/frontend/src/components/Navbar.jsx b/frontend/src/components/Navbar.jsx
new file mode 100644
index 00000000..c3cca3f8
--- /dev/null
+++ b/frontend/src/components/Navbar.jsx
@@ -0,0 +1,2587 @@
+import React, { useEffect, useState } from "react";
+import { Link, useNavigate } from "react-router-dom";
+import {
+ AppBar,
+ Box,
+ Toolbar,
+ IconButton,
+ Typography,
+ Menu,
+ MenuItem,
+ Button,
+ Container,
+ useTheme,
+ useMediaQuery,
+ Divider,
+ alpha,
+ Avatar,
+ Select,
+ Tooltip,
+ DialogTitle,
+ DialogContent,
+ Dialog,
+ Slide,
+ Collapse
+} from "@mui/material";
+import MenuIcon from "@mui/icons-material/Menu";
+import { Close as CloseIcon, Folder as FolderIcon, Code as CodeIcon, LibraryBooks as LibraryBooksIcon } from '@mui/icons-material'
+import SearchBox from "../components/SearchData.jsx";
+import ReactGA from "react-ga4";
+import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
+import KeyboardCommandKeyIcon from '@mui/icons-material/KeyboardCommandKey';
+import SearchIcon from "@mui/icons-material/Search";
+// import SearchField from "../components/Searchfield.jsx";
+import { toast } from "react-toastify";
+import AddIcon from '@mui/icons-material/Add';
+import Mousetrap from "mousetrap";
+import LicencePopup from "../components/LicencePopup.jsx";
+
+const curpath = (typeof window !== "undefined" && window.location && typeof window.location.pathname === "string")
+? window.location.pathname
+: "";
+
+// Menu Data Structure
+const menuData = {
+ Products: [
+ {
+ title: "Shuffle",
+ description:
+ "The most versatile automation engine with focus on security.",
+ icon: "images/icons/shuffleLogo.svg",
+ path: "/docs/about",
+ gaData: {
+ category: "navbar",
+ action: "products_click",
+ label: "shuffle_logo_click"
+ }
+ },
+ {
+ title: "Singul",
+ description:
+ "Connect and run actions seamlessly between different platforms.",
+ icon: "/images/logos/singul.svg",
+ path: "https://singul.io/",
+ gaData: {
+ category: "navbar",
+ action: "products_click",
+ label: "singul_click"
+ }
+ },
+ {
+ title: "API Explorer",
+ description:
+ "Explore, run and automate APIs from over 2500 platforms.",
+ icon: "/images/icons/API.svg",
+ path: "/apis",
+ gaData: {
+ category: "navbar",
+ action: "products_click",
+ label: "api_explorer_click"
+ }
+ },
+ ],
+ Services: [
+ {
+ title: "Professional Services",
+ description:
+ "Professional Services help you solve problems at your convenience.",
+ icon: "/images/ProfessionalServices.svg",
+ path: "/professional-services",
+ gaData: {
+ category: "navbar",
+ action: "services_click",
+ label: "professional_services_click"
+ }
+ },
+ {
+ title: "Support",
+ description:
+ "Support to help you build automations with confidence.",
+ icon: "/images/Support.svg",
+ path: "/contact?category=support",
+ gaData: {
+ category: "navbar",
+ action: "services_click",
+ label: "support_click"
+ }
+ },
+ {
+ title: "Training",
+ description:
+ "Tailored to provide hands-on learning of Shuffle for automation mastery.",
+ icon: "/images/Training.svg",
+ path: "/training",
+ gaData: {
+ category: "navbar",
+ action: "services_click",
+ label: "training_click"
+ }
+ },
+ {
+ title: "Security Consultation",
+ description:
+ "Automate your infrastructure with expert guidance and tailored solutions.",
+ icon: "/images/SecurityConsultation.svg",
+ path: "/contact?category=security_consultation",
+ gaData: {
+ category: "navbar",
+ action: "services_click",
+ label: "security_consultation_click"
+ }
+ },
+ ],
+ Resources: {
+ columns: [
+ {
+ title: "Platform",
+ items: [
+ {
+ title: "Usecases",
+ icon: "/images/icons/usecases.svg",
+ hoverIcon: "/images/icons/usecases_hover.svg",
+ link: "/usecases",
+ gaData: {
+ category: "navbar",
+ action: "resources_click",
+ label: "usecases_click"
+ }
+ },
+ {
+ title: "Documentation",
+ icon: "/images/icons/docs.svg",
+ hoverIcon: "/images/icons/docs_hover.svg",
+ link: "/docs/about",
+ gaData: {
+ category: "navbar",
+ action: "resources_click",
+ label: "documentation_click"
+ }
+ },
+ { title: "FAQ", icon: "/images/icons/faq.svg", hoverIcon: "/images/icons/faq_hover.svg", link: "/faq", gaData: { category: "navbar", action: "resources_click", label: "faq" } },
+ ],
+ },
+ {
+ title: "Company",
+ items: [
+ {
+ title: "About us",
+ icon: "/images/icons/about_us.svg",
+ hoverIcon: "/images/icons/about_us_hover.svg",
+ link: "/docs/about",
+ gaData: {
+ category: "navbar",
+ action: "resources_click",
+ label: "about_us_click"
+ }
+ },
+ {
+ title: "Articles",
+ icon: "/images/icons/articles.svg",
+ hoverIcon: "/images/icons/articles_hover.svg",
+ link: "/articles/2.0_release",
+ gaData: {
+ category: "navbar",
+ action: "resources_click",
+ label: "articles_click"
+ }
+ },
+ {
+ title: "Contact Us",
+ icon: "/images/icons/contact_us.svg",
+ hoverIcon: "/images/icons/contact_us_hover.svg",
+ link: "/contact?category=contact",
+ gaData: {
+ category: "navbar",
+ action: "resources_click",
+ label: "contact_us_click"
+ }
+ },
+ ],
+ },
+ {
+ title: "Join the community",
+ social: true,
+ platforms: [
+ { name: "Discord", icon: "/images/icons/discord.svg", link: "https://discord.gg/B2CBzUm", gaData: { category: "navbar", action: "social_click", label: "discord_icon_click" } },
+ { name: "GitHub", icon: "/images/icons/github.svg", link: "https://github.com/shuffle/shuffle/blob/main/.github/install-guide.md", gaData: { category: "navbar", action: "social_click", label: "github_icon_click" } },
+ ],
+ followUs: [
+ { name: "LinkedIn", icon: "/images/icons/linkedIn.svg", link: "https://www.linkedin.com/company/shuffleio", gaData: { category: "navbar", action: "social_click", label: "linkedin_icon_click" } },
+ { name: "Twitter", icon: "/images/icons/x.svg", link: "https://twitter.com/shuffleio", gaData: { category: "navbar", action: "social_click", label: "twitter_icon_click" } },
+ ],
+ },
+ ],
+ },
+};
+
+// Add this new component at the top level of the file, right after the imports
+const LoadingSkeleton = () => {
+ const theme = useTheme();
+ return (
+
+
+ );
+};
+
+// Add this new component for mobile menu
+const MobileMenu = ({ anchorEl, handleClose, isLoggedIn, navigate, isCloud }) => {
+ const [openSection, setOpenSection] = useState(null);
+ const theme = useTheme();
+
+ // Add useEffect to handle body scroll
+ useEffect(() => {
+ if (Boolean(anchorEl)) {
+ // Disable scroll
+ document.body.style.overflow = 'hidden';
+ } else {
+ // Re-enable scroll
+ document.body.style.overflow = 'auto';
+ }
+
+ // Cleanup function to ensure scroll is re-enabled when component unmounts
+ return () => {
+ document.body.style.overflow = 'auto';
+ };
+ }, [anchorEl]);
+
+ const handleSectionClick = (section) => {
+ setOpenSection(openSection === section ? null : section);
+ };
+
+ const handleItemClick = (path) => {
+ handleClose();
+ navigate(path);
+ };
+
+ const showDesktopToast = () => {
+ toast.info("Please open on desktop for the full experience");
+ handleClose();
+ };
+
+ return (
+
+ );
+};
+
+const Navbar = (props) => {
+ const {
+ globalUrl,
+ isLoaded,
+ isLoggedIn,
+ removeCookie,
+ homePage,
+ userdata,
+ // isMobile,
+ serverside,
+ billingInfo,
+
+ notifications,
+ } = props;
+
+ const topbar_var = "topbar_closed10"
+
+ const theme = useTheme();
+ const [searchBarModalOpen, setSearchBarModalOpen] = useState(false);
+ const [pricingModalOpen, setPricingModalOpen] = useState(false);
+ const isTabletOrMobile = useMediaQuery(theme.breakpoints.down("lg"));
+ const isMobile = useMediaQuery(theme.breakpoints.down("md"));
+ const [anchorElNav, setAnchorElNav] = useState(null);
+ const [openMenu, setOpenMenu] = useState(null);
+ const [selectedOrganization, setSelectedOrganization] = useState({});
+ const navigate = useNavigate();
+ const [anchorElUser, setAnchorElUser] = useState(null);
+ const [anchorElOrg, setAnchorElOrg] = useState(null);
+ const [isOrgChanging, setIsOrgChanging] = useState(false);
+ const [isHovered, setIsHovered] = useState("");
+ const [orgSelectOpen, setOrgSelectOpen] = useState(false);
+ const [showTopbar, setShowTopbar] = useState(true) // Set to true to show top bar
+ const isCloud =
+ serverside === true || typeof window === "undefined"
+ ? true
+ : window.location.host === "localhost:3002" ||
+ window.location.host === "shuffler.io" ||
+ window.location.host === "localhost:5002";
+
+
+ const stripeKey = typeof window === 'undefined' || window.location === undefined ? "" : window.location.origin === "https://shuffler.io" ? "pk_live_51PXYYMEJjT17t98N20qEqItyt1fLQjrnn41lPeG2PjnSlZHTDNKHuisAbW00s4KAn86nGuqB9uSVU4ds8MutbnMU00DPXpZ8ZD" : "pk_test_51PXYYMEJjT17t98NbDkojZ3DRvsFUQBs35LGMx3i436BXwEBVFKB9nCvHt0Q3M4MG3dz4mHheuWvfoYvpaL3GmsG00k1Rb2ksO"
+
+ useEffect(() => {
+ // Manually setShowTopbar(true) to show topbar by default
+ const topbar = localStorage.getItem(topbar_var)
+ if (topbar === "true") {
+ setShowTopbar(false)
+ }
+ }, [])
+
+ const pricingModal =
+
+
+
+ const modalView = (
+
+ );
+
+ const handleOpenNavMenu = (event) => {
+ setAnchorElNav(event.currentTarget);
+ };
+
+ const handleCloseNavMenu = () => {
+ setAnchorElNav(null);
+ };
+
+ const handleMenuOpen = (menu) => {
+ setOpenMenu(menu);
+ };
+
+ const handleMenuClose = () => {
+ setOpenMenu(null);
+ };
+
+ const handleOpenUserMenu = (event) => {
+ setAnchorElUser(event.currentTarget);
+ };
+
+ const handleCloseUserMenu = () => {
+ setAnchorElUser(null);
+ };
+
+ const handleOpenOrgMenu = (event) => {
+ setAnchorElOrg(event.currentTarget);
+ };
+
+ const handleCloseOrgMenu = () => {
+ setAnchorElOrg(null);
+ };
+
+ const menuStyles = {
+ "& .MuiPaper-root": {
+ backgroundColor: "#212121",
+ marginTop: 1,
+ backdropFilter: "blur(10px)",
+ fontFamily: theme.typography.fontFamily,
+ },
+ };
+
+ const menuItemBox = {
+ display: "flex",
+ alignItems: "flex-start",
+ padding: 2,
+ paddingTop: "20px",
+ paddingBottom: "20px",
+ paddingLeft: "20px",
+ gap: 2,
+ width: "100%",
+ backgroundColor: "#212121",
+ transition: "all 0.2s ease-in-out",
+ borderBottom: "1px solid #494949",
+ };
+
+ const buttonStyles = {
+ fontFamily: theme.typography.fontFamily,
+ color: "white",
+ textTransform: "none",
+ fontSize: "16px",
+ fontWeight: 400,
+ padding: "6px 12px",
+ "& .MuiSvgIcon-root": {
+ transition: "transform 0.2s ease-in-out",
+ },
+ "&:hover": {
+ backgroundColor: "transparent",
+ color: theme.palette.primary.main,
+ "& .MuiSvgIcon-root": {
+ transform: "rotate(180deg)",
+ },
+ },
+ };
+
+ // Render menu content based on type
+ const renderMenuContent = (item, isCloud) => {
+ if (item === "Resources") {
+ return (
+
+ {menuData.Resources.columns.map((column, index) => (
+
+
+ {column.title}
+
+
+ {column.social ? (
+ <>
+
+ {column.platforms.map((platform) => (
+ {
+ if (isCloud) {
+ ReactGA.event(platform.gaData);
+ }
+ handleMenuClose();
+ }}
+ sx={{
+ padding: 0,
+ width: 48,
+ height: 48,
+ "&:hover": {
+ backgroundColor: "transparent",
+ opacity: 0.8,
+ },
+ }}
+ >
+ 
+
+ ))}
+
+
+ Follow Us
+
+
+ {column.followUs.map((platform) => (
+ {
+ if (isCloud) {
+ ReactGA.event(platform.gaData);
+ }
+ handleMenuClose();
+ }}
+ sx={{
+ padding: 0,
+ width: 48,
+ height: 48,
+ "&:hover": {
+ backgroundColor: "transparent",
+ opacity: 0.8,
+ },
+ }}
+ >
+
+
+ ))}
+
+
+ ) : (
+
+ {column.items.map((item) => (
+
+ ))}
+
+ )}
+
+ ))}
+
+ );
+ }
+
+ return menuData[item].map((menuItem, index) => (
+
+ ));
+ };
+
+ const renderDesktopMenu = () => (
+
+ {Object.keys(menuData).map((item) => (
+
+
+
+ {/* Custom Dropdown */}
+ handleMenuOpen(item)}
+ onMouseLeave={handleMenuClose}
+ sx={{
+ position: "absolute",
+ top: "130%",
+ left:
+ item === "Products"
+ ? 0
+ : item === "Services"
+ ? -50
+ : item === "Resources"
+ ? isTabletOrMobile ? -330 : -250
+ : 0,
+ backgroundColor: "#212121",
+ borderTopLeftRadius: 0,
+ borderTopRightRadius: 0,
+ borderBottomLeftRadius: "4px",
+ borderBottomRightRadius: "4px",
+ boxShadow:
+ "0 8px 16px rgba(0, 0, 0, 0.25), 0 2px 4px rgba(0, 0, 0, 0.1)",
+ backdropFilter: "blur(10px)",
+ zIndex: -20,
+ opacity: openMenu === item ? 1 : 0,
+ visibility: openMenu === item ? "visible" : "hidden",
+ transform: openMenu === item ? "translateY(0)" : "translateY(-8px)",
+ transition: "transform 0.3s cubic-bezier(0.4, 0, 0.2, 1), opacity 0.3s ease",
+ pointerEvents: openMenu === item ? "auto" : "none",
+ ...(item === "Resources" && {
+ width: "900px",
+ padding: 3,
+ }),
+ }}
+ >
+ {renderMenuContent(item, isCloud)}
+
+
+ ))}
+
+
+
+ );
+
+ const menuItemStyles = {
+ fontFamily: theme.typography.fontFamily,
+ color: "white",
+ "&:hover": {
+ backgroundColor: "rgba(255, 133, 68, 0.1)",
+ },
+ };
+
+ const searchButtonStyles = {
+ fontFamily: theme.typography.fontFamily,
+ color: "rgba(255, 255, 255, 0.7)",
+ border: "1px solid rgba(26, 26, 26, 0.8)",
+ backgroundColor: "#2F2F2F",
+ textTransform: "none",
+ borderRadius: "8px",
+ fontSize: "14px",
+ padding: "6px 12px",
+ display: "flex",
+ alignItems: "center",
+ height: "42px",
+ gap: 1,
+ minWidth: "110px",
+ justifyContent: "space-between",
+ "&:hover": {
+ borderColor: "rgba(255, 255, 255, 0.1)",
+ },
+ };
+
+ const searchIconButtonStyles = {
+ color: "rgba(255, 255, 255, 0.7)",
+ padding: "8px",
+ minWidth: "unset",
+ height: "42px",
+ "&:hover": {
+ backgroundColor: "#3F3F3F",
+ },
+ };
+
+ // Add this shared button style
+ const sharedButtonStyles = {
+ fontFamily: theme.typography.fontFamily,
+ textTransform: "none",
+ fontSize: "16px",
+ fontWeight: 600,
+ padding: "6px 24px",
+ };
+
+
+ useEffect(() => {
+ Mousetrap.bind(['command+k', 'ctrl+k'], () => {
+ setSearchBarModalOpen(true);
+ return false; // Prevent the default action
+ });
+ Mousetrap.bind(['esc'], () => {
+ setSearchBarModalOpen(false);
+ return false; // Prevent the default action
+ });
+
+ return () => {
+ Mousetrap.unbind(['command+k', 'ctrl+k']);
+ };
+ }, []);
+
+ useEffect(() => {
+ if (isLoggedIn && userdata?.active_org?.id?.length > 0) {
+ handleGetOrg(userdata.active_org.id);
+ }
+ }, [isLoggedIn]);
+
+ const handleGetOrg = (orgId) => {
+ fetch(`${globalUrl}/api/v1/orgs/${orgId}`, {
+ method: "GET",
+ credentials: "include",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ })
+ .then((response) => {
+ if (response.status === 401) {
+ }
+
+ return response.json();
+ })
+ .then((responseJson) => {
+ if (responseJson["success"] === false) {
+ console.log("Error getting org: ", responseJson);
+ } else {
+ setSelectedOrganization(responseJson);
+ }
+ })
+ .catch((error) => {
+ console.log("Error getting org: ", error);
+ });
+ };
+
+ const handleClickLogout = () => {
+ console.log("SHOULD LOG OUT");
+
+ toast.info("Logging out...");
+ // Don't really care about the logout
+ fetch(globalUrl + "/api/v1/logout", {
+ credentials: "include",
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ })
+ .then(() => {
+ // Log out anyway
+ removeCookie("session_token", { path: "/" });
+ removeCookie("session_token", { path: "/" });
+ removeCookie("session_token", { path: "/" });
+
+ removeCookie("__session", { path: "/" });
+ removeCookie("__session", { path: "/" });
+ removeCookie("__session", { path: "/" });
+
+ removeCookie("__session", { path: "/" });
+
+ window.location.pathname = "/";
+
+ localStorage.setItem("globalUrl", "")
+
+ // Delete userinfo from localstorage
+ localStorage.removeItem("apps")
+ localStorage.removeItem("workflows")
+ localStorage.removeItem("userinfo")
+ })
+ .catch((error) => {
+ console.log(error);
+ });
+ };
+
+ const topbarHeight = showTopbar ? 40 : 0
+ const topbar = !isCloud || !showTopbar ? null :
+ curpath === "/" || curpath.includes("/docs") || curpath === "/pricing" || curpath === "/contact" || curpath === "/search" || curpath === "/usecases" || curpath === "/training" || curpath === "/professional-services" ?
+
+
+ {topbar}
+
+
+
+ {
+ if (isCloud) {
+ ReactGA.event({
+ category: "navbar",
+ action: "home_click",
+ label: "shuffle_logo",
+ });
+ }
+ }}
+ >
+ ![shuffle logo]({"/images/logos/topleft_logo.svg"})
+
+
+
+ {isMobile ? (
+ /* Mobile Navigation Icons */
+
+ setSearchBarModalOpen(true)}
+ >
+
+ {
+ if(Boolean(anchorElNav)) {
+ handleCloseNavMenu();
+ }else{
+ handleOpenNavMenu(e);
+ }
+ }
+ }
+ sx={{ color: "white" }}
+ >
+ {Boolean(anchorElNav) ? (
+
+
+ ) : (
+ <>
+ {modalView}
+ {pricingModal}
+ {renderDesktopMenu()}
+ {/* Right Side Buttons */}
+
+ {!isLoaded ? (
+
+
+ }
+ placement="bottom"
+ arrow
+ componentsProps={{
+ tooltip: {
+ sx: {
+ backgroundColor: "rgba(33, 33, 33, 1)",
+ color: "rgba(241, 241, 241, 1)",
+ fontSize: 12,
+ border: "1px solid rgba(73, 73, 73, 1)",
+ fontFamily: theme?.typography?.fontFamily,
+ }
+ },
+ popper: {
+ sx: {
+ zIndex: 1000019,
+ }
+ }
+ }}
+ >
+
-
+ color="primary">Recommended }
+
+ {/* Shuffle 1.4.0 is out! Read more about */}
+ Shuffle 2.0.0 is out now!
+
+ {
+ ReactGA.event({
+ category: "landingpage",
+ action: "click_header_training",
+ label: "",
+ })
+
+ navigate("/articles/2.0_release")
+
+ }} style={{ cursor: "pointer", textDecoration: "none", fontWeight: 600, color: "rgba(255,255,255,0.9)" }}>
+ Read about it here.
+
+
+
+ {
+ setShowTopbar(false)
+
+ // Set storage that it's clicked
+ localStorage.setItem(topbar_var, "true")
+ }}>
+
+
+
+ :
+ null
+
+ const handleClickChangeOrg = (orgId) => {
+ setIsOrgChanging(true);
+ const data = { org_id: orgId };
+
+ localStorage.setItem("globalUrl", "");
+ localStorage.setItem("getting_started_sidebar", "open");
+ toast.info("Changing organization...");
+ fetch(`${globalUrl}/api/v1/orgs/${orgId}/change`, {
+ mode: "cors",
+ credentials: "include",
+ crossDomain: true,
+ method: "POST",
+ body: JSON.stringify(data),
+ withCredentials: true,
+ headers: {
+ "Content-Type": "application/json; charset=utf-8",
+ },
+ })
+ .then(function (response) {
+ if (response.status !== 200) {
+ console.log("Error in response");
+ } else {
+ localStorage.removeItem("apps");
+ localStorage.removeItem("workflows");
+ localStorage.removeItem("userinfo");
+ }
+
+ return response.json();
+ })
+ .then(function (responseJson) {
+ if (responseJson.success === true) {
+ if (
+ responseJson.region_url !== undefined &&
+ responseJson.region_url !== null &&
+ responseJson.region_url.length > 0
+ ) {
+ console.log("Region Change: ", responseJson.region_url);
+ localStorage.setItem("globalUrl", responseJson.region_url);
+ //globalUrl = responseJson.region_url
+ }
+
+ if (responseJson["reason"] === "SSO_REDIRECT") {
+ toast.info("Redirecting to SSO login page as SSO is required for this organization.");
+ setTimeout(() => {
+ window.location.href = responseJson["url"];
+ }, 2000);
+ } else {
+ toast("Successfully changed active organization - refreshing!");
+ setTimeout(() => {
+ window.location.reload();
+ }, 2000);
+ }
+ } else {
+ setIsOrgChanging(false);
+ if (
+ responseJson.reason !== undefined &&
+ responseJson.reason !== null &&
+ responseJson.reason.length > 0
+ ) {
+ toast(responseJson.reason);
+ } else {
+ toast("Failed changing org. Try again or contact support@shuffler.io if this persists.");
+ }
+ }
+ })
+ .catch((error) => {
+ console.log("error changing: ", error);
+ setIsOrgChanging(false);
+ });
+ };
+
+ // Add these helper functions from LeftSideBar
+ const getRegionTag = (region_url) => {
+ let regiontag = "EU";
+ if (region_url !== undefined && region_url !== null && region_url.length > 0) {
+ const regionsplit = region_url.split(".");
+ if (regionsplit.length > 2 && !regionsplit[0].includes("shuffler")) {
+ const namesplit = regionsplit[0].split("/");
+ regiontag = namesplit[namesplit.length - 1];
+
+ if (regiontag === "california") {
+ regiontag = "US";
+ } else if (regiontag === "frankfurt") {
+ regiontag = "EU-2";
+ } else if (regiontag === "ca") {
+ regiontag = "CA";
+ }
+ }
+ }
+ return regiontag;
+ };
+
+ const getRegionFlag = (region_url) => {
+ const regionTag = getRegionTag(region_url);
+ const regionMapping = {
+ "US": "us",
+ "EU": "eu",
+ "EU-2": "de",
+ "CA": "ca",
+ "UK": "gb"
+ };
+
+ const region = regionMapping[regionTag] || "eu";
+ return `https://flagcdn.com/48x36/${region}.png`;
+ };
+
+ // Add this useEffect to prevent scroll locking
+ useEffect(() => {
+ // Remove modal classes that cause scroll locking
+ const removeModalClasses = () => {
+ document.body.style.overflow = 'auto';
+ document.body.style.paddingRight = '0px';
+ };
+
+ // Create observer to watch for class changes
+ const observer = new MutationObserver((mutations) => {
+ mutations.forEach((mutation) => {
+ if (mutation.attributeName === 'class') {
+ if (document.body.classList.contains('MuiModal-open')) {
+ removeModalClasses();
+ }
+ }
+ });
+ });
+
+ // Start observing
+ observer.observe(document.body, {
+ attributes: true,
+ attributeFilter: ['class'],
+ });
+
+ // Cleanup
+ return () => {
+ observer.disconnect();
+ removeModalClasses();
+ };
+ }, []);
+
+ const handleOrgSelectClick = (event) => {
+ // Prevent the default Select behavior
+ event.preventDefault();
+ if(isCloud){
+ ReactGA.event({
+ category: "navbar",
+ action: "org_dropdown_click",
+ label: "org_dropdown_click",
+ })
+ }
+ // Toggle the select open state
+ setOrgSelectOpen(!orgSelectOpen);
+ };
+
+ return (
+
+
+
- {
style={{ display:'table-cell',verticalAlign: 'middle', padding: "8px", }}
/>
- {/*
{
}
style={{ display:'table-cell', verticalAlign: 'middle',padding: "8px", color: data.mfa_info.active ? "#02CB70" : "#F53434" }}
/>
- */}
{selectedOrganization?.child_orgs !== undefined &&
selectedOrganization?.child_orgs !== null &&
diff --git a/frontend/src/context/ContextApi.jsx b/frontend/src/context/ContextApi.jsx
index 3932dfd0..4e82ba1e 100644
--- a/frontend/src/context/ContextApi.jsx
+++ b/frontend/src/context/ContextApi.jsx
@@ -1,14 +1,15 @@
-import { createContext, useState, useEffect } from 'react';
+import React, { createContext, useState, useEffect } from 'react';
export const Context = createContext();
-export const AppContext =(props) => {
+export const AppContext = (props) => {
+ const { serverside } = props
- const currentLocation = window?.location?.pathname;
+ const currentLocation = serverside === true ? "" : window?.location?.pathname;
// Left side bar global states
const [searchBarModalOpen, setSearchBarModalOpen] = useState(false);
const [leftSideBarOpenByClick, setLeftSideBarOpenByClick] = useState(currentLocation?.includes('/workflows/') ? false : true)
- const [windowWidth, setWindowWidth] = useState(window.innerWidth);
+ const [windowWidth, setWindowWidth] = useState(serverside === true ? 100 : window.innerWidth);
useEffect(() => {
if (currentLocation?.includes('/workflows/') && leftSideBarOpenByClick === true) {
@@ -18,6 +19,10 @@ export const AppContext =(props) => {
//Calculate window width
useEffect(() => {
+ if (serverside === true) {
+ return
+ }
+
const handleResize = () => {
setWindowWidth(window?.innerWidth);
};
diff --git a/frontend/src/views/AdminSetup.jsx b/frontend/src/views/AdminSetup.jsx
index f8f3d747..0365cf2f 100755
--- a/frontend/src/views/AdminSetup.jsx
+++ b/frontend/src/views/AdminSetup.jsx
@@ -1,6 +1,8 @@
/* eslint-disable react/no-multi-comp */
import React, { useState } from "react";
import { makeStyles } from "@mui/styles";
+import theme from '../theme.jsx';
+import { useNavigate } from "react-router-dom";
import {
CircularProgress,
@@ -20,11 +22,8 @@ const surfaceColor = "#27292D";
const inputColor = "#383B40";
const boxStyle = {
- paddingLeft: "30px",
- paddingRight: "30px",
- paddingBottom: "30px",
- paddingTop: "30px",
- backgroundColor: surfaceColor,
+ padding: 40,
+ backgroundColor: theme.palette.backgroundColor,
};
const useStyles = makeStyles({
@@ -41,8 +40,10 @@ const AdminAccount = (props) => {
const [firstRequest, setFirstRequest] = useState(true);
const [loginLoading, setLoginLoading] = useState(false);
+
// Used to swap from login to register. True = login, false = register
const register = true;
+ let navigate = useNavigate();
const classes = useStyles();
// Error messages etc
@@ -70,13 +71,16 @@ const AdminAccount = (props) => {
setLoginInfo(responseJson["reason"]);
} else {
if (responseJson.reason === "redirect") {
- window.location.pathname = "/login";
+ setTimeout(() => {
+ window.location.pathname = "/login";
+ }, 2500)
}
}
})
)
.catch((error) => {
- setLoginInfo("Error in userdata: ", error);
+ setLoginInfo("Error in userdata (1): ", error);
+ navigate("/loginsetup")
});
};
@@ -108,13 +112,17 @@ const AdminAccount = (props) => {
setLoginInfo(responseJson["reason"]);
} else {
setLoginInfo("Successful register :)");
- window.location.pathname = "/login";
+
+ setTimeout(() => {
+ window.location.pathname = "/login";
+ }, 2500)
}
})
)
.catch((error) => {
- setLoginLoading(false);
- setLoginInfo("Error in userdata: ", error);
+ setLoginInfo("Error in userdata (2): ", error);
+ setLoginLoading(false)
+ navigate("/loginsetup")
});
};
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index 16d5e9d0..374ce85b 100755
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -575,11 +575,17 @@ const AngularWorkflow = (defaultprops) => {
}, [editWorkflowModalOpen])
useEffect(() => {
- if(selectedTrigger?.trigger_type === "SUBFLOW"){
+ // Check if selectedTriggerIndex is a number >= 0
+ if (isNaN(selectedTriggerIndex) || selectedTriggerIndex < 0) {
+ return
+ }
+
+ if (selectedTrigger?.trigger_type === "SUBFLOW" && selectedTriggerIndex !== undefined && selectedTriggerIndex !== null && workflow?.triggers[selectedTriggerIndex].parameters.length > 1) {
setSelectedTriggerValue(workflow.triggers[selectedTriggerIndex].parameters[1].value || "")
- } else if(selectedTrigger?.trigger_type === "USERINPUT"){
+ } else if (selectedTrigger?.trigger_type === "USERINPUT" && selectedTriggerIndex !== undefined && selectedTriggerIndex !== null && workflow?.triggers[selectedTriggerIndex].parameters.length > 0) {
setSelectedTriggerValue(workflow.triggers[selectedTriggerIndex].parameters[0].value || "Do you want to continue the workflow? Start parameters: $exec")
}
+
}, [selectedTriggerIndex, selectedTrigger, workflow])
useEffect(() => {
@@ -948,11 +954,15 @@ const AngularWorkflow = (defaultprops) => {
}
useEffect(() => {
- if (workflow.actions?.length == 1) {
- if (workflow.actions[0].app_id == "3e320a20966d33c9b7e6790b2705f0bf") {
+ if (workflow?.actions?.length == 1) {
+ if (workflow?.actions[0].app_id == "3e320a20966d33c9b7e6790b2705f0bf") {
setWorkflowAsCode(true);
}
}
+
+ if (workflow?.suborg_distribution !== undefined && workflow?.suborg_distribution !== null && workflow?.suborg_distribution.length > 0) {
+ getChildWorkflows(workflow.id)
+ }
}, [workflow]);
// Event for making sure app is correct
@@ -1288,56 +1298,6 @@ const AngularWorkflow = (defaultprops) => {
return
}
- //console.log("Failed in trigger selection: ", selectedTriggerIndex, "Trigger: ", selectedTrigger)
-
- var found = null
- try {
- for (var key in workflows) {
- const curworkflow = workflows[key]
- const curtrigger = curworkflow?.triggers[selectedTriggerIndex]
- if (curtrigger === undefined || curtrigger === null) {
- console.log("Failed in trigger selection (1): ", curworkflow)
- continue
- }
-
- if (curtrigger?.parameters === undefined || curtrigger?.parameters === null || curtrigger?.parameters.length === 0) {
- console.log("Failed in trigger selection (2): ", curworkflow)
- continue
- }
-
- if (curtrigger?.parameters[0] === undefined || curtrigger?.parameters[0] === null || curtrigger?.parameters[0].value === undefined || curtrigger?.parameters[0].value === null) {
- console.log("Failed in trigger selection (3): ", curworkflow)
- continue
- }
-
- if (curtrigger?.parameters[0].value === selectedTrigger?.parameters[0]?.value) {
- found = curworkflow
- setSubworkflow(curworkflow)
- }
- }
-
- if (found !== null) {
- setSubworkflow(found)
- }
- } catch (e) {
- console.log("Failed in trigger selection (4): ", e)
- //return
- }
-
- if (found) {
- const startNode = found.actions?.find((action) => action.id === workflow?.triggers[selectedTriggerIndex]?.parameters[3]?.value)
- setSubworkflowStartnode(startNode)
- }
-
- /*
- // Multi-tenant sometimes gives us shit :(
- if (selectedTrigger === undefined || selectedTrigger === null || selectedTrigger.id === undefined || selectedTrigger.id === null && selectedTriggerIndex >= 0) {
- if (workflow.triggers !== undefined && workflow.triggers !== null && workflow.triggers.length > selectedTriggerIndex) {
- setSelectedTrigger(workflow.triggers[selectedTriggerIndex])
- }
- }
- */
-
// Check if the running state is correct or not according to allTriggers
if (allTriggers !== undefined && allTriggers !== null) {
// Find the active trigger
@@ -1545,6 +1505,8 @@ const AngularWorkflow = (defaultprops) => {
if (workflow.org_id !== undefined && workflow.org_id !== null && workflow.org_id.length > 0) {
headers["Org-Id"] = workflow.org_id
}
+
+ setWorkflows([])
fetch(globalUrl + "/api/v1/workflows?subflow=true", {
method: "GET",
@@ -1562,7 +1524,7 @@ const AngularWorkflow = (defaultprops) => {
if (responseJson !== undefined) {
// Sets up subflow trigger with the right info
- if (trigger_index > -1) {
+ if (isNaN(trigger_index) === false && trigger_index > -1) {
var baseSubflow = {}
const trigger = workflow.triggers[trigger_index];
@@ -1592,10 +1554,10 @@ const AngularWorkflow = (defaultprops) => {
if (Object.getOwnPropertyNames(baseSubflow).length > 0) {
const foundAction = baseSubflow.actions.find(action => action?.id === param.value)
if (foundAction !== null && foundAction !== undefined) {
- setSubworkflowStartnode(foundAction);
+ setSubworkflowStartnode(foundAction)
}
} else {
- setSubworkflowStartnode(param.value);
+ setSubworkflowStartnode(param.value)
}
}
}
@@ -2540,18 +2502,25 @@ const AngularWorkflow = (defaultprops) => {
}
*/
+ // FIXME: What is this?
if (cy !== undefined && cy !== null) {
// scale: 0.3,
// bg: "#27292d",
- const cyImageData = cy.png({
- output: "base64uri",
- maxWidth: 480,
- maxHeight: 270,
- })
+ if (cy?.png !== undefined && cy?.png !== null) {
+ try {
+ const cyImageData = cy.png({
+ output: "base64uri",
+ maxWidth: 480,
+ maxHeight: 270,
+ })
- if (cyImageData !== undefined && cyImageData !== null && cyImageData.length > 0) {
- useworkflow.image = cyImageData
- }
+ if (cyImageData !== undefined && cyImageData !== null && cyImageData.length > 0) {
+ useworkflow.image = cyImageData
+ }
+ } catch (e) {
+ console.log("Failed to get image data: ", e)
+ }
+ }
}
if (useworkflow.id === undefined || useworkflow.id === null || useworkflow.id.length === 0) {
@@ -3948,7 +3917,7 @@ const AngularWorkflow = (defaultprops) => {
apps.push(responseJson.actions[index]);
}
- console.log("Setting used subflow apps: ", apps)
+ //console.log("Setting used subflow apps: ", apps)
setUsedSubflowApps(apps);
return apps
@@ -3961,6 +3930,10 @@ const AngularWorkflow = (defaultprops) => {
}
const findWorkflowDiff = (parentWorkflow, childWorkflow) => {
+ // Ensures new memory is used
+ parentWorkflow = JSON.parse(JSON.stringify(parentWorkflow))
+ childWorkflow = JSON.parse(JSON.stringify(childWorkflow))
+
var diff = {
"different": false,
"environment": false,
@@ -3978,9 +3951,13 @@ const AngularWorkflow = (defaultprops) => {
return diff
}
-
var parentEnvironment = ""
var childEnvironment = ""
+
+ if (parentWorkflow.triggers !== undefined && parentWorkflow.triggers !== null && parentWorkflow.triggers.length > 0) {
+ parentWorkflow.actions = parentWorkflow.actions.concat(parentWorkflow.triggers)
+ }
+
for (var parentKey in parentWorkflow.actions) {
const parentAction = parentWorkflow.actions[parentKey]
if (parentAction.environment !== undefined && parentAction.environment !== null && parentAction.environment !== "") {
@@ -3992,6 +3969,19 @@ const AngularWorkflow = (defaultprops) => {
}
var found = false
+ if (childWorkflow.triggers !== undefined && childWorkflow.triggers !== null && childWorkflow.triggers.length > 0) {
+ for (var triggerKey in childWorkflow.triggers) {
+ if (childWorkflow.triggers[triggerKey].replacement_for_trigger !== parentAction.id) {
+ continue
+ }
+
+ // Rewrapping the ID just in case
+ childWorkflow.triggers[triggerKey].id = childWorkflow.triggers[triggerKey].replacement_for_trigger
+ childWorkflow.actions.push(childWorkflow.triggers[triggerKey])
+ break
+ }
+ }
+
for (var childKey in childWorkflow.actions) {
const childAction = childWorkflow.actions[childKey]
if (childAction.environment !== undefined && childAction.environment !== null && childAction.environment !== "") {
@@ -4038,6 +4028,10 @@ const AngularWorkflow = (defaultprops) => {
continue
}
+ var parentworkflow = ""
+ var parentstartnode = ""
+ var childworkflow = ""
+ var childstartnode = ""
for (var parentParamIndex in parentAction.parameters) {
const parentParam = parentAction.parameters[parentParamIndex]
for (var childParamIndex in childAction.parameters) {
@@ -4046,20 +4040,38 @@ const AngularWorkflow = (defaultprops) => {
continue
}
+ if (childParam.name === "workflow" || childParam.name === "subflow") {
+ parentworkflow = parentParam.value
+ childworkflow = childParam.value
+ continue
+ }
+
+ if (childParam.name == "startnode") {
+ parentstartnode = parentParam.value
+ childstartnode = childParam.value
+ continue
+ }
+
if (childParam.value !== parentParam.value) {
actionDiff.parameters.push(childParam.name)
}
}
}
+
+ if (parentworkflow !== childworkflow && parentstartnode !== childstartnode) {
+ actionDiff.parameters.push("subflow")
+ }
}
if (actionDiff.parameters.length > 0) {
actionDiff.params = true
}
+ /*
if (!found) {
actionDiff.new = true
}
+ */
if (actionDiff !== undefined && actionDiff !== null && Object.keys(actionDiff).length > 1) {
actionDiff.label = parentAction.label.replaceAll("_", " ")
@@ -6352,11 +6364,15 @@ const AngularWorkflow = (defaultprops) => {
if (workflow.org_id !== undefined && workflow.org_id !== null && workflow.org_id.length > 0 && originalWorkflow.org_id !== undefined && originalWorkflow.org_id !== null && originalWorkflow.org_id.length > 0 && workflow.org_id === originalWorkflow.org_id) {
// Allows a parent workflow to control the schedule
} else if (data.replacement_for_trigger !== undefined && data.replacement_for_trigger !== null && data.replacement_for_trigger.length > 0) {
- toast.warning("This schedule is controlled by the parent workflow. If you want additional schedule control, please add a custom schedule to this workflow.", {
- autoClose: 30000,
- })
- event.target.unselect()
- return
+
+ // No custom control on cloud
+ if (isCloud) {
+ toast.warning("This schedule is controlled by the parent workflow. If you want additional schedule control, please add a custom schedule to this workflow.", {
+ autoClose: 30000,
+ })
+ event.target.unselect()
+ return
+ }
}
} else if (data.app_name === "Webhook" && trigger_index >= 0) {
@@ -6932,7 +6948,7 @@ const AngularWorkflow = (defaultprops) => {
)
if (targetnode !== -1) {
if (workflow.triggers[targetnode].app_name === "User Input" || workflow.triggers[targetnode].app_name === "Shuffle Workflow" || workflow.triggers[targetnode].app_name === "Shuffle Subflow") {
- console.log("User Input or Shuffle Workflow")
+ //console.log("User Input or Shuffle Workflow")
} else {
toast("Can't have triggers as target of branch")
event.target.remove()
@@ -9264,11 +9280,15 @@ const AngularWorkflow = (defaultprops) => {
}
insertedNodes = insertedNodes.concat(newedges);
- setWorkflow(inputworkflow);
+ setWorkflow(inputworkflow)
// Reset view for cytoscape
if (cy !== undefined && cy !== null) {
- cy.add(insertedNodes)
+ try {
+ cy.add(insertedNodes)
+ } catch (error) {
+ console.log("Error adding nodes to cytoscape (6): ", error)
+ }
try {
cy.fit(null, 250)
@@ -9347,12 +9367,6 @@ const AngularWorkflow = (defaultprops) => {
}
}
- //if (selectedNode.data("id") === selectedAction.id) {
- // setSelectedApp({});
- // setSelectedAction({});
- //setSelectedTrigger({});
- //setSelectedTriggerIndex({});
- //}
const parsedSelection = cy.$(":selected");
if (selectedNode.data().decorator === true && selectedNode.data("type") !== "COMMENT") {
toast("This node can't be deleted.");
@@ -9552,7 +9566,6 @@ const AngularWorkflow = (defaultprops) => {
if (firstrequest) {
setFirstrequest(false)
getWorkflow(props.match.params.key, {})
- getChildWorkflows(props.match.params.key)
getRevisionHistory(props.match.params.key)
loadTriggers()
getApps()
@@ -9785,9 +9798,14 @@ const AngularWorkflow = (defaultprops) => {
toast("Successfully stopped schedule");
}
- workflow.triggers[triggerindex].status = "stopped";
- trigger.status = "stopped";
- setSelectedTrigger(trigger);
+ if (triggerindex !== undefined && triggerindex !== null && triggerindex >= 0) {
+ workflow.triggers[triggerindex].status = "stopped";
+ }
+
+ //trigger.status = "stopped";
+ //console.log("TRIGGER: ", trigger)
+ //setSelectedTrigger(trigger);
+
setWorkflow(workflow);
saveWorkflow(workflow)
@@ -11446,7 +11464,7 @@ const AngularWorkflow = (defaultprops) => {
var type = "app"
const baseImage = {
value={workflow.org_id}
disabled={savingState !== 0 || suborgWorkflows?.length === 0 || allTriggers === undefined}
onChange={(e) => {
+ if (cy !== undefined && cy !== null) {
+ cy.nodes().unselect()
+ }
+
if (lastSaved === false && originalWorkflow.id === workflow.id) {
setSuborgWorkflows([])
diff --git a/frontend/src/views/AppCreator.jsx b/frontend/src/views/AppCreator.jsx
index 2d1bbb32..50106831 100755
--- a/frontend/src/views/AppCreator.jsx
+++ b/frontend/src/views/AppCreator.jsx
@@ -2657,12 +2657,12 @@ const AppCreator = (defaultprops) => {
if (responseJson.reason !== undefined) {
setErrorCode(responseJson.reason);
- if (responseJson.extra === undefined && responseJson.extra === null) {
- toast("Failed to verify: " + responseJson.reason);
- }
+ toast.error("Failed to build: " + responseJson.reason, {
+ autoClose: 10000
+ })
}
} else {
- toast("Successfully uploaded openapi");
+ toast.success("Successfully built openapi app! Added job to rebuild it in your hybrid runtime locations (Orborus).");
if (window.location.pathname.includes("/new")) {
if (responseJson.id !== undefined && responseJson.id !== null) {
window.location = `/apps/edit/${responseJson.id}`;
diff --git a/frontend/src/views/AppExplorer.jsx b/frontend/src/views/AppExplorer.jsx
index b3cb0d99..d37709ee 100644
--- a/frontend/src/views/AppExplorer.jsx
+++ b/frontend/src/views/AppExplorer.jsx
@@ -3866,13 +3866,13 @@ const AppExplorer = (props) => {
}
}}
>
-
+
@@ -4120,7 +4120,7 @@ const AppExplorer = (props) => {
)}
{appType === 1 ? null :
- creatorProfile.self === true || userdata.support === true ?
+ userdata?.support || userdata?.id === app?.owner || (userdata?.admin === "true" && userdata?.active_org?.id === app?.reference_org) || app?.contributors?.includes(userdata?.id) || creatorProfile?.self === true ?
- {(appdata?.owner === userdata?.id) ? (
- ): null }
) : (
- {hoverEffect === index && isCloud ? (
+ {hoverEffect === index ? (
![]()
tags and translate them into ![]() format
const imgRegex = / {
.catch((error) => { });
};
+ const handleResetCache = () => {
+ fetchDocList(true);
+ toast("Cache has been reset");
+ }
+
if (firstrequest) {
setFirstrequest(false);
if (!serverside) {
@@ -769,11 +904,29 @@ const Docs = (defaultprops) => {
// return null
//}
//
- if (props.match.params.key === undefined) {
-
+ if (props.match.params.key === undefined && isArticlePage) {
+ fetch(`${globalUrl}/api/v1/articles`, {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ Accept: "application/json",
+ },
+ })
+ .then((response) => response.json())
+ .then((responseJson) => {
+ if (responseJson.success && responseJson.list && responseJson.list.length > 0) {
+ // Navigate to the latest article
+ if (responseJson?.list[0]?.name) {
+ navigate(`/articles/${responseJson?.list[0].name}`);
+ }
+ }
+ })
+ .catch((error) => {
+ console.error("Error fetching articles:", error);
+ });
} else {
console.log("DOCID: ", props.match.params.key)
- fetchDocs(props.match.params.key)
+ fetchDoc(props.match.params.key)
}
}
}
@@ -782,7 +935,7 @@ const Docs = (defaultprops) => {
// Handles search-based changes that origin from outside this file
if (serverside !== true && window.location.href !== baseUrl) {
setBaseUrl(window.location.href);
- fetchDocs(props.match.params.key);
+ fetchDoc(props.match.params.key);
}
const markdownStyle = {
@@ -793,7 +946,7 @@ const Docs = (defaultprops) => {
maxWidth: "100%",
minWidth: "100%",
overflow: "hidden",
- fontSize: isMobile ? "1.3rem" : "1rem",
+ fontSize: isMobile ? "1.3rem" : "1.1rem",
};
const alertNote = {
@@ -940,20 +1093,51 @@ const Docs = (defaultprops) => {
}
+ const activeHrefStyleToc2 = {
+ ...hrefStyleToc2,
+ color: "#f86a3e",
+ };
+
+ const activeListItemStyle = {
+ backgroundColor: "rgba(248, 106, 62, 0.08)", // Slight orange tint
+ marginRight: window.location.pathname.includes("/articles/") ? "0.8em" : undefined,
+ borderLeft: "3px solid #f86a3e",
+ paddingLeft: "13px", // Compensate for the border
+ };
+
+ const toggleSidebar = () => {
+ setSidebarOpen(!sidebarOpen);
+ };
+
+
// PostDataBrowser Section
const postDataBrowser =
list === undefined || list === null ? null : (
Organizations
+Tenants
- Control sub organizations (tenants)! {" "} + Create, manage and change to sub-organizations (tenants)! {" "} {isCloud ? "You can only make a sub organization if you are a customer of shuffle or running a POC of the platform. Please contact support@shuffler.io to try it out." : ''} diff --git a/frontend/src/components/UserManagmentTab.jsx b/frontend/src/components/UserManagmentTab.jsx index 2bb924b0..8aff24a5 100644 --- a/frontend/src/components/UserManagmentTab.jsx +++ b/frontend/src/components/UserManagmentTab.jsx @@ -1557,10 +1557,12 @@ const UserManagmentTab = memo((props) => { style={{ display:'table-cell', verticalAlign: 'middle' }} /> + {/*
+
+
{workflow.triggers[selectedTriggerIndex].parameters[0].value
.length === 0 ? null : workflow.triggers[selectedTriggerIndex]
- .parameters[0].value === props.match.params.key ? null : (
+ .parameters[0].value === props.match.params.key ?
+ null
+ : (
+
-
{hits.length === 0 ?
- Select a workflow to execute
+ Select a workflow to run
Are you sure you want to PUBLISH this app?
{data.tags && (
{
{
}}
/>
{
{
}
+
export const Img = (props) => {
// Find parent container and check width
-
+ const isArticlePage = window.location.pathname.includes("/articles/");
var height = "auto"
- var width = 750
+ var width = isArticlePage ? 1000 : 750
+
+ const docsImageStyle = {
+ border: "1px solid rgba(255,255,255,0.3)",
+ borderRadius: theme.palette?.borderRadius,
+ width: width,
+ maxWidth: width,
+ margin: "auto",
+ marginTop: 10,
+ marginBottom: 10
+ }
+
+ const articleImageStyle = {
+ borderRadius: theme.palette?.borderRadius,
+ minWidth: 350,
+ maxWidth: "100%",
+ textAlign: "center",
+ margin: "auto",
+ marginTop: 20,
+ marginBottom: 20,
+ }
+
if (props.height !== undefined && props.height !== null) {
height = props.height
}
@@ -166,11 +191,13 @@ export const Img = (props) => {
}
return(
- 
+
-
- {extraInfo}
+ {isArticlePage ? (userdata?.support ? extraInfo : "") : extraInfo}
)
}
@@ -647,21 +710,56 @@ const Docs = (defaultprops) => {
const SideBar = {
width: "17%",
+ borderRight: !isArticlePage ? "1px solid rgba(255,255,255,0.3)" : undefined,
+ minWidth: isArticlePage ? "250px" : "17%",
+ maxWidth: isArticlePage ? "250px" : "17%",
+ marginLeft: isArticlePage ? sidebarOpen ? 40 : 50 : undefined,
position: "sticky",
- top: 50,
- paddingTop: "0.25em",
- minHeight: "95vh",
- maxHeight: "95vh",
+ top: isArticlePage ? 120 : 50,
+ paddingTop: isArticlePage ? "0.65em" : "0.25em",
+ paddingRight: isArticlePage ? "1em" : undefined,
+ minHeight: isArticlePage ? "80vh" : "95vh",
+ maxHeight: isArticlePage ? "80vh" : "95vh",
overflowX: "hidden",
overflowY: "auto",
zIndex: 1000,
- //borderRight: "1px solid rgba(255,255,255,0.3)",
+ backgroundColor: isArticlePage ? "#212121" : undefined,
+ borderRadius: isArticlePage ? theme.palette?.borderRadius : undefined,
+ transition: isArticlePage ? "width 0.3s ease, min-width 0.3s ease" : undefined,
+ };
+
+ const sideBarToggleButton = {
+ position: "absolute",
+ bottom: sidebarOpen ? 20 : "50%",
+ right: sidebarOpen ? 30 : 21,
+ zIndex: 1000,
+ backgroundColor: "#212121",
+ border: "1px solid rgba(255,255,255,0.3)",
+ borderRadius: "50%",
+ width: 40,
+ height: 40,
+ display: "flex",
+ alignItems: "center",
+ justifyContent: "center",
+ cursor: "pointer",
+ transition: "transform 0.3s ease",
+ "&:hover": {
+ backgroundColor: "#2c2c2c",
+ }
+ };
+
+ const collapsedSideBar = {
+ ...SideBar,
+ width: "40px",
+ minWidth: "40px",
+ maxWidth: "40px",
+ overflow: "hidden",
};
const IndexBar = {
alignSelf: "flex-start",
position: "sticky",
- top: 80,
+ top: 120,
overflowY: "auto",
minHeight: "93vh",
maxHeight: "93vh",
@@ -670,8 +768,15 @@ const Docs = (defaultprops) => {
overflow: "hidden",
}
- const fetchDocList = () => {
- fetch(`${globalUrl}/api/v1/docs`, {
+ const fetchDocList = (resetCache = false) => {
+ var url = `${globalUrl}/api/v1/docs`
+ if (location.pathname.includes("/legal")) {
+ url = `${globalUrl}/api/v1/docs?folder=legal&resetCache=${resetCache}`
+ } else if (location.pathname.includes("/articles")) {
+ url = `${globalUrl}/api/v1/docs?folder=articles&resetCache=${resetCache}`
+ }
+
+ fetch(url, {
method: "GET",
headers: {
"Content-Type": "application/json",
@@ -691,8 +796,19 @@ const Docs = (defaultprops) => {
.catch((error) => { });
};
- const fetchDocs = (docId) => {
- fetch(`${globalUrl}/api/v1/docs/${docId}`, {
+ const fetchDoc = (docId) => {
+ if (docId === undefined) {
+ return
+ }
+
+ var url = `${globalUrl}/api/v1/docs/${docId}`
+ if (location.pathname.includes("/legal")) {
+ url = `${globalUrl}/api/v1/docs/${docId}?folder=legal`
+ } else if (location.pathname.includes("/articles")) {
+ url = `${globalUrl}/api/v1/docs/${docId}?folder=articles`
+ }
+
+ fetch(url, {
method: "GET",
headers: {
"Content-Type": "application/json",
@@ -706,18 +822,32 @@ const Docs = (defaultprops) => {
}
if (responseJson.success && responseJson.reason !== undefined) {
+
+ if(isArticlePage && window.location.pathname.includes("/articles/")) {
+ if (responseJson.reason !== undefined && responseJson.reason !== null && responseJson.reason.includes("404: Not Found")) {
+ setData("# Error\nThis page doesn't exist.");
+ toast("This page doesn't exist. Redirecting to the latest article...", {
+ position: "bottom-center",
+ autoClose: 2000,
+ });
+ setTimeout(() => {
+ navigate(`/articles/2.0_release`)
+ }, 2000)
+ return
+ }
+ }
// Find
+
+
)
}
@@ -251,8 +278,10 @@ export const CodeHandler = (props) => {
}
const Docs = (defaultprops) => {
- const { globalUrl, selectedDoc, serverside, serverMobile, isLoggedIn, isLoaded } = defaultprops;
+ const { globalUrl, selectedDoc, serverside, serverMobile, isLoggedIn, isLoaded, userdata } = defaultprops;
+
let navigate = useNavigate();
+ const location = useLocation();
// Quickfix for react router 5 -> 6
const params = useParams();
//var props = JSON.parse(JSON.stringify(defaultprops))
@@ -283,15 +312,31 @@ const Docs = (defaultprops) => {
serverside === true ? "" : window.location.href
);
const [hashRendered, setHashRendered] = React.useState(false)
-
+ const [sidebarOpen, setSidebarOpen] = useState(false);
+ const [activeSubItem, setActiveSubItem] = useState(false);
const headingElementsRef = useRef({})
+ var isArticlePage = window.location.pathname.includes("/articles/") || window.location.pathname === "/articles" ? true : false;
+
useEffect(() => {
- //if (params["key"] === undefined) {
- // navigate("/docs/about")
- // return
- //}
- }, [])
+ fetchDocList();
+ setSidebarOpen(false);
+
+ if (props.match.params === undefined || props.match.params === null) {
+ return
+ }
+
+ const propkey = props.match.params.key
+ if (propkey === undefined || propkey === null) {
+ return
+ }
+
+ if (location.pathname.includes("/docs/")) {
+ if (propkey === "cookie_policy" || propkey === "compliance" || propkey === "privacy_policy" || propkey === "terms_of_service") {
+ navigate(`/legal/${propkey}`)
+ }
+ }
+ }, [location]);
const handleClick = (event) => {
setAnchorEl(event.currentTarget);
@@ -460,8 +505,13 @@ const Docs = (defaultprops) => {
}
const SidebarPaperStyle = {
- backgroundColor: "rgb(26,26,26)",
+ backgroundColor: isArticlePage ? "transparent" : "rgb(26,26,26)",
+ border: isArticlePage ? "none" : undefined,
+ borderRadius: isArticlePage ? "none" : undefined,
+ boxShadow: isArticlePage ? "none" : undefined,
backgroundImage: "none",
+ width: isArticlePage ? "100%" : undefined,
+ height: isArticlePage ? "100%" : undefined,
overflowX: "hidden",
position: "relative",
paddingLeft: 15,
@@ -527,7 +577,7 @@ const Docs = (defaultprops) => {
backgroundColor: theme.palette.inputColor,
padding: 15,
borderRadius: theme.palette?.borderRadius,
- marginBottom: 25,
+ marginBottom: isArticlePage ? 25 : 30,
display: "flex",
}}
>
@@ -620,7 +670,7 @@ const Docs = (defaultprops) => {
style={{
width: "90%",
marginTop: 60,
- marginBottom: 20,
+ marginBottom: isArticlePage ? 40 : 20,
backgroundColor: theme.palette.inputColor,
}}
/>
@@ -630,7 +680,21 @@ const Docs = (defaultprops) => {
marginBlock: "0.85em", alignItems: "center"
}}>
{element}
- {
+ e.preventDefault(); // Prevent default navigation
+ document.getElementById(id)?.scrollIntoView({
+ behavior: 'smooth'
+ });
+
+ const url = `${window.location.origin}${window.location.pathname}#${id}`;
+ navigator.clipboard.writeText(url);
+ toast("Link copied to clipboard", {
+ position: "bottom-center",
+ autoClose: 2000,
+ });
+ }}
+ style={{
textDecoration: "none", color: "white",
paddingLeft: "0.3em", rotate: "-30deg",
paddingTop: "0.9em", display: props.level === 1 ? "none" : "block",
@@ -638,8 +702,7 @@ const Docs = (defaultprops) => {
-
+
-
-
-
+
-
{list.map((data, index) => {
const item = data.name;
if (item === undefined) {
return null;
}
- const path = "/docs/" + item;
+
+ var path = "/docs/" + item;
+ if (location.pathname.includes("/legal")) {
+ path = "/legal/" + item
+ } else if (location.pathname.includes("/articles")) {
+ path = "/articles/" + item
+ }
+
const newname =
item.charAt(0).toUpperCase() +
item.substring(1).split("_").join(" ").split("-").join(" ");
@@ -965,23 +1149,62 @@ const Docs = (defaultprops) => {
+
);
@@ -1198,7 +1457,7 @@ export default Docs;
const DocsContent = memo(({postDataBrowser, postDataMobile}) => {
return(
-
{props.match.params.key === undefined ?
mainpageInfo
:
@@ -1003,12 +1226,26 @@ const Docs = (defaultprops) => {
}
+ {userdata?.support && isArticlePage && (
+
+ )}
{tocLines.length > 0 ?
(
-
@@ -1083,7 +1327,7 @@ const Docs = (defaultprops) => {
color="primary"
onClick={handleClick}
>
- Table of Content
+Table Of Content
) : null} -More docs
+ More {isArticlePage ? "articles" : "docs"}
+
{postDataBrowser}
{postDataMobile}
@@ -1210,12 +1469,14 @@ const DocsWrapper = memo(({isLoggedIn, isLoaded, children })=>{
return (
{children}
diff --git a/frontend/src/views/LoginPage.jsx b/frontend/src/views/LoginPage.jsx
index 23f8e350..ede54153 100755
--- a/frontend/src/views/LoginPage.jsx
+++ b/frontend/src/views/LoginPage.jsx
@@ -1,547 +1,960 @@
/* eslint-disable react/no-multi-comp */
-import React, { useState, useEffect } from "react";
-import { makeStyles } from "@mui/styles";
+import React, { useState, useEffect, } from 'react';
+import { makeStyles } from '@mui/styles';
+import { useNavigate, Link, useParams } from "react-router-dom";
+import { isMobile } from "react-device-detect";
+import { toast } from 'react-toastify';
import { useInterval } from "react-powerhooks";
-import theme from '../theme.jsx';
+
import {
- CircularProgress,
- TextField,
- Button,
- Paper,
- Typography,
-} from "@mui/material";
+ ConnectingAirportsOutlined,
+ ConstructionOutlined,
+ DoneRounded,
+ Done as DoneIcon
+} from '@mui/icons-material';
-import { useNavigate } from "react-router-dom";
+import {
+ Checkbox,
+ CircularProgress,
+ TextField,
+ Button,
+ Paper,
+ Typography,
+ Tooltip,
+ TableHead,
+ TableRow,
+ TableContainer,
+ TableCell,
+ TableBody,
+ Table,
+} from '@mui/material';
const hrefStyle = {
- color: "white",
- textDecoration: "none",
-};
+ color: "#FF8444",
+ fontSize: "14px",
+ textDecoration: "none",
+ display: "flex",
+}
-const bodyDivStyle = {
- margin: "auto",
- marginTop: 150,
- width: "500px",
-};
+const googleLoginIcon = {
+ boxSizing: "border-box",
+ display: "flex",
+ flexDirection: "row",
+ justifyContent: "center",
+ alignItems: "center",
+ padding: "16px",
+ gap: "8px",
+ // position: "sticky",
+ width: 171,
+ height: "51px",
+ left: "352px",
+ top: "725px",
+ background: "#1A1A1A",
+ border: "1px solid #494949",
+ borderRadius: "8px",
+
+}
+
+const githubLoginIcon = {
+ boxSizing: "border-box",
+ display: "flex",
+ flexDirection: "row",
+ justifyContent: "center",
+ alignItems: "center",
+ padding: "16px",
+ gap: "8px",
+ position: "sticky",
+ width: "173px",
+ height: "51px",
+ left: "539px",
+ top: "725px",
+ backgroundColor: "#1A1A1A",
+ border: "1px solid #494949",
+ borderRadius: "8px",
+}
+
+const surfaceColor = "#27292D"
+const inputColor = "#383B40"
const useStyles = makeStyles({
- notchedOutline: {
- borderColor: "#f85a3e !important",
- },
+ notchedOutline: {
+ borderColor: "#f85a3e !important"
+ },
+ marketplaceButton: {
+ width: "100%",
+ justifyContent: "flex-start",
+ padding: "12px",
+ marginBottom: "12px",
+ backgroundColor: "#1A1A1A",
+ border: "1px solid #494949",
+ borderRadius: "8px",
+ color: "white",
+ opacity: 0.7,
+ '&:hover': {
+ opacity: 1,
+ cursor: "not-allowed",
+ },
+ },
+ marketplaceIcon: {
+ width: 28,
+ height: 28,
+ marginRight: 12
+ },
+ divider: {
+ display: "flex",
+ alignItems: "center",
+ margin: "0 20px",
+ '&::before, &::after': {
+ content: '""',
+ flex: 1,
+ borderBottom: "1px solid #494949"
+ },
+ '& span': {
+ margin: "0 10px",
+ color: "#9E9E9E"
+ }
+ },
+ freePlanCard: {
+ padding: "40px",
+ background: "#212121",
+ borderRadius: "12px",
+ width: "100%",
+ maxWidth: "500px"
+ },
+ freePlanTitle: {
+ fontSize: "28px",
+ fontWeight: 600,
+ color: "white",
+ marginTop: 0,
+ marginBottom: "32px"
+ },
+ featureItem: {
+ display: "flex",
+ alignItems: "center",
+ marginBottom: "20px",
+ color: "white",
+ fontSize: "16px",
+ fontWeight: 500
+ },
+ checkIcon: {
+ color: "#4CAF50",
+ marginRight: "16px",
+ width: "24px",
+ height: "24px"
+ }
});
-const LoginDialog = (props) => {
- const {
- globalUrl,
- isLoaded,
- isLoggedIn,
- setIsLoggedIn,
- setCookie,
- register,
- checkLogin,
- } = props;
+const FreePlanCard = ({ classes }) => {
+ const features = [
+ "Access to All Apps",
+ "10,000 App Runs",
+ "Monthly Runs Refresh",
+ "Unlimited Users & Workflows",
+ "Multi-Tenancy & -Region",
+ "Support & Discord Access"
+ ];
+
+ return (
+ {formtitle}
+
+ const buttonBackground = "linear-gradient(89.83deg, #FF8444 0.13%, #F2643B 99.84%)"
+
+ const buttonStyle = { borderRadius: 25, height: 50, fontSize: 18, backgroundImage: handleValidateForm(username, password) || loginLoading || (checkboxClicked && register) ? buttonBackground : "grey", color: "white" }
+ //
+
+ );
+};
+
+const MarketplaceCard = ({ classes }) => {
+ const marketplaceOptions = [
+ {
+ name: "Amazon Web Services",
+ logo: "https://cdn.cdnlogo.com/logos/a/19/aws.svg",
+ tooltipText: "Coming soon to AWS Marketplace!",
+ valid: false,
+ },
+ {
+ name: "Microsoft Azure",
+ logo: "https://cdn.cdnlogo.com/logos/a/12/azure.svg",
+ tooltipText: "Coming soon to Azure Marketplace!",
+ valid: false,
+ },
+ {
+ name: "Google Cloud Platform",
+ logo: "https://cdn.cdnlogo.com/logos/g/75/google-cloud.svg",
+ tooltipText: "Coming soon to Google Cloud Marketplace!",
+ valid: false,
+ }
+ ];
+
+ return (
+ + The free plan includes: +
+ + {features.map((feature, index) => ( +
+
+ ))}
+
+
+
+
+ ))}
+
+
+ );
+};
+
+
+const LoginPage = props => {
+ const { globalUrl, isLoaded, isLoggedIn, setIsLoggedIn, setCookie, inregister, serverside, checkLogin, } = props;
let navigate = useNavigate();
- const classes = useStyles();
+ const [username, setUsername] = useState("");
+ const [password, setPassword] = useState("");
+ const [message, setMessage] = useState("");
+ const [loginLoading, setLoginLoading] = useState(false);
- const [username, setUsername] = useState("");
- const [password, setPassword] = useState("");
- const [firstRequest, setFirstRequest] = useState(true);
- const [loginLoading, setLoginLoading] = useState(false);
- const [loginViewLoading, setLoginViewLoading] = useState(false);
- const [ssoUrl, setSSOUrl] = useState("");
+ const [MFAField, setMFAField] = useState(false);
+ const [MFAValue, setMFAValue] = useState("");
+ const [register, setRegister] = useState(inregister);
+ const [checkboxClicked, setCheckboxClicked] = useState(false);
+ const [loginWithSSO, setLoginWithSSO] = useState(false)
+
+ const [ssoUrl, setSSOUrl] = useState("");
- const [MFAField, setMFAField] = useState(false);
- const [MFAValue, setMFAValue] = useState("");
-
-
- // Used to swap from login to register. True = login, false = register
+ const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io" || window.location.host === "migration.shuffler.io";
+ const parsedsearch = serverside === true ? "" : window.location.search
useEffect(() => {
- checkAdmin()
- }, [loginViewLoading])
+ if (!isCloud) {
+ checkAdmin()
+ }
+ }, [])
- // Error messages etc
- const [loginInfo, setLoginInfo] = useState("");
-
- const handleValidateForm = () => {
- return username.length > 1 && password.length > 1;
- };
-
- if (isLoggedIn === true) {
- //window.location.pathname = "/workflows";
- navigate("/workflows")
- }
-
- const checkAdmin = () => {
- const url = globalUrl + "/api/v1/checkusers";
- fetch(url, {
- method: "GET",
- headers: {
- "Content-Type": "application/json",
+ const { start, stop } = useInterval({
+ duration: 3000,
+ startImmediate: false,
+ callback: () => {
+ checkAdmin()
},
})
+
+ if (serverside !== true) {
+ const tmpMessage = new URLSearchParams(window.location.search).get("message")
+ if (tmpMessage !== undefined && tmpMessage !== null && message !== tmpMessage) {
+ setMessage(tmpMessage)
+ }
+ }
+
+ if (document !== undefined) {
+ if (register) {
+ document.title = "Login to Shuffle SaaS"
+ } else {
+ document.title = "Register to Shuffle SaaS"
+ }
+ }
+
+ // Just a way to force location loading properly
+ // Register & login should be split :3
+ if (window !== undefined) {
+ const path = window.location.pathname;
+ if (path.includes("/login") && register === false) {
+ console.log("Should register instead of login!")
+ setRegister(!register)
+ } else if (path.includes("/register") && register === true) {
+ if (!isCloud) {
+ setRegister(true)
+ navigate("/login")
+ }
+
+ console.log("Should login instead of register!")
+ setRegister(!register)
+ } else {
+ console.log("Path: " + path, "Register: " + register)
+ }
+ }
+
+ const bodyDivStyle = {
+ marginTop: 100,
+ width: isMobile ? "100%" : "100%",
+ maxWidth: "1200px", // Increased max-width to accommodate larger cards
+ background: "#1A1A1A",
+ margin: "auto",
+ display: isMobile ? "block" : "flex",
+ padding: "40px",
+ gap: "40px",
+ overflow: "hidden",
+ alignItems: "center"
+ };
+
+ const boxStyle = {
+ color: "white",
+ padding: "40px",
+ flex: 1,
+ maxWidth: isMobile ? "100%" : "550px",
+ background: "#212121",
+ borderRadius: "12px",
+ display: "flex",
+ // flexDirection: "column",
+ };
+
+
+
+ const paperStyleReg = {
+ width: 300,
+ height: 350,
+ background: "#212121",
+ borderRadius: "8px",
+ marginLeft: isMobile ? 80 : register ? "455px" : "485px",
+ marginTop: isMobile ? 10 : 110,
+ position: isMobile ? "" : "absolute",
+
+ }
+ const paperStyleLog = {
+ position: "absolute",
+ width: isMobile ? "400px" : "532px",
+ padding: "0px 30px 0px",
+ // marginTop: "135px",
+ // background: "#212121",
+ borderRadius: "8px",
+ }
+ const createData = (icon, title) => {
+ return {
+ icon,
+ title,
+ }
+ }
+
+ // Used to swap from login to register. True = login, false = register
+ const activeIcon = + Self Host +
+ + {marketplaceOptions.map((option, index) => ( +
+ {/*
+
+ Read more about marketplaces
+
+ */}
+
+ Learn more about self hosting
+
+
+
+ Want to register? Click here.
Go back to login? Click here.
Login
: Register
;
- const imgsize = 100;
- const basedata = (
-
-
-
-
- );
-
- const loadedCheck = isLoaded ?
- 
-
-
- {loginViewLoading ? (
-
-
-
- Waiting for the Shuffle database to become available. This may
- take up to a minute.
-
-
- {loginInfo === undefined ||
- loginInfo === null ||
- loginInfo.length === 0 ? null : (
-
-
-
- Are you sure Shuffle is{" "}
-
- installed correctly
-
- ?
-
-
-
- 1. Make sure shuffle-database folder has correct access, and that you have a minimum of 2Gb of RAM available:{" "}
-
-
- sudo chown -R 1000:1000 shuffle-database -
-
- 2. Disable memory swap on the host:
-
-
- sudo swapoff -a -
-
- 3. Restart the database:
-
-
- sudo docker restart shuffle-opensearch -
-
-
- Need help?{" "}
-
- Join the Discord!
-
-
-
- ) : (
-
- )}
- Database Response: {loginInfo}
- )}
- -
- sudo chown -R 1000:1000 shuffle-database -
-
- sudo swapoff -a -
-
- sudo docker restart shuffle-opensearch -
{basedata}
: ;
-
- useEffect(() => {
- setTimeout(() => {
- if (ssoUrl !== undefined && ssoUrl !== null && ssoUrl.length > 0) {
- //id="sso_button"
- const ssoBtn = document.getElementById("sso_button");
- if (ssoBtn !== undefined && ssoBtn !== null) {
- //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) {
- if (tmpView === "true") {
- console.log("Tmp: ", tmpView)
- ssoBtn.click()
- }
- }
- }
+ if (loginWithSSO === true) {
+ url = baseurl + '/api/v1/login/sso'
+ setLoginInfo("Logging in with SSO. Please wait while we find a relevant org...")
}
- }, 200);
- }, [ssoUrl])
- return {loadedCheck}
;
-};
+ 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) => {
+ if (response.status !== 200) {
+ console.log("Status not 200 for login:O!");
+ }
-export default LoginDialog;
+ return response.json();
+ })
+ .then((responseJson) => {
+
+ setLoginLoading(false)
+
+ console.log("Resp from backend: ", responseJson)
+
+ if (responseJson["success"] === false) {
+ setLoginInfo(responseJson["reason"])
+ }
+ else {
+
+ if (responseJson["reason"] === "MFA_REDIRECT") {
+ setLoginInfo("Enter the 6-digit MFA code.")
+ setMFAField(true)
+ return
+
+ }
+ else if (responseJson["reason"] === "MFA_SETUP") {
+ window.location.href = `/login/${responseJson.url}/mfa-setup`;
+ return;
+ }
+ else if (responseJson["reason"] === "SSO_REDIRECT") {
+ //navigate(responseJson["url"])
+ window.location.href = responseJson["url"]
+ return
+
+ }
+ else if (responseJson["reason"] !== undefined && responseJson["reason"] !== null && responseJson["reason"].includes("error")) {
+ setLoginInfo(responseJson["reason"])
+ return
+ }
+
+
+ setLoginInfo("Successful login! Redirecting you in 3 seconds...")
+ for (var key in responseJson["cookies"]) {
+ setCookie(responseJson["cookies"][key].key, responseJson["cookies"][key].value, { path: "/" })
+ }
+
+ const tmpView = new URLSearchParams(window.location.search).get("view")
+ if (tmpView !== undefined && tmpView !== null) {
+ //const newUrl = `/${tmpView}${decodeURIComponent(window.location.search)}`
+ // Check if slash in the url
+
+ var newUrl = `/${tmpView}`
+ if (tmpView.startsWith("/")) {
+ newUrl = `${tmpView}`
+ }
+
+ console.log("Found url: ", newUrl)
+
+ window.location.pathname = newUrl
+ return
+ }
+
+ console.log("LOGIN DATA: ", responseJson)
+ if (responseJson.tutorials !== undefined && responseJson.tutorials !== null) {
+ // Find welcome in responseJson.tutorials under key name
+ const welcome = responseJson.tutorials.find(function (element) {
+ return element.name === "welcome";
+ })
+
+ console.log("Welcome: ", welcome)
+ if (welcome === undefined || welcome === null) {
+ console.log("RUN login Welcome!!")
+ // window.location.pathname = "/welcome?tab=2"
+ // window.location = "/welcome?tab=2"
+ window.location.href = "/welcome?tab=2"
+ return
+ }
+ }
+
+ window.location.pathname = "/workflows"
+ }
+ })
+ .catch(error => {
+ setLoginInfo("Error from login API: " + error)
+ setLoginLoading(false)
+ });
+ } else {
+ url = baseurl + '/api/v1/register';
+ fetch(url, {
+ method: 'POST',
+ body: JSON.stringify(data),
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ })
+ .then(response =>
+ response.json().then(responseJson => {
+ if (responseJson["success"] === false) {
+ setLoginInfo(responseJson["reason"])
+ } else {
+ if (responseJson["reason"] === "shuffle_account") {
+ window.location.href = "/login?message=Please+login+with+your+Shuffle+account"
+ return
+ }
+
+ //setLoginInfo("Successful register!")
+ //var newpath = "/login?message=Successfully signed up. You can now sign in."
+ //const tmpMessage = new URLSearchParams(window.location.search).get("message")
+ setLoginInfo("Successful registration! Redirecting in 3 seconds...")
+ for (var key in responseJson["cookies"]) {
+ setCookie(responseJson["cookies"][key].key, responseJson["cookies"][key].value, { path: "/" })
+ }
+
+ setTimeout(() => {
+ console.log("LOGIN DATA: ", responseJson)
+
+ const tmpView = new URLSearchParams(window.location.search).get("view")
+ if (tmpView !== undefined && tmpView !== null) {
+ //const newUrl = `/${tmpView}${decodeURIComponent(window.location.search)}`
+ const newUrl = `/${tmpView}`
+ window.location.pathname = newUrl
+ return
+ }
+
+ //if (responseJson.tutorials === undefined || responseJson.tutorials === null || !responseJson.tutorials.includes("welcome")) {
+ console.log("RUN Welcome!!")
+ //window.location.pathname = "/welcome?tab=2"
+ window.location.href = "/welcome"
+ }, 1500);
+ }
+ setLoginLoading(false)
+ }),
+ )
+ .catch(error => {
+ setLoginInfo("Error in login. Please try again, or contact support@shuffler.io if the problem persists.")
+ setLoginLoading(false)
+ });
+ }
+ }
+
+ const onChangeUser = (e) => {
+ setUsername(e.target.value)
+ }
+
+ const onChangePass = (e) => {
+ setPassword(e.target.value)
+ }
+
+ const HandleLoginWithSSO = () => {
+ setPassword("")
+ setLoginInfo("")
+ setLoginWithSSO(true)
+ }
+
+ //const onClickRegister = () => {
+ // if (props.location.pathname === "/login") {
+ // window.location.pathname = "/register"
+ // } else {
+ // window.location.pathname = "/login"
+ // }
+
+ // setLoginCheck(!register)
+ //}
+
+ //var loginChange = register ? (Want to register? Click here.
Go back to login? Click here.
Welcome Back!
: Create your account
+ var formButton = !isCloud ? "" : register ? Don’t have an account yet?
Register here
Already have an account?
Login here
Click here to Login
+
+ //