Fixed issues in app creator

This commit is contained in:
frikky
2021-11-24 18:57:01 +01:00
parent 47b02dec89
commit 7c641b918e
+58 -37
View File
@@ -2194,7 +2194,7 @@ const AppCreator = (props) => {
const extraKeys = ( const extraKeys = (
<div style={{ marginTop: 50 }}> <div style={{ marginTop: 50 }}>
<div style={{ display: "flex" }}> <div style={{ display: "flex" }}>
<Typography variant="body1">Extra configuration items</Typography> <Typography variant="body1">Extra authentication</Typography>
{extraAuth.length === 0 ? ( {extraAuth.length === 0 ? (
<Button <Button
color="primary" color="primary"
@@ -3119,6 +3119,15 @@ const AppCreator = (props) => {
<Dialog <Dialog
open={actionsModalOpen} open={actionsModalOpen}
fullWidth fullWidth
PaperProps={{
style: {
backgroundColor: surfaceColor,
color: "white",
minWidth: 500,
maxWidth: 500,
maxHeight: 800,
},
}}
onClose={() => { onClose={() => {
setUrlPath(""); setUrlPath("");
setCurrentAction({ setCurrentAction({
@@ -3430,6 +3439,14 @@ const AppCreator = (props) => {
} }
} }
if (baseUrl !== undefined && baseUrl !== null && parsedurl.startsWith(baseUrl)) {
parsedurl = parsedurl.replaceAll(baseUrl, "");
}
if (parsedurl.includes("?")) {
parsedurl = parsedurl.split("?")[0]
}
if (event.target.value !== parsedurl) { if (event.target.value !== parsedurl) {
setUrlPath(parsedurl); setUrlPath(parsedurl);
setActionField("url", parsedurl); setActionField("url", parsedurl);
@@ -4701,6 +4718,7 @@ const AppCreator = (props) => {
type="name" type="name"
id="outlined-with-placeholder" id="outlined-with-placeholder"
margin="normal" margin="normal"
multiline
variant="outlined" variant="outlined"
placeholder="A description for the service" placeholder="A description for the service"
value={description} value={description}
@@ -4779,42 +4797,45 @@ const AppCreator = (props) => {
setBaseUrl(tmpstring); setBaseUrl(tmpstring);
}} }}
/> />
<FormControl style={{ marginTop: 30 }} variant="outlined"> <div style={{padding: 25, border: "2px solid rgba(255,255,255,0.7)", borderRadius: theme.palette.borderRadius, }}>
<Typography variant="body1">Authentication type</Typography> <FormControl style={{ }} variant="outlined">
<Select <Typography variant="h6">Authentication</Typography>
fullWidth <Select
onChange={(e) => { fullWidth
setAuthenticationOption(e.target.value); onChange={(e) => {
if (e.target.value === "No authentication") { setAuthenticationOption(e.target.value);
setAuthenticationRequired(false); if (e.target.value === "No authentication") {
} else { setAuthenticationRequired(false);
setAuthenticationRequired(true); } else {
} setAuthenticationRequired(true);
}} }
value={authenticationOption} }}
style={{ value={authenticationOption}
backgroundColor: inputColor, style={{
color: "white", backgroundColor: inputColor,
height: "50px", color: "white",
}} height: "50px",
> }}
{authenticationOptions.map((data, index) => ( >
<MenuItem {authenticationOptions.map((data, index) => (
key={index} <MenuItem
style={{ backgroundColor: inputColor, color: "white" }} key={index}
value={data} style={{ backgroundColor: inputColor, color: "white" }}
> value={data}
{data} >
</MenuItem> {data}
))} </MenuItem>
</Select> ))}
</FormControl> </Select>
{basicAuth} </FormControl>
{bearerAuth} <div style={{marginTop: 15 }} />
{apiKey} {basicAuth}
{oauth2Auth} {bearerAuth}
{jwtAuth} {apiKey}
{extraKeys} {oauth2Auth}
{jwtAuth}
{extraKeys}
</div>
{/*authenticationOption === "No authentication" ? null : {/*authenticationOption === "No authentication" ? null :
<FormControlLabel <FormControlLabel