Fixed minor header issues to make Tenant management more obvious
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
module shuffle
|
module shuffle
|
||||||
|
|
||||||
go 1.22.2
|
go 1.22
|
||||||
|
|
||||||
require (
|
require (
|
||||||
cloud.google.com/go/datastore v1.15.0
|
cloud.google.com/go/datastore v1.15.0
|
||||||
|
|||||||
@@ -37,9 +37,7 @@ import {
|
|||||||
EmojiObjects as EmojiObjectsIcon,
|
EmojiObjects as EmojiObjectsIcon,
|
||||||
Business as BusinessIcon,
|
Business as BusinessIcon,
|
||||||
Polyline as PolylineIcon,
|
Polyline as PolylineIcon,
|
||||||
} from "@mui/icons-material";
|
Add as AddIcon,
|
||||||
|
|
||||||
import {
|
|
||||||
Analytics as AnalyticsIcon,
|
Analytics as AnalyticsIcon,
|
||||||
Lightbulb as LightbulbIcon,
|
Lightbulb as LightbulbIcon,
|
||||||
} from "@mui/icons-material";
|
} from "@mui/icons-material";
|
||||||
@@ -247,6 +245,7 @@ const Header = (props) => {
|
|||||||
var image = "";
|
var image = "";
|
||||||
var orgName = "";
|
var orgName = "";
|
||||||
var orgId = "";
|
var orgId = "";
|
||||||
|
|
||||||
if (userdata.orgs !== undefined) {
|
if (userdata.orgs !== undefined) {
|
||||||
const foundOrg = userdata.orgs.find((org) => org.id === data["org_id"]);
|
const foundOrg = userdata.orgs.find((org) => org.id === data["org_id"]);
|
||||||
if (foundOrg !== undefined && foundOrg !== null) {
|
if (foundOrg !== undefined && foundOrg !== null) {
|
||||||
@@ -942,7 +941,7 @@ const Header = (props) => {
|
|||||||
{userdata === undefined ||
|
{userdata === undefined ||
|
||||||
userdata.orgs === undefined ||
|
userdata.orgs === undefined ||
|
||||||
userdata.orgs === null ||
|
userdata.orgs === null ||
|
||||||
userdata.orgs.length <= 1 ? null : (
|
userdata.orgs.length <= 0 ? null : (
|
||||||
<span style={{ paddingTop: 5 }}>
|
<span style={{ paddingTop: 5 }}>
|
||||||
<Select
|
<Select
|
||||||
disableUnderline
|
disableUnderline
|
||||||
@@ -969,6 +968,10 @@ const Header = (props) => {
|
|||||||
value={userdata.active_org.id}
|
value={userdata.active_org.id}
|
||||||
fullWidth
|
fullWidth
|
||||||
onChange={(e) => {
|
onChange={(e) => {
|
||||||
|
if (e.target.value === undefined || e.target.value === "create_new_suborgs") {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
handleClickChangeOrg(e.target.value);
|
handleClickChangeOrg(e.target.value);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@@ -1099,6 +1102,32 @@ const Header = (props) => {
|
|||||||
</MenuItem>
|
</MenuItem>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
<Divider />
|
||||||
|
<Link to="/admin?tab=suborgs" style={hrefStyle}>
|
||||||
|
<MenuItem
|
||||||
|
key={"add suborgs"}
|
||||||
|
style={{
|
||||||
|
backgroundColor: theme.palette.inputColor,
|
||||||
|
color: "white",
|
||||||
|
height: 40,
|
||||||
|
zIndex: 10003,
|
||||||
|
}}
|
||||||
|
value={"create_new_suborgs"}
|
||||||
|
>
|
||||||
|
<Tooltip
|
||||||
|
color="primary"
|
||||||
|
title={""}
|
||||||
|
placement="left"
|
||||||
|
>
|
||||||
|
<div style={{ display: "flex", marginLeft: 85, }}>
|
||||||
|
<AddIcon />
|
||||||
|
<span style={{ marginLeft: 8 }}>
|
||||||
|
Add suborgs
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</Tooltip>
|
||||||
|
</MenuItem>
|
||||||
|
</Link>
|
||||||
</Select>
|
</Select>
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ const SearchField = props => {
|
|||||||
}}><CloseIcon /></Button>
|
}}><CloseIcon /></Button>
|
||||||
</div>
|
</div>
|
||||||
: null}
|
: null}
|
||||||
<DialogContent style={{}}>
|
<DialogContent className='dialog-content' style={{}}>
|
||||||
<SearchBox globalUrl={globalUrl} setModalOpen={setModalOpen} modalOpen={modalOpen} serverside={serverside} userdata={userdata} />
|
<SearchBox globalUrl={globalUrl} setModalOpen={setModalOpen} modalOpen={modalOpen} serverside={serverside} userdata={userdata} />
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
<Divider style={{overflow: "hidden"}}/>
|
<Divider style={{overflow: "hidden"}}/>
|
||||||
|
|||||||
@@ -6243,7 +6243,7 @@ If you're interested, please let me know a time that works for you, or set up a
|
|||||||
letterSpacing: "1px",
|
letterSpacing: "1px",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
All Tenants
|
All Your Organizations
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -11890,6 +11890,7 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
borderRadius: theme.palette.borderRadius,
|
borderRadius: theme.palette.borderRadius,
|
||||||
}}
|
}}
|
||||||
onChange={(event, newValue) => {
|
onChange={(event, newValue) => {
|
||||||
|
setLastSaved(false)
|
||||||
console.log("Found value: ", newValue)
|
console.log("Found value: ", newValue)
|
||||||
|
|
||||||
var parsedinput = { target: { value: newValue } }
|
var parsedinput = { target: { value: newValue } }
|
||||||
@@ -11923,10 +11924,10 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
<img src={data.image} alt={data.name} style={{ backgroundColor: theme.palette.surfaceColor, maxHeight: 200, minHeigth: 200, borderRadius: theme.palette.borderRadius, }} />
|
<img src={data.image} alt={data.name} style={{ backgroundColor: theme.palette.surfaceColor, maxHeight: 200, minHeigth: 200, borderRadius: theme.palette.borderRadius, }} />
|
||||||
: null}
|
: null}
|
||||||
<Typography>
|
<Typography>
|
||||||
Choose {data.name}
|
Choose Subflow '{data.name}'
|
||||||
</Typography>
|
</Typography>
|
||||||
</span>
|
</span>
|
||||||
} placement="bottom">
|
}>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
style={{
|
style={{
|
||||||
backgroundColor: theme.palette.inputColor,
|
backgroundColor: theme.palette.inputColor,
|
||||||
@@ -12015,6 +12016,7 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
borderRadius: theme.palette.borderRadius,
|
borderRadius: theme.palette.borderRadius,
|
||||||
}}
|
}}
|
||||||
onChange={(event, newValue) => {
|
onChange={(event, newValue) => {
|
||||||
|
setLastSaved(false)
|
||||||
handleSubflowStartnodeSelection({ target: { value: newValue } })
|
handleSubflowStartnodeSelection({ target: { value: newValue } })
|
||||||
}}
|
}}
|
||||||
renderOption={(props, action, state) => {
|
renderOption={(props, action, state) => {
|
||||||
@@ -12114,9 +12116,10 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
workflow.triggers[selectedTriggerIndex].parameters[1].value
|
workflow.triggers[selectedTriggerIndex].parameters[1].value
|
||||||
}
|
}
|
||||||
onBlur={(e) => {
|
onBlur={(e) => {
|
||||||
workflow.triggers[selectedTriggerIndex].parameters[1].value =
|
setLastSaved(false)
|
||||||
e.target.value;
|
|
||||||
setWorkflow(workflow);
|
workflow.triggers[selectedTriggerIndex].parameters[1].value = e.target.value
|
||||||
|
setWorkflow(workflow)
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
{!showDropdown ? null :
|
{!showDropdown ? null :
|
||||||
@@ -13455,10 +13458,10 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
<img src={data.image} alt={data.name} style={{ backgroundColor: theme.palette.surfaceColor, maxHeight: 200, minHeigth: 200, borderRadius: theme.palette.borderRadius, }} />
|
<img src={data.image} alt={data.name} style={{ backgroundColor: theme.palette.surfaceColor, maxHeight: 200, minHeigth: 200, borderRadius: theme.palette.borderRadius, }} />
|
||||||
: null}
|
: null}
|
||||||
<Typography>
|
<Typography>
|
||||||
Choose {data.name}
|
Choose Trigger '{data.name}'
|
||||||
</Typography>
|
</Typography>
|
||||||
</span>
|
</span>
|
||||||
} placement="bottom">
|
}>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
style={{
|
style={{
|
||||||
color: data.id === workflow.id ? "red" : "white",
|
color: data.id === workflow.id ? "red" : "white",
|
||||||
|
|||||||
Reference in New Issue
Block a user