Merge pull request #910 from StackStorm/int_yaql

Allow integer fields with YAQL expressions to be saved
StackStorm · Sep 20, 2021 · 3236dd2 · 3236dd2
2 parents 065f5c6 + d3f5b1d
commit 3236dd2
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 7 deletions.
diff --git a/apps/st2-actions/actions-details.component.js b/apps/st2-actions/actions-details.component.js
@@ -200,6 +200,18 @@ export default class ActionsDetails extends React.Component {
     return false;
   }
 
+  isExpression (value) {
+    if (value.startsWith('{{') && value.endsWith('}}')) {
+      return true;
+    } 
+    else if (value.startsWith('<%') && value.endsWith('%>')) {
+      return true;
+    } 
+    else {
+      return false;
+    }
+  }
+
   isValidInt (value) {
     for ( let n = 0; n < value.length; n += 1) {
       const digit = (value.charCodeAt(n) >= 48 && value.charCodeAt(n) <= 57)  || value.charCodeAt(n) === 45 || value.charCodeAt(n) === 8;
@@ -280,10 +292,12 @@ export default class ActionsDetails extends React.Component {
             <DetailsToolbar key="toolbar">
               <Button  
                 disabled={ 
-                  (this.state.runValue && this.state.runValue.timeout &&  this.minMax(this.state.runValue.timeout)) || 
-                  (this.state.runValue && this.state.runValue.limit &&  this.minMax(this.state.runValue.limit))  || 
-                  (this.state.runValue && this.state.runValue.timeout &&  this.isValidInt(this.state.runValue.timeout))  ||
-                  (this.state.runValue && this.state.runValue.limit &&  this.isValidInt(this.state.runValue.limit))  
+                  (this.state.runValue && this.state.runValue.timeout && !this.isExpression(this.state.runValue.timeout) && 
+                     (this.isValidInt(this.state.runValue.timeout) ||
+                      this.minMax(this.state.runValue.timeout))) || 
+                  (this.state.runValue && this.state.runValue.limit && !this.isExpression(this.state.runValue.limit) && 
+                     (this.isValidInt(this.state.runValue.limit) ||
+                      this.minMax(this.state.runValue.limit)))
                 }
                 value="Run" data-test="run_submit" onClick={(e) => this.handleRun(e, action.ref, this.state.runValue, this.state.runTrace || undefined)} 
               />

diff --git a/modules/st2-auto-form/fields/base.js b/modules/st2-auto-form/fields/base.js
@@ -84,7 +84,12 @@ export class BaseTextField extends React.Component {
       return false;
     }
 
+    if (isYaql(v)) {
+      return false;
+    }
+
     return undefined;
+
   }
 
   handleChange(e, value) {

diff --git a/modules/st2-auto-form/fields/integer.js b/modules/st2-auto-form/fields/integer.js
@@ -14,7 +14,7 @@
 
 import validator from 'validator';
 
-import { BaseTextField, isJinja } from './base';
+import { BaseTextField, isJinja, isYaql } from './base';
 
 export default class IntegerField extends BaseTextField {
   static icon = '12'
@@ -24,6 +24,10 @@ export default class IntegerField extends BaseTextField {
       return v;
     }
 
+    if (isYaql(v)) {
+      return v;
+    }
+
     if (this.props.name === 'timeout' || this.props.name === 'limit') {
       return v ;
     }
@@ -37,6 +41,10 @@ export default class IntegerField extends BaseTextField {
       return v;
     }
 
+    if (isYaql(v)) {
+      return v;
+    }
+
     return v ? v.toString(10) : '';
   }
 

diff --git a/modules/st2-auto-form/fields/number.js b/modules/st2-auto-form/fields/number.js
@@ -14,7 +14,7 @@
 
 import validator from 'validator';
 
-import { BaseTextField, isJinja } from './base';
+import { BaseTextField, isJinja, isYaql } from './base';
 
 export default class NumberField extends BaseTextField {
   static icon = '.5'
@@ -24,6 +24,10 @@ export default class NumberField extends BaseTextField {
       return v;
     }
 
+    if (isYaql(v)) {
+      return v;
+    }
+
     return v !== '' ? validator.toFloat(v) : void 0;
   }
 
@@ -32,6 +36,10 @@ export default class NumberField extends BaseTextField {
       return v;
     }
 
+    if (isYaql(v)) {
+      return v;
+    }
+
     return v ? v.toString(10) : '';
   }
 

diff --git a/modules/st2-auto-form/fields/object.js b/modules/st2-auto-form/fields/object.js
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import _ from 'lodash';
-import { BaseTextareaField, isJinja } from './base';
+import { BaseTextareaField, isJinja, isYaql } from './base';
 
 export default class ObjectField extends BaseTextareaField {
   static icon = '{ }'
@@ -23,6 +23,10 @@ export default class ObjectField extends BaseTextareaField {
       return v;
     }
 
+    if (isYaql(v)) {
+      return v;
+    }
+
     return v !== '' && v !== undefined ? JSON.parse(v) : void 0;
   }
 
@@ -31,6 +35,10 @@ export default class ObjectField extends BaseTextareaField {
       return v;
     }
 
+    if (isYaql(v)) {
+      return v;
+    }
+
     return JSON.stringify(v || {});
   }