remove OEID alias from taskqueries. Fixed test and refreshGrid errors

mswiderski · Jun 6, 2016 · 20a4df0 · 20a4df0
1 parent ce8ef50
commit 20a4df0
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/...c-client/src/main/java/org/jbpm/console/ng/gc/client/list/base/AbstractListPresenter.java b/...c-client/src/main/java/org/jbpm/console/ng/gc/client/list/base/AbstractListPresenter.java
@@ -155,7 +155,9 @@ public void onRefresh() {
     }
 
     public void refreshGrid() {
-        getListView().getListGrid().setVisibleRangeAndClearData(getListView().getListGrid().getVisibleRange(),true);
+        if(getListView().getListGrid()!=null) {
+            getListView().getListGrid().setVisibleRangeAndClearData(getListView().getListGrid().getVisibleRange(), true);
+        }
     }
 
     protected void onSearchEvent(@Observes SearchEvent searchEvent) {

diff --git a/...ient/src/test/java/org/jbpm/console/ng/gc/client/list/base/AbstractListPresenterTest.java b/...ient/src/test/java/org/jbpm/console/ng/gc/client/list/base/AbstractListPresenterTest.java
@@ -25,7 +25,7 @@
 import com.google.gwt.view.client.Range;
 import com.google.gwtmockito.GwtMockitoTestRunner;
 import org.apache.commons.lang3.RandomStringUtils;
-import org.drools.core.spi.DataProvider;
+import org.jbpm.console.ng.gc.client.experimental.grid.base.ExtendedPagedTable;
 import org.jbpm.console.ng.gc.client.list.base.events.SearchEvent;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,6 +46,9 @@ public class AbstractListPresenterTest {
     @Mock
     private AbstractListView.ListView viewMock;
 
+    @Mock
+    ExtendedPagedTable extendedPagedTable;
+
     @Mock
     HasData next;
 
@@ -157,4 +160,19 @@ public void testUpDateDataOnCallBackMiddlePage() {
 
     }
 
+    @Test
+    public void testRefreshGrid() {
+
+        Range range = new Range(0,5);
+
+        when(viewMock.getListGrid()).thenReturn(extendedPagedTable);
+        when(extendedPagedTable.getVisibleRange()).thenReturn(range);
+
+        testListPresenter.refreshGrid();
+
+        verify(extendedPagedTable).setVisibleRangeAndClearData(range, true);
+
+    }
+
+
 }
diff --git a/...e-ng-human-tasks-api/src/main/java/org/jbpm/console/ng/ht/model/TaskDataSetConstants.java b/...e-ng-human-tasks-api/src/main/java/org/jbpm/console/ng/ht/model/TaskDataSetConstants.java
@@ -38,7 +38,7 @@ public final class TaskDataSetConstants {
     public static final String COLUMN_STATUS = "status";
     public static final String COLUMN_TASK_ID = "taskId";
     public static final String COLUMN_WORK_ITEM_ID = "workItemId";
-    public static final String COLUMN_ORGANIZATIONAL_ENTITY = "oeid";
+    public static final String COLUMN_ORGANIZATIONAL_ENTITY = "id";
 
     public static final String COLUMN_TASK_VARIABLE_TASK_ID = "taskId";
     public static final String COLUMN_TASK_VARIABLE_TASK_NAME = "TASKNAME";

diff --git a/...sks-backend/src/main/java/org/jbpm/console/ng/ht/backend/server/DataSetDefsBootstrap.java b/...sks-backend/src/main/java/org/jbpm/console/ng/ht/backend/server/DataSetDefsBootstrap.java
@@ -124,7 +124,7 @@ protected void registerDataSetDefinitions() {
                             "t.status, " +
                             "t.taskId, " +
                             "t.workItemId, " +
-                            "oe.id as OEID " +
+                            "oe.id " +
                         "from " +
                             "AuditTaskImpl t, " +
                             "PeopleAssignments_PotOwners po, " +
@@ -172,7 +172,7 @@ protected void registerDataSetDefinitions() {
                             "t.status, " +
                             "t.taskId, " +
                             "t.workItemId, " +
-                            "oe.id as OEID " +
+                            "oe.id " +
                         "from " +
                             "AuditTaskImpl t, " +
                             "PeopleAssignments_BAs bas, " +

diff --git a/...rg/jbpm/console/ng/pr/client/editors/variables/list/ProcessVariableListPresenterTest.java b/...rg/jbpm/console/ng/pr/client/editors/variables/list/ProcessVariableListPresenterTest.java
@@ -22,6 +22,7 @@
 import com.google.gwtmockito.GwtMockitoTestRunner;
 import org.jboss.errai.common.client.api.Caller;
 import org.jbpm.console.ng.bd.model.ProcessVariableSummary;
+import org.jbpm.console.ng.gc.client.experimental.grid.base.ExtendedPagedTable;
 import org.jbpm.console.ng.pr.model.events.ProcessInstanceSelectionEvent;
 import org.jbpm.console.ng.pr.service.ProcessVariablesService;
 import org.junit.Before;
@@ -39,6 +40,9 @@ public class ProcessVariableListPresenterTest {
     @Mock
     ProcessVariableListPresenter.ProcessVariableListView view;
 
+    @Mock
+    ExtendedPagedTable extendedPagedTable;
+
     Caller<ProcessVariablesService> variablesServicesCaller;
 
     @Mock
@@ -61,6 +65,7 @@ public void testLoadVariableHistory() {
         final ProcessVariableSummary summary = new ProcessVariableSummary(variableName, "variableInstanceId", processInstanceId, "oldValue", "newValue", System.currentTimeMillis(), "type");
         final List<ProcessVariableSummary> summaries = Arrays.asList(summary);
         when(processVariablesService.getVariableHistory(anyString(), eq(deploymentId), eq(processInstanceId), eq(variableName))).thenReturn(summaries);
+        when(view.getListGrid()).thenReturn(extendedPagedTable);
 
         final ProcessInstanceSelectionEvent event = new ProcessInstanceSelectionEvent(deploymentId, processInstanceId, "processDefId", "processDefName", 1);