From 1115a8cade972d324836c1a468221d4702fb7669 Mon Sep 17 00:00:00 2001 From: frikky Date: Sat, 18 Dec 2021 01:52:05 +0100 Subject: [PATCH] Fixed url field parsing issues --- frontend/src/components/ParsedAction.jsx | 20 +++++++++++--------- frontend/src/views/Docs.jsx | 11 +++++++---- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/frontend/src/components/ParsedAction.jsx b/frontend/src/components/ParsedAction.jsx index a35ee256..ab5ba534 100644 --- a/frontend/src/components/ParsedAction.jsx +++ b/frontend/src/components/ParsedAction.jsx @@ -6,6 +6,7 @@ import { GetIconInfo } from "../views/Workflows.jsx"; import { sortByKey } from "../views/AngularWorkflow.jsx"; import { useTheme } from "@material-ui/core/styles"; import NestedMenuItem from "material-ui-nested-menu-item"; +import theme from '../theme'; //import NestedMenuItem from "./NestedMenu.jsx"; import { @@ -162,7 +163,7 @@ const ParsedAction = (props) => { getAppAuthentication, } = props; - const theme = useTheme(); + //const theme = useTheme(); const classes = useStyles(); const [expansionModalOpen, setExpansionModalOpen] = React.useState(false); @@ -385,10 +386,8 @@ const ParsedAction = (props) => { }; const AppActionArguments = (props) => { - const [selectedActionParameters, setSelectedActionParameters] = - React.useState([]); - const [selectedVariableParameter, setSelectedVariableParameter] = - React.useState(""); + const [selectedActionParameters, setSelectedActionParameters] = React.useState([]); + const [selectedVariableParameter, setSelectedVariableParameter] = React.useState(""); const [actionlist, setActionlist] = React.useState([]); const [jsonList, setJsonList] = React.useState([]); const [showDropdown, setShowDropdown] = React.useState(false); @@ -1106,16 +1105,20 @@ const ParsedAction = (props) => { var disabled = false; var rows = "5"; var openApiHelperText = "This is an OpenAPI specific field"; + /* if ( selectedApp.generated && data.name === "url" && data.required && - data.configuration && - hideExtraTypes + data.configuration ) { + //&& + //hideExtraTypes + //console.log("GENERATED WITH DATA: ", data); return null; } + */ if (selectedApp.generated && data.name === "headers") { //console.log("HEADER: ", data) @@ -1888,7 +1891,6 @@ const ParsedAction = (props) => { > {data.configuration === true ? ( @@ -1898,8 +1900,8 @@ const ParsedAction = (props) => { width: 24, height: 24, marginRight: 10, + color: "rgba(255,255,255,0.6)", }} - color="primary" onClick={() => { setAuthenticationModalOpen(true); }} diff --git a/frontend/src/views/Docs.jsx b/frontend/src/views/Docs.jsx index 1c125d21..f05e96c2 100644 --- a/frontend/src/views/Docs.jsx +++ b/frontend/src/views/Docs.jsx @@ -24,6 +24,7 @@ const Body = { display: "flex", height: "100%", color: "white", + position: "relative", //textAlign: "center", }; @@ -80,10 +81,12 @@ const Docs = (props) => { const SideBar = { maxWidth: 250, flex: 1, - position: "fixed", + position: "sticky", + top: 100, maxHeight: "83vh", overflowX: "hidden", overflowY: "auto", + zIndex: 10003, }; const fetchDocList = () => { @@ -299,8 +302,8 @@ const Docs = (props) => { flex: "1", maxWidth: mobile ? "100%" : 750, overflow: "hidden", - paddingBottom: 200, - marginLeft: mobile ? 0 : 275, + paddingBottom: 100, + marginLeft: mobile ? 0 : 50, }; function OuterLink(props) { @@ -655,7 +658,7 @@ const Docs = (props) => { // Padding and zIndex etc set because of footer in cloud. const loadedCheck = ( -
+
{postDataBrowser} {postDataMobile}