Fixed issue with actionlist autocompletion

This commit is contained in:
frikky
2022-02-11 00:23:34 +01:00
parent 349449e903
commit 65418b39c4
5 changed files with 27 additions and 7 deletions
+1 -1
View File
@@ -3939,7 +3939,7 @@ func runInitEs(ctx context.Context) {
} }
for _, schedule := range schedules { for _, schedule := range schedules {
if schedule.Environment == "cloud" { if strings.toToLower(schedule.Environment) == "cloud" {
log.Printf("Skipping cloud schedule") log.Printf("Skipping cloud schedule")
continue continue
} }
+8 -2
View File
@@ -488,7 +488,7 @@ const ParsedAction = (props) => {
continue; continue;
} }
var exampledata = item.example === undefined ? "" : item.example; var exampledata = item.example === undefined || item.example === null ? "" : item.example;
// Find previous execution and their variables // Find previous execution and their variables
//exampledata === "" && //exampledata === "" &&
if (workflowExecutions.length > 0) { if (workflowExecutions.length > 0) {
@@ -505,10 +505,14 @@ const ParsedAction = (props) => {
var foundResult = workflowExecutions[key].results.find( var foundResult = workflowExecutions[key].results.find(
(result) => result.action.id === item.id (result) => result.action.id === item.id
); );
if (foundResult === undefined) { if (foundResult === undefined || foundResult === null) {
continue; continue;
} }
if (foundResult.result !== undefined && foundResult.result !== null) {
foundResult = foundResult.result
}
const valid = validateJson(foundResult) const valid = validateJson(foundResult)
if (valid.valid) { if (valid.valid) {
exampledata = valid.result; exampledata = valid.result;
@@ -524,6 +528,7 @@ const ParsedAction = (props) => {
item.label === null || item.label === undefined item.label === null || item.label === undefined
? "" ? ""
: item.label.split(" ").join("_"); : item.label.split(" ").join("_");
const actionvalue = { const actionvalue = {
type: "action", type: "action",
id: item.id, id: item.id,
@@ -535,6 +540,7 @@ const ParsedAction = (props) => {
} }
} }
console.log("ACTIONLIST: ", actionlist)
setActionlist(actionlist); setActionlist(actionlist);
} }
} }
@@ -19,6 +19,7 @@ import {
import { useTheme } from '@material-ui/core/styles'; import { useTheme } from '@material-ui/core/styles';
import { validateJson } from "../views/Workflows.jsx"; import { validateJson } from "../views/Workflows.jsx";
import ReactJson from "react-json-view"; import ReactJson from "react-json-view";
import PaperComponent from "../components/PaperComponent.jsx"
import CodeMirror from '@uiw/react-codemirror'; import CodeMirror from '@uiw/react-codemirror';
import 'codemirror/keymap/sublime'; import 'codemirror/keymap/sublime';
@@ -84,10 +85,14 @@ const CodeEditor = (props) => {
<Dialog <Dialog
disableEnforceFocus={true} disableEnforceFocus={true}
hideBackdrop={true} hideBackdrop={true}
disableBackdropClick={true}
open={expansionModalOpen} open={expansionModalOpen}
onClose={() => { onClose={() => {
//setExpansionModalOpen(false) console.log("In closer")
changeActionParameterCodeMirror({target: {value: ""}}, fieldCount, localcodedata)
}} }}
PaperComponent={PaperComponent}
aria-labelledby="draggable-dialog-title"
PaperProps={{ PaperProps={{
style: { style: {
backgroundColor: theme.palette.surfaceColor, backgroundColor: theme.palette.surfaceColor,
@@ -106,7 +111,9 @@ const CodeEditor = (props) => {
> >
<div style={{display: "flex"}}> <div style={{display: "flex"}}>
<DialogTitle <DialogTitle
id="draggable-dialog-title"
style={{ style={{
cursor: "move",
paddingBottom:20, paddingBottom:20,
paddingLeft: 10, paddingLeft: 10,
}} }}
+2 -1
View File
@@ -2353,7 +2353,8 @@ const AngularWorkflow = (defaultprops) => {
} }
} }
var newapps = JSON.parse(JSON.stringify(apps)) //var newapps = JSON.parse(JSON.stringify(apps))
var newapps = apps
const curapp = newapps.find( const curapp = newapps.find(
(a) => (a) =>
a.name === curaction.app_name && a.name === curaction.app_name &&
+8 -2
View File
@@ -102,7 +102,7 @@ const Docs = (defaultprops) => {
maxHeight: "83vh", maxHeight: "83vh",
overflowX: "hidden", overflowX: "hidden",
overflowY: "auto", overflowY: "auto",
zIndex: 10003, zIndex: 1000,
}; };
const fetchDocList = () => { const fetchDocList = () => {
@@ -141,6 +141,11 @@ const Docs = (defaultprops) => {
setData(responseJson.reason); setData(responseJson.reason);
document.title = "Shuffle " + docId + " documentation"; document.title = "Shuffle " + docId + " documentation";
if (responseJson.reason !== undefined && responseJson.reason !== null && responseJson.reason.includes("404: Not Found")) {
navigate("/docs")
return
}
if (responseJson.meta !== undefined) { if (responseJson.meta !== undefined) {
setSelectedMeta(responseJson.meta); setSelectedMeta(responseJson.meta);
} }
@@ -517,7 +522,8 @@ const Docs = (defaultprops) => {
const newname = const newname =
item.charAt(0).toUpperCase() + item.charAt(0).toUpperCase() +
item.substring(1).split("_").join(" ").split("-").join(" "); item.substring(1).split("_").join(" ").split("-").join(" ");
const itemMatching =
const itemMatching = props.match.params.key === undefined ? false :
props.match.params.key.toLowerCase() === item.toLowerCase(); props.match.params.key.toLowerCase() === item.toLowerCase();
//const [tocLines, setTocLines] = React.useState([]); //const [tocLines, setTocLines] = React.useState([]);
return ( return (