Added searchMethod

You can now choose between searching with contains or starts-with.
bizzomate · Sep 2, 2019 · dc17715 · dc17715
1 parent 18f3e85
commit dc17715
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/src/ComboSelector/ComboSelector.xml b/src/ComboSelector/ComboSelector.xml
@@ -140,6 +140,15 @@
             <description>Specify a microflow to execute on change of the attribute. (optional)</description>
             <returnType type="Void"/>
         </property>
+        <property key="searchMethod" type="enumeration" defaultValue="contains" required="true">
+            <caption>Search method</caption>
+            <category>Behavior</category>
+            <description>Base the search on contain or match with the start of the item.</description>
+            <enumerationValues>
+                <enumerationValue key="contains">Contains</enumerationValue>
+                <enumerationValue key="startswith">Starts with</enumerationValue>
+            </enumerationValues>
+        </property>
         <property key="autoComplete" type="boolean" defaultValue="false">
             <caption>Autocomplete</caption>
             <category>Behavior</category>

diff --git a/src/ComboSelector/lib/XpathStore.js b/src/ComboSelector/lib/XpathStore.js
@@ -12,13 +12,15 @@ define([
             associationDisplay: "",
             XpathDeferred: "",
             data: "",
+            searchMethod: "",
 
             constructor: function (options) {
                 this.id = options.caller + '.XpathStore';
                 this.dataSourceXpath = options.dataSourceXpath;
                 this.dataSourceXpathLimit = options.dataSourceXpathLimit;;
                 this.sortParams = options.sortParams;
                 this.associationDisplay = options.associationDisplay;
+                this.searchMethod = options.searchMethod;
                 logger.debug(this.id + ".constructor");
             },
             query: function (query, options) {
@@ -32,7 +34,8 @@ define([
                 if (query.name) {
                     var
                         searchString = query.name.toString().replace(/\'/g, '&#39;').replace(/\"/g, '&#34;'),
-                        xpathQuery = this.dataSourceXpath + "[contains(" + this.associationDisplay + ", '" + searchString + "')]";
+                        xpathQuery = this.dataSourceXpath + "[" + this.searchMethod + "(" + this.associationDisplay + ", '" + searchString + "')]";
+                        console.log("xpathQuery: " + xpathQuery);
                     mx.data.get({
                         xpath: xpathQuery,
                         filter: {

diff --git a/src/ComboSelector/widget/ComboSelector.js b/src/ComboSelector/widget/ComboSelector.js
@@ -67,6 +67,7 @@ define([
         dataSourceXpathSortOrder: "",
         dataSourceXpathExecution: "",
         reloadOnRefresh: "",
+        searchMethod: "",
 
 
         // Internal variables. Non-primitives created in the prototype are shared between all widget instances.
@@ -79,6 +80,7 @@ define([
         _association: null,
         _entity: null,
         _sortParams: null,
+        _searchMethodWidget: null,
 
         // dojo.declare.constructor is called to construct the widget instance. Implement to initialize non-primitive properties.
         constructor: function () {
@@ -107,6 +109,12 @@ define([
                 dojoClass.add(this.inputWrapper, "col-sm-" + (12 - this.labelWidth));
             }
 
+            if (this.dataSourceSelection == "dataSourceMicroflow" || this.dataSourceXpathExecution == "widget"){
+                this._searchMethodWidget = (this.searchMethod == 'contains' ? "*${0}*" : "${0}*");
+            } else {
+                this._searchMethodWidget = (this.searchMethod == 'contains' ? "contains" : "starts-with");
+            }
+
             this._association = this.associationEntity.split("/")[0];
             this._entity = this.associationEntity.split("/")[1];
 
@@ -172,6 +180,7 @@ define([
                     dataSourceXpathLimit: this.dataSourceXpathLimit,
                     sortParams: this._sortParams,
                     associationDisplay: this.associationDisplay,
+                    searchMethod: this._searchMethodWidget
                 });
                 this._buildComboBox();
             } else if (this.dataSourceSelection == "dataSourceXpath" && this.dataSourceXpathExecution == "widget") {
@@ -218,7 +227,7 @@ define([
             if (!this._comboBox) {
                 this._comboBox = new dojoComboBox({
                     store: this._comboBoxStore,
-                    queryExpr: (this.dataSourceSelection == "dataSourceXpath" && this.dataSourceXpathExecution == "xpath" ? "${0}" : "*${0}*"),
+                    queryExpr: (this.dataSourceSelection == "dataSourceXpath" && this.dataSourceXpathExecution == "xpath" ? "${0}" : this._searchMethodWidget),
                     searchAttr: "name",
                     autoComplete: this.autoComplete,
                     searchDelay: this.searchDelay

diff --git a/src/package.xml b/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="ComboSelector" version="1.2.3" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="ComboSelector" version="1.3.0" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="ComboSelector/ComboSelector.xml" />
         </widgetFiles>

diff --git a/test/widgets/ComboSelector.mpk b/test/widgets/ComboSelector.mpk