marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bumped public Form running and subflow/user input fixes in multi-tenant workflows

Browse Source
This commit is contained in:
Frikky
2025-02-17 00:50:08 +01:00
parent 1f2e0ed6a3
commit 6719f527e8
11 changed files with 148 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/ApiExplorer.jsx
+26 -14
View File
@@ -25,7 +25,8 @@ import {
TableRow,
InputAdornment,
Divider,
LinearProgress
LinearProgress,
Tooltip,
} from "@mui/material";
import throttle from "lodash/throttle";
import theme from "../theme.jsx";
@@ -1447,19 +1448,28 @@ const ActionsList = memo(({
<div style={{ borderBottom: '1px solid #494949', paddingTop: 10, paddingBottom: 10}}>
<div>
{info?.title ? (
<div style={{ display: "flex", alignItems: "center" }}>
<img
src={openapi?.info["x-logo"]}
width={48}
height={48}
alt="app logo"
style={{ marginLeft: 20, borderRadius: 8 }}
/>
<Typography style={{ fontSize: 24, fontWeight: 'bold', marginLeft: 20, overflow: 'hidden', color: '#F1F1F1'
}}>
{info.title}
</Typography>
</div>
<a
href={`/apps/${openapi?.id}`}
style={{ textDecoration: 'none', }}
target="_blank"
rel="noreferrer"
>
<Tooltip title="Go to app" placement="right">
<div style={{ display: "flex", alignItems: "center" }}>
<img
src={openapi?.info["x-logo"]}
width={48}
height={48}
alt="app logo"
style={{ marginLeft: 20, borderRadius: 8 }}
/>
<Typography style={{ fontSize: 24, fontWeight: 'bold', marginLeft: 20, overflow: 'hidden', color: '#F1F1F1'
}}>
{info.title}
</Typography>
</div>
</Tooltip>
</a>
) : (
<Typography style={{ fontSize: 24, fontWeight: 'bold', marginLeft: 20, overflow: 'hidden', color: '#F1F1F1'
}}>
@@ -1468,6 +1478,7 @@ const ActionsList = memo(({
)}
</div>
</div>
<TextField
value={searchQuery}
placeholder="Search endpoints"
@@ -1488,6 +1499,7 @@ const ActionsList = memo(({
},
}}
/>
<div
style={{
marginLeft: 20,
frontend/src/components/LeftSideBar.jsx
+3 -3
View File
@@ -657,8 +657,8 @@ useEffect(() => {
};
const getRegionTag = (region_url) => {
//let regiontag = "UK";
let regiontag = "EU";
let regiontag = "UK";
//let regiontag = "EU";
if (
region_url !== undefined &&
region_url !== null &&
@@ -755,7 +755,7 @@ useEffect(() => {
};
const getRegionFlag = (region_url) => {
var region = "gb";
var region = "UK";
const regionMapping = {
"US": "us",
"EU": "eu",
frontend/src/components/OrgHeaderexpandedNew.jsx
+2 -2
View File
@@ -1087,11 +1087,11 @@ const RegionChangeModal = memo(({selectedOrganization, setSelectedRegion, userda
"US": "us",
"EU-2": "eu",
"CA": "ca",
"EU": "eu"
"UK": "gb"
};
//let regiontag = "UK";
let regiontag = "EU";
let regiontag = "UK";
let regionCode = "gb";
const regionsplit = selectedOrganization?.region_url?.split(".");
frontend/src/components/OrganizationTab.jsx
-1
View File
@@ -155,7 +155,6 @@ const OrganizationTab = (props) => {
<Button
key={tabName}
onClick={() => {
console.log("index", index);
setCurIndex(index);
handleTabClick(index === 0 ? "org_config" : tabName.toLowerCase().replace(/[\s&]+/g, ''));
}}
frontend/src/components/TenantsTab.jsx
+69 -47
View File
@@ -54,15 +54,15 @@ const TenantsTab = memo((props) => {
const [cloudSyncModalOpen, setCloudSyncModalOpen] = React.useState(false);
const [modalOpen, setModalOpen] = React.useState(false);
const [parentOrg, setParentOrg] = React.useState(null);
const [parentOrgFlag, setParentOrgFlag] = React.useState("eu");
const [parentOrgFlag, setParentOrgFlag] = React.useState(null);
const [loadOrgs, setLoadOrgs] = React.useState(true);
const [, forceUpdate] = React.useState();
const itemColor = "black";
useEffect(() => {
if(parentOrgFlag === null) {
let regiontag = "EU";
let regionCode = "eu";
if(parentOrg !== null && parentOrgFlag === null) {
let regiontag = "UK";
let regionCode = "gb";
if (parentOrg?.region_url?.length > 0) {
const regionsplit = parentOrg?.region_url.split(".");
@@ -71,17 +71,16 @@ const TenantsTab = memo((props) => {
regiontag = namesplit[namesplit.length - 1];
if (regiontag === "california") {
regiontag = "US";
regionCode = "us";
regiontag = "US";
regionCode = "us";
} else if (regiontag === "frankfurt") {
regiontag = "EU-2";
regionCode = "eu";
regiontag = "EU-2";
regionCode = "eu";
} else if (regiontag === "ca") {
regiontag = "CA";
regionCode = "ca";
regiontag = "CA";
regionCode = "ca";
}
}
console.log("did i reach here, region code is: ", regionCode);
setParentOrgFlag(regionCode);
}
}
@@ -145,8 +144,8 @@ const TenantsTab = memo((props) => {
setSubOrgs(subOrgs);
setParentOrg(parentOrg);
let regiontag = "EU";
let regionCode = "eu";
let regiontag = "UK";
let regionCode = "gb";
if (parentOrg?.region_url?.length > 0) {
const regionsplit = parentOrg?.region_url.split(".");
@@ -155,14 +154,14 @@ const TenantsTab = memo((props) => {
regiontag = namesplit[namesplit.length - 1];
if (regiontag === "california") {
regiontag = "US";
regionCode = "us";
regiontag = "US";
regionCode = "us";
} else if (regiontag === "frankfurt") {
regiontag = "EU-2";
regionCode = "eu";
regiontag = "EU-2";
regionCode = "eu";
} else if (regiontag === "ca") {
regiontag = "CA";
regionCode = "ca";
regiontag = "CA";
regionCode = "ca";
}
}
setParentOrgFlag(regionCode);
@@ -1220,7 +1219,29 @@ const TenantsTab = memo((props) => {
}}
/>
</ListItem>
{subOrgs.map((data, index) => (
{subOrgs.map((data, index) => {
let regiontag = "UK";
let regionCode = "gb";
if (data.region_url?.length > 0) {
const regionsplit = data.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";
regionCode = "us";
} else if (regiontag === "frankfurt") {
regiontag = "EU-2";
regionCode = "eu";
} else if (regiontag === "ca") {
regiontag = "CA";
regionCode = "ca";
}
}
}
return (
<ListItem key={index} style={{ backgroundColor: index % 2 === 0 ? '#1A1A1A' : '#212121', width: "100%", borderBottomLeftRadius: 8, display:'table-row', borderBottomRightRadius: 8 }}>
<ListItemText primary={<img alt={data?.name} src={data.image || theme.palette.defaultImage} style={imageStyle} />} style={{ width: 100,
minWidth: 100,
@@ -1237,30 +1258,31 @@ const TenantsTab = memo((props) => {
padding: 8,
verticalAlign: "middle",
textAlign: "center", }} />
{isCloud && (
<ListItemText
primary={
<div style={{ display: "flex", alignItems: "center" }}>
<img
alt={parentOrgFlag}
src={`https://flagcdn.com/w20/${parentOrgFlag}.png`}
alt={regiontag}
src={`https://flagcdn.com/w20/${regionCode}.png`}
style={{ width: "30px", height: "20px", marginRight: "5px" }}
/>
<ListItemText primary={parentOrgFlag?.toUpperCase()} />
<ListItemText primary={regiontag?.toUpperCase()} />
</div>
}
style={{ display: "table-cell", padding: 8, verticalAlign: "middle" }}
/>
)}
<ListItemText primary={data.id} style={{ minWidth: 300,
maxWidth: 300,
display: "table-cell",
padding: 8,
verticalAlign: "middle", }} />
maxWidth: 300,
display: "table-cell",
padding: 8,
verticalAlign: "middle", }} />
<ListItemText
primary={
<Tooltip title={data.id === userdata?.active_org?.id ? "You are already in this organization." : ""} disableInteractive>
primary={
<Tooltip title={data.id === userdata?.active_org?.id ? "You are already in this organization." : ""} disableInteractive>
<Button
color="primary"
variant='outlined'
@@ -1284,7 +1306,7 @@ const TenantsTab = memo((props) => {
style={{ display: "table-cell", verticalAlign: "middle" }}
/>
</ListItem>
))}
)})}
</List>
</div>
</div>
@@ -1452,26 +1474,26 @@ const TenantsTab = memo((props) => {
) : (
userdata?.orgs?.length > 0 &&
userdata.orgs.map((data, index) => {
let regiontag = "EU";
let regionCode = "eu";
let regiontag = "UK";
let regionCode = "gb";
if (data.region_url?.length > 0) {
const regionsplit = data.region_url.split(".");
if (regionsplit.length > 2 && !regionsplit[0].includes("shuffler")) {
const namesplit = regionsplit[0].split("/");
regiontag = namesplit[namesplit.length - 1];
const regionsplit = data.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";
regionCode = "us";
} else if (regiontag === "frankfurt") {
regiontag = "EU-2";
regionCode = "eu";
} else if (regiontag === "ca") {
regiontag = "CA";
regionCode = "ca";
}
}
if (regiontag === "california") {
regiontag = "US";
regionCode = "us";
} else if (regiontag === "frankfurt") {
regiontag = "EU-2";
regionCode = "eu";
} else if (regiontag === "ca") {
regiontag = "CA";
regionCode = "ca";
}
}
}
return (