JBPM-6867, JBPM-6886, JBPM-6825, JBPM-6841, JBPM-6826, JBPM-6802 ,JB…

…PM-6659, JBPM-6660 - Runtime views update, new Manage section (#994) * JBPM-6802:Add breadcrumbs to list and details views * Update Breadcrumb i18n keys * Use definition name instead of deployment id for breadcrumb * JBPM-6803: Migrate server template selector to breadcrumb area. * Migrate runtime views to new perspective layout * Move detail screens to full screen * Review toolbar primary action buttons * Review master detail API (#12) Remove table style for selected row Remove place status handling for opening details screen * Add new filters dock panel (#10) * JBPM-6826:Include Manage selector ( Inventory Switcher ) (#11) * Update attribute selector label to Filter By (#15) * Remove user task list from manage section (#14) * Add new saved filters dock panel (#9) * JBPM-6877 - Fix screen id for navigating to task and process instance details screens (#16) * [AF-913]: Added Category to resource type and integrated with UX/UI (#966) (#18) [AF-913]: Added Category to resource type * JBPM-6846: Move process model to detail tab (#13) * JBPM-6887 - Rename Task Lists to Task Inbox (#986) (#19) * JBPM-6892 - Remove spacing between table results and controls (#988) (#22) * JBPM-6841: Review details page layout. Details alignment, input fields size, primary button review and task context tab removed (#20) * JBPM-6867 - Restyle manage view table (#17) * JBPM-6885 - Split Task & Process Dashboard tabs into separated screens (#987) (#23) * JBPM-6867 - Layout updates to manage result list (#24) - Fix scrolling - Remove table rows stripes - Add grey background to table header * JBPM-6879: Prepend "Manage" to all runtime management list views breadcrumb (#25) * error detail breadcrumb updated with the error detail title (#21) * Upgrade supported WildFly version to 11. (#983) (#26) * Upgrade supported WildFly version to 11. This reverts commit 1d8f778. * Clean up auth properties files comments * fixed server logging in GWT SDM * JBPM-6174: Add error count column to the task admin list (#965) (#27) * JBPM-6825 - Move saved and quick filters to docks (#28) * JBPM-6881 : Rename Task Administration menu to Tasks (#30) * JBPM-6879: Prepend "Manage" to all runtime management list views breadcrumb. Process definition breadcrumb from new instance (#31) * JBPM-6841: Review details page layout. Spacing between tab header and content (#32) * JBPM-6886 : Update Dashboards layout (#29) * JBPM-7002 - Group action buttons in list table to kebab (#33) * Enhance filters tests (#34) * JBPM-6894 - User should be able to define case, process, activity level SLA (#990) (#36) * JBPM-6793 - Remove onclick and onmouseover in process diagram svg content (#37) * Increase space between tab and content in task admin and assignment tabs (#39) * Test addition: Breadcrumbs and ManageSelector (#38)
kiegroup · Mar 16, 2018 · 1a22703 · 1a22703
1 parent aad4b2b
commit 1a22703
Show file tree

Hide file tree

Showing 227 changed files with 9,663 additions and 5,505 deletions.
diff --git a/...mmon/jbpm-wb-common-api/src/main/java/org/jbpm/workbench/common/model/GenericSummary.java b/...mmon/jbpm-wb-common-api/src/main/java/org/jbpm/workbench/common/model/GenericSummary.java
@@ -26,7 +26,6 @@ public abstract class GenericSummary<T> extends AbstractPageRow implements Seria
 
     protected T id;
     protected String name;
-    private boolean selected = false;
 
     public GenericSummary() {
     }
@@ -53,14 +52,6 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public boolean isSelected() {
-        return selected;
-    }
-
-    public void setSelected(boolean selected) {
-        this.selected = selected;
-    }
-
     @Override
     @SuppressWarnings("PMD.AvoidMultipleUnaryOperators")
     public int hashCode() {
@@ -107,7 +98,6 @@ public String toString() {
         return "GenericSummary{" +
                 "id=" + id +
                 ", name='" + name + '\'' +
-                ", selected=" + selected +
-                '}';
+                "} " + super.toString();
     }
 }
diff --git a/jbpm-wb-common/jbpm-wb-common-client/pom.xml b/jbpm-wb-common/jbpm-wb-common-client/pom.xml
@@ -50,6 +50,10 @@
       <groupId>org.gwtbootstrap3</groupId>
       <artifactId>gwtbootstrap3-extras</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.elemental2</groupId>
+      <artifactId>elemental2-dom</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -167,10 +171,6 @@
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.elemental2</groupId>
-      <artifactId>elemental2-dom</artifactId>
-    </dependency>
 
     <!-- Test deps -->
     <dependency>

diff --git a/...bpm-wb-common-client/src/main/java/org/jbpm/workbench/common/client/CommonEntryPoint.java b/...bpm-wb-common-client/src/main/java/org/jbpm/workbench/common/client/CommonEntryPoint.java
@@ -19,15 +19,15 @@
 import javax.annotation.PostConstruct;
 
 import org.jboss.errai.ioc.client.api.EntryPoint;
-import org.jbpm.workbench.common.client.resources.CommonResources;
+import org.jboss.errai.ui.shared.api.annotations.Bundle;
 import org.uberfire.client.views.pfly.sys.PatternFlyBootstrapper;
 
 @EntryPoint
+@Bundle("resources/i18n/Constants.properties")
 public class CommonEntryPoint {
 
     @PostConstruct
     public void init() {
-        CommonResources.INSTANCE.css().ensureInjected();
         PatternFlyBootstrapper.ensureBootstrapSelectIsAvailable();
         PatternFlyBootstrapper.ensureBootstrapDateRangePickerIsAvailable();
     }

diff --git a/.../jbpm-wb-common-client/src/main/java/org/jbpm/workbench/common/client/PerspectiveIds.java b/.../jbpm-wb-common-client/src/main/java/org/jbpm/workbench/common/client/PerspectiveIds.java
@@ -39,4 +39,15 @@ public interface PerspectiveIds extends org.kie.workbench.common.workbench.clien
     String TASK_LIST_SCREEN = "TaskListScreen";
     String TASK_DETAILS_SCREEN = "TaskDetailsScreen";
 
+    String JOB_LIST_BASIC_FILTERS_SCREEN = "JobListBasicFiltersScreen";
+    String EXECUTION_ERROR_LIST_BASIC_FILTERS_SCREEN = "ErrorListBasicFiltersScreen";
+    String PROCESS_INSTANCE_LIST_BASIC_FILTERS_SCREEN = "ProcessInstanceListBasicFiltersScreen";
+    String TASK_ADMIN_LIST_BASIC_FILTERS_SCREEN = "TaskAdminListBasicFiltersScreen";
+    String TASK_LIST_BASIC_FILTERS_SCREEN = "TaskListBasicFiltersScreen";
+
+    String JOB_LIST_SAVED_FILTERS_SCREEN = "JobListSavedFiltersScreen";
+    String EXECUTION_ERROR_LIST_SAVED_FILTERS_SCREEN = "ExecutionErrorListSavedFiltersScreen";
+    String PROCESS_INSTANCE_LIST_SAVED_FILTERS_SCREEN = "ProcessInstanceListSavedFiltersScreen";
+    String TASK_ADMIN_LIST_SAVED_FILTERS_SCREEN = "TaskAdminListSavedFiltersScreen";
+    String TASK_LIST_SAVED_FILTERS_SCREEN = "TaskListSavedFiltersScreen";
 }
diff --git a/...mon-client/src/main/java/org/jbpm/workbench/common/client/dataset/DataSetAwareSelect.java b/...mon-client/src/main/java/org/jbpm/workbench/common/client/dataset/DataSetAwareSelect.java
@@ -16,6 +16,7 @@
 
 package org.jbpm.workbench.common.client.dataset;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.Dependent;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
@@ -50,7 +51,11 @@ public class DataSetAwareSelect {
     private String valueColumnId;
     private String textColumnId;
     private DataSetLookup dataSetLookup;
-    private String tableKey;
+
+    @PostConstruct
+    public void init(){
+        select.disable();
+    }
 
     public void setDataSetLookup(DataSetLookup dataSetLookup) {
         this.dataSetLookup = dataSetLookup;
@@ -64,15 +69,8 @@ public void setValueColumnId(String valueColumnId) {
         this.valueColumnId = valueColumnId;
     }
 
-    public void setTableKey(String tableKey) {
-        this.tableKey = tableKey;
-    }
-
     public void onDataSetReady(@Observes DataSetReadyEvent event) {
         final FilterSettings filterSettings = event.getFilterSettings();
-        if (this.tableKey.equals(filterSettings.getKey()) == false) {
-            return;
-        }
 
         if (filterSettings.getServerTemplateId() == null || filterSettings.getServerTemplateId().isEmpty()) {
             removeOptions();

diff --git a/.../common/client/list/ActiveFilterItem.java → ...ient/filters/active/ActiveFilterItem.java b/.../common/client/list/ActiveFilterItem.java → ...ient/filters/active/ActiveFilterItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Red Hat, Inc. and/or its affiliates.
+ * Copyright 2018 Red Hat, Inc. and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jbpm.workbench.common.client.list;
+package org.jbpm.workbench.common.client.filters.active;
 
 import java.util.function.Consumer;
 
@@ -23,7 +23,7 @@
 @Bindable
 public class ActiveFilterItem<T extends Object> {
 
-    private String labelKey;
+    private String key;
 
     private String labelValue;
 
@@ -36,24 +36,24 @@ public class ActiveFilterItem<T extends Object> {
     public ActiveFilterItem() {
     }
 
-    public ActiveFilterItem(final String labelKey,
+    public ActiveFilterItem(final String key,
                             final String labelValue,
                             final String hint,
                             final T value,
                             final Consumer<T> callback) {
-        this.labelKey = labelKey;
+        this.key = key;
         this.labelValue = labelValue;
         this.hint = hint;
         this.value = value;
         this.callback = callback;
     }
 
-    public String getLabelKey() {
-        return labelKey;
+    public String getKey() {
+        return key;
     }
 
-    public void setLabelKey(String labelKey) {
-        this.labelKey = labelKey;
+    public void setKey(String key) {
+        this.key = key;
     }
 
     public String getLabelValue() {
@@ -99,7 +99,7 @@ public boolean equals(Object o) {
 
         ActiveFilterItem that = (ActiveFilterItem) o;
 
-        if (!getLabelKey().equals(that.getLabelKey())) {
+        if (!getKey().equals(that.getKey())) {
             return false;
         }
         if (!getLabelValue().equals(that.getLabelValue())) {
@@ -111,12 +111,23 @@ public boolean equals(Object o) {
     @Override
     @SuppressWarnings("PMD.AvoidMultipleUnaryOperators")
     public int hashCode() {
-        int result = getLabelKey().hashCode();
+        int result = getKey().hashCode();
         result = ~~result;
         result = 31 * result + getLabelValue().hashCode();
         result = ~~result;
         result = 31 * result + getValue().hashCode();
         result = ~~result;
         return result;
     }
+
+    @Override
+    public String toString() {
+        return "ActiveFilterItem{" +
+                "key='" + key + '\'' +
+                ", labelValue='" + labelValue + '\'' +
+                ", hint='" + hint + '\'' +
+                ", value=" + value +
+                ", callback=" + callback +
+                '}';
+    }
 }
diff --git a/...in/java/org/jbpm/workbench/common/client/filters/active/ActiveFilterItemRemovedEvent.java b/...in/java/org/jbpm/workbench/common/client/filters/active/ActiveFilterItemRemovedEvent.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jbpm.workbench.common.client.filters.active;
+
+public class ActiveFilterItemRemovedEvent {
+
+    private ActiveFilterItem activeFilterItem;
+
+    public ActiveFilterItemRemovedEvent(final ActiveFilterItem activeFilterItem) {
+        this.activeFilterItem = activeFilterItem;
+    }
+
+    public ActiveFilterItem getActiveFilterItem() {
+        return activeFilterItem;
+    }
+
+    @Override
+    public String toString() {
+        return "ActiveFilterItemRemovedEvent{" +
+                "activeFilterItem=" + activeFilterItem +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof ActiveFilterItemRemovedEvent)) {
+            return false;
+        }
+
+        ActiveFilterItemRemovedEvent that = (ActiveFilterItemRemovedEvent) o;
+
+        return getActiveFilterItem().equals(that.getActiveFilterItem());
+    }
+
+    @Override
+    public int hashCode() {
+        return getActiveFilterItem().hashCode();
+    }
+}
diff --git a/...mon/client/list/ActiveFilterItemView.html → .../filters/active/ActiveFilterItemView.html b/...mon/client/list/ActiveFilterItemView.html → .../filters/active/ActiveFilterItemView.html
@@ -1,6 +1,6 @@
 <li data-field="li" style="padding-right: 0px;" data-toggle="popover">
     <span class="label label-info">
-        <span data-field="labelKey"></span>: <span data-field="labelValue"></span>
+        <span data-field="labelValue"></span>
         <a href="#" data-field="remove"><span class="pficon pficon-close"></span></a>
     </span>
-</li>
+</li>
diff --git a/...mon/client/list/ActiveFilterItemView.java → .../filters/active/ActiveFilterItemView.java b/...mon/client/list/ActiveFilterItemView.java → .../filters/active/ActiveFilterItemView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Red Hat, Inc. and/or its affiliates.
+ * Copyright 2018 Red Hat, Inc. and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jbpm.workbench.common.client.list;
+package org.jbpm.workbench.common.client.filters.active;
 
 import javax.annotation.PreDestroy;
 import javax.enterprise.context.Dependent;
+import javax.enterprise.event.Event;
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import com.google.gwt.user.client.TakesValue;
 import org.jboss.errai.common.client.api.IsElement;
-import org.jboss.errai.common.client.dom.Event;
 import org.jboss.errai.common.client.dom.HTMLElement;
 import org.jboss.errai.common.client.dom.ListItem;
-import org.jboss.errai.common.client.dom.Span;
 import org.jboss.errai.databinding.client.api.DataBinder;
 import org.jboss.errai.ui.shared.api.annotations.*;
 import org.uberfire.client.views.pfly.widgets.JQueryProducer;
@@ -39,13 +39,9 @@ public class ActiveFilterItemView implements TakesValue<ActiveFilterItem>,
 
     @Inject
     @DataField
+    @Named("span")
     @Bound
-    Span labelKey;
-
-    @Inject
-    @DataField
-    @Bound
-    Span labelValue;
+    elemental2.dom.HTMLElement labelValue;
 
     @Inject
     @DataField
@@ -59,7 +55,7 @@ public class ActiveFilterItemView implements TakesValue<ActiveFilterItem>,
     private DataBinder<ActiveFilterItem> dataBinder;
 
     @Inject
-    private javax.enterprise.event.Event<ActiveFilterItemRemoved> event;
+    private Event<ActiveFilterItemRemovedEvent> event;
 
     @Override
     public ActiveFilterItem getValue() {
@@ -86,8 +82,8 @@ public HTMLElement getElement() {
     }
 
     @EventHandler("remove")
-    public void onRemove(@ForEvent("click") Event e) {
-        event.fire(new ActiveFilterItemRemoved(getValue()));
+    public void onRemove(@ForEvent("click") elemental2.dom.Event e) {
+        event.fire(new ActiveFilterItemRemovedEvent(getValue()));
     }
 
     @PreDestroy

diff --git a/...ommon/client/resources/css/CommonCSS.java → .../client/filters/active/ActiveFilters.java b/...ommon/client/resources/css/CommonCSS.java → .../client/filters/active/ActiveFilters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Red Hat, Inc. and/or its affiliates.
+ * Copyright 2018 Red Hat, Inc. and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,18 @@
  * limitations under the License.
  */
 
-package org.jbpm.workbench.common.client.resources.css;
+package org.jbpm.workbench.common.client.filters.active;
 
-import com.google.gwt.resources.client.CssResource;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 
-public interface CommonCSS extends CssResource {
+import org.jboss.errai.common.client.api.elemental2.IsElement;
 
-    @ClassName("selected")
-    String selected();
+public interface ActiveFilters extends IsElement {
+
+    <T extends Object> void addActiveFilter(ActiveFilterItem<T> filter);
+
+    void removeAllActiveFilters();
+
+    void setSaveFilterCallback(BiConsumer<String, Consumer<String>> filterNameCallback);
 }