{(() => {
diff --git a/frontend/src/views/LoginPage.jsx b/frontend/src/views/LoginPage.jsx
index e470255d..e710c612 100755
--- a/frontend/src/views/LoginPage.jsx
+++ b/frontend/src/views/LoginPage.jsx
@@ -476,7 +476,7 @@ const LoginPage = props => {
return;
}
- window.location.pathname = "/workflows"
+ window.location.pathname = "/new-dashboard"
}, 2000);
}
@@ -658,7 +658,7 @@ const LoginPage = props => {
}
}
- window.location.pathname = "/workflows"
+ window.location.pathname = "/new-dashboard"
}, 2000);
}
})
diff --git a/frontend/src/views/NewDashboard.jsx b/frontend/src/views/NewDashboard.jsx
index 630e6dec..bbe32310 100644
--- a/frontend/src/views/NewDashboard.jsx
+++ b/frontend/src/views/NewDashboard.jsx
@@ -10,22 +10,31 @@ import {
Divider,
Select,
MenuItem,
+ Tooltip,
+ CircularProgress,
} from '@mui/material';
-import TrendingUpIcon from '@mui/icons-material/TrendingUp';
-import TrendingDownIcon from '@mui/icons-material/TrendingDown';
-import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline';
-import TaskAltIcon from '@mui/icons-material/TaskAlt';
+import { toast } from "react-toastify";
+
+
+import {
+ TrendingFlat as TrendingFlatIcon,
+ TrendingUp as TrendingUpIcon,
+ TrendingDown as TrendingDownIcon,
+ TaskAlt as TaskAltIcon,
+ SuccessFailed as SuccessFailedIcon,
+ RunsOverTime as RunsOverTimeIcon,
+ ErrorOutline as ErrorOutlineIcon,
+} from '@mui/icons-material';
+
import SuccessFailedRunsWidget from '../components/SuccessFailedRunsWidget.jsx';
import RunsOverTimeWidget from '../components/RunsOverTimeWidget.jsx';
-import { Context } from '../context/ContextApi.jsx';
-import CircularProgress from '@mui/material/CircularProgress';
-import { useNavigate } from 'react-router-dom';
import DashboardOnboarding from '../components/DashboardOnboarding.jsx';
+import { Context } from '../context/ContextApi.jsx';
+import { useNavigate } from 'react-router-dom';
const NewDashboard = (props) => {
- const { globalUrl, userdata } = props;
+ const { globalUrl, serverside, userdata } = props;
- // const [workflows, setWorkflows] = useState([]);
const { leftSideBarOpenByClick } = useContext(Context);
const [sfwControls, setSfwControls] = useState(null);
const [loadingSfw, setLoadingSfw] = useState(true);
@@ -40,9 +49,18 @@ const NewDashboard = (props) => {
} catch {
return true;
}
- });
+
+ })
const [overrideDays, setOverrideDays] = useState(undefined);
const [rotMonthOverride, setRotMonthOverride] = useState(undefined);
+ const [isProdStatusOn, setIsProdStatusOn] = useState(false)
+
+ const isCloud =
+ serverside === true || typeof window === "undefined"
+ ? true
+ : window.location.host === "localhost:3002" ||
+ window.location.host === "shuffler.io" ||
+ window.location.host === "localhost:5002";
const navigate = useNavigate();
const handleSfwControls = useCallback((node) => {
@@ -71,8 +89,6 @@ const NewDashboard = (props) => {
};
const timeFmt = formatTimeDisplay(totals.timeSavedMinutes);
- const STATIC_TIME_PERCENT = '62%';
- const STATIC_MONEY_PERCENT = '46%';
const unreadCount = notifications.filter(n => n && n.read === false).length;
const readCount = notifications.filter(n => n && n.read === true).length;
@@ -81,9 +97,11 @@ const NewDashboard = (props) => {
// 1 Workflow run = 15 minutes
// 1 Workflow run = $25
+ const STATIC_TIME_PERCENT = 'TBD'
+ const STATIC_MONEY_PERCENT = 'TBD'
const kpis = [
- { value: timeFmt.display, title: timeFmt.title, label: 'Time saved', icon:
, percentage: STATIC_TIME_PERCENT, color: '#5cc879' },
- { value: formatCurrencyCompact(totals.moneySavedDollars), label: 'Money saved', icon:
, percentage: STATIC_MONEY_PERCENT, color: '#5cc879' },
+ { value: timeFmt.display, title: timeFmt.title, label: 'Time saved', icon:
, percentage: STATIC_TIME_PERCENT, color: '#5cc879', disabled: true},
+ { value: formatCurrencyCompact(totals.moneySavedDollars), label: 'Money saved', icon:
, percentage: STATIC_MONEY_PERCENT, color: '#5cc879', disabled: true, },
{ value: String(unreadCount), label: 'Total errors', icon:
, percentage: "", color: '#f87171' },
{ value: String(readCount), label: 'Errors resolved', icon:
, percentage: "", color: '#5cc879' },
];
@@ -177,13 +195,51 @@ const NewDashboard = (props) => {
// loadWorkflows();
// }, [globalUrl]);
+
+ useEffect(() => {
+ const orgId = userdata?.active_org?.id;
+ if (!orgId) {
+ return;
+ }
+
+ let fetched = false;
+ fetch(`${globalUrl}/api/v1/orgs/${orgId}`, {
+ method: "GET",
+ credentials: "include",
+ headers: { "Content-Type": "application/json" },
+ })
+ .then((response) => (response.ok ? response.json() : null))
+ .then((org) => {
+ if (!fetched && org) {
+ if (!isCloud) {
+ if (org?.cloud_sync && org?.subscriptions[0]?.name?.toLowerCase().includes("enterprise") && org?.subscriptions[0]?.active) {
+ setIsProdStatusOn(true);
+ } else if (org?.subscriptions[0]?.name?.toLowerCase().includes("enterprise") && org?.subscriptions[0]?.active) {
+ setIsProdStatusOn(true);
+ } else {
+ setIsProdStatusOn(false);
+ }
+ }
+ }
+ })
+ .catch(() => {});
+
+ return () => {
+ fetched = true;
+ };
+ }, [userdata?.active_org?.id, globalUrl]);
return (
setOnboardingOpen(false)}
+ onClose={() => {
+ setOnboardingOpen(false)
+ }}
+ setOnboardingOpen={setOnboardingOpen}
+ isProdStatusOn={isProdStatusOn}
+ isCloud={isCloud}
onExplore={() => {
// Ensure overrides are set before closing modal
setOverrideDays(5);
@@ -215,28 +271,31 @@ const NewDashboard = (props) => {
{kpis.map((kpi) => (
- {
- if (kpi.label.toLowerCase().includes('total errors')) {
- // navigate to notifications page
- navigate('/admin?admin_tab=notifications');
- }
- }}
-
- >
-
-
- {kpi.value}
- {kpi.label}
-
-
- {kpi.icon}
- {kpi.percentage}
-
-
-
+
+ {
+ if (kpi.label.toLowerCase().includes('total errors')) {
+ // navigate to notifications page
+ navigate('/admin?admin_tab=notifications');
+ }
+ }}
+
+ >
+
+
+ {kpi.value}
+ {kpi.label}
+
+
+ {kpi.icon}
+ {kpi.percentage}
+
+
+
+
))}
diff --git a/frontend/src/views/Workflows2.jsx b/frontend/src/views/Workflows2.jsx
index 02df7908..2732279a 100644
--- a/frontend/src/views/Workflows2.jsx
+++ b/frontend/src/views/Workflows2.jsx
@@ -818,6 +818,7 @@ const Workflows2 = (props) => {
const [highlightIds, setHighlightIds] = React.useState([])
const [apps, setApps] = React.useState([]);
+ const [isProdStatusOn, setIsProdStatusOn] = React.useState(false);
const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
@@ -839,6 +840,39 @@ const Workflows2 = (props) => {
}
}, [location.search]);
+ useEffect(() => {
+ const orgId = userdata?.active_org?.id;
+ if (!orgId) {
+ return;
+ }
+
+ let fetched = false;
+ fetch(`${globalUrl}/api/v1/orgs/${orgId}`, {
+ method: "GET",
+ credentials: "include",
+ headers: { "Content-Type": "application/json" },
+ })
+ .then((response) => (response.ok ? response.json() : null))
+ .then((org) => {
+ if (!fetched && org) {
+ if (!isCloud) {
+ if (org?.cloud_sync && org?.subscriptions[0]?.name?.toLowerCase().includes("enterprise") && org?.subscriptions[0]?.active) {
+ setIsProdStatusOn(true);
+ } else if (org?.subscriptions[0]?.name?.toLowerCase().includes("enterprise") && org?.subscriptions[0]?.active) {
+ setIsProdStatusOn(true);
+ } else {
+ setIsProdStatusOn(false);
+ }
+ }
+ }
+ })
+ .catch(() => {});
+
+ return () => {
+ fetched = true;
+ };
+ }, [userdata?.active_org?.id, globalUrl]);
+
const handleTabChange = (event, newValue) => {
setCurrTab(newValue);
@@ -3043,12 +3077,34 @@ const Workflows2 = (props) => {
}
}
+ const isPublicWorkflow = data?.objectId === undefined || data?.objectId === null
+ const foundImage = !isPublicWorkflow ? "" : data?.image_url === undefined || data?.image_url === null || data?.image_url === "" ? data?.image : data?.image_url
+
const foundTimeline = workflowTimelines.find((timeline) => timeline.id === data.id)
return (
+ style={{ width: "100%", minWidth: 320, position: "relative", border: highlightIds.includes(data.id) ? "2px solid #f85a3e" : isDistributed || hasSuborgs ? `2px solid ${theme.palette.distributionColor}` : "inherit", borderRadius: theme.palette?.borderRadius, backgroundColor: "#212121", fontFamily: theme.typography?.fontFamily, overflow: "hidden", }}
+ >
+ {isPublicWorkflow && foundImage?.length > 0 ?
+
{
+ if (isCloud) {
+ navigate(`/workflows/${data.objectID}`)
+ } else {
+ window.open(`https://shuffler.io/workflows/${data.objectID}`, "_blank")
+ }
+ }}
+ />
+ : null}
+
{selectedCategory !== "" ?
@@ -4934,7 +4990,7 @@ const Workflows2 = (props) => {
}}
/>
{
{
+ navigate("/admin?admin_tab=billingstats")
+ }}
+ >
+
+
+ {isProdStatusOn ? "Production" : "NOT Production"}
+
+
+ ) : null}
+
+
{
(isLoadingWorkflow && currTab !== 2) ? (