Correct component's IDs

Correct ID save/cancel button

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

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
Change button naming, fix selenium tests

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

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

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java

@@ -105,8 +105,8 @@ public class CommonDialogWindow extends Window {
         buttonsLayout.setSizeFull();
         buttonsLayout.setSpacing(true);
 
-        saveButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.SYSTEM_CONFIGURATION_SAVE, "save", "", "",
+        saveButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.SAVE_BUTTON, "Save", "", "", true,
-                true, FontAwesome.SAVE, SPUIButtonStyleBorderWithIcon.class);
+                FontAwesome.SAVE, SPUIButtonStyleBorderWithIcon.class);
         saveButton.setSizeUndefined();
         saveButton.addStyleName("default-color");
         if (null != saveButtonClickListener) {
@@ -118,8 +118,8 @@ public class CommonDialogWindow extends Window {
         buttonsLayout.setComponentAlignment(saveButton, Alignment.MIDDLE_RIGHT);
         buttonsLayout.setExpandRatio(saveButton, 1.0F);
 
-        cancelButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.SYSTEM_CONFIGURATION_CANCEL, "cancel",
+        cancelButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.CANCEL_BUTTON, "Cancel", "", "", true,
-                "", "", true, FontAwesome.TIMES, SPUIButtonStyleBorderWithIcon.class);
+                FontAwesome.TIMES, SPUIButtonStyleBorderWithIcon.class);
         cancelButton.setSizeUndefined();
         cancelButton.addStyleName("default-color");
         if (null != cancelButtonClickListener) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java

@@ -640,4 +640,11 @@ public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout
         tagPreviewBtnClicked = !tagPreviewBtnClicked;
     }
 
+    @Override
+    protected void createOptionGroup(final boolean hasCreatePermission, final boolean hasUpdatePermission) {
+
+        super.createOptionGroup(hasCreatePermission, hasUpdatePermission);
+        optiongroup.setId(SPUIDefinitions.CREATE_OPTION_GROUP_DISTRIBUTION_SET_TYPE_ID);
+    }
+
 }

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java

@@ -10,6 +10,7 @@ package org.eclipse.hawkbit.ui.distributions.disttype;
 
 import javax.annotation.PostConstruct;
 
+import org.eclipse.hawkbit.ui.common.CommonDialogWindow;
 import org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader;
 import org.eclipse.hawkbit.ui.distributions.event.DistributionsUIEvent;
 import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
@@ -21,7 +22,6 @@ import com.vaadin.spring.annotation.SpringComponent;
 import com.vaadin.spring.annotation.ViewScope;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.Window;
 
 /**
  * Distribution Set Type filter buttons header.
@@ -38,6 +38,8 @@ public class DSTypeFilterHeader extends AbstractFilterHeader {
     @Autowired
     private CreateUpdateDistSetTypeLayout createUpdateDistSetTypeLayout;
 
+    private CommonDialogWindow addUpdateWindow;
+
     @Override
     @PostConstruct
     public void init() {
@@ -59,9 +61,8 @@ public class DSTypeFilterHeader extends AbstractFilterHeader {
 
     @Override
     protected void settingsIconClicked(final ClickEvent event) {
-        final Window addUpdateWindow = createUpdateDistSetTypeLayout.getWindow();
+        addUpdateWindow = createUpdateDistSetTypeLayout.getWindow();
         UI.getCurrent().addWindow(addUpdateWindow);
-        addUpdateWindow.setVisible(Boolean.TRUE);
     }
 
     @Override

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java

@@ -174,8 +174,10 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
         setDefaultSaveStartGroupOption();
         totalTargetsLabel.setVisible(false);
         groupSizeLabel.setVisible(false);
-        targetFilterQuery.setVisible(false);
+        removeComponent(targetFilterQuery);
-        targetFilterQueryCombo.setVisible(true);
+        if (getComponent(1, 3) == null) {
+            addComponent(targetFilterQueryCombo, 1, 3);
+        }
         actionTypeOptionGroupLayout.selectDefaultOption();
         totalTargetsCount = 0L;
         rolloutForEdit = null;
@@ -277,7 +279,6 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
                 SPUILabelDefinitions.TARGET_FILTER_QUERY_TEXT_FIELD_LENGTH);
         filterField.setId(SPUIComponentIdProvider.ROLLOUT_TARGET_FILTER_QUERY_FIELD);
         filterField.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
-        filterField.setVisible(false);
         filterField.setEnabled(false);
         filterField.setSizeUndefined();
         return filterField;
@@ -721,8 +722,8 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
 
         noOfGroups.setEnabled(false);
         targetFilterQuery.setValue(rolloutForEdit.getTargetFilterQuery());
-        targetFilterQuery.setVisible(true);
+        removeComponent(targetFilterQueryCombo);
-        targetFilterQueryCombo.setVisible(false);
+        addComponent(targetFilterQuery, 1, 3);
 
         totalTargetsCount = targetManagement.countTargetByTargetFilterQuery(rolloutForEdit.getTargetFilterQuery());
         totalTargetsLabel.setValue(getTotalTargetMessage());

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java

@@ -96,8 +96,8 @@ public class RolloutListGrid extends AbstractGrid {
     @Autowired
     private transient RolloutManagement rolloutManagement;
 
-    // @Autowired
+    @Autowired
-    private final AddUpdateRolloutWindowLayout addUpdateRolloutWindow = new AddUpdateRolloutWindowLayout();
+    private AddUpdateRolloutWindowLayout addUpdateRolloutWindow;
 
     @Autowired
     private UINotification uiNotification;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponentIdProvider.java

@@ -112,14 +112,6 @@ public final class SPUIComponentIdProvider {
      * ID-Dist.JVM delete icon.
      */
     public static final String DIST_DELETE_MODULE = "dist.delete.module.";
-    /**
-     * ID-Dist.Add.save.
-     */
-    public static final String DIST_ADD_SAVE = "dist.add.save";
-    /**
-     * ID-Dist.Add.discard.
-     */
-    public static final String DIST_ADD_DISCARD = "dist.add.discard";
     /**
      * /** ID-Dist.DELETE.
      */
@@ -922,6 +914,7 @@ public final class SPUIComponentIdProvider {
      * Artifact uplaod view - uplod status popup id.
      */
     public static final String UPLOAD_STATUS_POPUP_ID = "artifact.upload.status.popup.id";
+
     /**
      * /* Private Constructor.
      */

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java

@@ -271,7 +271,7 @@ public final class SPUIDefinitions {
     /**
      * New Target discard icon id.
      */
-    public static final String NEW_TARGET_DISCARD = "target.add.discard";
+    // public static final String NEW_TARGET_DISCARD = "target.add.discard";
     /**
      * New Target add icon id.
      */
@@ -347,11 +347,12 @@ public final class SPUIDefinitions {
     /**
      * New Target tag save icon id.
      */
-    public static final String NEW_TARGET_TAG_SAVE = "target.tag.add.save";
+    // public static final String NEW_TARGET_TAG_SAVE = "target.tag.add.save";
     /**
      * New Target tag discard icon id.
      */
-    public static final String NEW_TARGET_TAG_DISRACD = "target.tag.add.discard";
+    // public static final String NEW_TARGET_TAG_DISRACD =
+    // "target.tag.add.discard";
     /**
      * New Target tag add icon id.
      */