Merge branch 'frikky:launch' into launch
This commit is contained in:
@@ -2717,7 +2717,7 @@ const Admin = (props) => {
|
||||
style={{minWidth: 150, maxWidth: 150}}
|
||||
/>
|
||||
<ListItemText
|
||||
primary="Orborus running (TBD)"
|
||||
primary="Orborus running"
|
||||
style={{minWidth: 200, maxWidth: 200}}
|
||||
/>
|
||||
<ListItemText
|
||||
@@ -2736,6 +2736,10 @@ const Admin = (props) => {
|
||||
primary="Archived"
|
||||
style={{minWidth: 150, maxWidth: 150}}
|
||||
/>
|
||||
<ListItemText
|
||||
primary="Last Changed"
|
||||
style={{minWidth: 150, maxWidth: 150}}
|
||||
/>
|
||||
</ListItem>
|
||||
{environments === undefined || environments === null ? null : environments.map((environment, index)=> {
|
||||
if (!showArchived && environment.archived) {
|
||||
@@ -2747,19 +2751,19 @@ const Admin = (props) => {
|
||||
return null
|
||||
}
|
||||
|
||||
//var bgColor = "#27292d"
|
||||
//if (index % 2 === 0) {
|
||||
// bgColor = "#1f2023"
|
||||
//}
|
||||
var bgColor = "#27292d"
|
||||
if (index % 2 === 0) {
|
||||
bgColor = "#1f2023"
|
||||
}
|
||||
|
||||
return (
|
||||
<ListItem key={index}>
|
||||
<ListItem key={index} style={{backgroundColor: bgColor}}>
|
||||
<ListItemText
|
||||
primary={environment.Name}
|
||||
style={{minWidth: 150, maxWidth: 150, overflow: "hidden"}}
|
||||
/>
|
||||
<ListItemText
|
||||
primary={environment.Type === "cloud" ? "N/A" : "TBD"}
|
||||
primary={environment.Type !== "cloud" ? environment.running_ip === undefined || environment.running_ip === null || environment.running_ip.length === 0 ? "Not started" : environment.running_ip : "N/A"}
|
||||
style={{minWidth: 200, maxWidth: 200, overflow: "hidden"}}
|
||||
/>
|
||||
<ListItemText
|
||||
@@ -2786,6 +2790,10 @@ const Admin = (props) => {
|
||||
style={{minWidth: 150, maxWidth: 150, overflow: "hidden"}}
|
||||
primary={environment.archived.toString()}
|
||||
/>
|
||||
<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>
|
||||
)
|
||||
})}
|
||||
@@ -2907,7 +2915,7 @@ const Admin = (props) => {
|
||||
style={{minWidth: 150, maxWidth: 150}}
|
||||
/>
|
||||
<ListItemText
|
||||
primary="Orborus running (TBD)"
|
||||
primary="Orborus running"
|
||||
style={{minWidth: 200, maxWidth: 200}}
|
||||
/>
|
||||
<ListItemText
|
||||
|
||||
@@ -7308,6 +7308,7 @@ const AngularWorkflow = (props) => {
|
||||
<Button
|
||||
style={{borderRadius: "0px"}}
|
||||
variant="outlined"
|
||||
fullWidth
|
||||
onClick={() => {
|
||||
getWorkflowExecution(props.match.params.key, "")
|
||||
}} color="primary">
|
||||
|
||||
@@ -370,8 +370,13 @@ const Apps = (props) => {
|
||||
}} />
|
||||
|
||||
var newAppname = data.name
|
||||
newAppname = newAppname.charAt(0).toUpperCase()+newAppname.substring(1)
|
||||
newAppname = newAppname.replaceAll("_", " ")
|
||||
if (newAppname === undefined) {
|
||||
newAppname = "Undefined"
|
||||
} else {
|
||||
newAppname = newAppname.charAt(0).toUpperCase()+newAppname.substring(1)
|
||||
newAppname = newAppname.replaceAll("_", " ")
|
||||
}
|
||||
|
||||
var sharing = "public"
|
||||
if (!data.sharing) {
|
||||
sharing = "private"
|
||||
|
||||
@@ -444,7 +444,7 @@ const Workflows = (props) => {
|
||||
return
|
||||
}
|
||||
|
||||
if (filters.includes(data)) {
|
||||
if (filters.includes(data) || filters.includes(data.toLowerCase())) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -1938,7 +1938,7 @@ const Workflows = (props) => {
|
||||
|
||||
}} color="primary">
|
||||
{submitLoading ?
|
||||
<CircularProgress />
|
||||
<CircularProgress color="secondary" />
|
||||
:
|
||||
"Submit"
|
||||
}
|
||||
@@ -2061,7 +2061,7 @@ const Workflows = (props) => {
|
||||
<div style={flexContainerStyle}>
|
||||
<div style={{...flexBoxStyle, ...activeWorkflowStyle}}>
|
||||
<div style={flexContentStyle}>
|
||||
<div ><img src={mobileImage} style={iconStyle} /></div>
|
||||
<div><img src={mobileImage} style={iconStyle} /></div>
|
||||
<div style={ blockRightStyle }>
|
||||
<div style={counterStyle}>{workflows.length}</div>
|
||||
<div style={fontSize_16}>ACTIVE WORKFLOWS</div>
|
||||
@@ -2155,7 +2155,9 @@ const Workflows = (props) => {
|
||||
}}>
|
||||
<Tooltip title={`Filter by ${data.app_name}`} placement="top">
|
||||
<Badge badgeContent={0} color="secondary" style={{fontSize: 10}}>
|
||||
<img style={{height: imgSize, width: imgSize, cursor: "pointer", borderRadius: imgSize/2, border: "2px solid rgba(255,255,255,0.7)"}} alt={data.app_name} src={data.large_image}/>
|
||||
<div style={{height: imgSize, width: imgSize, position: "relative", filter: "brightness(0.6)", backgroundColor: "#000", borderRadius: imgSize/2, zIndex: 100, overflow: "hidden", display: "flex", justifyContent: "center", }}>
|
||||
<img style={{height: imgSize, width: imgSize, position: "absolute", top: -2, left: -2, cursor: "pointer", zIndex: 99, border: "2px solid rgba(255,255,255,0.7)", }} alt={data.app_name} src={data.large_image}/>
|
||||
</div>
|
||||
</Badge>
|
||||
</Tooltip>
|
||||
</IconButton>
|
||||
|
||||
Reference in New Issue
Block a user