[KNOWAGE-2252] Docs for isValid func in dataset's script

KnowageLabs · Sep 22, 2020 · 08d1f64 · 08d1f64
1 parent e9a610f
commit 08d1f64
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/knowage/src/main/resources/predefinedJavascriptScript.js b/knowage/src/main/resources/predefinedJavascriptScript.js
@@ -79,11 +79,13 @@ function getInClauseForNullableValues(colName, parName){
     }
 }
 
-parameters.isValid = function(key) {
+function isValid(key) {
 	return key != null
 		&& parameters.get(key) != null
 		&& parameters.get(key) != ''
 		&& parameters.get(key) != "''"
 		&& parameters.get(key) != "null"
 		&& parameters.get(key) != "%";
 }
+
+parameters.isValid = isValid;
diff --git a/knowage/src/main/webapp/themes/sbi_default/html/dsrules.html b/knowage/src/main/webapp/themes/sbi_default/html/dsrules.html
@@ -47,6 +47,13 @@
 	, ")" )</i>
 	<hr />
 	</li>
+	<li><b>isValid('attribute_name') </b>: Returns true if the value
+	of the attribute is not null or empty or equals to "''"" or equals
+	to "null" or equals to "%" <br />
+	<i><b>Example:</b>
+	isValid('${multi_value_attribute}')</i>
+	<hr />
+	</li>
 </ul>
 </div>
 </body>

diff --git a/knowageutils/src/main/resources/predefinedJavascriptScript.js b/knowageutils/src/main/resources/predefinedJavascriptScript.js
@@ -79,11 +79,13 @@ function getInClauseForNullableValues(colName, parName){
     }
 }
 
-parameters.isValid = function(key) {
+function isValid(key) {
 	return key != null
 		&& parameters.get(key) != null
 		&& parameters.get(key) != ''
 		&& parameters.get(key) != "''"
 		&& parameters.get(key) != "null"
 		&& parameters.get(key) != "%";
 }
+
+parameters.isValid = isValid;