Add Job Targets via Tag and Rename JobStepDefinitions names

Signed-off-by: Claudio Mezzasalma <claudio.mezzasalma@eurotech.com>
eclipse · Feb 8, 2019 · 545b530 · 545b530
1 parent 4669a6d
commit 545b530
Show file tree

Hide file tree

Showing 31 changed files with 610 additions and 104 deletions.
diff --git a/...ain/java/org/eclipse/kapua/app/console/module/device/client/device/DeviceFilterPanel.java b/...ain/java/org/eclipse/kapua/app/console/module/device/client/device/DeviceFilterPanel.java
@@ -40,6 +40,7 @@
 import org.eclipse.kapua.app.console.module.tag.shared.service.GwtTagService;
 import org.eclipse.kapua.app.console.module.tag.shared.service.GwtTagServiceAsync;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class DeviceFilterPanel extends EntityFilterPanel<GwtDevice> {
@@ -431,7 +432,9 @@ public void doFilter() {
             predicates.setGroupDevice("NO_GROUP");
         }
         if (tagsCombo != null && !tagsCombo.getValue().equals(allTag)) {
-            predicates.setTagId(tagsCombo.getValue().getId());
+            List<String> tagIds = new ArrayList<String>();
+            tagIds.add(tagsCombo.getValue().getId());
+            predicates.setTagIds(tagIds);
         }
 
         query.setPredicates(predicates);

diff --git a/...ain/java/org/eclipse/kapua/app/console/module/device/client/device/DeviceGridToolbar.java b/...ain/java/org/eclipse/kapua/app/console/module/device/client/device/DeviceGridToolbar.java
@@ -130,9 +130,9 @@ private void export(String format) {
                     .append(URL.encodeQueryString(query.getPredicates().getGroupId()));
         }
 
-        if (query.getPredicates().getTagId() != null) {
+        if (query.getPredicates().getTagIds().get(0) != null) {
             sbUrl.append("&tag=")
-                    .append(URL.encodeQueryString(query.getPredicates().getTagId()));
+                    .append(URL.encodeQueryString(query.getPredicates().getTagIds().get(0)));
         }
 
         Window.open(sbUrl.toString(), "_blank", "location=no");

diff --git a/...in/java/org/eclipse/kapua/app/console/module/device/client/device/tag/TagSubjectGrid.java b/...in/java/org/eclipse/kapua/app/console/module/device/client/device/tag/TagSubjectGrid.java
@@ -110,7 +110,9 @@ public void setEntity(GwtTag gwtTag) {
         if (gwtTag != null) {
             selectedTag = gwtTag;
             GwtDeviceQueryPredicates predicates = new GwtDeviceQueryPredicates();
-            predicates.setTagId(selectedTag.getId());
+            List<String> tagIds = new ArrayList<String>();
+            tagIds.add(selectedTag.getId());
+            predicates.setTagIds(tagIds);
             query.setPredicates(predicates);
         }
         refresh();