[CDF-817] - Table component - search box doesn't work when "paginate …

…server side" is set to true
webdetails · Mar 29, 2016 · 251dfa6 · 251dfa6
1 parent 39caa8c
commit 251dfa6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/core/src/main/java/pt/webdetails/cda/utils/TableModelUtils.java b/core/src/main/java/pt/webdetails/cda/utils/TableModelUtils.java
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2002 - 2015 Webdetails, a Pentaho company. All rights reserved.
+ * Copyright 2002 - 2016 Webdetails, a Pentaho company. All rights reserved.
  *
  * This software was developed by Webdetails and is provided under the terms
  * of the Mozilla Public License, Version 2.0, or any later version. You may not use
@@ -245,17 +245,27 @@ private static DataTableFilter getRowFilter( final QueryOptions queryOptions, fi
       }
 
       if ( searchableIndexes == null ) { //include all
-        searchableIndexes = new int[ outputIndexes.size() ];
-        for ( int i = 0; i < searchableIndexes.length; i++ ) {
-          searchableIndexes[ i ] = outputIndexes.get( i );
-        }
+        searchableIndexes = toIntArray( outputIndexes );
       }
 
       return new DataTableFilter( filterText, searchableIndexes );
     }
+
+    for ( Parameter parameter:queryOptions.getParameters() ) {
+      if ( parameter.getName().equals( "searchBox" ) ) {
+        return new DataTableFilter( parameter.getStringValue(), toIntArray( outputIndexes ) );
+      }
+    }
     return null;
   }
 
+  private static int[] toIntArray( List<Integer> outputIndexes )  {
+    int [] searchableIndexes = new int[ outputIndexes.size() ];
+    for ( int i = 0; i < searchableIndexes.length; i++ ) {
+      searchableIndexes[ i ] = outputIndexes.get( i );
+    }
+    return searchableIndexes;
+  }
 
   private static List<Integer> getOutputIndexes( final DataAccess dataAccess, final QueryOptions queryOptions,
                                                  TableModel table ) throws InvalidOutputIndexException {

diff --git a/core/src/test/java/pt/webdetails/cda/utils/TableModelUtilsTest.java b/core/src/test/java/pt/webdetails/cda/utils/TableModelUtilsTest.java
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2002 - 2015 Webdetails, a Pentaho company. All rights reserved.
+ * Copyright 2002 - 2016 Webdetails, a Pentaho company. All rights reserved.
  *
  * This software was developed by Webdetails and is provided under the terms
  * of the Mozilla Public License, Version 2.0, or any later version. You may not use
@@ -130,8 +130,15 @@ public void testOutputIdx() throws Exception {
       new Object[] { 2.0d, "two" } ), result );
     checker.assertColumnNames( result, "c3", "c2" );
     checker.assertColumnClasses( result, Double.class, String.class );
+    opts.addParameter( "searchBox", "one" );
+    result = TableModelUtils.postProcessTableModel( dataAccess, opts, tm );
+    checker = new TableModelChecker();
+    checker.assertEquals( new SimpleTableModel(
+      new Object[] { 1.0d, "one" } ), result );
 
     when( dataAccess.getOutputMode( 6 ) ).thenReturn( OutputMode.EXCLUDE );
+    opts = new QueryOptions();
+    opts.setOutputIndexId( 6 );
     result = TableModelUtils.postProcessTableModel( dataAccess, opts, tm );
     checker.assertEquals(
       new SimpleTableModel( new Object[] { 1L }, new Object[] { 2L } ),