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

Fix DistributionSet type should not be updatable (#659)

Browse Source 
* DistributionSet type is no longer changable for an existing distribution
set in the ui.

Signed-off-by: Markus Block <markus.block@bosch-si.com>

* Removed field "type" from a distribution update.

Signed-off-by: Markus Block <markus.block@bosch-si.com>

* Incorporated review comments.

Signed-off-by: Markus Block <markus.block@bosch-si.com>
This commit is contained in:
Markus Block
2018-03-19 11:31:41 +01:00
committed by Kai Zimmermann
parent a55c34d0bb
commit e700acc312
7 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractDistributionSetDetails.java
View File

@@ -82,8 +82,7 @@ public abstract class AbstractDistributionSetDetails
@Override
protected void onEdit(final ClickEvent event) {
final Window newDistWindow = distributionAddUpdateWindowLayout.getWindow(getSelectedBaseEntityId());
newDistWindow.setCaption(getI18n().getMessage(UIComponentIdProvider.DIST_UPDATE_CAPTION));
final Window newDistWindow = distributionAddUpdateWindowLayout.getWindowForUpdateDistributionSet(getSelectedBaseEntityId());
UI.getCurrent().addWindow(newDistWindow);
newDistWindow.setVisible(Boolean.TRUE);
}

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java
View File

@@ -16,7 +16,6 @@ import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
import org.eclipse.hawkbit.ui.management.dstable.DistributionAddUpdateWindowLayout;
import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent;
import org.eclipse.hawkbit.ui.management.event.RefreshDistributionTableByFilterEvent;
import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider;
import org.eclipse.hawkbit.ui.utils.VaadinMessageSource;
import org.vaadin.spring.events.EventBus.UIEventBus;
import org.vaadin.spring.events.EventScope;
@@ -98,8 +97,7 @@ public class DistributionSetTableHeader extends AbstractDistributionSetTableHead
@Override
protected void addNewItem(final ClickEvent event) {
final Window newDistWindow = addUpdateWindowLayout.getWindow(null);
newDistWindow.setCaption(i18n.getMessage(UIComponentIdProvider.DIST_ADD_CAPTION));
final Window newDistWindow = addUpdateWindowLayout.getWindowForCreateDistributionSet();
UI.getCurrent().addWindow(newDistWindow);
newDistWindow.setVisible(Boolean.TRUE);
}

153
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
View File

@@ -73,8 +73,6 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
private TextArea descTextArea;
private CheckBox reqMigStepCheckbox;
private ComboBox distsetTypeNameComboBox;
private boolean editDistribution;
private Long editDistId;
private FormLayout formLayout;
@@ -115,27 +113,19 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
}
/**
* Save or update distribution set.
*
* Updates the distribution set on close.
*/
private final class SaveOnCloseDialogListener implements SaveDialogCloseListener {
private final class UpdateOnCloseDialogListener implements SaveDialogCloseListener {
private final Long editDistId;
public UpdateOnCloseDialogListener(final Long editDistId) {
this.editDistId = editDistId;
}
@Override
public void saveOrUpdate() {
if (editDistribution) {
updateDistribution();
return;
}
addNewDistribution();
}
@Override
public boolean canWindowSaveOrUpdate() {
return !isDuplicate();
}
private void updateDistribution() {
if (isDuplicate()) {
if (isDuplicate(editDistId)) {
return;
}
final boolean isMigStepReq = reqMigStepCheckbox.getValue();
@@ -144,7 +134,7 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
distributionSetTypeManagement.get(distSetTypeId).ifPresent(type -> {
final DistributionSet currentDS = distributionSetManagement.update(entityFactory.distributionSet()
.update(editDistId).name(distNameTextField.getValue()).description(descTextArea.getValue())
.version(distVersionTextField.getValue()).requiredMigrationStep(isMigStepReq).type(type));
.version(distVersionTextField.getValue()).requiredMigrationStep(isMigStepReq));
notificationMessage.displaySuccess(i18n.getMessage("message.new.dist.save.success",
new Object[] { currentDS.getName(), currentDS.getVersion() }));
// update table row+details layout
@@ -152,12 +142,20 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
});
}
/**
* Add new Distribution set.
*/
private void addNewDistribution() {
editDistribution = Boolean.FALSE;
@Override
public boolean canWindowSaveOrUpdate() {
return !isDuplicate(editDistId);
}
}
/**
* Creates the distribution set on close.
*
*/
private final class CreateOnCloseDialogListener implements SaveDialogCloseListener {
@Override
public void saveOrUpdate() {
final String name = distNameTextField.getValue();
final String version = distVersionTextField.getValue();
final Long distSetTypeId = (Long) distsetTypeNameComboBox.getValue();
@@ -176,31 +174,33 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
distributionSetTable.setValue(Sets.newHashSet(newDist.getId()));
}
private boolean isDuplicate() {
final String name = distNameTextField.getValue();
final String version = distVersionTextField.getValue();
@Override
public boolean canWindowSaveOrUpdate() {
return !isDuplicate(null);
}
}
final Optional<DistributionSet> existingDs = distributionSetManagement.getByNameAndVersion(name, version);
/*
* Distribution should not exists with the same name & version.
* Display error message, when the "existingDs" is not null and it
* is add window (or) when the "existingDs" is not null and it is
* edit window and the distribution Id of the edit window is
* different then the "existingDs"
*/
if (existingDs.isPresent() && !existingDs.get().getId().equals(editDistId)) {
distNameTextField.addStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_LAYOUT_ERROR_HIGHTLIGHT);
distVersionTextField.addStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_LAYOUT_ERROR_HIGHTLIGHT);
notificationMessage.displayValidationError(i18n.getMessage("message.duplicate.dist",
new Object[] { existingDs.get().getName(), existingDs.get().getVersion() }));
private boolean isDuplicate(final Long editDistId) {
final String name = distNameTextField.getValue();
final String version = distVersionTextField.getValue();
return true;
}
return false;
final Optional<DistributionSet> existingDs = distributionSetManagement.getByNameAndVersion(name, version);
/*
* Distribution should not exists with the same name & version. Display
* error message, when the "existingDs" is not null and it is add window
* (or) when the "existingDs" is not null and it is edit window and the
* distribution Id of the edit window is different then the "existingDs"
*/
if (existingDs.isPresent() && !existingDs.get().getId().equals(editDistId)) {
distNameTextField.addStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_LAYOUT_ERROR_HIGHTLIGHT);
distVersionTextField.addStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_LAYOUT_ERROR_HIGHTLIGHT);
notificationMessage.displayValidationError(i18n.getMessage("message.duplicate.dist",
new Object[] { existingDs.get().getName(), existingDs.get().getVersion() }));
return true;
}
return false;
}
private void buildLayout() {
@@ -277,53 +277,86 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
* clear all the fields.
*/
public void resetComponents() {
editDistribution = Boolean.FALSE;
distNameTextField.clear();
distNameTextField.removeStyleName("v-textfield-error");
distVersionTextField.clear();
distVersionTextField.removeStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_LAYOUT_ERROR_HIGHTLIGHT);
distsetTypeNameComboBox.removeStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_LAYOUT_ERROR_HIGHTLIGHT);
distsetTypeNameComboBox.clear();
distsetTypeNameComboBox.setEnabled(true);
descTextArea.clear();
reqMigStepCheckbox.clear();
}
private void populateValuesOfDistribution(final Long editDistId) {
this.editDistId = editDistId;
if (editDistId == null) {
return;
}
final Optional<DistributionSet> distSet = distributionSetManagement.getWithDetails(editDistId);
if (!distSet.isPresent()) {
return;
}
editDistribution = Boolean.TRUE;
distNameTextField.setValue(distSet.get().getName());
distVersionTextField.setValue(distSet.get().getVersion());
if (distSet.get().getType().isDeleted()) {
distsetTypeNameComboBox.addItem(distSet.get().getType().getId());
}
distsetTypeNameComboBox.setValue(distSet.get().getType().getId());
distsetTypeNameComboBox.setEnabled(false);
reqMigStepCheckbox.setValue(distSet.get().isRequiredMigrationStep());
descTextArea.setValue(distSet.get().getDescription());
}
/**
* Returns the dialog window for the distributions.
* Returns the dialog window for creating a distribution.
*
* @param editDistId
* @return window
*/
public CommonDialogWindow getWindow(final Long editDistId) {
public CommonDialogWindow getWindowForCreateDistributionSet() {
return getWindow(null);
}
/**
* Returns the dialog window for updating a distribution.
*
* @param editDistId
* the id of the distribution that should be updated
* @return window
*/
public CommonDialogWindow getWindowForUpdateDistributionSet(final Long editDistId) {
return getWindow(editDistId);
}
/**
* Internal method to create a window to create or update a DistributionSet.
*
* @param editDistId
* if <code>null</code> is provided the window is configured to
* create a DistributionSet otherwise it is configured for
* update.
* @return
*/
private CommonDialogWindow getWindow(final Long editDistId) {
final SaveDialogCloseListener saveDialogCloseListener;
String captionId;
resetComponents();
populateDistSetTypeNameCombo();
populateValuesOfDistribution(editDistId);
return new WindowBuilder(SPUIDefinitions.CREATE_UPDATE_WINDOW)
.caption(i18n.getMessage(UIComponentIdProvider.DIST_ADD_CAPTION)).content(this).layout(formLayout)
.i18n(i18n).saveDialogCloseListener(new SaveOnCloseDialogListener()).buildCommonDialogWindow();
if (editDistId == null) {
saveDialogCloseListener = new CreateOnCloseDialogListener();
captionId = UIComponentIdProvider.DIST_ADD_CAPTION;
} else {
saveDialogCloseListener = new UpdateOnCloseDialogListener(editDistId);
captionId = UIComponentIdProvider.DIST_UPDATE_CAPTION;
populateValuesOfDistribution(editDistId);
}
return new WindowBuilder(SPUIDefinitions.CREATE_UPDATE_WINDOW).caption(i18n.getMessage(captionId)).content(this)
.layout(formLayout).i18n(i18n).saveDialogCloseListener(saveDialogCloseListener)
.buildCommonDialogWindow();
}
/**