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

Added the error message on the field about the variable

Browse Source
This commit is contained in:
monilprajapati
2024-07-22 16:08:46 +05:30
parent 2337c6b468
commit 2b90a1b9af
1 changed files with 35 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/ParsedAction.jsx
+35 -84
View File
@@ -184,15 +184,8 @@ const ParsedAction = (props) => {
const [hiddenDescription, setHiddenDescription] = React.useState(true); const [hiddenDescription, setHiddenDescription] = React.useState(true);
const [autoCompleting, setAutocompleting] = React.useState(false); const [autoCompleting, setAutocompleting] = React.useState(false);
const [selectedActionParameters, setSelectedActionParameters] = React.useState(selectedAction?.parameters || []); const [selectedActionParameters, setSelectedActionParameters] = React.useState(selectedAction?.parameters || []);
const [selectedVariableParameter, setSelectedVariableParameter] = React.useState(""); const [selectedVariableParameter, setSelectedVariableParameter] = React.useState("");
const [paramValues, setParamValues] = React.useState( const [paramUpdate, setParamUpdate] = React.useState("");
selectedAction?.parameters?.map((param) => {
return {
name: param.name,
value: param.value,
}
})
);
const [actionlist, setActionlist] = React.useState([]); const [actionlist, setActionlist] = React.useState([]);
const [jsonList, setJsonList] = React.useState([]); const [jsonList, setJsonList] = React.useState([]);
const [showDropdown, setShowDropdown] = React.useState(false); const [showDropdown, setShowDropdown] = React.useState(false);
@@ -207,16 +200,6 @@ const ParsedAction = (props) => {
} }
}, [expansionModalOpen]) }, [expansionModalOpen])
// useEffect(() => {
// setParamValues(selectedAction.parameters?.map((param) => {
// return {
// name: param.name,
// value: param.value,
// }
// }))
// },[
// selectedAction, selectedApp,setNewSelectedAction, workflow,
// ])
useEffect(() => { useEffect(() => {
if (selectedAction.parameters === null || selectedAction.parameters === undefined) { if (selectedAction.parameters === null || selectedAction.parameters === undefined) {
@@ -417,8 +400,8 @@ const ParsedAction = (props) => {
} }
// Only set selected action parameters if they have changed // Only set selected action parameters if they have changed
if (selectedAction.parameters && selectedAction.parameters.length > 0) { if (selectedAction?.parameters && selectedAction?.parameters.length > 0) {
setSelectedActionParameters(selectedAction.parameters); setSelectedActionParameters(selectedAction?.parameters);
} }
// Only set selected variable parameter if it is null or undefined // Only set selected variable parameter if it is null or undefined
@@ -433,6 +416,7 @@ const ParsedAction = (props) => {
useEffect(() => { useEffect(() => {
const newActionList = []; const newActionList = [];
const parentActionList = [];
// Process workflowExecutions // Process workflowExecutions
if (workflowExecutions.length > 0) { if (workflowExecutions.length > 0) {
@@ -560,89 +544,54 @@ const ParsedAction = (props) => {
autocomplete: parentNode.label.split(" ").join("_"), autocomplete: parentNode.label.split(" ").join("_"),
example: exampleData, example: exampleData,
}); });
}
}
}
}
// Update the actionlist state parentActionList.push({
setActionlist(newActionList);
}, [workflow.execution_variables, workflow.workflow_variables, workflowExecutions, workflow, selectedAction, listCache, getParents]);
const memoizedParam = useMemo(() => {
let appActions = [];
if (getParents) {
const parents = getParents(selectedAction);
if (parents.length > 1) {
const labels = [];
for (let parentNode of parents) {
if (parentNode.label !== "Execution Argument" && !labels.includes(parentNode.label)) {
labels.push(parentNode.label);
let exampleData = parentNode.example ?? "";
if (!exampleData && workflowExecutions.length > 0) {
for (let exec of workflowExecutions) {
const foundResult = exec.results?.find(result => result.action.id === parentNode.id);
if (foundResult) {
const valid = validateJson(foundResult.result);
if (valid.valid && valid.result.success !== false) {
exampleData = valid.result;
break;
}
}
}
}
appActions.push({
type: "action", type: "action",
id: parentNode.id, id: parentNode.id,
name: parentNode.label, name: parentNode.label,
autocomplete: parentNode.label.split(" ").join("_"), autocomplete: parentNode.label.split(" ").join("_"),
example: exampleData, example: exampleData,
}); });
} }
} }
} }
} }
let newParameters = selectedAction.parameters?.map((param) => { let newParameters = selectedAction?.parameters?.map((param) => {
let paramvalue = param.value; let paramvalue = param.value;
let errorVars = [];
if(paramvalue.includes("$")){ if(paramvalue.includes("$")){
let actions = workflow.actions?.map((action) => { let actions = workflow.actions?.map((action) => {
return "$"+action.label.toLowerCase(); return "$"+action.label.toLowerCase();
}) })
if(actionlist.length > 0){ if(newActionList.length > 0){
let appParentActions = appActions?.map(action => "$" + action.name.toLowerCase()); let appParentActions = parentActionList?.map(action => "$" + action.name.toLowerCase());
let notPresentAction = actions?.filter((action) => !appParentActions?.includes(action)) let notPresentAction = actions?.filter((action) => !appParentActions?.includes(action))
console.log("ACTIONS: ", actions)
console.log("APP ACTIONS: ", appParentActions)
console.log("NOT PRESENT: ", notPresentAction)
notPresentAction?.forEach((action) => { notPresentAction?.forEach((action) => {
console.log("Not included Action: ", action)
if(paramvalue.includes(action)){ if(paramvalue.includes(action)){
errorVars.push(action);
// paramvalue = paramvalue.replace(action, "") // paramvalue = paramvalue.replace(action, "")
// paramvalue = paramvalue.replace(/^\s*[\r\n]/gm, ""); // paramvalue = paramvalue.replace(/^\s*[\r\n]/gm, "");
} }
}) })
} }
} }
console.log("After removing param value: ", paramvalue)
return {...param, value: paramvalue}
});
selectedAction.parameters = newParameters;
setSelectedActionParameters(newParameters);
setSelectedAction(selectedAction);
return newParameters;
},[actionlist,selectedAction,workflow.actions,workflow,selectedApp,setNewSelectedAction])
useEffect(() => { let message = "";
setParamValues(memoizedParam?.map((param) => { if(errorVars.length > 0){
return { if(errorVars.length === 1){
name: param.name, message = errorVars[0] + " is not accessible in this action";
value: param.value, }else{
message = errorVars.join(", ") + " are not accessible in this action";
}
} }
})) return {...param, value: paramvalue, error: message}
},[memoizedParam]) });
setSelectedActionParameters(newParameters);
setActionlist(newActionList);
}, [workflow.execution_variables,paramUpdate, workflow.workflow_variables, workflowExecutions, workflow, selectedAction, listCache, getParents,setNewSelectedAction]);
useEffect(() => { useEffect(() => {
selectedNameChange(appActionName) selectedNameChange(appActionName)
@@ -653,13 +602,14 @@ const ParsedAction = (props) => {
},[appActionName,delay]) },[appActionName,delay])
const handleParamChange = (event, count,data) => { const handleParamChange = (event, count,data) => {
const newParams = [...paramValues]; const newParams = [...selectedActionParameters];
newParams.map((param) => { newParams.map((param) => {
if (param.name === data.name) { if (param.name === data.name) {
param.value = event.target.value; param.value = event.target.value;
} }
}) })
setParamValues(newParams); setSelectedActionParameters(newParams);
setParamUpdate(event.target.value);
changeActionParameter(event, count, data) changeActionParameter(event, count, data)
} }
const calculateHelpertext = (input_data) => { const calculateHelpertext = (input_data) => {
@@ -1248,7 +1198,7 @@ const ParsedAction = (props) => {
} }
// FIXME: Issue #40 - selectedActionParameters not reset // FIXME: Issue #40 - selectedActionParameters not reset
if (Object.getOwnPropertyNames(selectedAction).length > 0 && selectedActionParameters.length > 0) { if (Object.getOwnPropertyNames(selectedAction)?.length > 0 && selectedActionParameters?.length > 0) {
var wrapperapp = { var wrapperapp = {
"id": "", "id": "",
"name": "noapp", "name": "noapp",
@@ -2759,7 +2709,7 @@ const ParsedAction = (props) => {
{suggestionInfo()} {suggestionInfo()}
{selectedActionParameters.map((data, count) => { {selectedActionParameters?.map((data, count) => {
if (data.variant === "") { if (data.variant === "") {
data.variant = "STATIC_VALUE"; data.variant = "STATIC_VALUE";
} }
@@ -3214,10 +3164,12 @@ const ParsedAction = (props) => {
color="primary" color="primary"
// defaultValue={data.value} // defaultValue={data.value}
value={ value={
paramValues.find((param) => param.name === data.name) !== undefined data?.value
? paramValues.find((param) => param.name === data.name).value
: ""
} }
error={
data?.error?.length > 0 ? true : false
}
helperText={data?.error?.length > 0 ? data.error : returnHelperText(data.name, data.value)}
//options={{ //options={{
// theme: 'gruvbox-dark', // theme: 'gruvbox-dark',
// keyMap: 'sublime', // keyMap: 'sublime',
@@ -3240,7 +3192,6 @@ const ParsedAction = (props) => {
// changeActionParameter(event, count, data); // changeActionParameter(event, count, data);
handleParamChange(event, count, data) handleParamChange(event, count, data)
}} }}
helperText={returnHelperText(data.name, data.value)}
onBlur={(event) => { onBlur={(event) => {
baseHelperText = calculateHelpertext(event.target.value) baseHelperText = calculateHelpertext(event.target.value)
if (setLastSaved !== undefined) { if (setLastSaved !== undefined) {