Merge pull request #1441 from Monilprajapati/mergingIssue
Variable fields in the parameter is now changing dynamically.
This commit is contained in:
@@ -179,7 +179,7 @@ const ParsedAction = (props) => {
|
|||||||
const [activateHidingBodyButton, setActivateHidingBodyButton] = React.useState(false)
|
const [activateHidingBodyButton, setActivateHidingBodyButton] = React.useState(false)
|
||||||
const [appActionName, setAppActionName] = React.useState(selectedAction.label);
|
const [appActionName, setAppActionName] = React.useState(selectedAction.label);
|
||||||
const [delay, setDelay] = React.useState(selectedAction?.execution_delay || 0);
|
const [delay, setDelay] = React.useState(selectedAction?.execution_delay || 0);
|
||||||
|
const [prevActionName, setPrevActionName] = React.useState(selectedAction.label);
|
||||||
const [fieldCount, setFieldCount] = React.useState(0);
|
const [fieldCount, setFieldCount] = React.useState(0);
|
||||||
const [hiddenDescription, setHiddenDescription] = React.useState(true);
|
const [hiddenDescription, setHiddenDescription] = React.useState(true);
|
||||||
const [autoCompleting, setAutocompleting] = React.useState(false);
|
const [autoCompleting, setAutocompleting] = React.useState(false);
|
||||||
@@ -206,16 +206,6 @@ const ParsedAction = (props) => {
|
|||||||
setLastSaved(false)
|
setLastSaved(false)
|
||||||
}
|
}
|
||||||
}, [expansionModalOpen])
|
}, [expansionModalOpen])
|
||||||
useEffect(() => {
|
|
||||||
setParamValues(selectedAction.parameters.map((param) => {
|
|
||||||
return {
|
|
||||||
name: param.name,
|
|
||||||
value: param.value,
|
|
||||||
}
|
|
||||||
}))
|
|
||||||
},[
|
|
||||||
selectedAction, selectedApp,setNewSelectedAction, workflow,
|
|
||||||
])
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setParamValues(selectedAction.parameters.map((param) => {
|
setParamValues(selectedAction.parameters.map((param) => {
|
||||||
@@ -416,6 +406,10 @@ const ParsedAction = (props) => {
|
|||||||
if (selectedAction.label !== appActionName) {
|
if (selectedAction.label !== appActionName) {
|
||||||
setAppActionName(selectedAction.label);
|
setAppActionName(selectedAction.label);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(selectedAction.label !== prevActionName){
|
||||||
|
setPrevActionName(selectedAction.label)
|
||||||
|
}
|
||||||
|
|
||||||
// Only set delay if it has changed
|
// Only set delay if it has changed
|
||||||
const newDelay = selectedAction?.execution_delay || 0;
|
const newDelay = selectedAction?.execution_delay || 0;
|
||||||
@@ -1302,7 +1296,6 @@ const ParsedAction = (props) => {
|
|||||||
|
|
||||||
|
|
||||||
const selectedAppIcon = selectedAction.large_image
|
const selectedAppIcon = selectedAction.large_image
|
||||||
var baselabel = selectedAction.label
|
|
||||||
return (
|
return (
|
||||||
<div style={appApiViewStyle} id="parsed_action_view">
|
<div style={appApiViewStyle} id="parsed_action_view">
|
||||||
|
|
||||||
@@ -1621,8 +1614,8 @@ const ParsedAction = (props) => {
|
|||||||
}
|
}
|
||||||
onBlur={(e) => {
|
onBlur={(e) => {
|
||||||
// Copy the name value
|
// Copy the name value
|
||||||
const name = appActionName
|
const name = e.target.value
|
||||||
const parsedBaseLabel = "$"+baselabel.toLowerCase().replaceAll(" ", "_")
|
const parsedBaseLabel = "$"+prevActionName.toLowerCase().replaceAll(" ", "_")
|
||||||
const newname = "$"+name.toLowerCase().replaceAll(" ", "_")
|
const newname = "$"+name.toLowerCase().replaceAll(" ", "_")
|
||||||
|
|
||||||
// Check if it's the same as the current name in use
|
// Check if it's the same as the current name in use
|
||||||
@@ -1774,7 +1767,6 @@ const ParsedAction = (props) => {
|
|||||||
// Need to make sure e.g. changing the first here doesn't change the 2nd
|
// Need to make sure e.g. changing the first here doesn't change the 2nd
|
||||||
// $change_me
|
// $change_me
|
||||||
// $change_me_2
|
// $change_me_2
|
||||||
|
|
||||||
const foundindex = param.value.toLowerCase().indexOf(parsedBaseLabel, previous)
|
const foundindex = param.value.toLowerCase().indexOf(parsedBaseLabel, previous)
|
||||||
if (foundindex === previous && foundindex !== 0) {
|
if (foundindex === previous && foundindex !== 0) {
|
||||||
break
|
break
|
||||||
@@ -1817,7 +1809,7 @@ const ParsedAction = (props) => {
|
|||||||
|
|
||||||
setWorkflow(workflow);
|
setWorkflow(workflow);
|
||||||
setUpdate(Math.random());
|
setUpdate(Math.random());
|
||||||
baselabel = name
|
setPrevActionName(name)
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -21606,7 +21606,7 @@ const releaseToConnectLabel = "Release to Connect"
|
|||||||
</Paper>
|
</Paper>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
//! Logs
|
|
||||||
const drawerData = originalWorkflow !== undefined && originalWorkflow !== null ?
|
const drawerData = originalWorkflow !== undefined && originalWorkflow !== null ?
|
||||||
<div style={{ height: "100%"}}>
|
<div style={{ height: "100%"}}>
|
||||||
<Typography variant="h5" style={{ paddingLeft: 25, paddingTop:25, backgroundColor: theme.palette.surfaceColor, height: "8%" }}>
|
<Typography variant="h5" style={{ paddingLeft: 25, paddingTop:25, backgroundColor: theme.palette.surfaceColor, height: "8%" }}>
|
||||||
|
|||||||
Reference in New Issue
Block a user