Skip to content

Commit

Permalink
Tag filter in Device view
Browse files Browse the repository at this point in the history 
Signed-off-by: Claudio Mezzasalma <claudio.mezzasalma@eurotech.com>
  • Loading branch information
Claudio Mezzasalma committed Nov 17, 2017
1 parent cc90b1b commit bcf3de1
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 40 deletions.
119 changes: 88 additions & 31 deletions ...ain/java/org/eclipse/kapua/app/console/module/device/client/device/DeviceFilterPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
import org.eclipse.kapua.app.console.module.device.shared.model.GwtDevice;
import org.eclipse.kapua.app.console.module.device.shared.model.GwtDeviceQuery;
import org.eclipse.kapua.app.console.module.device.shared.model.GwtDeviceQueryPredicates;
import org.eclipse.kapua.app.console.module.tag.shared.model.GwtTag;
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.List;

Expand All @@ -49,6 +52,7 @@ public class DeviceFilterPanel extends EntityFilterPanel<GwtDevice> {
private EntityGrid<GwtDevice> entityGrid;

private final GwtGroupServiceAsync groupService = GWT.create(GwtGroupService.class);
private final GwtTagServiceAsync tagService = GWT.create(GwtTagService.class);
private final GwtSession currentSession;

private final TextField<String> clientIdField;
Expand All @@ -62,6 +66,8 @@ public class DeviceFilterPanel extends EntityFilterPanel<GwtDevice> {
private final TextField<String> customAttribute2Field;
private final ComboBox<GwtGroup> groupsCombo;
private final GwtGroup allGroup;
private final ComboBox<GwtTag> tagsCombo;
private final GwtTag allTag;

public DeviceFilterPanel(AbstractEntityView<GwtDevice> entityView, GwtSession currentSession) {
super(entityView, currentSession);
Expand Down Expand Up @@ -285,6 +291,53 @@ public void onSuccess(List<GwtGroup> result) {
});

fieldsPanel.add(groupsCombo);

//
// Groups
final Label tagLabel = new Label(DEVICE_MSGS.deviceFilteringPanelTag());
tagLabel.setWidth(WIDTH);
tagLabel.setStyleAttribute("margin", "5px");
fieldsPanel.add(tagLabel);

allTag = new GwtTag();
allTag.setTagName("ANY");
allTag.setId(null);

tagsCombo = new ComboBox<GwtTag>();
tagsCombo.setStore(new ListStore<GwtTag>());
tagsCombo.disable();
tagsCombo.setEditable(false);
tagsCombo.setTypeAhead(false);
tagsCombo.setAllowBlank(false);
tagsCombo.setEmptyText(DEVICE_MSGS.deviceFilteringPanelLoading());
tagsCombo.setDisplayField("tagName");
tagsCombo.setValueField("id");
tagsCombo.setName("tagId");
tagsCombo.setWidth(WIDTH);
tagsCombo.setStyleAttribute("margin-top", "0px");
tagsCombo.setStyleAttribute("margin-left", "5px");
tagsCombo.setStyleAttribute("margin-right", "5px");
tagsCombo.setStyleAttribute("margin-bottom", "10px");
tagsCombo.setTriggerAction(TriggerAction.ALL);
tagsCombo.setValue(allTag);
tagService.findAll(currentSession.getSelectedAccountId(), new AsyncCallback<List<GwtTag>>() {

@Override
public void onFailure(Throwable caught) {
ConsoleInfo.display(MSGS.popupError(), DEVICE_MSGS.deviceFilteringPanelTagsError());
}

@Override
public void onSuccess(List<GwtTag> result) {
tagsCombo.getStore().removeAll();
tagsCombo.getStore().add(allTag);
tagsCombo.getStore().add(result);
tagsCombo.setValue(allTag);
tagsCombo.enable();
}
});

fieldsPanel.add(tagsCombo);
}

public String unescapeValue(String value) {
Expand All @@ -303,6 +356,7 @@ public void resetFields() {
customAttribute1Field.setValue("");
customAttribute2Field.setValue("");
groupsCombo.setValue(allGroup);
tagsCombo.setValue(allTag);
GwtDeviceQuery query = new GwtDeviceQuery();
query.setScopeId(currentSession.getSelectedAccountId());
query.setPredicates(new GwtDeviceQueryPredicates());
Expand All @@ -320,37 +374,40 @@ public void doFilter() {
GwtDeviceQuery query = new GwtDeviceQuery();
query.setScopeId(currentSession.getSelectedAccountId());

GwtDeviceQueryPredicates predicates = new GwtDeviceQueryPredicates();
if (clientIdField.getValue() != null && !clientIdField.getValue().trim().isEmpty()) {
predicates.setClientId(unescapeValue(clientIdField.getValue()));
}
if (displayNameField.getValue() != null && !displayNameField.getValue().trim().isEmpty()) {
predicates.setDisplayName(unescapeValue(displayNameField.getValue()));
}
if (serialNumberField.getValue() != null && !serialNumberField.getValue().trim().isEmpty()) {
predicates.setSerialNumber(unescapeValue(serialNumberField.getValue()));
}
if (!statusCombo.getValue().getValue().equals(GwtDeviceQueryPredicates.GwtDeviceStatus.ANY)) {
predicates.setDeviceStatus(statusCombo.getValue().getValue().name());
}
if (!connectionStatusCombo.getValue().getValue().equals(GwtDeviceQueryPredicates.GwtDeviceConnectionStatus.ANY)) {
predicates.setDeviceConnectionStatus(connectionStatusCombo.getValue().getValue().name());
}
if (iotFrameworkVersionField.getValue() != null && !iotFrameworkVersionField.getValue().trim().isEmpty()) {
predicates.setIotFrameworkVersion(unescapeValue(iotFrameworkVersionField.getValue()));
}
if (applicationIdentifiersField.getValue() != null && !applicationIdentifiersField.getValue().trim().isEmpty()) {
predicates.setApplicationIdentifiers(unescapeValue(applicationIdentifiersField.getValue()));
}
if (customAttribute1Field.getValue() != null && !customAttribute1Field.getValue().trim().isEmpty()) {
predicates.setCustomAttribute1(unescapeValue(customAttribute1Field.getValue()));
}
if (customAttribute2Field.getValue() != null && !customAttribute2Field.getValue().trim().isEmpty()) {
predicates.setCustomAttribute2(unescapeValue(customAttribute2Field.getValue()));
}
if (!groupsCombo.getValue() .equals(allGroup)) {
predicates.setGroupId(groupsCombo.getValue().getId());
}
GwtDeviceQueryPredicates predicates = new GwtDeviceQueryPredicates();
if (clientIdField.getValue() != null && !clientIdField.getValue().trim().isEmpty()) {
predicates.setClientId(unescapeValue(clientIdField.getValue()));
}
if (displayNameField.getValue() != null && !displayNameField.getValue().trim().isEmpty()) {
predicates.setDisplayName(unescapeValue(displayNameField.getValue()));
}
if (serialNumberField.getValue() != null && !serialNumberField.getValue().trim().isEmpty()) {
predicates.setSerialNumber(unescapeValue(serialNumberField.getValue()));
}
if (!statusCombo.getValue().getValue().equals(GwtDeviceQueryPredicates.GwtDeviceStatus.ANY)) {
predicates.setDeviceStatus(statusCombo.getValue().getValue().name());
}
if (!connectionStatusCombo.getValue().getValue().equals(GwtDeviceQueryPredicates.GwtDeviceConnectionStatus.ANY)) {
predicates.setDeviceConnectionStatus(connectionStatusCombo.getValue().getValue().name());
}
if (iotFrameworkVersionField.getValue() != null && !iotFrameworkVersionField.getValue().trim().isEmpty()) {
predicates.setIotFrameworkVersion(unescapeValue(iotFrameworkVersionField.getValue()));
}
if (applicationIdentifiersField.getValue() != null && !applicationIdentifiersField.getValue().trim().isEmpty()) {
predicates.setApplicationIdentifiers(unescapeValue(applicationIdentifiersField.getValue()));
}
if (customAttribute1Field.getValue() != null && !customAttribute1Field.getValue().trim().isEmpty()) {
predicates.setCustomAttribute1(unescapeValue(customAttribute1Field.getValue()));
}
if (customAttribute2Field.getValue() != null && !customAttribute2Field.getValue().trim().isEmpty()) {
predicates.setCustomAttribute2(unescapeValue(customAttribute2Field.getValue()));
}
if (!groupsCombo.getValue().equals(allGroup)) {
predicates.setGroupId(groupsCombo.getValue().getId());
}
if (!tagsCombo.getValue().equals(allTag)) {
predicates.setTagId(tagsCombo.getValue().getId());
}

query.setPredicates(predicates);

Expand Down
16 changes: 8 additions & 8 deletions ...va/org/eclipse/kapua/app/console/module/device/shared/model/GwtDeviceQueryPredicates.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,6 @@ public <X> X get(String property) {
}
}

public Long getTag() {
return (Long) get("tag");
}

public void setTag(Long gwtTag) {
set("tag", gwtTag);
}

public String getClientId() {
return (String) get("clientId");
}
Expand Down Expand Up @@ -278,4 +270,12 @@ public void setGroupId(String groupId) {
set("groupId", groupId);
}

public String getTagId() {
return (String) get("tagId");
}

public void setTagId(String tagId) {
set("tagId", tagId);
}

}
3 changes: 3 additions & 0 deletions ...org/eclipse/kapua/app/console/module/device/shared/util/GwtKapuaDeviceModelConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ public static DeviceQuery convertDeviceQuery(PagingLoadConfig loadConfig, GwtDev
if (predicates.getGroupId() != null) {
andPred = andPred.and(new AttributePredicate<KapuaId>(DevicePredicates.GROUP_ID, KapuaEid.parseCompactId(predicates.getGroupId())));
}
if(predicates.getTagId() != null) {
andPred = andPred.and(new AttributePredicate<KapuaId[]>(DevicePredicates.TAG_IDS, new KapuaId[] { GwtKapuaCommonsModelConverter.convertKapuaId(predicates.getTagId()) }));
}

if (predicates.getSortAttribute() != null) {
SortOrder sortOrder = SortOrder.ASCENDING;
Expand Down
3 changes: 2 additions & 1 deletion .../eclipse/kapua/app/console/module/device/client/messages/ConsoleDeviceMessages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ deviceTableCertificateDMTooltipStatusNotSignedRevoked=Device Management communic
deviceTableCertificateDMTooltipStatusSignedNeedUpdate=Device Management communication is signed but device certificate must be updated.

deviceFilteringPanelHeading=Devices Filter
deviceFilteringPanelTag=Tag:
deviceFilteringPanelTag=Tag
deviceFilteringPanelTagEmptyText=Select a tag...
deviceFilteringPanelClientId=Client ID:
deviceFilteringPanelDisplayName=Display Name:
Expand All @@ -97,6 +97,7 @@ deviceFilteringPanelGroup=Group

deviceFilteringPanelLoading=Loading...
deviceFilteringPanelGroupsError=Error while fetching groups!
deviceFilteringPanelTagsError=Error while fetching tags!

deviceFormHeadingNew=New Device
deviceFormHeadingEdit=Edit Device: {0}
Expand Down

0 comments on commit bcf3de1

Please sign in to comment.