lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Entity details are updated after view change, delete and filtering (#486)

Browse Source 
* Distribution Set Details are shown correctly.

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Fix Distribution Set details shows the right data

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Show the right Details when deleting target, ds and sm

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Software Module details are shown correctly on view change

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Caption Artifact Details of is updated correctly after software module
deletion

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Artifact Details are shown correctly, small css improvements

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Code refactor

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Fix search of softwareModule and DistributionSet in UI

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Fix typos, insert ids for components

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Code Refactor

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Redo add access

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Correct caption Id of new dist. set, remove unnecessary event

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Fix selected entity in SwModuleTable, Code refactor

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Fix error in Upload View concerning selected softwareModule

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Remove Optional, Remove StringUtils, refactor code

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Refactor events when filtering distribution set or software module

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Fix Sonar issues

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Save softwareMmoduleId in ArtifactUploadState, not whole entity

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Refactor event handling for filtering sw and ds; refactor optional
handling

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Make selectedSoftwareModule transient

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Remove mysql properties

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Refactor ArtifactDetailsLayout

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Fix comment

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Fix some comments

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Generalize common behavior in selecting entity in a table

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Optional is not set in the getter but in the setter in the UIState
classes

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Fix sonar issue

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Change getter visibility to protected

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Refactor publishSelectedEntity

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Refactor Java Docs

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Fix pull request comments

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Fix comments

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Change lastSelectedEntities/selectedEntities to type Long,remove Generic

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Show details captions even when table is empty

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2017-05-06 08:33:01 +02:00
committed by Kai Zimmermann
parent 3da33dd486
commit 7b2e93a727
90 changed files with 1133 additions and 1193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java
View File

@@ -730,12 +730,12 @@ public class JpaDistributionSetManagement implements DistributionSetManagement {
Specification<JpaDistributionSet> spec;
if (null != distributionSetFilter.getIsComplete()) {
if (distributionSetFilter.getIsComplete() != null) {
spec = DistributionSetSpecification.isCompleted(distributionSetFilter.getIsComplete());
specList.add(spec);
}
if (null != distributionSetFilter.getIsDeleted()) {
if (distributionSetFilter.getIsDeleted() != null) {
spec = DistributionSetSpecification.isDeleted(distributionSetFilter.getIsDeleted());
specList.add(spec);
}

2
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java
View File

@@ -266,7 +266,7 @@ public class JpaRolloutManagement extends AbstractRolloutManagement {
if (srcGroup.getTargetFilterQuery() != null) {
group.setTargetFilterQuery(srcGroup.getTargetFilterQuery());
} else {
group.setTargetFilterQuery(StringUtils.EMPTY);
group.setTargetFilterQuery("");
}
group.setSuccessCondition(srcGroup.getSuccessCondition());