Fixed a bunch of possible issues with User Input on cloud vs onprem, and how workflows start in shuffle-shared
This commit is contained in:
+21
-17
@@ -196,26 +196,30 @@ const App = (message, props) => {
|
||||
}
|
||||
|
||||
<div style={{ minHeight: 68, maxHeight: 68, }}>
|
||||
<Header
|
||||
billingInfo={{}}
|
||||
{curpath.includes("/workflows") && curpath.includes("/run") ?
|
||||
<div style={{ height: 60, }} />
|
||||
:
|
||||
<Header
|
||||
billingInfo={{}}
|
||||
|
||||
notifications={notifications}
|
||||
setNotifications={setNotifications}
|
||||
checkLogin={checkLogin}
|
||||
cookies={cookies}
|
||||
removeCookie={removeCookie}
|
||||
isLoaded={isLoaded}
|
||||
globalUrl={globalUrl}
|
||||
setIsLoggedIn={setIsLoggedIn}
|
||||
isLoggedIn={isLoggedIn}
|
||||
userdata={userdata}
|
||||
notifications={notifications}
|
||||
setNotifications={setNotifications}
|
||||
checkLogin={checkLogin}
|
||||
cookies={cookies}
|
||||
removeCookie={removeCookie}
|
||||
isLoaded={isLoaded}
|
||||
globalUrl={globalUrl}
|
||||
setIsLoggedIn={setIsLoggedIn}
|
||||
isLoggedIn={isLoggedIn}
|
||||
userdata={userdata}
|
||||
|
||||
curpath={curpath}
|
||||
serverside={false}
|
||||
isMobile={false}
|
||||
curpath={curpath}
|
||||
serverside={false}
|
||||
isMobile={false}
|
||||
|
||||
{...props}
|
||||
/>
|
||||
{...props}
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
|
||||
{/*
|
||||
|
||||
@@ -11,14 +11,14 @@ import {
|
||||
import HealthBarChart from '../components/HealthBarChart.jsx';
|
||||
|
||||
const HealthPage = (props) => {
|
||||
const { userdata } = props;
|
||||
const { globalUrl, userdata } = props;
|
||||
const [healthData, setHealthData] = useState(null);
|
||||
const [selectedRange, setSelectedRange] = useState('30d');
|
||||
const [filteredData, setFilteredData] = useState([]);
|
||||
const [averageUptime, setAverageUptime] = useState(0);
|
||||
|
||||
const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io";
|
||||
const globalUrl = `https://shuffler.io`
|
||||
//const globalUrl = `https://shuffler.io`
|
||||
|
||||
console.log("HEALTHPAGE 1")
|
||||
|
||||
|
||||
@@ -6305,10 +6305,6 @@ If you're interested, please let me know a time that works for you, or set up a
|
||||
primary="Actions"
|
||||
style={{ minWidth: 200, maxWidth: 200 }}
|
||||
/>
|
||||
<ListItemText
|
||||
primary="Last Edited"
|
||||
style={{ minWidth: 170, maxWidth: 170 }}
|
||||
/>
|
||||
</ListItem>
|
||||
{environments === undefined || environments === null
|
||||
? null
|
||||
@@ -6626,20 +6622,6 @@ If you're interested, please let me know a time that works for you, or set up a
|
||||
</ButtonGroup>
|
||||
</div>
|
||||
</ListItemText>
|
||||
<ListItemText
|
||||
style={{
|
||||
minWidth: 150,
|
||||
maxWidth: 150,
|
||||
overflow: "hidden",
|
||||
}}
|
||||
primary={
|
||||
environment.edited !== undefined &&
|
||||
environment.edited !== null &&
|
||||
environment.edited !== 0
|
||||
? new Date(environment.edited * 1000).toISOString()
|
||||
: 0
|
||||
}
|
||||
/>
|
||||
</ListItem>
|
||||
{showCPUAlert === false ? null : (
|
||||
<ListItem
|
||||
|
||||
Reference in New Issue
Block a user