Skip to content

Commit 7d75d6e

Browse files
committed
Allow assert and setVarNode to assign now() as value to variable
1 parent c142b33 commit 7d75d6e

File tree

3 files changed

+14
-22
lines changed

3 files changed

+14
-22
lines changed

src/components/molecules/flow/graph/Graph.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ class Graph {
155155
const sNode = new setVarNode(node.data, prevNodeOutputData, this.envVariables);
156156
const newVariable = sNode.evaluate();
157157
if (newVariable != undefined) {
158-
this.logs.push(`Evaluate variable: ${newVariable}`);
158+
this.logs.push(`Evaluate variable: ${JSON.stringify(newVariable)}`);
159159
this.envVariables = {
160160
...this.envVariables,
161161
...newVariable,

src/components/molecules/flow/nodes/AssertNode.js

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,26 +60,27 @@ const variableElem = (id, data, varName) => {
6060
case 'Boolean':
6161
setAssertNodeVariable(id, varName, selectedValue, false);
6262
break;
63+
case 'Now':
64+
setAssertNodeVariable(id, varName, selectedValue, '');
65+
break;
6366
}
6467
};
6568

66-
const handleBooleanValueSelection = (event) => {
67-
setAssertNodeVariable(id, varName, 'Boolean', event.target?.value);
68-
};
69-
7069
return (
7170
<div className='flex items-center justify-center mb-4 text-sm border rounded-md border-neutral-500 text-neutral-500 outline-0 focus:ring-0'>
7271
{data.variables && data.variables[varName] ? (
7372
data.variables[varName].type === 'Boolean' ? (
7473
<select
75-
onChange={handleBooleanValueSelection}
74+
onChange={(event) => setAssertNodeVariable(id, varName, 'Boolean', event.target?.value)}
7675
name='boolean-val'
7776
className='nodrag h-12 w-full rounded-br-md rounded-tr-md p-2.5 px-1 '
7877
value={data.variables[varName].value}
7978
>
8079
<option value='true'>True</option>
8180
<option value='false'>False</option>
8281
</select>
82+
) : data.variables[varName].type === 'Now' ? (
83+
<div></div>
8384
) : (
8485
<input
8586
id='outlined-adornment-weight'
@@ -92,23 +93,15 @@ const variableElem = (id, data, varName) => {
9293
const updatedValue = event.target.value;
9394
switch (data.variables[varName].type) {
9495
case 'String':
95-
// data.variables[varName].value = updatedValue.toString();
96-
// setVariableValue(updatedValue.toString());
9796
setAssertNodeVariable(id, varName, 'String', updatedValue.toString());
9897
break;
9998
case 'Select':
100-
// data.variables[varName].value = updatedValue.toString();
101-
// setVariableValue(updatedValue.toString());
10299
setAssertNodeVariable(id, varName, 'Select', updatedValue.toString());
103100
break;
104101
case 'Variable':
105-
// data.variables[varName].value = updatedValue.toString();
106-
// setVariableValue(updatedValue.toString());
107102
setAssertNodeVariable(id, varName, 'Variable', updatedValue.toString());
108103
break;
109104
case 'Number':
110-
// data.variables[varName].value = parseInt(updatedValue);
111-
// setVariableValue(parseInt(updatedValue));
112105
setAssertNodeVariable(id, varName, 'Number', parseInt(updatedValue));
113106
break;
114107
}
@@ -142,6 +135,7 @@ const variableElem = (id, data, varName) => {
142135
<option value='Variable'>Variable</option>
143136
<option value='Number'>Number</option>
144137
<option value='Boolean'>Boolean</option>
138+
<option value='Now'>Now</option>
145139
</select>
146140
</div>
147141
);

src/components/molecules/flow/nodes/SetVarNode.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ const SetVarNode = ({ id, data }) => {
9999
case 'Boolean':
100100
setVariableNodeExpressionsVariable(id, varName, selectedValue, false);
101101
break;
102+
case 'Now':
103+
setVariableNodeExpressionsVariable(id, varName, selectedValue, '');
104+
break;
102105
}
103106
};
104107

@@ -115,6 +118,8 @@ const SetVarNode = ({ id, data }) => {
115118
<option value='true'>True</option>
116119
<option value='false'>False</option>
117120
</select>
121+
) : data.variable.value.variables[varName].type === 'Now' ? (
122+
<div></div>
118123
) : (
119124
<input
120125
id='outlined-adornment-weight'
@@ -127,23 +132,15 @@ const SetVarNode = ({ id, data }) => {
127132
const updatedValue = event.target.value;
128133
switch (data.variable.value.variables[varName].type) {
129134
case 'String':
130-
// data.variables[varName].value = updatedValue.toString();
131-
// setVariableValue(updatedValue.toString());
132135
setVariableNodeExpressionsVariable(id, varName, 'String', updatedValue.toString());
133136
break;
134137
case 'Select':
135-
// data.variables[varName].value = updatedValue.toString();
136-
// setVariableValue(updatedValue.toString());
137138
setVariableNodeExpressionsVariable(id, varName, 'Select', updatedValue.toString());
138139
break;
139140
case 'Variable':
140-
// data.variables[varName].value = updatedValue.toString();
141-
// setVariableValue(updatedValue.toString());
142141
setVariableNodeExpressionsVariable(id, varName, 'Variable', updatedValue.toString());
143142
break;
144143
case 'Number':
145-
// data.variables[varName].value = parseInt(updatedValue);
146-
// setVariableValue(parseInt(updatedValue));
147144
setVariableNodeExpressionsVariable(id, varName, 'Number', parseInt(updatedValue));
148145
break;
149146
}
@@ -181,6 +178,7 @@ const SetVarNode = ({ id, data }) => {
181178
<option value='Variable'>Variable</option>
182179
<option value='Number'>Number</option>
183180
<option value='Boolean'>Boolean</option>
181+
<option value='Now'>Now</option>
184182
</select>
185183
</div>
186184
);

0 commit comments

Comments
 (0)