Correct Typo
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
@@ -31,7 +31,7 @@ import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
|||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPDateTimeUtil;
|
import org.eclipse.hawkbit.ui.utils.SPDateTimeUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SpringContextHelper;
|
import org.eclipse.hawkbit.ui.utils.SpringContextHelper;
|
||||||
@@ -260,7 +260,7 @@ public class ArtifactDetailsLayout extends VerticalLayout {
|
|||||||
final String fileName = (String) table.getContainerDataSource().getItem(itemId)
|
final String fileName = (String) table.getContainerDataSource().getItem(itemId)
|
||||||
.getItemProperty(PROVIDED_FILE_NAME).getValue();
|
.getItemProperty(PROVIDED_FILE_NAME).getValue();
|
||||||
final Button deleteIcon = SPUIComponentProvider.getButton(
|
final Button deleteIcon = SPUIComponentProvider.getButton(
|
||||||
fileName + "-" + SPUIComponetIdProvider.UPLOAD_FILE_DELETE_ICON, "",
|
fileName + "-" + SPUIComponentIdProvider.UPLOAD_FILE_DELETE_ICON, "",
|
||||||
SPUILabelDefinitions.DISCARD, ValoTheme.BUTTON_TINY + " " + "redicon", true,
|
SPUILabelDefinitions.DISCARD, ValoTheme.BUTTON_TINY + " " + "redicon", true,
|
||||||
FontAwesome.TRASH_O, SPUIButtonStyleSmallNoBorder.class);
|
FontAwesome.TRASH_O, SPUIButtonStyleSmallNoBorder.class);
|
||||||
deleteIcon.setData(itemId);
|
deleteIcon.setData(itemId);
|
||||||
@@ -344,7 +344,7 @@ public class ArtifactDetailsLayout extends VerticalLayout {
|
|||||||
detailsTable.setImmediate(true);
|
detailsTable.setImmediate(true);
|
||||||
detailsTable.setSizeFull();
|
detailsTable.setSizeFull();
|
||||||
|
|
||||||
detailsTable.setId(SPUIComponetIdProvider.UPLOAD_ARTIFACT_DETAILS_TABLE);
|
detailsTable.setId(SPUIComponentIdProvider.UPLOAD_ARTIFACT_DETAILS_TABLE);
|
||||||
detailsTable.addStyleName(ValoTheme.TABLE_NO_VERTICAL_LINES);
|
detailsTable.addStyleName(ValoTheme.TABLE_NO_VERTICAL_LINES);
|
||||||
detailsTable.addStyleName(ValoTheme.TABLE_SMALL);
|
detailsTable.addStyleName(ValoTheme.TABLE_SMALL);
|
||||||
return detailsTable;
|
return detailsTable;
|
||||||
@@ -385,7 +385,7 @@ public class ArtifactDetailsLayout extends VerticalLayout {
|
|||||||
*/
|
*/
|
||||||
public void createMaxArtifactDetailsTable() {
|
public void createMaxArtifactDetailsTable() {
|
||||||
maxArtifactDetailsTable = createArtifactDetailsTable();
|
maxArtifactDetailsTable = createArtifactDetailsTable();
|
||||||
maxArtifactDetailsTable.setId(SPUIComponetIdProvider.UPLOAD_ARTIFACT_DETAILS_TABLE_MAX);
|
maxArtifactDetailsTable.setId(SPUIComponentIdProvider.UPLOAD_ARTIFACT_DETAILS_TABLE_MAX);
|
||||||
maxArtifactDetailsTable.setContainerDataSource(artifactDetailsTable.getContainerDataSource());
|
maxArtifactDetailsTable.setContainerDataSource(artifactDetailsTable.getContainerDataSource());
|
||||||
addGeneratedColumn(maxArtifactDetailsTable);
|
addGeneratedColumn(maxArtifactDetailsTable);
|
||||||
if (!readOnly) {
|
if (!readOnly) {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.eclipse.hawkbit.ui.common.AbstractAcceptCriteria;
|
import org.eclipse.hawkbit.ui.common.AbstractAcceptCriteria;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
|
|
||||||
import com.vaadin.spring.annotation.SpringComponent;
|
import com.vaadin.spring.annotation.SpringComponent;
|
||||||
import com.vaadin.spring.annotation.ViewScope;
|
import com.vaadin.spring.annotation.ViewScope;
|
||||||
@@ -37,8 +37,8 @@ public class UploadViewAcceptCriteria extends AbstractAcceptCriteria {
|
|||||||
@Override
|
@Override
|
||||||
protected String getComponentId(final Component component) {
|
protected String getComponentId(final Component component) {
|
||||||
String id = component.getId();
|
String id = component.getId();
|
||||||
if (id != null && id.startsWith(SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX)) {
|
if (id != null && id.startsWith(SPUIComponentIdProvider.UPLOAD_TYPE_BUTTON_PREFIX)) {
|
||||||
id = SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX;
|
id = SPUIComponentIdProvider.UPLOAD_TYPE_BUTTON_PREFIX;
|
||||||
}
|
}
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
@@ -56,16 +56,16 @@ public class UploadViewAcceptCriteria extends AbstractAcceptCriteria {
|
|||||||
private static Map<String, List<String>> createDropConfigurations() {
|
private static Map<String, List<String>> createDropConfigurations() {
|
||||||
final Map<String, List<String>> config = new HashMap<>();
|
final Map<String, List<String>> config = new HashMap<>();
|
||||||
// Delete drop area droppable components
|
// Delete drop area droppable components
|
||||||
config.put(SPUIComponetIdProvider.DELETE_BUTTON_WRAPPER_ID, Arrays.asList(
|
config.put(SPUIComponentIdProvider.DELETE_BUTTON_WRAPPER_ID, Arrays.asList(
|
||||||
SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE, SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX));
|
SPUIComponentIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE, SPUIComponentIdProvider.UPLOAD_TYPE_BUTTON_PREFIX));
|
||||||
|
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Map<String, Object> createDropHintConfigurations() {
|
private static Map<String, Object> createDropHintConfigurations() {
|
||||||
final Map<String, Object> config = new HashMap<>();
|
final Map<String, Object> config = new HashMap<>();
|
||||||
config.put(SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX, UploadArtifactUIEvent.SOFTWARE_TYPE_DRAG_START);
|
config.put(SPUIComponentIdProvider.UPLOAD_TYPE_BUTTON_PREFIX, UploadArtifactUIEvent.SOFTWARE_TYPE_DRAG_START);
|
||||||
config.put(SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE, UploadArtifactUIEvent.SOFTWARE_DRAG_START);
|
config.put(SPUIComponentIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE, UploadArtifactUIEvent.SOFTWARE_DRAG_START);
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import org.eclipse.hawkbit.ui.artifacts.state.ArtifactUploadState;
|
|||||||
import org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout;
|
import org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout;
|
||||||
import org.eclipse.hawkbit.ui.common.table.AbstractTable;
|
import org.eclipse.hawkbit.ui.common.table.AbstractTable;
|
||||||
import org.eclipse.hawkbit.ui.management.event.DragEvent;
|
import org.eclipse.hawkbit.ui.management.event.DragEvent;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventScope;
|
import org.vaadin.spring.events.EventScope;
|
||||||
@@ -114,7 +114,7 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getDeleteAreaId() {
|
protected String getDeleteAreaId() {
|
||||||
return SPUIComponetIdProvider.DELETE_BUTTON_WRAPPER_ID;
|
return SPUIComponentIdProvider.DELETE_BUTTON_WRAPPER_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -130,10 +130,10 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
|
|||||||
addToDeleteList(sourceTable, (TableTransferable) event.getTransferable());
|
addToDeleteList(sourceTable, (TableTransferable) event.getTransferable());
|
||||||
updateSWActionCount();
|
updateSWActionCount();
|
||||||
}
|
}
|
||||||
if (sourceComponent.getId().startsWith(SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX)) {
|
if (sourceComponent.getId().startsWith(SPUIComponentIdProvider.UPLOAD_TYPE_BUTTON_PREFIX)) {
|
||||||
|
|
||||||
final String swModuleTypeName = sourceComponent.getId()
|
final String swModuleTypeName = sourceComponent.getId()
|
||||||
.replace(SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX, "");
|
.replace(SPUIComponentIdProvider.UPLOAD_TYPE_BUTTON_PREFIX, "");
|
||||||
if (artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType().isPresent()
|
if (artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType().isPresent()
|
||||||
&& artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType().get().getName()
|
&& artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType().get().getName()
|
||||||
.equalsIgnoreCase(swModuleTypeName)) {
|
.equalsIgnoreCase(swModuleTypeName)) {
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import org.eclipse.hawkbit.ui.artifacts.state.CustomFile;
|
|||||||
import org.eclipse.hawkbit.ui.common.confirmwindow.layout.AbstractConfirmationWindowLayout;
|
import org.eclipse.hawkbit.ui.common.confirmwindow.layout.AbstractConfirmationWindowLayout;
|
||||||
import org.eclipse.hawkbit.ui.common.confirmwindow.layout.ConfirmationTab;
|
import org.eclipse.hawkbit.ui.common.confirmwindow.layout.ConfirmationTab;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -77,7 +77,7 @@ public class UploadViewConfirmationWindowLayout extends AbstractConfirmationWind
|
|||||||
private ConfirmationTab createSMDeleteConfirmationTab() {
|
private ConfirmationTab createSMDeleteConfirmationTab() {
|
||||||
final ConfirmationTab tab = new ConfirmationTab();
|
final ConfirmationTab tab = new ConfirmationTab();
|
||||||
|
|
||||||
tab.getConfirmAll().setId(SPUIComponetIdProvider.SW_DELETE_ALL);
|
tab.getConfirmAll().setId(SPUIComponentIdProvider.SW_DELETE_ALL);
|
||||||
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
||||||
tab.getConfirmAll().setCaption(i18n.get("button.delete.all"));
|
tab.getConfirmAll().setCaption(i18n.get("button.delete.all"));
|
||||||
tab.getConfirmAll().addClickListener(event -> deleteSMAll(tab));
|
tab.getConfirmAll().addClickListener(event -> deleteSMAll(tab));
|
||||||
@@ -181,7 +181,7 @@ public class UploadViewConfirmationWindowLayout extends AbstractConfirmationWind
|
|||||||
private ConfirmationTab createSMtypeDeleteConfirmationTab() {
|
private ConfirmationTab createSMtypeDeleteConfirmationTab() {
|
||||||
final ConfirmationTab tab = new ConfirmationTab();
|
final ConfirmationTab tab = new ConfirmationTab();
|
||||||
|
|
||||||
tab.getConfirmAll().setId(SPUIComponetIdProvider.SAVE_DELETE_SW_MODULE_TYPE);
|
tab.getConfirmAll().setId(SPUIComponentIdProvider.SAVE_DELETE_SW_MODULE_TYPE);
|
||||||
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
||||||
tab.getConfirmAll().setCaption(i18n.get("button.delete.all"));
|
tab.getConfirmAll().setCaption(i18n.get("button.delete.all"));
|
||||||
tab.getConfirmAll().addClickListener(event -> deleteSMtypeAll(tab));
|
tab.getConfirmAll().addClickListener(event -> deleteSMtypeAll(tab));
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
|||||||
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -130,21 +130,21 @@ public class SoftwareModuleAddUpdateWindow implements Serializable {
|
|||||||
/* name textfield */
|
/* name textfield */
|
||||||
nameTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
nameTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
||||||
i18n.get("textfield.name"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
i18n.get("textfield.name"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
||||||
nameTextField.setId(SPUIComponetIdProvider.SOFT_MODULE_NAME);
|
nameTextField.setId(SPUIComponentIdProvider.SOFT_MODULE_NAME);
|
||||||
|
|
||||||
/* version text field */
|
/* version text field */
|
||||||
versionTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
versionTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
||||||
i18n.get("textfield.version"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
i18n.get("textfield.version"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
||||||
versionTextField.setId(SPUIComponetIdProvider.SOFT_MODULE_VERSION);
|
versionTextField.setId(SPUIComponentIdProvider.SOFT_MODULE_VERSION);
|
||||||
|
|
||||||
/* Vendor text field */
|
/* Vendor text field */
|
||||||
vendorTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, false, null,
|
vendorTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, false, null,
|
||||||
i18n.get("textfield.vendor"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
i18n.get("textfield.vendor"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
||||||
vendorTextField.setId(SPUIComponetIdProvider.SOFT_MODULE_VENDOR);
|
vendorTextField.setId(SPUIComponentIdProvider.SOFT_MODULE_VENDOR);
|
||||||
|
|
||||||
descTextArea = SPUIComponentProvider.getTextArea("text-area-style", ValoTheme.TEXTAREA_TINY, false, null,
|
descTextArea = SPUIComponentProvider.getTextArea("text-area-style", ValoTheme.TEXTAREA_TINY, false, null,
|
||||||
i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH);
|
i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH);
|
||||||
descTextArea.setId(SPUIComponetIdProvider.ADD_SW_MODULE_DESCRIPTION);
|
descTextArea.setId(SPUIComponentIdProvider.ADD_SW_MODULE_DESCRIPTION);
|
||||||
addDescriptionTextChangeListener();
|
addDescriptionTextChangeListener();
|
||||||
addVendorTextChangeListener();
|
addVendorTextChangeListener();
|
||||||
|
|
||||||
@@ -155,7 +155,7 @@ public class SoftwareModuleAddUpdateWindow implements Serializable {
|
|||||||
|
|
||||||
typeComboBox = SPUIComponentProvider.getComboBox("", "", null, null, false, null,
|
typeComboBox = SPUIComponentProvider.getComboBox("", "", null, null, false, null,
|
||||||
i18n.get("upload.swmodule.type"));
|
i18n.get("upload.swmodule.type"));
|
||||||
typeComboBox.setId(SPUIComponetIdProvider.SW_MODULE_TYPE);
|
typeComboBox.setId(SPUIComponentIdProvider.SW_MODULE_TYPE);
|
||||||
typeComboBox.setStyleName(SPUIDefinitions.COMBO_BOX_SPECIFIC_STYLE + " " + ValoTheme.COMBOBOX_TINY);
|
typeComboBox.setStyleName(SPUIDefinitions.COMBO_BOX_SPECIFIC_STYLE + " " + ValoTheme.COMBOBOX_TINY);
|
||||||
typeComboBox.setNewItemsAllowed(Boolean.FALSE);
|
typeComboBox.setNewItemsAllowed(Boolean.FALSE);
|
||||||
typeComboBox.setImmediate(Boolean.TRUE);
|
typeComboBox.setImmediate(Boolean.TRUE);
|
||||||
@@ -163,7 +163,7 @@ public class SoftwareModuleAddUpdateWindow implements Serializable {
|
|||||||
populateTypeNameCombo();
|
populateTypeNameCombo();
|
||||||
|
|
||||||
/* save or update button */
|
/* save or update button */
|
||||||
saveSoftware = SPUIComponentProvider.getButton(SPUIComponetIdProvider.SOFT_MODULE_SAVE, "", "", "", true,
|
saveSoftware = SPUIComponentProvider.getButton(SPUIComponentIdProvider.SOFT_MODULE_SAVE, "", "", "", true,
|
||||||
FontAwesome.SAVE, SPUIButtonStyleSmallNoBorder.class);
|
FontAwesome.SAVE, SPUIButtonStyleSmallNoBorder.class);
|
||||||
saveSoftware.addClickListener(event -> {
|
saveSoftware.addClickListener(event -> {
|
||||||
if (editSwModule) {
|
if (editSwModule) {
|
||||||
@@ -175,7 +175,7 @@ public class SoftwareModuleAddUpdateWindow implements Serializable {
|
|||||||
});
|
});
|
||||||
|
|
||||||
/* close button */
|
/* close button */
|
||||||
closeWindow = SPUIComponentProvider.getButton(SPUIComponetIdProvider.SOFT_MODULE_DISCARD, "", "", "", true,
|
closeWindow = SPUIComponentProvider.getButton(SPUIComponentIdProvider.SOFT_MODULE_DISCARD, "", "", "", true,
|
||||||
FontAwesome.TIMES, SPUIButtonStyleSmallNoBorder.class);
|
FontAwesome.TIMES, SPUIButtonStyleSmallNoBorder.class);
|
||||||
/* Just close this window when this button is clicked */
|
/* Just close this window when this button is clicked */
|
||||||
closeWindow.addClickListener(event -> closeThisWindow());
|
closeWindow.addClickListener(event -> closeThisWindow());
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import org.eclipse.hawkbit.ui.artifacts.state.ArtifactUploadState;
|
|||||||
import org.eclipse.hawkbit.ui.common.detailslayout.AbstractNamedVersionedEntityTableDetailsLayout;
|
import org.eclipse.hawkbit.ui.common.detailslayout.AbstractNamedVersionedEntityTableDetailsLayout;
|
||||||
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventScope;
|
import org.vaadin.spring.events.EventScope;
|
||||||
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
||||||
@@ -47,7 +47,7 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getEditButtonId() {
|
protected String getEditButtonId() {
|
||||||
return SPUIComponetIdProvider.UPLOAD_SW_MODULE_EDIT_BUTTON;
|
return SPUIComponentIdProvider.UPLOAD_SW_MODULE_EDIT_BUTTON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -90,19 +90,19 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta
|
|||||||
|
|
||||||
final Label vendorLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.dist.details.vendor"),
|
final Label vendorLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.dist.details.vendor"),
|
||||||
HawkbitCommonUtil.trimAndNullIfEmpty(vendor) == null ? "" : vendor);
|
HawkbitCommonUtil.trimAndNullIfEmpty(vendor) == null ? "" : vendor);
|
||||||
vendorLabel.setId(SPUIComponetIdProvider.DETAILS_VENDOR_LABEL_ID);
|
vendorLabel.setId(SPUIComponentIdProvider.DETAILS_VENDOR_LABEL_ID);
|
||||||
detailsTabLayout.addComponent(vendorLabel);
|
detailsTabLayout.addComponent(vendorLabel);
|
||||||
|
|
||||||
if (type != null) {
|
if (type != null) {
|
||||||
final Label typeLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.dist.details.type"),
|
final Label typeLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.dist.details.type"),
|
||||||
type);
|
type);
|
||||||
typeLabel.setId(SPUIComponetIdProvider.DETAILS_TYPE_LABEL_ID);
|
typeLabel.setId(SPUIComponentIdProvider.DETAILS_TYPE_LABEL_ID);
|
||||||
detailsTabLayout.addComponent(typeLabel);
|
detailsTabLayout.addComponent(typeLabel);
|
||||||
}
|
}
|
||||||
|
|
||||||
final Label assignLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.assigned.type"),
|
final Label assignLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.assigned.type"),
|
||||||
HawkbitCommonUtil.trimAndNullIfEmpty(maxAssign) == null ? "" : maxAssign);
|
HawkbitCommonUtil.trimAndNullIfEmpty(maxAssign) == null ? "" : maxAssign);
|
||||||
assignLabel.setId(SPUIComponetIdProvider.SWM_DTLS_MAX_ASSIGN);
|
assignLabel.setId(SPUIComponentIdProvider.SWM_DTLS_MAX_ASSIGN);
|
||||||
detailsTabLayout.addComponent(assignLabel);
|
detailsTabLayout.addComponent(assignLabel);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -139,6 +139,6 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getDetailsHeaderCaptionId() {
|
protected String getDetailsHeaderCaptionId() {
|
||||||
return SPUIComponetIdProvider.TARGET_DETAILS_HEADER_LABEL_ID;
|
return SPUIComponentIdProvider.TARGET_DETAILS_HEADER_LABEL_ID;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import org.eclipse.hawkbit.ui.artifacts.state.ArtifactUploadState;
|
|||||||
import org.eclipse.hawkbit.ui.common.table.AbstractNamedVersionTable;
|
import org.eclipse.hawkbit.ui.common.table.AbstractNamedVersionTable;
|
||||||
import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType;
|
import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.TableColumn;
|
import org.eclipse.hawkbit.ui.utils.TableColumn;
|
||||||
@@ -75,7 +75,7 @@ public class SoftwareModuleTable extends AbstractNamedVersionTable<SoftwareModul
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getTableId() {
|
protected String getTableId() {
|
||||||
return SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE;
|
return SPUIComponentIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import org.eclipse.hawkbit.ui.artifacts.event.UploadArtifactUIEvent;
|
|||||||
import org.eclipse.hawkbit.ui.artifacts.state.ArtifactUploadState;
|
import org.eclipse.hawkbit.ui.artifacts.state.ArtifactUploadState;
|
||||||
import org.eclipse.hawkbit.ui.common.table.AbstractTableHeader;
|
import org.eclipse.hawkbit.ui.common.table.AbstractTableHeader;
|
||||||
import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType;
|
import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventScope;
|
import org.vaadin.spring.events.EventScope;
|
||||||
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
||||||
@@ -58,17 +58,17 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getSearchBoxId() {
|
protected String getSearchBoxId() {
|
||||||
return SPUIComponetIdProvider.SW_MODULE_SEARCH_TEXT_FIELD;
|
return SPUIComponentIdProvider.SW_MODULE_SEARCH_TEXT_FIELD;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getSearchRestIconId() {
|
protected String getSearchRestIconId() {
|
||||||
return SPUIComponetIdProvider.SW_MODULE_SEARCH_RESET_ICON;
|
return SPUIComponentIdProvider.SW_MODULE_SEARCH_RESET_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getAddIconId() {
|
protected String getAddIconId() {
|
||||||
return SPUIComponetIdProvider.SW_MODULE_ADD_BUTTON;
|
return SPUIComponentIdProvider.SW_MODULE_ADD_BUTTON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -124,7 +124,7 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getMaxMinIconId() {
|
protected String getMaxMinIconId() {
|
||||||
return SPUIComponetIdProvider.SW_MAX_MIN_TABLE_ICON;
|
return SPUIComponentIdProvider.SW_MAX_MIN_TABLE_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
|||||||
import org.eclipse.hawkbit.ui.management.tag.SpColorPickerPreview;
|
import org.eclipse.hawkbit.ui.management.tag.SpColorPickerPreview;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -189,7 +189,7 @@ public class CreateUpdateSoftwareTypeLayout extends CustomComponent implements C
|
|||||||
discardTag.addStyleName(ValoTheme.BUTTON_BORDERLESS);
|
discardTag.addStyleName(ValoTheme.BUTTON_BORDERLESS);
|
||||||
|
|
||||||
tagColorPreviewBtn = new Button();
|
tagColorPreviewBtn = new Button();
|
||||||
tagColorPreviewBtn.setId(SPUIComponetIdProvider.TAG_COLOR_PREVIEW_ID);
|
tagColorPreviewBtn.setId(SPUIComponentIdProvider.TAG_COLOR_PREVIEW_ID);
|
||||||
getPreviewButtonColor(DEFAULT_COLOR);
|
getPreviewButtonColor(DEFAULT_COLOR);
|
||||||
tagColorPreviewBtn.setStyleName(TAG_DYNAMIC_STYLE);
|
tagColorPreviewBtn.setStyleName(TAG_DYNAMIC_STYLE);
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import org.eclipse.hawkbit.ui.artifacts.state.ArtifactUploadState;
|
|||||||
import org.eclipse.hawkbit.ui.common.SoftwareModuleTypeBeanQuery;
|
import org.eclipse.hawkbit.ui.common.SoftwareModuleTypeBeanQuery;
|
||||||
import org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterButtons;
|
import org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterButtons;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory;
|
import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory;
|
||||||
import org.vaadin.addons.lazyquerycontainer.LazyQueryContainer;
|
import org.vaadin.addons.lazyquerycontainer.LazyQueryContainer;
|
||||||
@@ -63,7 +63,7 @@ public class SMTypeFilterButtons extends AbstractFilterButtons {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getButtonsTableId() {
|
protected String getButtonsTableId() {
|
||||||
return SPUIComponetIdProvider.SW_MODULE_TYPE_TABLE_ID;
|
return SPUIComponentIdProvider.SW_MODULE_TYPE_TABLE_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -80,7 +80,7 @@ public class SMTypeFilterButtons extends AbstractFilterButtons {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String createButtonId(final String name) {
|
protected String createButtonId(final String name) {
|
||||||
return SPUIComponetIdProvider.SM_TYPE_FILTER_BTN_ID + name;
|
return SPUIComponentIdProvider.SM_TYPE_FILTER_BTN_ID + name;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -102,7 +102,7 @@ public class SMTypeFilterButtons extends AbstractFilterButtons {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getButttonWrapperIdPrefix() {
|
protected String getButttonWrapperIdPrefix() {
|
||||||
return SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX;
|
return SPUIComponentIdProvider.UPLOAD_TYPE_BUTTON_PREFIX;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import javax.annotation.PostConstruct;
|
|||||||
import org.eclipse.hawkbit.ui.artifacts.event.UploadArtifactUIEvent;
|
import org.eclipse.hawkbit.ui.artifacts.event.UploadArtifactUIEvent;
|
||||||
import org.eclipse.hawkbit.ui.artifacts.state.ArtifactUploadState;
|
import org.eclipse.hawkbit.ui.artifacts.state.ArtifactUploadState;
|
||||||
import org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader;
|
import org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -86,7 +86,7 @@ public class SMTypeFilterHeader extends AbstractFilterHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getHideButtonId() {
|
protected String getHideButtonId() {
|
||||||
return SPUIComponetIdProvider.SM_SHOW_FILTER_BUTTON_ID;
|
return SPUIComponentIdProvider.SM_SHOW_FILTER_BUTTON_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
|||||||
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleTiny;
|
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleTiny;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -151,10 +151,10 @@ public class UploadConfirmationwindow implements Button.ClickListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void createRequiredComponents() {
|
private void createRequiredComponents() {
|
||||||
uploadBtn = SPUIComponentProvider.getButton(SPUIComponetIdProvider.UPLOAD_BUTTON, SPUILabelDefinitions.SUBMIT,
|
uploadBtn = SPUIComponentProvider.getButton(SPUIComponentIdProvider.UPLOAD_BUTTON, SPUILabelDefinitions.SUBMIT,
|
||||||
SPUILabelDefinitions.SUBMIT, ValoTheme.BUTTON_PRIMARY, false, null, SPUIButtonStyleTiny.class);
|
SPUILabelDefinitions.SUBMIT, ValoTheme.BUTTON_PRIMARY, false, null, SPUIButtonStyleTiny.class);
|
||||||
uploadBtn.addClickListener(this);
|
uploadBtn.addClickListener(this);
|
||||||
cancelBtn = SPUIComponentProvider.getButton(SPUIComponetIdProvider.UPLOAD_DISCARD_DETAILS_BUTTON,
|
cancelBtn = SPUIComponentProvider.getButton(SPUIComponentIdProvider.UPLOAD_DISCARD_DETAILS_BUTTON,
|
||||||
SPUILabelDefinitions.DISCARD, SPUILabelDefinitions.DISCARD, null, false, null,
|
SPUILabelDefinitions.DISCARD, SPUILabelDefinitions.DISCARD, null, false, null,
|
||||||
SPUIButtonStyleTiny.class);
|
SPUIButtonStyleTiny.class);
|
||||||
cancelBtn.addClickListener(this);
|
cancelBtn.addClickListener(this);
|
||||||
@@ -162,7 +162,7 @@ public class UploadConfirmationwindow implements Button.ClickListener {
|
|||||||
uploadDetailsTable = new Table();
|
uploadDetailsTable = new Table();
|
||||||
uploadDetailsTable.addStyleName("artifact-table");
|
uploadDetailsTable.addStyleName("artifact-table");
|
||||||
uploadDetailsTable.setSizeFull();
|
uploadDetailsTable.setSizeFull();
|
||||||
uploadDetailsTable.setId(SPUIComponetIdProvider.UPLOAD_ARTIFACT_DETAILS_TABLE);
|
uploadDetailsTable.setId(SPUIComponentIdProvider.UPLOAD_ARTIFACT_DETAILS_TABLE);
|
||||||
uploadDetailsTable.addStyleName(ValoTheme.TABLE_BORDERLESS);
|
uploadDetailsTable.addStyleName(ValoTheme.TABLE_BORDERLESS);
|
||||||
uploadDetailsTable.addStyleName(ValoTheme.TABLE_NO_VERTICAL_LINES);
|
uploadDetailsTable.addStyleName(ValoTheme.TABLE_NO_VERTICAL_LINES);
|
||||||
uploadDetailsTable.addStyleName(ValoTheme.TABLE_SMALL);
|
uploadDetailsTable.addStyleName(ValoTheme.TABLE_SMALL);
|
||||||
@@ -238,7 +238,7 @@ public class UploadConfirmationwindow implements Button.ClickListener {
|
|||||||
newItem.getItemProperty(SW_MODULE_NAME).setValue(HawkbitCommonUtil.getFormatedLabel(swNameVersion));
|
newItem.getItemProperty(SW_MODULE_NAME).setValue(HawkbitCommonUtil.getFormatedLabel(swNameVersion));
|
||||||
newItem.getItemProperty(SIZE).setValue(customFile.getFileSize());
|
newItem.getItemProperty(SIZE).setValue(customFile.getFileSize());
|
||||||
final Button deleteIcon = SPUIComponentProvider.getButton(
|
final Button deleteIcon = SPUIComponentProvider.getButton(
|
||||||
SPUIComponetIdProvider.UPLOAD_DELETE_ICON + "-" + itemId, "", SPUILabelDefinitions.DISCARD,
|
SPUIComponentIdProvider.UPLOAD_DELETE_ICON + "-" + itemId, "", SPUILabelDefinitions.DISCARD,
|
||||||
ValoTheme.BUTTON_TINY + " " + "redicon", true, FontAwesome.TRASH_O,
|
ValoTheme.BUTTON_TINY + " " + "redicon", true, FontAwesome.TRASH_O,
|
||||||
SPUIButtonStyleSmallNoBorder.class);
|
SPUIButtonStyleSmallNoBorder.class);
|
||||||
deleteIcon.addClickListener(this);
|
deleteIcon.addClickListener(this);
|
||||||
@@ -541,16 +541,16 @@ public class UploadConfirmationwindow implements Button.ClickListener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void buttonClick(final ClickEvent event) {
|
public void buttonClick(final ClickEvent event) {
|
||||||
if (event.getComponent().getId().equals(SPUIComponetIdProvider.UPLOAD_ARTIFACT_DETAILS_CLOSE)) {
|
if (event.getComponent().getId().equals(SPUIComponentIdProvider.UPLOAD_ARTIFACT_DETAILS_CLOSE)) {
|
||||||
uploadConfrimationWindow.close();
|
uploadConfrimationWindow.close();
|
||||||
} else if (event.getComponent().getId().equals(SPUIComponetIdProvider.UPLOAD_DISCARD_DETAILS_BUTTON)) {
|
} else if (event.getComponent().getId().equals(SPUIComponentIdProvider.UPLOAD_DISCARD_DETAILS_BUTTON)) {
|
||||||
uploadLayout.clearFileList();
|
uploadLayout.clearFileList();
|
||||||
uploadConfrimationWindow.close();
|
uploadConfrimationWindow.close();
|
||||||
} else if (event.getComponent().getId().equals(SPUIComponetIdProvider.UPLOAD_BUTTON)) {
|
} else if (event.getComponent().getId().equals(SPUIComponentIdProvider.UPLOAD_BUTTON)) {
|
||||||
processArtifactUpload();
|
processArtifactUpload();
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (event.getComponent().getId().startsWith(SPUIComponetIdProvider.UPLOAD_DELETE_ICON)) {
|
else if (event.getComponent().getId().startsWith(SPUIComponentIdProvider.UPLOAD_DELETE_ICON)) {
|
||||||
final String itemId = ((Button) event.getComponent()).getData().toString();
|
final String itemId = ((Button) event.getComponent()).getData().toString();
|
||||||
final Item item = uploadDetailsTable.getItem(((Button) event.getComponent()).getData());
|
final Item item = uploadDetailsTable.getItem(((Button) event.getComponent()).getData());
|
||||||
final Long swId = (Long) item.getItemProperty(BASE_SOFTWARE_ID).getValue();
|
final Long swId = (Long) item.getItemProperty(BASE_SOFTWARE_ID).getValue();
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
|||||||
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmall;
|
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmall;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -263,7 +263,7 @@ public class UploadLayout extends VerticalLayout {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void createProcessButton() {
|
private void createProcessButton() {
|
||||||
processBtn = SPUIComponentProvider.getButton(SPUIComponetIdProvider.UPLOAD_PROCESS_BUTTON,
|
processBtn = SPUIComponentProvider.getButton(SPUIComponentIdProvider.UPLOAD_PROCESS_BUTTON,
|
||||||
SPUILabelDefinitions.PROCESS, SPUILabelDefinitions.PROCESS, null, false, null,
|
SPUILabelDefinitions.PROCESS, SPUILabelDefinitions.PROCESS, null, false, null,
|
||||||
SPUIButtonStyleSmall.class);
|
SPUIButtonStyleSmall.class);
|
||||||
processBtn.setIcon(FontAwesome.BELL);
|
processBtn.setIcon(FontAwesome.BELL);
|
||||||
@@ -276,7 +276,7 @@ public class UploadLayout extends VerticalLayout {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void createDiscardBtn() {
|
private void createDiscardBtn() {
|
||||||
discardBtn = SPUIComponentProvider.getButton(SPUIComponetIdProvider.UPLOAD_DISCARD_BUTTON,
|
discardBtn = SPUIComponentProvider.getButton(SPUIComponentIdProvider.UPLOAD_DISCARD_BUTTON,
|
||||||
SPUILabelDefinitions.DISCARD, SPUILabelDefinitions.DISCARD, null, false, null,
|
SPUILabelDefinitions.DISCARD, SPUILabelDefinitions.DISCARD, null, false, null,
|
||||||
SPUIButtonStyleSmall.class);
|
SPUIButtonStyleSmall.class);
|
||||||
discardBtn.setIcon(FontAwesome.TRASH_O);
|
discardBtn.setIcon(FontAwesome.TRASH_O);
|
||||||
@@ -566,7 +566,7 @@ public class UploadLayout extends VerticalLayout {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void displayConfirmWindow(final Button.ClickEvent event) {
|
private void displayConfirmWindow(final Button.ClickEvent event) {
|
||||||
if (event.getComponent().getId().equals(SPUIComponetIdProvider.UPLOAD_PROCESS_BUTTON)) {
|
if (event.getComponent().getId().equals(SPUIComponentIdProvider.UPLOAD_PROCESS_BUTTON)) {
|
||||||
if (artifactUploadState.getFileSelected().isEmpty()) {
|
if (artifactUploadState.getFileSelected().isEmpty()) {
|
||||||
uiNotification.displayValidationError(i18n.get("message.error.noFileSelected"));
|
uiNotification.displayValidationError(i18n.get("message.error.noFileSelected"));
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
|||||||
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleTiny;
|
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleTiny;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -80,7 +80,7 @@ public class UploadResultWindow implements Button.ClickListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void createComponents() {
|
private void createComponents() {
|
||||||
closeBtn = SPUIComponentProvider.getButton(SPUIComponetIdProvider.UPLOAD_ARTIFACT_RESULT_CLOSE,
|
closeBtn = SPUIComponentProvider.getButton(SPUIComponentIdProvider.UPLOAD_ARTIFACT_RESULT_CLOSE,
|
||||||
SPUILabelDefinitions.CLOSE, SPUILabelDefinitions.CLOSE, ValoTheme.BUTTON_PRIMARY, false, null,
|
SPUILabelDefinitions.CLOSE, SPUILabelDefinitions.CLOSE, ValoTheme.BUTTON_PRIMARY, false, null,
|
||||||
SPUIButtonStyleTiny.class);
|
SPUIButtonStyleTiny.class);
|
||||||
closeBtn.addClickListener(this);
|
closeBtn.addClickListener(this);
|
||||||
@@ -89,7 +89,7 @@ public class UploadResultWindow implements Button.ClickListener {
|
|||||||
uploadResultTable.addStyleName("artifact-table");
|
uploadResultTable.addStyleName("artifact-table");
|
||||||
uploadResultTable.setSizeFull();
|
uploadResultTable.setSizeFull();
|
||||||
uploadResultTable.setImmediate(true);
|
uploadResultTable.setImmediate(true);
|
||||||
uploadResultTable.setId(SPUIComponetIdProvider.UPLOAD_RESULT_TABLE);
|
uploadResultTable.setId(SPUIComponentIdProvider.UPLOAD_RESULT_TABLE);
|
||||||
uploadResultTable.addStyleName(ValoTheme.TABLE_BORDERLESS);
|
uploadResultTable.addStyleName(ValoTheme.TABLE_BORDERLESS);
|
||||||
uploadResultTable.addStyleName(ValoTheme.TABLE_SMALL);
|
uploadResultTable.addStyleName(ValoTheme.TABLE_SMALL);
|
||||||
uploadResultTable.addStyleName(ValoTheme.TABLE_NO_VERTICAL_LINES);
|
uploadResultTable.addStyleName(ValoTheme.TABLE_NO_VERTICAL_LINES);
|
||||||
@@ -121,7 +121,7 @@ public class UploadResultWindow implements Button.ClickListener {
|
|||||||
|
|
||||||
reasonLabel = HawkbitCommonUtil.getFormatedLabel(uploadResult.getReason());
|
reasonLabel = HawkbitCommonUtil.getFormatedLabel(uploadResult.getReason());
|
||||||
reasonLabel.setDescription(uploadResult.getReason());
|
reasonLabel.setDescription(uploadResult.getReason());
|
||||||
final String idStr = SPUIComponetIdProvider.UPLOAD_ERROR_REASON + uploadResult.getBaseSwModuleName() + "/"
|
final String idStr = SPUIComponentIdProvider.UPLOAD_ERROR_REASON + uploadResult.getBaseSwModuleName() + "/"
|
||||||
+ uploadResult.getFileName();
|
+ uploadResult.getFileName();
|
||||||
reasonLabel.setId(idStr);
|
reasonLabel.setId(idStr);
|
||||||
newItem.getItemProperty(REASON).setValue(reasonLabel);
|
newItem.getItemProperty(REASON).setValue(reasonLabel);
|
||||||
@@ -180,8 +180,8 @@ public class UploadResultWindow implements Button.ClickListener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void buttonClick(final ClickEvent event) {
|
public void buttonClick(final ClickEvent event) {
|
||||||
if (event.getComponent().getId().equals(SPUIComponetIdProvider.UPLOAD_ARTIFACT_RESULT_CLOSE)
|
if (event.getComponent().getId().equals(SPUIComponentIdProvider.UPLOAD_ARTIFACT_RESULT_CLOSE)
|
||||||
|| event.getComponent().getId().equals(SPUIComponetIdProvider.UPLOAD_ARTIFACT_RESULT_POPUP_CLOSE)) {
|
|| event.getComponent().getId().equals(SPUIComponentIdProvider.UPLOAD_ARTIFACT_RESULT_POPUP_CLOSE)) {
|
||||||
uploadResultsWindow.close();
|
uploadResultsWindow.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ package org.eclipse.hawkbit.ui.common;
|
|||||||
|
|
||||||
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
||||||
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleTiny;
|
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleTiny;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
|
|
||||||
import com.vaadin.server.Resource;
|
import com.vaadin.server.Resource;
|
||||||
@@ -82,7 +82,7 @@ public class ConfirmationDialog implements Button.ClickListener {
|
|||||||
window.setIcon(icon);
|
window.setIcon(icon);
|
||||||
}
|
}
|
||||||
|
|
||||||
okButton = SPUIComponentProvider.getButton(SPUIComponetIdProvider.OK_BUTTON, okLabel, "",
|
okButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.OK_BUTTON, okLabel, "",
|
||||||
ValoTheme.BUTTON_PRIMARY, false, null, SPUIButtonStyleTiny.class);
|
ValoTheme.BUTTON_PRIMARY, false, null, SPUIButtonStyleTiny.class);
|
||||||
okButton.addClickListener(this);
|
okButton.addClickListener(this);
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import javax.annotation.PostConstruct;
|
|||||||
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
||||||
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -67,7 +67,7 @@ public abstract class AbstractConfirmationWindowLayout extends VerticalLayout {
|
|||||||
private void createActionMessgaeLabel() {
|
private void createActionMessgaeLabel() {
|
||||||
actionMessage = SPUIComponentProvider.getLabel("", null);
|
actionMessage = SPUIComponentProvider.getLabel("", null);
|
||||||
actionMessage.addStyleName(SPUIStyleDefinitions.CONFIRM_WINDOW_INFO_BOX);
|
actionMessage.addStyleName(SPUIStyleDefinitions.CONFIRM_WINDOW_INFO_BOX);
|
||||||
actionMessage.setId(SPUIComponetIdProvider.ACTION_LABEL);
|
actionMessage.setId(SPUIComponentIdProvider.ACTION_LABEL);
|
||||||
actionMessage.setVisible(false);
|
actionMessage.setVisible(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
|||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPDateTimeUtil;
|
import org.eclipse.hawkbit.ui.utils.SPDateTimeUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -238,7 +238,7 @@ public abstract class AbstractTableDetailsLayout<T extends NamedEntity> extends
|
|||||||
* it as we need full description.
|
* it as we need full description.
|
||||||
*/
|
*/
|
||||||
descLabel.removeStyleName("label-style");
|
descLabel.removeStyleName("label-style");
|
||||||
descLabel.setId(SPUIComponetIdProvider.DETAILS_DESCRIPTION_LABEL_ID);
|
descLabel.setId(SPUIComponentIdProvider.DETAILS_DESCRIPTION_LABEL_ID);
|
||||||
descriptionLayout.addComponent(descLabel);
|
descriptionLayout.addComponent(descLabel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
|||||||
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmall;
|
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmall;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.UINotification;
|
import org.eclipse.hawkbit.ui.utils.UINotification;
|
||||||
@@ -154,7 +154,7 @@ public abstract class AbstractDeleteActionsLayout extends VerticalLayout impleme
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Button createActionsButton() {
|
private Button createActionsButton() {
|
||||||
final Button button = SPUIComponentProvider.getButton(SPUIComponetIdProvider.PENDING_ACTION_BUTTON,
|
final Button button = SPUIComponentProvider.getButton(SPUIComponentIdProvider.PENDING_ACTION_BUTTON,
|
||||||
getNoActionsButtonLabel(), "", "", false, FontAwesome.BELL, SPUIButtonStyleSmall.class);
|
getNoActionsButtonLabel(), "", "", false, FontAwesome.BELL, SPUIButtonStyleSmall.class);
|
||||||
button.setStyleName(SPUIStyleDefinitions.ACTION_BUTTON);
|
button.setStyleName(SPUIStyleDefinitions.ACTION_BUTTON);
|
||||||
button.addStyleName("del-action-button");
|
button.addStyleName("del-action-button");
|
||||||
@@ -165,7 +165,7 @@ public abstract class AbstractDeleteActionsLayout extends VerticalLayout impleme
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Button createBulkUploadStatusButton() {
|
private Button createBulkUploadStatusButton() {
|
||||||
final Button button = SPUIComponentProvider.getButton(SPUIComponetIdProvider.BULK_UPLOAD_STATUS_BUTTON, "", "",
|
final Button button = SPUIComponentProvider.getButton(SPUIComponentIdProvider.BULK_UPLOAD_STATUS_BUTTON, "", "",
|
||||||
"", false, null, SPUIButtonStyleSmall.class);
|
"", false, null, SPUIButtonStyleSmall.class);
|
||||||
button.setStyleName(SPUIStyleDefinitions.ACTION_BUTTON);
|
button.setStyleName(SPUIStyleDefinitions.ACTION_BUTTON);
|
||||||
button.addStyleName(SPUIStyleDefinitions.BULK_UPLOAD_PROGRESS_INDICATOR_STYLE);
|
button.addStyleName(SPUIStyleDefinitions.BULK_UPLOAD_PROGRESS_INDICATOR_STYLE);
|
||||||
@@ -216,10 +216,10 @@ public abstract class AbstractDeleteActionsLayout extends VerticalLayout impleme
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
unsavedActionsWindow = SPUIComponentProvider.getWindow(getUnsavedActionsWindowCaption(),
|
unsavedActionsWindow = SPUIComponentProvider.getWindow(getUnsavedActionsWindowCaption(),
|
||||||
SPUIComponetIdProvider.SAVE_ACTIONS_POPUP, SPUIDefinitions.CONFIRMATION_WINDOW);
|
SPUIComponentIdProvider.SAVE_ACTIONS_POPUP, SPUIDefinitions.CONFIRMATION_WINDOW);
|
||||||
unsavedActionsWindow.addCloseListener(event -> unsavedActionsWindowClosed());
|
unsavedActionsWindow.addCloseListener(event -> unsavedActionsWindowClosed());
|
||||||
unsavedActionsWindow.setContent(getUnsavedActionsWindowContent());
|
unsavedActionsWindow.setContent(getUnsavedActionsWindowContent());
|
||||||
unsavedActionsWindow.setId(SPUIComponetIdProvider.CONFIRMATION_POPUP_ID);
|
unsavedActionsWindow.setId(SPUIComponentIdProvider.CONFIRMATION_POPUP_ID);
|
||||||
UI.getCurrent().addWindow(unsavedActionsWindow);
|
UI.getCurrent().addWindow(unsavedActionsWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.eclipse.hawkbit.ui.common.grid;
|
package org.eclipse.hawkbit.ui.common.grid;
|
||||||
|
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
|
|
||||||
import com.vaadin.ui.Alignment;
|
import com.vaadin.ui.Alignment;
|
||||||
import com.vaadin.ui.HorizontalLayout;
|
import com.vaadin.ui.HorizontalLayout;
|
||||||
@@ -70,7 +70,7 @@ public abstract class AbstractGridLayout extends VerticalLayout {
|
|||||||
private HorizontalLayout createCountMessageComponent() {
|
private HorizontalLayout createCountMessageComponent() {
|
||||||
final HorizontalLayout rolloutGroupTargetsCountLayout = new HorizontalLayout();
|
final HorizontalLayout rolloutGroupTargetsCountLayout = new HorizontalLayout();
|
||||||
final Label countMessageLabel = getCountMessageLabel();
|
final Label countMessageLabel = getCountMessageLabel();
|
||||||
countMessageLabel.setId(SPUIComponetIdProvider.ROLLOUT_GROUP_TARGET_LABEL);
|
countMessageLabel.setId(SPUIComponentIdProvider.ROLLOUT_GROUP_TARGET_LABEL);
|
||||||
rolloutGroupTargetsCountLayout.addComponent(getCountMessageLabel());
|
rolloutGroupTargetsCountLayout.addComponent(getCountMessageLabel());
|
||||||
rolloutGroupTargetsCountLayout.setStyleName("footer-layout");
|
rolloutGroupTargetsCountLayout.setStyleName("footer-layout");
|
||||||
rolloutGroupTargetsCountLayout.setWidth("100%");
|
rolloutGroupTargetsCountLayout.setWidth("100%");
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import org.eclipse.hawkbit.ui.distributions.event.DistributionSetTypeEvent.Distr
|
|||||||
import org.eclipse.hawkbit.ui.management.tag.SpColorPickerPreview;
|
import org.eclipse.hawkbit.ui.management.tag.SpColorPickerPreview;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -205,7 +205,7 @@ public class CreateUpdateDistSetTypeLayout extends CustomComponent implements Co
|
|||||||
colorLabel.addStyleName(SPUIDefinitions.COLOR_LABEL_STYLE);
|
colorLabel.addStyleName(SPUIDefinitions.COLOR_LABEL_STYLE);
|
||||||
|
|
||||||
tagColorPreviewBtn = new Button();
|
tagColorPreviewBtn = new Button();
|
||||||
tagColorPreviewBtn.setId(SPUIComponetIdProvider.TAG_COLOR_PREVIEW_ID);
|
tagColorPreviewBtn.setId(SPUIComponentIdProvider.TAG_COLOR_PREVIEW_ID);
|
||||||
getPreviewButtonColor(DEFAULT_COLOR);
|
getPreviewButtonColor(DEFAULT_COLOR);
|
||||||
tagColorPreviewBtn.setStyleName("tag-color-preview");
|
tagColorPreviewBtn.setStyleName("tag-color-preview");
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import org.eclipse.hawkbit.ui.distributions.event.DistributionsViewAcceptCriteri
|
|||||||
import org.eclipse.hawkbit.ui.distributions.event.SaveActionWindowEvent;
|
import org.eclipse.hawkbit.ui.distributions.event.SaveActionWindowEvent;
|
||||||
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory;
|
import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory;
|
||||||
@@ -50,7 +50,7 @@ public class DSTypeFilterButtons extends AbstractFilterButtons {
|
|||||||
@Override
|
@Override
|
||||||
protected String getButtonsTableId() {
|
protected String getButtonsTableId() {
|
||||||
|
|
||||||
return SPUIComponetIdProvider.DISTRIBUTION_SET_TYPE_TABLE_ID;
|
return SPUIComponentIdProvider.DISTRIBUTION_SET_TYPE_TABLE_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -68,7 +68,7 @@ public class DSTypeFilterButtons extends AbstractFilterButtons {
|
|||||||
@Override
|
@Override
|
||||||
protected String createButtonId(final String name) {
|
protected String createButtonId(final String name) {
|
||||||
|
|
||||||
return SPUIComponetIdProvider.DS_TYPE_FILTER_BTN_ID + name;
|
return SPUIComponentIdProvider.DS_TYPE_FILTER_BTN_ID + name;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
|||||||
import org.eclipse.hawkbit.ui.management.dstable.DistributionAddUpdateWindowLayout;
|
import org.eclipse.hawkbit.ui.management.dstable.DistributionAddUpdateWindowLayout;
|
||||||
import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent;
|
import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventScope;
|
import org.vaadin.spring.events.EventScope;
|
||||||
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
||||||
@@ -246,7 +246,7 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
|
|||||||
if (type != null) {
|
if (type != null) {
|
||||||
final Label typeLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.dist.details.type"),
|
final Label typeLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.dist.details.type"),
|
||||||
type);
|
type);
|
||||||
typeLabel.setId(SPUIComponetIdProvider.DETAILS_TYPE_LABEL_ID);
|
typeLabel.setId(SPUIComponentIdProvider.DETAILS_TYPE_LABEL_ID);
|
||||||
detailsTabLayout.addComponent(typeLabel);
|
detailsTabLayout.addComponent(typeLabel);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -268,7 +268,7 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getEditButtonId() {
|
protected String getEditButtonId() {
|
||||||
return SPUIComponetIdProvider.DS_EDIT_BUTTON;
|
return SPUIComponentIdProvider.DS_EDIT_BUTTON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -358,7 +358,7 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getDetailsHeaderCaptionId() {
|
protected String getDetailsHeaderCaptionId() {
|
||||||
return SPUIComponetIdProvider.DISTRIBUTION_DETAILS_HEADER_LABEL_ID;
|
return SPUIComponentIdProvider.DISTRIBUTION_DETAILS_HEADER_LABEL_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
|||||||
import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent;
|
import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent;
|
||||||
import org.eclipse.hawkbit.ui.management.event.DistributionTableFilterEvent;
|
import org.eclipse.hawkbit.ui.management.event.DistributionTableFilterEvent;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -120,7 +120,7 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getTableId() {
|
protected String getTableId() {
|
||||||
return SPUIComponetIdProvider.DIST_TABLE_ID;
|
return SPUIComponentIdProvider.DIST_TABLE_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -392,7 +392,7 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
|
|||||||
final Component compsource = dragEvent.getTransferable().getSourceComponent();
|
final Component compsource = dragEvent.getTransferable().getSourceComponent();
|
||||||
final Table source = (Table) compsource;
|
final Table source = (Table) compsource;
|
||||||
if (compsource instanceof Table) {
|
if (compsource instanceof Table) {
|
||||||
if (!source.getId().equals(SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE)) {
|
if (!source.getId().equals(SPUIComponentIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE)) {
|
||||||
notification.displayValidationError(i18n.get("message.action.not.allowed"));
|
notification.displayValidationError(i18n.get("message.action.not.allowed"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
|||||||
import org.eclipse.hawkbit.ui.management.dstable.DistributionAddUpdateWindowLayout;
|
import org.eclipse.hawkbit.ui.management.dstable.DistributionAddUpdateWindowLayout;
|
||||||
import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent;
|
import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent;
|
||||||
import org.eclipse.hawkbit.ui.management.event.DistributionTableFilterEvent;
|
import org.eclipse.hawkbit.ui.management.event.DistributionTableFilterEvent;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventScope;
|
import org.vaadin.spring.events.EventScope;
|
||||||
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
||||||
@@ -57,17 +57,17 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getSearchBoxId() {
|
protected String getSearchBoxId() {
|
||||||
return SPUIComponetIdProvider.DIST_SEARCH_TEXTFIELD;
|
return SPUIComponentIdProvider.DIST_SEARCH_TEXTFIELD;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getSearchRestIconId() {
|
protected String getSearchRestIconId() {
|
||||||
return SPUIComponetIdProvider.DIST_SEARCH_ICON;
|
return SPUIComponentIdProvider.DIST_SEARCH_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getAddIconId() {
|
protected String getAddIconId() {
|
||||||
return SPUIComponetIdProvider.DIST_ADD_ICON;
|
return SPUIComponentIdProvider.DIST_ADD_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -119,7 +119,7 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getMaxMinIconId() {
|
protected String getMaxMinIconId() {
|
||||||
return SPUIComponetIdProvider.DS_MAX_MIN_TABLE_ICON;
|
return SPUIComponentIdProvider.DS_MAX_MIN_TABLE_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.eclipse.hawkbit.ui.common.AbstractAcceptCriteria;
|
import org.eclipse.hawkbit.ui.common.AbstractAcceptCriteria;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
|
|
||||||
import com.vaadin.spring.annotation.SpringComponent;
|
import com.vaadin.spring.annotation.SpringComponent;
|
||||||
@@ -69,14 +69,14 @@ public class DistributionsViewAcceptCriteria extends AbstractAcceptCriteria {
|
|||||||
final Map<String, List<String>> config = new HashMap<>();
|
final Map<String, List<String>> config = new HashMap<>();
|
||||||
|
|
||||||
// Delete drop area droppable components
|
// Delete drop area droppable components
|
||||||
config.put(SPUIComponetIdProvider.DELETE_BUTTON_WRAPPER_ID,
|
config.put(SPUIComponentIdProvider.DELETE_BUTTON_WRAPPER_ID,
|
||||||
Arrays.asList(SPUIDefinitions.DISTRIBUTION_TYPE_ID_PREFIXS, SPUIComponetIdProvider.DIST_TABLE_ID,
|
Arrays.asList(SPUIDefinitions.DISTRIBUTION_TYPE_ID_PREFIXS, SPUIComponentIdProvider.DIST_TABLE_ID,
|
||||||
SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE,
|
SPUIComponentIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE,
|
||||||
SPUIDefinitions.SOFTWARE_MODULE_TAG_ID_PREFIXS));
|
SPUIDefinitions.SOFTWARE_MODULE_TAG_ID_PREFIXS));
|
||||||
|
|
||||||
// Distribution table drop components
|
// Distribution table drop components
|
||||||
config.put(SPUIComponetIdProvider.DIST_TABLE_ID,
|
config.put(SPUIComponentIdProvider.DIST_TABLE_ID,
|
||||||
Arrays.asList(SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE));
|
Arrays.asList(SPUIComponentIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE));
|
||||||
|
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
@@ -84,8 +84,8 @@ public class DistributionsViewAcceptCriteria extends AbstractAcceptCriteria {
|
|||||||
private static Map<String, Object> createDropHintConfigurations() {
|
private static Map<String, Object> createDropHintConfigurations() {
|
||||||
final Map<String, Object> config = new HashMap<>();
|
final Map<String, Object> config = new HashMap<>();
|
||||||
config.put(SPUIDefinitions.DISTRIBUTION_TYPE_ID_PREFIXS, DragEvent.DISTRIBUTION_TYPE_DRAG);
|
config.put(SPUIDefinitions.DISTRIBUTION_TYPE_ID_PREFIXS, DragEvent.DISTRIBUTION_TYPE_DRAG);
|
||||||
config.put(SPUIComponetIdProvider.DIST_TABLE_ID, DragEvent.DISTRIBUTION_DRAG);
|
config.put(SPUIComponentIdProvider.DIST_TABLE_ID, DragEvent.DISTRIBUTION_DRAG);
|
||||||
config.put(SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE, DragEvent.SOFTWAREMODULE_DRAG);
|
config.put(SPUIComponentIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE, DragEvent.SOFTWAREMODULE_DRAG);
|
||||||
config.put(SPUIDefinitions.SOFTWARE_MODULE_TAG_ID_PREFIXS, DragEvent.SOFTWAREMODULE_TYPE_DRAG);
|
config.put(SPUIDefinitions.SOFTWARE_MODULE_TAG_ID_PREFIXS, DragEvent.SOFTWAREMODULE_TYPE_DRAG);
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ import org.eclipse.hawkbit.ui.distributions.event.DragEvent;
|
|||||||
import org.eclipse.hawkbit.ui.distributions.event.SaveActionWindowEvent;
|
import org.eclipse.hawkbit.ui.distributions.event.SaveActionWindowEvent;
|
||||||
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -115,7 +115,7 @@ public class DSDeleteActionsLayout extends AbstractDeleteActionsLayout {
|
|||||||
@Override
|
@Override
|
||||||
protected String getDeleteAreaId() {
|
protected String getDeleteAreaId() {
|
||||||
|
|
||||||
return SPUIComponetIdProvider.DELETE_BUTTON_WRAPPER_ID;
|
return SPUIComponentIdProvider.DELETE_BUTTON_WRAPPER_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -262,11 +262,11 @@ public class DSDeleteActionsLayout extends AbstractDeleteActionsLayout {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean isDistributionTable(final Component source) {
|
private boolean isDistributionTable(final Component source) {
|
||||||
return SPUIComponetIdProvider.DIST_TABLE_ID.equals(source.getId());
|
return SPUIComponentIdProvider.DIST_TABLE_ID.equals(source.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isSoftwareModuleTable(final Component source) {
|
private boolean isSoftwareModuleTable(final Component source) {
|
||||||
return SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE.equals(source.getId());
|
return SPUIComponentIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE.equals(source.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
|||||||
import org.eclipse.hawkbit.ui.distributions.event.SaveActionWindowEvent;
|
import org.eclipse.hawkbit.ui.distributions.event.SaveActionWindowEvent;
|
||||||
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -124,7 +124,7 @@ public class DistributionsConfirmationWindowLayout extends AbstractConfirmationW
|
|||||||
private ConfirmationTab createSMDeleteConfirmationTab() {
|
private ConfirmationTab createSMDeleteConfirmationTab() {
|
||||||
final ConfirmationTab tab = new ConfirmationTab();
|
final ConfirmationTab tab = new ConfirmationTab();
|
||||||
|
|
||||||
tab.getConfirmAll().setId(SPUIComponetIdProvider.SW_DELETE_ALL);
|
tab.getConfirmAll().setId(SPUIComponentIdProvider.SW_DELETE_ALL);
|
||||||
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
||||||
tab.getConfirmAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DELETE_ALL));
|
tab.getConfirmAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DELETE_ALL));
|
||||||
tab.getConfirmAll().addClickListener(event -> deleteSMAll(tab));
|
tab.getConfirmAll().addClickListener(event -> deleteSMAll(tab));
|
||||||
@@ -232,13 +232,13 @@ public class DistributionsConfirmationWindowLayout extends AbstractConfirmationW
|
|||||||
private ConfirmationTab createSMtypeDeleteConfirmationTab() {
|
private ConfirmationTab createSMtypeDeleteConfirmationTab() {
|
||||||
final ConfirmationTab tab = new ConfirmationTab();
|
final ConfirmationTab tab = new ConfirmationTab();
|
||||||
|
|
||||||
tab.getConfirmAll().setId(SPUIComponetIdProvider.SAVE_DELETE_SW_MODULE_TYPE);
|
tab.getConfirmAll().setId(SPUIComponentIdProvider.SAVE_DELETE_SW_MODULE_TYPE);
|
||||||
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
||||||
tab.getConfirmAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DELETE_ALL));
|
tab.getConfirmAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DELETE_ALL));
|
||||||
tab.getConfirmAll().addClickListener(event -> deleteSMtypeAll(tab));
|
tab.getConfirmAll().addClickListener(event -> deleteSMtypeAll(tab));
|
||||||
|
|
||||||
tab.getDiscardAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DISCARD_ALL));
|
tab.getDiscardAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DISCARD_ALL));
|
||||||
tab.getDiscardAll().setId(SPUIComponetIdProvider.DISCARD_SW_MODULE_TYPE);
|
tab.getDiscardAll().setId(SPUIComponentIdProvider.DISCARD_SW_MODULE_TYPE);
|
||||||
tab.getDiscardAll().addClickListener(event -> discardSMtypeAll(tab));
|
tab.getDiscardAll().addClickListener(event -> discardSMtypeAll(tab));
|
||||||
|
|
||||||
// Add items container to the table.
|
// Add items container to the table.
|
||||||
@@ -324,7 +324,7 @@ public class DistributionsConfirmationWindowLayout extends AbstractConfirmationW
|
|||||||
private ConfirmationTab createDistDeleteConfirmationTab() {
|
private ConfirmationTab createDistDeleteConfirmationTab() {
|
||||||
final ConfirmationTab tab = new ConfirmationTab();
|
final ConfirmationTab tab = new ConfirmationTab();
|
||||||
|
|
||||||
tab.getConfirmAll().setId(SPUIComponetIdProvider.DIST_DELETE_ALL);
|
tab.getConfirmAll().setId(SPUIComponentIdProvider.DIST_DELETE_ALL);
|
||||||
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
||||||
tab.getConfirmAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DELETE_ALL));
|
tab.getConfirmAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DELETE_ALL));
|
||||||
tab.getConfirmAll().addClickListener(event -> deleteDistAll(tab));
|
tab.getConfirmAll().addClickListener(event -> deleteDistAll(tab));
|
||||||
@@ -423,13 +423,13 @@ public class DistributionsConfirmationWindowLayout extends AbstractConfirmationW
|
|||||||
private ConfirmationTab createDistSetTypeDeleteConfirmationTab() {
|
private ConfirmationTab createDistSetTypeDeleteConfirmationTab() {
|
||||||
final ConfirmationTab tab = new ConfirmationTab();
|
final ConfirmationTab tab = new ConfirmationTab();
|
||||||
|
|
||||||
tab.getConfirmAll().setId(SPUIComponetIdProvider.SAVE_DELETE_DIST_SET_TYPE);
|
tab.getConfirmAll().setId(SPUIComponentIdProvider.SAVE_DELETE_DIST_SET_TYPE);
|
||||||
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
||||||
tab.getConfirmAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DELETE_ALL));
|
tab.getConfirmAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DELETE_ALL));
|
||||||
tab.getConfirmAll().addClickListener(event -> deleteDistSetTypeAll(tab));
|
tab.getConfirmAll().addClickListener(event -> deleteDistSetTypeAll(tab));
|
||||||
|
|
||||||
tab.getDiscardAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DISCARD_ALL));
|
tab.getDiscardAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DISCARD_ALL));
|
||||||
tab.getDiscardAll().setId(SPUIComponetIdProvider.DISCARD_DIST_SET_TYPE);
|
tab.getDiscardAll().setId(SPUIComponentIdProvider.DISCARD_DIST_SET_TYPE);
|
||||||
tab.getDiscardAll().addClickListener(event -> discardDistSetTypeAll(tab));
|
tab.getDiscardAll().addClickListener(event -> discardDistSetTypeAll(tab));
|
||||||
|
|
||||||
// Add items container to the table.
|
// Add items container to the table.
|
||||||
@@ -511,13 +511,13 @@ public class DistributionsConfirmationWindowLayout extends AbstractConfirmationW
|
|||||||
|
|
||||||
assignmnetTab = new ConfirmationTab();
|
assignmnetTab = new ConfirmationTab();
|
||||||
|
|
||||||
assignmnetTab.getConfirmAll().setId(SPUIComponetIdProvider.SAVE_ASSIGNMENT);
|
assignmnetTab.getConfirmAll().setId(SPUIComponentIdProvider.SAVE_ASSIGNMENT);
|
||||||
assignmnetTab.getConfirmAll().setIcon(FontAwesome.SAVE);
|
assignmnetTab.getConfirmAll().setIcon(FontAwesome.SAVE);
|
||||||
assignmnetTab.getConfirmAll().setCaption(i18n.get("button.assign.all"));
|
assignmnetTab.getConfirmAll().setCaption(i18n.get("button.assign.all"));
|
||||||
assignmnetTab.getConfirmAll().addClickListener(event -> saveAllAssignments(assignmnetTab));
|
assignmnetTab.getConfirmAll().addClickListener(event -> saveAllAssignments(assignmnetTab));
|
||||||
|
|
||||||
assignmnetTab.getDiscardAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DISCARD_ALL));
|
assignmnetTab.getDiscardAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DISCARD_ALL));
|
||||||
assignmnetTab.getDiscardAll().setId(SPUIComponetIdProvider.DISCARD_ASSIGNMENT);
|
assignmnetTab.getDiscardAll().setId(SPUIComponentIdProvider.DISCARD_ASSIGNMENT);
|
||||||
assignmnetTab.getDiscardAll().addClickListener(event -> discardAllSWAssignments(assignmnetTab));
|
assignmnetTab.getDiscardAll().addClickListener(event -> discardAllSWAssignments(assignmnetTab));
|
||||||
|
|
||||||
// Add items container to the table.
|
// Add items container to the table.
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import org.eclipse.hawkbit.ui.common.detailslayout.AbstractNamedVersionedEntityT
|
|||||||
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
||||||
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventScope;
|
import org.vaadin.spring.events.EventScope;
|
||||||
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
||||||
@@ -61,7 +61,7 @@ public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLay
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getEditButtonId() {
|
protected String getEditButtonId() {
|
||||||
return SPUIComponetIdProvider.UPLOAD_SW_MODULE_EDIT_BUTTON;
|
return SPUIComponentIdProvider.UPLOAD_SW_MODULE_EDIT_BUTTON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -119,19 +119,19 @@ public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLay
|
|||||||
|
|
||||||
final Label vendorLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.dist.details.vendor"),
|
final Label vendorLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.dist.details.vendor"),
|
||||||
HawkbitCommonUtil.trimAndNullIfEmpty(vendor) == null ? "" : vendor);
|
HawkbitCommonUtil.trimAndNullIfEmpty(vendor) == null ? "" : vendor);
|
||||||
vendorLabel.setId(SPUIComponetIdProvider.DETAILS_VENDOR_LABEL_ID);
|
vendorLabel.setId(SPUIComponentIdProvider.DETAILS_VENDOR_LABEL_ID);
|
||||||
detailsTabLayout.addComponent(vendorLabel);
|
detailsTabLayout.addComponent(vendorLabel);
|
||||||
|
|
||||||
if (type != null) {
|
if (type != null) {
|
||||||
final Label typeLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.dist.details.type"),
|
final Label typeLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.dist.details.type"),
|
||||||
type);
|
type);
|
||||||
typeLabel.setId(SPUIComponetIdProvider.DETAILS_TYPE_LABEL_ID);
|
typeLabel.setId(SPUIComponentIdProvider.DETAILS_TYPE_LABEL_ID);
|
||||||
detailsTabLayout.addComponent(typeLabel);
|
detailsTabLayout.addComponent(typeLabel);
|
||||||
}
|
}
|
||||||
|
|
||||||
final Label assignLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.assigned.type"),
|
final Label assignLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.assigned.type"),
|
||||||
HawkbitCommonUtil.trimAndNullIfEmpty(maxAssign) == null ? "" : maxAssign);
|
HawkbitCommonUtil.trimAndNullIfEmpty(maxAssign) == null ? "" : maxAssign);
|
||||||
assignLabel.setId(SPUIComponetIdProvider.SWM_DTLS_MAX_ASSIGN);
|
assignLabel.setId(SPUIComponentIdProvider.SWM_DTLS_MAX_ASSIGN);
|
||||||
detailsTabLayout.addComponent(assignLabel);
|
detailsTabLayout.addComponent(assignLabel);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -143,7 +143,7 @@ public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLay
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getDetailsHeaderCaptionId() {
|
protected String getDetailsHeaderCaptionId() {
|
||||||
return SPUIComponetIdProvider.TARGET_DETAILS_HEADER_LABEL_ID;
|
return SPUIComponentIdProvider.TARGET_DETAILS_HEADER_LABEL_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import org.eclipse.hawkbit.ui.distributions.event.DistributionsViewAcceptCriteri
|
|||||||
import org.eclipse.hawkbit.ui.distributions.event.SaveActionWindowEvent;
|
import org.eclipse.hawkbit.ui.distributions.event.SaveActionWindowEvent;
|
||||||
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -126,7 +126,7 @@ public class SwModuleTable extends AbstractNamedVersionTable<SoftwareModule, Lon
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getTableId() {
|
protected String getTableId() {
|
||||||
return SPUIComponetIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE;
|
return SPUIComponentIdProvider.UPLOAD_SOFTWARE_MODULE_TABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -309,7 +309,7 @@ public class SwModuleTable extends AbstractNamedVersionTable<SoftwareModule, Lon
|
|||||||
|
|
||||||
private Button createShowArtifactDtlsButton(final String nameVersionStr) {
|
private Button createShowArtifactDtlsButton(final String nameVersionStr) {
|
||||||
final Button showArtifactDtlsBtn = SPUIComponentProvider.getButton(
|
final Button showArtifactDtlsBtn = SPUIComponentProvider.getButton(
|
||||||
SPUIComponetIdProvider.SW_TABLE_ATRTIFACT_DETAILS_ICON + "." + nameVersionStr, "", "", null, false,
|
SPUIComponentIdProvider.SW_TABLE_ATRTIFACT_DETAILS_ICON + "." + nameVersionStr, "", "", null, false,
|
||||||
FontAwesome.LIST_ALT, SPUIButtonStyleSmallNoBorder.class);
|
FontAwesome.LIST_ALT, SPUIButtonStyleSmallNoBorder.class);
|
||||||
showArtifactDtlsBtn.addStyleName(SPUIStyleDefinitions.ARTIFACT_DTLS_ICON);
|
showArtifactDtlsBtn.addStyleName(SPUIStyleDefinitions.ARTIFACT_DTLS_ICON);
|
||||||
showArtifactDtlsBtn.setDescription(i18n.get("tooltip.artifact.icon"));
|
showArtifactDtlsBtn.setDescription(i18n.get("tooltip.artifact.icon"));
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import org.eclipse.hawkbit.ui.common.table.AbstractTableHeader;
|
|||||||
import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType;
|
import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType;
|
||||||
import org.eclipse.hawkbit.ui.distributions.event.DistributionsUIEvent;
|
import org.eclipse.hawkbit.ui.distributions.event.DistributionsUIEvent;
|
||||||
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventScope;
|
import org.vaadin.spring.events.EventScope;
|
||||||
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
||||||
@@ -57,17 +57,17 @@ public class SwModuleTableHeader extends AbstractTableHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getSearchBoxId() {
|
protected String getSearchBoxId() {
|
||||||
return SPUIComponetIdProvider.SW_MODULE_SEARCH_TEXT_FIELD;
|
return SPUIComponentIdProvider.SW_MODULE_SEARCH_TEXT_FIELD;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getSearchRestIconId() {
|
protected String getSearchRestIconId() {
|
||||||
return SPUIComponetIdProvider.SW_MODULE_SEARCH_RESET_ICON;
|
return SPUIComponentIdProvider.SW_MODULE_SEARCH_RESET_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getAddIconId() {
|
protected String getAddIconId() {
|
||||||
return SPUIComponetIdProvider.SW_MODULE_ADD_BUTTON;
|
return SPUIComponentIdProvider.SW_MODULE_ADD_BUTTON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -116,7 +116,7 @@ public class SwModuleTableHeader extends AbstractTableHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getMaxMinIconId() {
|
protected String getMaxMinIconId() {
|
||||||
return SPUIComponetIdProvider.SW_MAX_MIN_TABLE_ICON;
|
return SPUIComponentIdProvider.SW_MAX_MIN_TABLE_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterButtons;
|
|||||||
import org.eclipse.hawkbit.ui.distributions.event.DistributionsViewAcceptCriteria;
|
import org.eclipse.hawkbit.ui.distributions.event.DistributionsViewAcceptCriteria;
|
||||||
import org.eclipse.hawkbit.ui.distributions.event.SaveActionWindowEvent;
|
import org.eclipse.hawkbit.ui.distributions.event.SaveActionWindowEvent;
|
||||||
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -51,7 +51,7 @@ public class DistSMTypeFilterButtons extends AbstractFilterButtons {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getButtonsTableId() {
|
protected String getButtonsTableId() {
|
||||||
return SPUIComponetIdProvider.SW_MODULE_TYPE_TABLE_ID;
|
return SPUIComponentIdProvider.SW_MODULE_TYPE_TABLE_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -76,7 +76,7 @@ public class DistSMTypeFilterButtons extends AbstractFilterButtons {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String createButtonId(final String name) {
|
protected String createButtonId(final String name) {
|
||||||
return SPUIComponetIdProvider.SM_TYPE_FILTER_BTN_ID + name;
|
return SPUIComponentIdProvider.SM_TYPE_FILTER_BTN_ID + name;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import org.eclipse.hawkbit.ui.artifacts.smtype.CreateUpdateSoftwareTypeLayout;
|
|||||||
import org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader;
|
import org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader;
|
||||||
import org.eclipse.hawkbit.ui.distributions.event.DistributionsUIEvent;
|
import org.eclipse.hawkbit.ui.distributions.event.DistributionsUIEvent;
|
||||||
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -51,7 +51,7 @@ public class DistSMTypeFilterHeader extends AbstractFilterHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getHideButtonId() {
|
protected String getHideButtonId() {
|
||||||
return SPUIComponetIdProvider.SM_SHOW_FILTER_BUTTON_ID;
|
return SPUIComponentIdProvider.SM_SHOW_FILTER_BUTTON_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
|||||||
import org.eclipse.hawkbit.ui.filtermanagement.event.CustomFilterUIEvent;
|
import org.eclipse.hawkbit.ui.filtermanagement.event.CustomFilterUIEvent;
|
||||||
import org.eclipse.hawkbit.ui.filtermanagement.state.FilterManagementUIState;
|
import org.eclipse.hawkbit.ui.filtermanagement.state.FilterManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.UINotification;
|
import org.eclipse.hawkbit.ui.utils.UINotification;
|
||||||
@@ -201,7 +201,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
|
|||||||
statusIcon.setContentMode(ContentMode.HTML);
|
statusIcon.setContentMode(ContentMode.HTML);
|
||||||
statusIcon.setSizeFull();
|
statusIcon.setSizeFull();
|
||||||
setInitialStatusIconStyle(statusIcon);
|
setInitialStatusIconStyle(statusIcon);
|
||||||
statusIcon.setId(SPUIComponetIdProvider.VALIDATION_STATUS_ICON_ID);
|
statusIcon.setId(SPUIComponentIdProvider.VALIDATION_STATUS_ICON_ID);
|
||||||
return statusIcon;
|
return statusIcon;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -218,7 +218,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
|
|||||||
SPUILabelDefinitions.SP_WIDGET_CAPTION);
|
SPUILabelDefinitions.SP_WIDGET_CAPTION);
|
||||||
|
|
||||||
nameLabel = SPUIComponentProvider.getLabel("", SPUILabelDefinitions.SP_LABEL_SIMPLE);
|
nameLabel = SPUIComponentProvider.getLabel("", SPUILabelDefinitions.SP_LABEL_SIMPLE);
|
||||||
nameLabel.setId(SPUIComponetIdProvider.TARGET_FILTER_QUERY_NAME_LABEL_ID);
|
nameLabel.setId(SPUIComponentIdProvider.TARGET_FILTER_QUERY_NAME_LABEL_ID);
|
||||||
|
|
||||||
nameTextField = createNameTextField();
|
nameTextField = createNameTextField();
|
||||||
nameTextField.setWidth(380, Unit.PIXELS);
|
nameTextField.setWidth(380, Unit.PIXELS);
|
||||||
@@ -248,7 +248,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
|
|||||||
private TextField createNameTextField() {
|
private TextField createNameTextField() {
|
||||||
final TextField nameField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, false, null,
|
final TextField nameField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, false, null,
|
||||||
i18n.get("textfield.customfiltername"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
i18n.get("textfield.customfiltername"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
||||||
nameField.setId(SPUIComponetIdProvider.CUSTOM_FILTER_ADD_NAME);
|
nameField.setId(SPUIComponentIdProvider.CUSTOM_FILTER_ADD_NAME);
|
||||||
nameField.setPropertyDataSource(nameLabel);
|
nameField.setPropertyDataSource(nameLabel);
|
||||||
nameField.addTextChangeListener(event -> onFilterNameChange(event));
|
nameField.addTextChangeListener(event -> onFilterNameChange(event));
|
||||||
return nameField;
|
return nameField;
|
||||||
@@ -294,7 +294,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
|
|||||||
private void buildLayout() {
|
private void buildLayout() {
|
||||||
captionLayout = new HorizontalLayout();
|
captionLayout = new HorizontalLayout();
|
||||||
captionLayout.setDescription(i18n.get("tooltip.click.to.edit"));
|
captionLayout.setDescription(i18n.get("tooltip.click.to.edit"));
|
||||||
captionLayout.setId(SPUIComponetIdProvider.TARGET_FILTER_QUERY_NAME_LAYOUT_ID);
|
captionLayout.setId(SPUIComponentIdProvider.TARGET_FILTER_QUERY_NAME_LAYOUT_ID);
|
||||||
|
|
||||||
titleFilterIconsLayout = new HorizontalLayout();
|
titleFilterIconsLayout = new HorizontalLayout();
|
||||||
titleFilterIconsLayout.addComponents(headerCaption, captionLayout);
|
titleFilterIconsLayout.addComponents(headerCaption, captionLayout);
|
||||||
@@ -468,8 +468,8 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Button createSaveButton() {
|
private Button createSaveButton() {
|
||||||
saveButton = SPUIComponentProvider.getButton(SPUIComponetIdProvider.CUSTOM_FILTER_SAVE_ICON,
|
saveButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.CUSTOM_FILTER_SAVE_ICON,
|
||||||
SPUIComponetIdProvider.CUSTOM_FILTER_SAVE_ICON, "Save", null, false, FontAwesome.SAVE,
|
SPUIComponentIdProvider.CUSTOM_FILTER_SAVE_ICON, "Save", null, false, FontAwesome.SAVE,
|
||||||
SPUIButtonStyleSmallNoBorder.class);
|
SPUIButtonStyleSmallNoBorder.class);
|
||||||
saveButton.addClickListener(this);
|
saveButton.addClickListener(this);
|
||||||
saveButton.setEnabled(false);
|
saveButton.setEnabled(false);
|
||||||
@@ -484,7 +484,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void buttonClick(final ClickEvent event) {
|
public void buttonClick(final ClickEvent event) {
|
||||||
if (SPUIComponetIdProvider.CUSTOM_FILTER_SAVE_ICON.equals(event.getComponent().getId())
|
if (SPUIComponentIdProvider.CUSTOM_FILTER_SAVE_ICON.equals(event.getComponent().getId())
|
||||||
&& manadatoryFieldsPresent()) {
|
&& manadatoryFieldsPresent()) {
|
||||||
if (filterManagementUIState.isCreateFilterViewDisplayed()) {
|
if (filterManagementUIState.isCreateFilterViewDisplayed()) {
|
||||||
if (!doesAlreadyExists()) {
|
if (!doesAlreadyExists()) {
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import org.eclipse.hawkbit.ui.filtermanagement.event.CustomFilterUIEvent;
|
|||||||
import org.eclipse.hawkbit.ui.filtermanagement.state.FilterManagementUIState;
|
import org.eclipse.hawkbit.ui.filtermanagement.state.FilterManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.AssignInstalledDSTooltipGenerator;
|
import org.eclipse.hawkbit.ui.utils.AssignInstalledDSTooltipGenerator;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.TableColumn;
|
import org.eclipse.hawkbit.ui.utils.TableColumn;
|
||||||
@@ -90,7 +90,7 @@ public class CreateOrUpdateFilterTable extends Table {
|
|||||||
addCustomGeneratedColumns();
|
addCustomGeneratedColumns();
|
||||||
restoreOnLoad();
|
restoreOnLoad();
|
||||||
populateTableData();
|
populateTableData();
|
||||||
setId(SPUIComponetIdProvider.CUSTOM_FILTER_TARGET_TABLE_ID);
|
setId(SPUIComponentIdProvider.CUSTOM_FILTER_TARGET_TABLE_ID);
|
||||||
setSelectable(false);
|
setSelectable(false);
|
||||||
eventBus.subscribe(this);
|
eventBus.subscribe(this);
|
||||||
setItemDescriptionGenerator(new AssignInstalledDSTooltipGenerator());
|
setItemDescriptionGenerator(new AssignInstalledDSTooltipGenerator());
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
|||||||
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
||||||
import org.eclipse.hawkbit.ui.filtermanagement.event.CustomFilterUIEvent;
|
import org.eclipse.hawkbit.ui.filtermanagement.event.CustomFilterUIEvent;
|
||||||
import org.eclipse.hawkbit.ui.filtermanagement.state.FilterManagementUIState;
|
import org.eclipse.hawkbit.ui.filtermanagement.state.FilterManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -108,7 +108,7 @@ public class TargetFilterHeader extends VerticalLayout {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Button createAddButton() {
|
private Button createAddButton() {
|
||||||
final Button button = SPUIComponentProvider.getButton(SPUIComponetIdProvider.TARGET_FILTER_ADD_ICON_ID, "", "",
|
final Button button = SPUIComponentProvider.getButton(SPUIComponentIdProvider.TARGET_FILTER_ADD_ICON_ID, "", "",
|
||||||
null, false, FontAwesome.PLUS, SPUIButtonStyleSmallNoBorder.class);
|
null, false, FontAwesome.PLUS, SPUIButtonStyleSmallNoBorder.class);
|
||||||
button.addClickListener(event -> addNewFilter());
|
button.addClickListener(event -> addNewFilter());
|
||||||
return button;
|
return button;
|
||||||
@@ -176,7 +176,7 @@ public class TargetFilterHeader extends VerticalLayout {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private String getSearchRestIconId() {
|
private String getSearchRestIconId() {
|
||||||
return SPUIComponetIdProvider.TARGET_FILTER_TBL_SEARCH_RESET_ID;
|
return SPUIComponentIdProvider.TARGET_FILTER_TBL_SEARCH_RESET_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void resetSearchText() {
|
protected void resetSearchText() {
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
|||||||
import org.eclipse.hawkbit.ui.filtermanagement.event.CustomFilterUIEvent;
|
import org.eclipse.hawkbit.ui.filtermanagement.event.CustomFilterUIEvent;
|
||||||
import org.eclipse.hawkbit.ui.filtermanagement.state.FilterManagementUIState;
|
import org.eclipse.hawkbit.ui.filtermanagement.state.FilterManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.TableColumn;
|
import org.eclipse.hawkbit.ui.utils.TableColumn;
|
||||||
@@ -94,7 +94,7 @@ public class TargetFilterTable extends Table {
|
|||||||
populateTableData();
|
populateTableData();
|
||||||
setColumnCollapsingAllowed(true);
|
setColumnCollapsingAllowed(true);
|
||||||
setColumnProperties();
|
setColumnProperties();
|
||||||
setId(SPUIComponetIdProvider.TAEGET_FILTER_TABLE_ID);
|
setId(SPUIComponentIdProvider.TAEGET_FILTER_TABLE_ID);
|
||||||
eventBus.subscribe(this);
|
eventBus.subscribe(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -172,7 +172,7 @@ public class TargetFilterTable extends Table {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private String getDeleteIconId(final String targetFilterName) {
|
private String getDeleteIconId(final String targetFilterName) {
|
||||||
return new StringBuilder(SPUIComponetIdProvider.CUSTOM_FILTER_DELETE_ICON).append('.').append(targetFilterName)
|
return new StringBuilder(SPUIComponentIdProvider.CUSTOM_FILTER_DELETE_ICON).append('.').append(targetFilterName)
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -241,7 +241,7 @@ public class TargetFilterTable extends Table {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static String getDetailLinkId(final String filterName) {
|
private static String getDetailLinkId(final String filterName) {
|
||||||
return new StringBuilder(SPUIComponetIdProvider.CUSTOM_FILTER_DETAIL_LINK).append('.').append(filterName)
|
return new StringBuilder(SPUIComponentIdProvider.CUSTOM_FILTER_DETAIL_LINK).append('.').append(filterName)
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import org.eclipse.hawkbit.ui.filtermanagement.event.CustomFilterUIEvent;
|
|||||||
import org.eclipse.hawkbit.ui.filtermanagement.state.FilterManagementUIState;
|
import org.eclipse.hawkbit.ui.filtermanagement.state.FilterManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -79,7 +79,7 @@ public class TargetFilterCountMessageLabel extends Label {
|
|||||||
private void applyStyle() {
|
private void applyStyle() {
|
||||||
addStyleName(SPUILabelDefinitions.SP_LABEL_MESSAGE_STYLE);
|
addStyleName(SPUILabelDefinitions.SP_LABEL_MESSAGE_STYLE);
|
||||||
setContentMode(ContentMode.HTML);
|
setContentMode(ContentMode.HTML);
|
||||||
setId(SPUIComponetIdProvider.COUNT_LABEL);
|
setId(SPUIComponentIdProvider.COUNT_LABEL);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void displayTargetFilterMessage() {
|
private void displayTargetFilterMessage() {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import org.eclipse.hawkbit.im.authentication.TenantUserPasswordAuthenticationTok
|
|||||||
import org.eclipse.hawkbit.ui.UiProperties;
|
import org.eclipse.hawkbit.ui.UiProperties;
|
||||||
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -225,7 +225,7 @@ public class LoginView extends VerticalLayout implements View {
|
|||||||
final String linkStyle = "v-link";
|
final String linkStyle = "v-link";
|
||||||
|
|
||||||
if (!uiProperties.getLinks().getDocumentation().getRoot().isEmpty()) {
|
if (!uiProperties.getLinks().getDocumentation().getRoot().isEmpty()) {
|
||||||
final Link docuLink = SPUIComponentProvider.getLink(SPUIComponetIdProvider.LINK_DOCUMENTATION,
|
final Link docuLink = SPUIComponentProvider.getLink(SPUIComponentIdProvider.LINK_DOCUMENTATION,
|
||||||
i18n.get("link.documentation.name"), uiProperties.getLinks().getDocumentation().getRoot(),
|
i18n.get("link.documentation.name"), uiProperties.getLinks().getDocumentation().getRoot(),
|
||||||
FontAwesome.QUESTION_CIRCLE, "_blank", linkStyle, true);
|
FontAwesome.QUESTION_CIRCLE, "_blank", linkStyle, true);
|
||||||
links.addComponent(docuLink);
|
links.addComponent(docuLink);
|
||||||
@@ -233,14 +233,14 @@ public class LoginView extends VerticalLayout implements View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!uiProperties.getDemo().getUser().isEmpty()) {
|
if (!uiProperties.getDemo().getUser().isEmpty()) {
|
||||||
final Link demoLink = SPUIComponentProvider.getLink(SPUIComponetIdProvider.LINK_DEMO,
|
final Link demoLink = SPUIComponentProvider.getLink(SPUIComponentIdProvider.LINK_DEMO,
|
||||||
i18n.get("link.demo.name"), "?demo", FontAwesome.DESKTOP, "_top", linkStyle, true);
|
i18n.get("link.demo.name"), "?demo", FontAwesome.DESKTOP, "_top", linkStyle, true);
|
||||||
links.addComponent(demoLink);
|
links.addComponent(demoLink);
|
||||||
demoLink.addStyleName(ValoTheme.LINK_SMALL);
|
demoLink.addStyleName(ValoTheme.LINK_SMALL);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!uiProperties.getLinks().getRequestAccount().isEmpty()) {
|
if (!uiProperties.getLinks().getRequestAccount().isEmpty()) {
|
||||||
final Link requestAccountLink = SPUIComponentProvider.getLink(SPUIComponetIdProvider.LINK_REQUESTACCOUNT,
|
final Link requestAccountLink = SPUIComponentProvider.getLink(SPUIComponentIdProvider.LINK_REQUESTACCOUNT,
|
||||||
i18n.get("link.requestaccount.name"), uiProperties.getLinks().getRequestAccount(),
|
i18n.get("link.requestaccount.name"), uiProperties.getLinks().getRequestAccount(),
|
||||||
FontAwesome.SHOPPING_CART, "", linkStyle, true);
|
FontAwesome.SHOPPING_CART, "", linkStyle, true);
|
||||||
links.addComponent(requestAccountLink);
|
links.addComponent(requestAccountLink);
|
||||||
@@ -248,7 +248,7 @@ public class LoginView extends VerticalLayout implements View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!uiProperties.getLinks().getUserManagement().isEmpty()) {
|
if (!uiProperties.getLinks().getUserManagement().isEmpty()) {
|
||||||
final Link userManagementLink = SPUIComponentProvider.getLink(SPUIComponetIdProvider.LINK_USERMANAGEMENT,
|
final Link userManagementLink = SPUIComponentProvider.getLink(SPUIComponentIdProvider.LINK_USERMANAGEMENT,
|
||||||
i18n.get("link.usermanagement.name"), uiProperties.getLinks().getUserManagement(),
|
i18n.get("link.usermanagement.name"), uiProperties.getLinks().getUserManagement(),
|
||||||
FontAwesome.USERS, "_blank", linkStyle, true);
|
FontAwesome.USERS, "_blank", linkStyle, true);
|
||||||
links.addComponent(userManagementLink);
|
links.addComponent(userManagementLink);
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
|||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPDateTimeUtil;
|
import org.eclipse.hawkbit.ui.utils.SPDateTimeUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.UINotification;
|
import org.eclipse.hawkbit.ui.utils.UINotification;
|
||||||
@@ -158,7 +158,7 @@ public class ActionHistoryTable extends TreeTable implements Handler {
|
|||||||
|
|
||||||
private void initializeTableSettings() {
|
private void initializeTableSettings() {
|
||||||
|
|
||||||
setId(SPUIComponetIdProvider.ACTION_HISTORY_TABLE_ID);
|
setId(SPUIComponentIdProvider.ACTION_HISTORY_TABLE_ID);
|
||||||
setSelectable(false);
|
setSelectable(false);
|
||||||
setMultiSelect(false);
|
setMultiSelect(false);
|
||||||
setSortEnabled(true);
|
setSortEnabled(true);
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent;
|
|||||||
import org.eclipse.hawkbit.ui.management.event.DragEvent;
|
import org.eclipse.hawkbit.ui.management.event.DragEvent;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -158,23 +158,23 @@ public class DistributionAddUpdateWindowLayout extends VerticalLayout {
|
|||||||
private void createRequiredComponents() {
|
private void createRequiredComponents() {
|
||||||
distNameTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
distNameTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
||||||
i18n.get("textfield.name"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
i18n.get("textfield.name"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
||||||
distNameTextField.setId(SPUIComponetIdProvider.DIST_ADD_NAME);
|
distNameTextField.setId(SPUIComponentIdProvider.DIST_ADD_NAME);
|
||||||
distNameTextField.setNullRepresentation("");
|
distNameTextField.setNullRepresentation("");
|
||||||
|
|
||||||
distVersionTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
distVersionTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
||||||
i18n.get("textfield.version"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
i18n.get("textfield.version"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
||||||
distVersionTextField.setId(SPUIComponetIdProvider.DIST_ADD_VERSION);
|
distVersionTextField.setId(SPUIComponentIdProvider.DIST_ADD_VERSION);
|
||||||
distVersionTextField.setNullRepresentation("");
|
distVersionTextField.setNullRepresentation("");
|
||||||
|
|
||||||
distsetTypeNameComboBox = SPUIComponentProvider.getComboBox("", "", null, "", false, "",
|
distsetTypeNameComboBox = SPUIComponentProvider.getComboBox("", "", null, "", false, "",
|
||||||
i18n.get("label.combobox.type"));
|
i18n.get("label.combobox.type"));
|
||||||
distsetTypeNameComboBox.setImmediate(true);
|
distsetTypeNameComboBox.setImmediate(true);
|
||||||
distsetTypeNameComboBox.setNullSelectionAllowed(false);
|
distsetTypeNameComboBox.setNullSelectionAllowed(false);
|
||||||
distsetTypeNameComboBox.setId(SPUIComponetIdProvider.DIST_ADD_DISTSETTYPE);
|
distsetTypeNameComboBox.setId(SPUIComponentIdProvider.DIST_ADD_DISTSETTYPE);
|
||||||
|
|
||||||
descTextArea = SPUIComponentProvider.getTextArea("text-area-style", ValoTheme.TEXTAREA_TINY, false, null,
|
descTextArea = SPUIComponentProvider.getTextArea("text-area-style", ValoTheme.TEXTAREA_TINY, false, null,
|
||||||
i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH);
|
i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH);
|
||||||
descTextArea.setId(SPUIComponetIdProvider.DIST_ADD_DESC);
|
descTextArea.setId(SPUIComponentIdProvider.DIST_ADD_DESC);
|
||||||
descTextArea.setNullRepresentation("");
|
descTextArea.setNullRepresentation("");
|
||||||
|
|
||||||
/* Label for mandatory symbol */
|
/* Label for mandatory symbol */
|
||||||
@@ -184,15 +184,15 @@ public class DistributionAddUpdateWindowLayout extends VerticalLayout {
|
|||||||
reqMigStepCheckbox = SPUIComponentProvider.getCheckBox(i18n.get("checkbox.dist.required.migration.step"),
|
reqMigStepCheckbox = SPUIComponentProvider.getCheckBox(i18n.get("checkbox.dist.required.migration.step"),
|
||||||
"dist-checkbox-style", null, false, "");
|
"dist-checkbox-style", null, false, "");
|
||||||
reqMigStepCheckbox.addStyleName(ValoTheme.CHECKBOX_SMALL);
|
reqMigStepCheckbox.addStyleName(ValoTheme.CHECKBOX_SMALL);
|
||||||
reqMigStepCheckbox.setId(SPUIComponetIdProvider.DIST_ADD_MIGRATION_CHECK);
|
reqMigStepCheckbox.setId(SPUIComponentIdProvider.DIST_ADD_MIGRATION_CHECK);
|
||||||
|
|
||||||
/* save or update button */
|
/* save or update button */
|
||||||
saveDistributionBtn = SPUIComponentProvider.getButton(SPUIComponetIdProvider.DIST_ADD_SAVE, "", "", "", true,
|
saveDistributionBtn = SPUIComponentProvider.getButton(SPUIComponentIdProvider.DIST_ADD_SAVE, "", "", "", true,
|
||||||
FontAwesome.SAVE, SPUIButtonStyleSmallNoBorder.class);
|
FontAwesome.SAVE, SPUIButtonStyleSmallNoBorder.class);
|
||||||
saveDistributionBtn.addClickListener(event -> saveDistribution());
|
saveDistributionBtn.addClickListener(event -> saveDistribution());
|
||||||
|
|
||||||
/* close button */
|
/* close button */
|
||||||
discardDistributionBtn = SPUIComponentProvider.getButton(SPUIComponetIdProvider.DIST_ADD_DISCARD, "", "", "",
|
discardDistributionBtn = SPUIComponentProvider.getButton(SPUIComponentIdProvider.DIST_ADD_DISCARD, "", "", "",
|
||||||
true, FontAwesome.TIMES, SPUIButtonStyleSmallNoBorder.class);
|
true, FontAwesome.TIMES, SPUIButtonStyleSmallNoBorder.class);
|
||||||
discardDistributionBtn.addClickListener(event -> discardDistribution());
|
discardDistributionBtn.addClickListener(event -> discardDistribution());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import org.eclipse.hawkbit.ui.common.tagdetails.DistributionTagToken;
|
|||||||
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
||||||
import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent;
|
import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent;
|
||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventScope;
|
import org.vaadin.spring.events.EventScope;
|
||||||
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
||||||
@@ -86,7 +86,7 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getEditButtonId() {
|
protected String getEditButtonId() {
|
||||||
return SPUIComponetIdProvider.DS_EDIT_BUTTON;
|
return SPUIComponentIdProvider.DS_EDIT_BUTTON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -107,7 +107,7 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getTabSheetId() {
|
protected String getTabSheetId() {
|
||||||
return SPUIComponetIdProvider.DISTRIBUTION_DETAILS_TABSHEET;
|
return SPUIComponentIdProvider.DISTRIBUTION_DETAILS_TABSHEET;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -132,7 +132,7 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
|
|||||||
if (type != null) {
|
if (type != null) {
|
||||||
final Label typeLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.dist.details.type"),
|
final Label typeLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.dist.details.type"),
|
||||||
type);
|
type);
|
||||||
typeLabel.setId(SPUIComponetIdProvider.DETAILS_TYPE_LABEL_ID);
|
typeLabel.setId(SPUIComponentIdProvider.DETAILS_TYPE_LABEL_ID);
|
||||||
detailsTabLayout.addComponent(typeLabel);
|
detailsTabLayout.addComponent(typeLabel);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,7 +158,7 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getDetailsHeaderCaptionId() {
|
protected String getDetailsHeaderCaptionId() {
|
||||||
return SPUIComponetIdProvider.DISTRIBUTION_DETAILS_HEADER_LABEL_ID;
|
return SPUIComponentIdProvider.DISTRIBUTION_DETAILS_HEADER_LABEL_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ import org.eclipse.hawkbit.ui.management.event.PinUnpinEvent;
|
|||||||
import org.eclipse.hawkbit.ui.management.event.SaveActionWindowEvent;
|
import org.eclipse.hawkbit.ui.management.event.SaveActionWindowEvent;
|
||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -176,7 +176,7 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getTableId() {
|
protected String getTableId() {
|
||||||
return SPUIComponetIdProvider.DIST_TABLE_ID;
|
return SPUIComponentIdProvider.DIST_TABLE_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -393,7 +393,7 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
|
|||||||
notification.displayValidationError(i18n.get("message.permission.insufficient"));
|
notification.displayValidationError(i18n.get("message.permission.insufficient"));
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
if (compsource instanceof Table && !compsource.getId().equals(SPUIComponetIdProvider.TARGET_TABLE_ID)) {
|
if (compsource instanceof Table && !compsource.getId().equals(SPUIComponentIdProvider.TARGET_TABLE_ID)) {
|
||||||
notification.displayValidationError(notAllowedMsg);
|
notification.displayValidationError(notAllowedMsg);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -607,7 +607,7 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
|
|||||||
}
|
}
|
||||||
|
|
||||||
private String getPinButtonId(final String distName, final String distVersion) {
|
private String getPinButtonId(final String distName, final String distVersion) {
|
||||||
final StringBuilder pinBtnId = new StringBuilder(SPUIComponetIdProvider.DIST_PIN_BUTTON);
|
final StringBuilder pinBtnId = new StringBuilder(SPUIComponentIdProvider.DIST_PIN_BUTTON);
|
||||||
pinBtnId.append('.');
|
pinBtnId.append('.');
|
||||||
pinBtnId.append(distName);
|
pinBtnId.append(distName);
|
||||||
pinBtnId.append('.');
|
pinBtnId.append('.');
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import org.eclipse.hawkbit.ui.management.event.DistributionTableFilterEvent;
|
|||||||
import org.eclipse.hawkbit.ui.management.event.DragEvent;
|
import org.eclipse.hawkbit.ui.management.event.DragEvent;
|
||||||
import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent;
|
import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent;
|
||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventScope;
|
import org.vaadin.spring.events.EventScope;
|
||||||
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
|
||||||
@@ -59,17 +59,17 @@ public class DistributionTableHeader extends AbstractTableHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getSearchBoxId() {
|
protected String getSearchBoxId() {
|
||||||
return SPUIComponetIdProvider.DIST_SEARCH_TEXTFIELD;
|
return SPUIComponentIdProvider.DIST_SEARCH_TEXTFIELD;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getSearchRestIconId() {
|
protected String getSearchRestIconId() {
|
||||||
return SPUIComponetIdProvider.DIST_SEARCH_ICON;
|
return SPUIComponentIdProvider.DIST_SEARCH_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getAddIconId() {
|
protected String getAddIconId() {
|
||||||
return SPUIComponetIdProvider.DIST_ADD_ICON;
|
return SPUIComponentIdProvider.DIST_ADD_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -121,7 +121,7 @@ public class DistributionTableHeader extends AbstractTableHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getMaxMinIconId() {
|
protected String getMaxMinIconId() {
|
||||||
return SPUIComponetIdProvider.DS_MAX_MIN_TABLE_ICON;
|
return SPUIComponentIdProvider.DS_MAX_MIN_TABLE_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import org.eclipse.hawkbit.ui.management.event.DragEvent;
|
|||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.management.tag.TagIdName;
|
import org.eclipse.hawkbit.ui.management.tag.TagIdName;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -92,7 +92,7 @@ public class DistributionTagButtons extends AbstractFilterButtons {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getButtonsTableId() {
|
protected String getButtonsTableId() {
|
||||||
return SPUIComponetIdProvider.DISTRIBUTION_TAG_TABLE_ID;
|
return SPUIComponentIdProvider.DISTRIBUTION_TAG_TABLE_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader;
|
|||||||
import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent;
|
import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent;
|
||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
||||||
import com.vaadin.spring.annotation.SpringComponent;
|
import com.vaadin.spring.annotation.SpringComponent;
|
||||||
@@ -87,7 +87,7 @@ public class DistributionTagHeader extends AbstractFilterHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getConfigureFilterButtonId() {
|
protected String getConfigureFilterButtonId() {
|
||||||
return SPUIComponetIdProvider.ADD_DISTRIBUTION_TAG;
|
return SPUIComponentIdProvider.ADD_DISTRIBUTION_TAG;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import org.eclipse.hawkbit.ui.common.table.AbstractTable;
|
|||||||
import org.eclipse.hawkbit.ui.management.state.DistributionTableFilters;
|
import org.eclipse.hawkbit.ui.management.state.DistributionTableFilters;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.UINotification;
|
import org.eclipse.hawkbit.ui.utils.UINotification;
|
||||||
@@ -74,7 +74,7 @@ public class DistributionTagDropEvent implements DropHandler {
|
|||||||
final TableTransferable tbl = (TableTransferable) event.getTransferable();
|
final TableTransferable tbl = (TableTransferable) event.getTransferable();
|
||||||
final Table source = tbl.getSourceComponent();
|
final Table source = tbl.getSourceComponent();
|
||||||
|
|
||||||
if (source.getId().equals(SPUIComponetIdProvider.DIST_TABLE_ID)) {
|
if (source.getId().equals(SPUIComponentIdProvider.DIST_TABLE_ID)) {
|
||||||
processDistributionDrop(event);
|
processDistributionDrop(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,7 +118,7 @@ public class DistributionTagDropEvent implements DropHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean validateIfSourceIsDs(final Table source) {
|
private boolean validateIfSourceIsDs(final Table source) {
|
||||||
if (!source.getId().equals(SPUIComponetIdProvider.DIST_TABLE_ID)) {
|
if (!source.getId().equals(SPUIComponentIdProvider.DIST_TABLE_ID)) {
|
||||||
notification.displayValidationError(i18n.get(SPUILabelDefinitions.ACTION_NOT_ALLOWED));
|
notification.displayValidationError(i18n.get(SPUILabelDefinitions.ACTION_NOT_ALLOWED));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.eclipse.hawkbit.ui.common.AbstractAcceptCriteria;
|
import org.eclipse.hawkbit.ui.common.AbstractAcceptCriteria;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
|
|
||||||
import com.vaadin.spring.annotation.SpringComponent;
|
import com.vaadin.spring.annotation.SpringComponent;
|
||||||
@@ -70,34 +70,34 @@ public class ManagementViewAcceptCriteria extends AbstractAcceptCriteria {
|
|||||||
final Map<String, List<String>> config = new HashMap<>();
|
final Map<String, List<String>> config = new HashMap<>();
|
||||||
|
|
||||||
// Delete drop area acceptable components
|
// Delete drop area acceptable components
|
||||||
config.put(SPUIComponetIdProvider.DELETE_BUTTON_WRAPPER_ID,
|
config.put(SPUIComponentIdProvider.DELETE_BUTTON_WRAPPER_ID,
|
||||||
Arrays.asList(SPUIDefinitions.TARGET_TAG_ID_PREFIXS, SPUIComponetIdProvider.TARGET_TABLE_ID,
|
Arrays.asList(SPUIDefinitions.TARGET_TAG_ID_PREFIXS, SPUIComponentIdProvider.TARGET_TABLE_ID,
|
||||||
SPUIDefinitions.DISTRIBUTION_TAG_ID_PREFIXS, SPUIComponetIdProvider.DIST_TABLE_ID));
|
SPUIDefinitions.DISTRIBUTION_TAG_ID_PREFIXS, SPUIComponentIdProvider.DIST_TABLE_ID));
|
||||||
|
|
||||||
// Target Tag acceptable components
|
// Target Tag acceptable components
|
||||||
config.put(SPUIDefinitions.TARGET_TAG_ID_PREFIXS, Arrays.asList(SPUIComponetIdProvider.TARGET_TABLE_ID));
|
config.put(SPUIDefinitions.TARGET_TAG_ID_PREFIXS, Arrays.asList(SPUIComponentIdProvider.TARGET_TABLE_ID));
|
||||||
|
|
||||||
// Target table acceptable components
|
// Target table acceptable components
|
||||||
config.put(SPUIComponetIdProvider.TARGET_TABLE_ID,
|
config.put(SPUIComponentIdProvider.TARGET_TABLE_ID,
|
||||||
Arrays.asList(SPUIDefinitions.TARGET_TAG_ID_PREFIXS, SPUIComponetIdProvider.DIST_TABLE_ID));
|
Arrays.asList(SPUIDefinitions.TARGET_TAG_ID_PREFIXS, SPUIComponentIdProvider.DIST_TABLE_ID));
|
||||||
|
|
||||||
// Target table header acceptable components
|
// Target table header acceptable components
|
||||||
config.put(SPUIComponetIdProvider.TARGET_DROP_FILTER_ICON, Arrays.asList(SPUIComponetIdProvider.DIST_TABLE_ID));
|
config.put(SPUIComponentIdProvider.TARGET_DROP_FILTER_ICON, Arrays.asList(SPUIComponentIdProvider.DIST_TABLE_ID));
|
||||||
|
|
||||||
// Distribution table acceptable components
|
// Distribution table acceptable components
|
||||||
config.put(SPUIComponetIdProvider.DIST_TABLE_ID, Arrays.asList(SPUIDefinitions.TARGET_TAG_ID_PREFIXS,
|
config.put(SPUIComponentIdProvider.DIST_TABLE_ID, Arrays.asList(SPUIDefinitions.TARGET_TAG_ID_PREFIXS,
|
||||||
SPUIComponetIdProvider.TARGET_TABLE_ID, SPUIDefinitions.DISTRIBUTION_TAG_ID_PREFIXS));
|
SPUIComponentIdProvider.TARGET_TABLE_ID, SPUIDefinitions.DISTRIBUTION_TAG_ID_PREFIXS));
|
||||||
|
|
||||||
// Distribution tag acceptable components.
|
// Distribution tag acceptable components.
|
||||||
config.put(SPUIDefinitions.DISTRIBUTION_TAG_ID_PREFIXS, Arrays.asList(SPUIComponetIdProvider.DIST_TABLE_ID));
|
config.put(SPUIDefinitions.DISTRIBUTION_TAG_ID_PREFIXS, Arrays.asList(SPUIComponentIdProvider.DIST_TABLE_ID));
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Map<String, Object> createDropHintConfigurations() {
|
private static Map<String, Object> createDropHintConfigurations() {
|
||||||
final Map<String, Object> config = new HashMap<>();
|
final Map<String, Object> config = new HashMap<>();
|
||||||
config.put(SPUIDefinitions.TARGET_TAG_ID_PREFIXS, DragEvent.TARGET_TAG_DRAG);
|
config.put(SPUIDefinitions.TARGET_TAG_ID_PREFIXS, DragEvent.TARGET_TAG_DRAG);
|
||||||
config.put(SPUIComponetIdProvider.TARGET_TABLE_ID, DragEvent.TARGET_DRAG);
|
config.put(SPUIComponentIdProvider.TARGET_TABLE_ID, DragEvent.TARGET_DRAG);
|
||||||
config.put(SPUIComponetIdProvider.DIST_TABLE_ID, DragEvent.DISTRIBUTION_DRAG);
|
config.put(SPUIComponentIdProvider.DIST_TABLE_ID, DragEvent.DISTRIBUTION_DRAG);
|
||||||
config.put(SPUIDefinitions.DISTRIBUTION_TAG_ID_PREFIXS, DragEvent.DISTRIBUTION_TAG_DRAG);
|
config.put(SPUIDefinitions.DISTRIBUTION_TAG_ID_PREFIXS, DragEvent.DISTRIBUTION_TAG_DRAG);
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import org.eclipse.hawkbit.ui.management.state.TargetTableFilters;
|
|||||||
import org.eclipse.hawkbit.ui.management.targettable.TargetTable;
|
import org.eclipse.hawkbit.ui.management.targettable.TargetTable;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -125,7 +125,7 @@ public class CountMessageLabel extends Label {
|
|||||||
/* Create label for Targets count message displaying below the table */
|
/* Create label for Targets count message displaying below the table */
|
||||||
addStyleName(SPUILabelDefinitions.SP_LABEL_MESSAGE_STYLE);
|
addStyleName(SPUILabelDefinitions.SP_LABEL_MESSAGE_STYLE);
|
||||||
setContentMode(ContentMode.HTML);
|
setContentMode(ContentMode.HTML);
|
||||||
setId(SPUIComponetIdProvider.COUNT_LABEL);
|
setId(SPUIComponentIdProvider.COUNT_LABEL);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void displayTargetCountStatus() {
|
private void displayTargetCountStatus() {
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import org.eclipse.hawkbit.ui.management.event.TargetTableEvent;
|
|||||||
import org.eclipse.hawkbit.ui.management.event.TargetTableEvent.TargetComponentEvent;
|
import org.eclipse.hawkbit.ui.management.event.TargetTableEvent.TargetComponentEvent;
|
||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventScope;
|
import org.vaadin.spring.events.EventScope;
|
||||||
@@ -152,7 +152,7 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getDeleteAreaId() {
|
protected String getDeleteAreaId() {
|
||||||
return SPUIComponetIdProvider.DELETE_BUTTON_WRAPPER_ID;
|
return SPUIComponentIdProvider.DELETE_BUTTON_WRAPPER_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.eclipse.hawkbit.ui.management.footer;
|
package org.eclipse.hawkbit.ui.management.footer;
|
||||||
|
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
|
|
||||||
import com.vaadin.ui.Component;
|
import com.vaadin.ui.Component;
|
||||||
@@ -68,7 +68,7 @@ public final class DeleteActionsLayoutHelper {
|
|||||||
* @return true if it component is target table
|
* @return true if it component is target table
|
||||||
*/
|
*/
|
||||||
public static boolean isTargetTable(final Component source) {
|
public static boolean isTargetTable(final Component source) {
|
||||||
return SPUIComponetIdProvider.TARGET_TABLE_ID.equalsIgnoreCase(source.getId());
|
return SPUIComponentIdProvider.TARGET_TABLE_ID.equalsIgnoreCase(source.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -79,7 +79,7 @@ public final class DeleteActionsLayoutHelper {
|
|||||||
* @return true if it component is distribution table
|
* @return true if it component is distribution table
|
||||||
*/
|
*/
|
||||||
public static boolean isDistributionTable(final Component source) {
|
public static boolean isDistributionTable(final Component source) {
|
||||||
return SPUIComponetIdProvider.DIST_TABLE_ID.equalsIgnoreCase(source.getId());
|
return SPUIComponentIdProvider.DIST_TABLE_ID.equalsIgnoreCase(source.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ import org.eclipse.hawkbit.ui.management.event.SaveActionWindowEvent;
|
|||||||
import org.eclipse.hawkbit.ui.management.footer.ActionTypeOptionGroupLayout.ActionTypeOption;
|
import org.eclipse.hawkbit.ui.management.footer.ActionTypeOptionGroupLayout.ActionTypeOption;
|
||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -105,13 +105,13 @@ public class ManangementConfirmationWindowLayout extends AbstractConfirmationWin
|
|||||||
private ConfirmationTab createAssignmentTab() {
|
private ConfirmationTab createAssignmentTab() {
|
||||||
|
|
||||||
assignmnetTab = new ConfirmationTab();
|
assignmnetTab = new ConfirmationTab();
|
||||||
assignmnetTab.getConfirmAll().setId(SPUIComponetIdProvider.SAVE_ASSIGNMENT);
|
assignmnetTab.getConfirmAll().setId(SPUIComponentIdProvider.SAVE_ASSIGNMENT);
|
||||||
assignmnetTab.getConfirmAll().setIcon(FontAwesome.SAVE);
|
assignmnetTab.getConfirmAll().setIcon(FontAwesome.SAVE);
|
||||||
assignmnetTab.getConfirmAll().setCaption(i18n.get("button.assign.all"));
|
assignmnetTab.getConfirmAll().setCaption(i18n.get("button.assign.all"));
|
||||||
assignmnetTab.getConfirmAll().addClickListener(event -> saveAllAssignments(assignmnetTab));
|
assignmnetTab.getConfirmAll().addClickListener(event -> saveAllAssignments(assignmnetTab));
|
||||||
|
|
||||||
assignmnetTab.getDiscardAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DISCARD_ALL));
|
assignmnetTab.getDiscardAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DISCARD_ALL));
|
||||||
assignmnetTab.getDiscardAll().setId(SPUIComponetIdProvider.DISCARD_ASSIGNMENT);
|
assignmnetTab.getDiscardAll().setId(SPUIComponentIdProvider.DISCARD_ASSIGNMENT);
|
||||||
assignmnetTab.getDiscardAll().addClickListener(event -> discardAllAssignments(assignmnetTab));
|
assignmnetTab.getDiscardAll().addClickListener(event -> discardAllAssignments(assignmnetTab));
|
||||||
|
|
||||||
// Add items container to the table.
|
// Add items container to the table.
|
||||||
@@ -275,7 +275,7 @@ public class ManangementConfirmationWindowLayout extends AbstractConfirmationWin
|
|||||||
final ConfirmationTab tab = new ConfirmationTab();
|
final ConfirmationTab tab = new ConfirmationTab();
|
||||||
|
|
||||||
// TobeDone ? y to set caption every time??
|
// TobeDone ? y to set caption every time??
|
||||||
tab.getConfirmAll().setId(SPUIComponetIdProvider.TARGET_DELETE_ALL);
|
tab.getConfirmAll().setId(SPUIComponentIdProvider.TARGET_DELETE_ALL);
|
||||||
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
||||||
tab.getConfirmAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DELETE_ALL));
|
tab.getConfirmAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DELETE_ALL));
|
||||||
tab.getConfirmAll().addClickListener(event -> deleteAllTargets(tab));
|
tab.getConfirmAll().addClickListener(event -> deleteAllTargets(tab));
|
||||||
@@ -308,7 +308,7 @@ public class ManangementConfirmationWindowLayout extends AbstractConfirmationWin
|
|||||||
final ConfirmationTab tab = new ConfirmationTab();
|
final ConfirmationTab tab = new ConfirmationTab();
|
||||||
|
|
||||||
// TobeDone ? y to set caption every time??
|
// TobeDone ? y to set caption every time??
|
||||||
tab.getConfirmAll().setId(SPUIComponetIdProvider.DIST_DELETE_ALL);
|
tab.getConfirmAll().setId(SPUIComponentIdProvider.DIST_DELETE_ALL);
|
||||||
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
tab.getConfirmAll().setIcon(FontAwesome.TRASH_O);
|
||||||
tab.getConfirmAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DELETE_ALL));
|
tab.getConfirmAll().setCaption(i18n.get(SPUILabelDefinitions.BUTTON_DELETE_ALL));
|
||||||
tab.getConfirmAll().addClickListener(event -> deleteAllDistributions(tab));
|
tab.getConfirmAll().addClickListener(event -> deleteAllDistributions(tab));
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
|||||||
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -193,7 +193,7 @@ public abstract class CreateUpdateTagLayout extends CustomComponent implements C
|
|||||||
discardTag.addStyleName(ValoTheme.BUTTON_BORDERLESS);
|
discardTag.addStyleName(ValoTheme.BUTTON_BORDERLESS);
|
||||||
|
|
||||||
tagColorPreviewBtn = new Button();
|
tagColorPreviewBtn = new Button();
|
||||||
tagColorPreviewBtn.setId(SPUIComponetIdProvider.TAG_COLOR_PREVIEW_ID);
|
tagColorPreviewBtn.setId(SPUIComponentIdProvider.TAG_COLOR_PREVIEW_ID);
|
||||||
getPreviewButtonColor(DEFAULT_COLOR);
|
getPreviewButtonColor(DEFAULT_COLOR);
|
||||||
tagColorPreviewBtn.setStyleName(TAG_DYNAMIC_STYLE);
|
tagColorPreviewBtn.setStyleName(TAG_DYNAMIC_STYLE);
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import org.eclipse.hawkbit.ui.management.event.DragEvent;
|
|||||||
import org.eclipse.hawkbit.ui.management.event.TargetTableEvent;
|
import org.eclipse.hawkbit.ui.management.event.TargetTableEvent;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -102,17 +102,17 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
|
|||||||
/* Textfield for controller Id */
|
/* Textfield for controller Id */
|
||||||
controllerIDTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
controllerIDTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
||||||
i18n.get("prompt.target.id"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
i18n.get("prompt.target.id"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
||||||
controllerIDTextField.setId(SPUIComponetIdProvider.TARGET_ADD_CONTROLLER_ID);
|
controllerIDTextField.setId(SPUIComponentIdProvider.TARGET_ADD_CONTROLLER_ID);
|
||||||
|
|
||||||
/* Textfield for target name */
|
/* Textfield for target name */
|
||||||
nameTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, false, null,
|
nameTextField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, false, null,
|
||||||
i18n.get("textfield.name"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
i18n.get("textfield.name"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
||||||
nameTextField.setId(SPUIComponetIdProvider.TARGET_ADD_NAME);
|
nameTextField.setId(SPUIComponentIdProvider.TARGET_ADD_NAME);
|
||||||
|
|
||||||
/* Textarea for target description */
|
/* Textarea for target description */
|
||||||
descTextArea = SPUIComponentProvider.getTextArea("text-area-style", ValoTheme.TEXTFIELD_TINY, false, null,
|
descTextArea = SPUIComponentProvider.getTextArea("text-area-style", ValoTheme.TEXTFIELD_TINY, false, null,
|
||||||
i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH);
|
i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH);
|
||||||
descTextArea.setId(SPUIComponetIdProvider.TARGET_ADD_DESC);
|
descTextArea.setId(SPUIComponentIdProvider.TARGET_ADD_DESC);
|
||||||
descTextArea.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
|
descTextArea.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
|
||||||
|
|
||||||
/* Label for mandatory symbol */
|
/* Label for mandatory symbol */
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
|||||||
import org.eclipse.hawkbit.ui.management.state.TargetBulkUpload;
|
import org.eclipse.hawkbit.ui.management.state.TargetBulkUpload;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -159,7 +159,7 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Button getCloseButton() {
|
private Button getCloseButton() {
|
||||||
final Button closeBtn = SPUIComponentProvider.getButton(SPUIComponetIdProvider.BULK_UPLOAD_CLOSE_BUTTON_ID, "",
|
final Button closeBtn = SPUIComponentProvider.getButton(SPUIComponentIdProvider.BULK_UPLOAD_CLOSE_BUTTON_ID, "",
|
||||||
"", "", true, FontAwesome.TIMES, SPUIButtonStyleSmallNoBorder.class);
|
"", "", true, FontAwesome.TIMES, SPUIButtonStyleSmallNoBorder.class);
|
||||||
closeBtn.addStyleName(ValoTheme.BUTTON_BORDERLESS);
|
closeBtn.addStyleName(ValoTheme.BUTTON_BORDERLESS);
|
||||||
closeBtn.addClickListener(event -> closePopup());
|
closeBtn.addClickListener(event -> closePopup());
|
||||||
@@ -168,7 +168,7 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent {
|
|||||||
|
|
||||||
private Button getMinimizeButton() {
|
private Button getMinimizeButton() {
|
||||||
final Button minimizeBtn = SPUIComponentProvider.getButton(
|
final Button minimizeBtn = SPUIComponentProvider.getButton(
|
||||||
SPUIComponetIdProvider.BULK_UPLOAD_MINIMIZE_BUTTON_ID, "", "", "", true, FontAwesome.MINUS,
|
SPUIComponentIdProvider.BULK_UPLOAD_MINIMIZE_BUTTON_ID, "", "", "", true, FontAwesome.MINUS,
|
||||||
SPUIButtonStyleSmallNoBorder.class);
|
SPUIButtonStyleSmallNoBorder.class);
|
||||||
minimizeBtn.addStyleName(ValoTheme.BUTTON_BORDERLESS);
|
minimizeBtn.addStyleName(ValoTheme.BUTTON_BORDERLESS);
|
||||||
minimizeBtn.addClickListener(event -> minimizeWindow());
|
minimizeBtn.addClickListener(event -> minimizeWindow());
|
||||||
@@ -190,14 +190,14 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent {
|
|||||||
countLabel.addStyleName("bulk-upload-label");
|
countLabel.addStyleName("bulk-upload-label");
|
||||||
countLabel.setVisible(false);
|
countLabel.setVisible(false);
|
||||||
countLabel.setCaptionAsHtml(true);
|
countLabel.setCaptionAsHtml(true);
|
||||||
countLabel.setId(SPUIComponetIdProvider.BULK_UPLOAD_COUNT);
|
countLabel.setId(SPUIComponentIdProvider.BULK_UPLOAD_COUNT);
|
||||||
return countLabel;
|
return countLabel;
|
||||||
}
|
}
|
||||||
|
|
||||||
private TextArea getDescriptionTextArea() {
|
private TextArea getDescriptionTextArea() {
|
||||||
final TextArea description = SPUIComponentProvider.getTextArea("text-area-style", ValoTheme.TEXTFIELD_TINY,
|
final TextArea description = SPUIComponentProvider.getTextArea("text-area-style", ValoTheme.TEXTFIELD_TINY,
|
||||||
false, null, i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH);
|
false, null, i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH);
|
||||||
description.setId(SPUIComponetIdProvider.BULK_UPLOAD_DESC);
|
description.setId(SPUIComponentIdProvider.BULK_UPLOAD_DESC);
|
||||||
description.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
|
description.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
|
||||||
description.setWidth("100%");
|
description.setWidth("100%");
|
||||||
return description;
|
return description;
|
||||||
@@ -214,7 +214,7 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent {
|
|||||||
dsComboBox.setPageLength(7);
|
dsComboBox.setPageLength(7);
|
||||||
dsComboBox.setContainerDataSource(container);
|
dsComboBox.setContainerDataSource(container);
|
||||||
dsComboBox.setItemCaptionPropertyId(SPUILabelDefinitions.VAR_NAME_VERSION);
|
dsComboBox.setItemCaptionPropertyId(SPUILabelDefinitions.VAR_NAME_VERSION);
|
||||||
dsComboBox.setId(SPUIComponetIdProvider.BULK_UPLOAD_DS_COMBO);
|
dsComboBox.setId(SPUIComponentIdProvider.BULK_UPLOAD_DS_COMBO);
|
||||||
dsComboBox.setWidth("100%");
|
dsComboBox.setWidth("100%");
|
||||||
return dsComboBox;
|
return dsComboBox;
|
||||||
}
|
}
|
||||||
@@ -228,7 +228,7 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent {
|
|||||||
tokenLayout.setMargin(false);
|
tokenLayout.setMargin(false);
|
||||||
tokenLayout.setSizeFull();
|
tokenLayout.setSizeFull();
|
||||||
tokenLayout.setHeight("100px");
|
tokenLayout.setHeight("100px");
|
||||||
tokenLayout.setId(SPUIComponetIdProvider.BULK_UPLOAD_TAG);
|
tokenLayout.setId(SPUIComponentIdProvider.BULK_UPLOAD_TAG);
|
||||||
return tokenLayout;
|
return tokenLayout;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import org.eclipse.hawkbit.ui.management.event.TargetTableEvent;
|
|||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPDateTimeUtil;
|
import org.eclipse.hawkbit.ui.utils.SPDateTimeUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventScope;
|
import org.vaadin.spring.events.EventScope;
|
||||||
@@ -115,7 +115,7 @@ public class TargetDetails extends AbstractTableDetailsLayout<Target> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getEditButtonId() {
|
protected String getEditButtonId() {
|
||||||
return SPUIComponetIdProvider.TARGET_EDIT_ICON;
|
return SPUIComponentIdProvider.TARGET_EDIT_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -157,23 +157,23 @@ public class TargetDetails extends AbstractTableDetailsLayout<Target> {
|
|||||||
|
|
||||||
final Label controllerLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.target.id"),
|
final Label controllerLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.target.id"),
|
||||||
HawkbitCommonUtil.trimAndNullIfEmpty(controllerId) == null ? "" : controllerId);
|
HawkbitCommonUtil.trimAndNullIfEmpty(controllerId) == null ? "" : controllerId);
|
||||||
controllerLabel.setId(SPUIComponetIdProvider.TARGET_CONTROLLER_ID);
|
controllerLabel.setId(SPUIComponentIdProvider.TARGET_CONTROLLER_ID);
|
||||||
detailsTabLayout.addComponent(controllerLabel);
|
detailsTabLayout.addComponent(controllerLabel);
|
||||||
|
|
||||||
final Label lastPollDtLabel = SPUIComponentProvider.createNameValueLabel(
|
final Label lastPollDtLabel = SPUIComponentProvider.createNameValueLabel(
|
||||||
getI18n().get("label.target.lastpolldate"),
|
getI18n().get("label.target.lastpolldate"),
|
||||||
HawkbitCommonUtil.trimAndNullIfEmpty(lastQueryDate) == null ? "" : lastQueryDate);
|
HawkbitCommonUtil.trimAndNullIfEmpty(lastQueryDate) == null ? "" : lastQueryDate);
|
||||||
lastPollDtLabel.setId(SPUIComponetIdProvider.TARGET_LAST_QUERY_DT);
|
lastPollDtLabel.setId(SPUIComponentIdProvider.TARGET_LAST_QUERY_DT);
|
||||||
detailsTabLayout.addComponent(lastPollDtLabel);
|
detailsTabLayout.addComponent(lastPollDtLabel);
|
||||||
|
|
||||||
final Label typeLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.ip"),
|
final Label typeLabel = SPUIComponentProvider.createNameValueLabel(getI18n().get("label.ip"),
|
||||||
address == null ? StringUtils.EMPTY : address.toString());
|
address == null ? StringUtils.EMPTY : address.toString());
|
||||||
typeLabel.setId(SPUIComponetIdProvider.TARGET_IP_ADDRESS);
|
typeLabel.setId(SPUIComponentIdProvider.TARGET_IP_ADDRESS);
|
||||||
detailsTabLayout.addComponent(typeLabel);
|
detailsTabLayout.addComponent(typeLabel);
|
||||||
|
|
||||||
if (securityToken != null) {
|
if (securityToken != null) {
|
||||||
final HorizontalLayout securityTokenLayout = getSecurityTokenLayout(securityToken);
|
final HorizontalLayout securityTokenLayout = getSecurityTokenLayout(securityToken);
|
||||||
controllerLabel.setId(SPUIComponetIdProvider.TARGET_SECURITY_TOKEN);
|
controllerLabel.setId(SPUIComponentIdProvider.TARGET_SECURITY_TOKEN);
|
||||||
detailsTabLayout.addComponent(securityTokenLayout);
|
detailsTabLayout.addComponent(securityTokenLayout);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -240,12 +240,12 @@ public class TargetDetails extends AbstractTableDetailsLayout<Target> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getTabSheetId() {
|
protected String getTabSheetId() {
|
||||||
return SPUIComponetIdProvider.TARGET_DETAILS_TABSHEET;
|
return SPUIComponentIdProvider.TARGET_DETAILS_TABSHEET;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getDetailsHeaderCaptionId() {
|
protected String getDetailsHeaderCaptionId() {
|
||||||
return SPUIComponetIdProvider.TARGET_DETAILS_HEADER_LABEL_ID;
|
return SPUIComponentIdProvider.TARGET_DETAILS_HEADER_LABEL_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ import org.eclipse.hawkbit.ui.management.state.TargetTableFilters;
|
|||||||
import org.eclipse.hawkbit.ui.utils.AssignInstalledDSTooltipGenerator;
|
import org.eclipse.hawkbit.ui.utils.AssignInstalledDSTooltipGenerator;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPDateTimeUtil;
|
import org.eclipse.hawkbit.ui.utils.SPDateTimeUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -230,7 +230,7 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> implements
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getTableId() {
|
protected String getTableId() {
|
||||||
return SPUIComponetIdProvider.TARGET_TABLE_ID;
|
return SPUIComponentIdProvider.TARGET_TABLE_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -454,7 +454,7 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> implements
|
|||||||
pinBtn.setStyleName(pinBtnStyle.toString());
|
pinBtn.setStyleName(pinBtnStyle.toString());
|
||||||
pinBtn.setHeightUndefined();
|
pinBtn.setHeightUndefined();
|
||||||
pinBtn.setData(itemId);
|
pinBtn.setData(itemId);
|
||||||
pinBtn.setId(SPUIComponetIdProvider.TARGET_PIN_ICON + "." + itemId);
|
pinBtn.setId(SPUIComponentIdProvider.TARGET_PIN_ICON + "." + itemId);
|
||||||
pinBtn.addClickListener(event -> addPinClickListener(event));
|
pinBtn.addClickListener(event -> addPinClickListener(event));
|
||||||
if (isPinned(((TargetIdName) itemId).getControllerId())) {
|
if (isPinned(((TargetIdName) itemId).getControllerId())) {
|
||||||
pinBtn.addStyleName(TARGET_PINNED);
|
pinBtn.addStyleName(TARGET_PINNED);
|
||||||
@@ -620,7 +620,7 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> implements
|
|||||||
|
|
||||||
private Boolean validateTable(final Component compsource, final TableTransferable transferable) {
|
private Boolean validateTable(final Component compsource, final TableTransferable transferable) {
|
||||||
final Table source = (Table) compsource;
|
final Table source = (Table) compsource;
|
||||||
if (!(source.getId().equals(SPUIComponetIdProvider.DIST_TABLE_ID)
|
if (!(source.getId().equals(SPUIComponentIdProvider.DIST_TABLE_ID)
|
||||||
|| source.getId().startsWith(SPUIDefinitions.TARGET_TAG_ID_PREFIXS))) {
|
|| source.getId().startsWith(SPUIDefinitions.TARGET_TAG_ID_PREFIXS))) {
|
||||||
notification.displayValidationError(i18n.get(ACTION_NOT_ALLOWED_MSG));
|
notification.displayValidationError(i18n.get(ACTION_NOT_ALLOWED_MSG));
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import org.eclipse.hawkbit.ui.management.event.TargetTableEvent;
|
|||||||
import org.eclipse.hawkbit.ui.management.event.TargetTableEvent.TargetComponentEvent;
|
import org.eclipse.hawkbit.ui.management.event.TargetTableEvent.TargetComponentEvent;
|
||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUITargetDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUITargetDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.UINotification;
|
import org.eclipse.hawkbit.ui.utils.UINotification;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -175,22 +175,22 @@ public class TargetTableHeader extends AbstractTableHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getSearchBoxId() {
|
protected String getSearchBoxId() {
|
||||||
return SPUIComponetIdProvider.TARGET_TEXT_FIELD;
|
return SPUIComponentIdProvider.TARGET_TEXT_FIELD;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getSearchRestIconId() {
|
protected String getSearchRestIconId() {
|
||||||
return SPUIComponetIdProvider.TARGET_TBL_SEARCH_RESET_ID;
|
return SPUIComponentIdProvider.TARGET_TBL_SEARCH_RESET_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getAddIconId() {
|
protected String getAddIconId() {
|
||||||
return SPUIComponetIdProvider.TARGET_TBL_ADD_ICON_ID;
|
return SPUIComponentIdProvider.TARGET_TBL_ADD_ICON_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getBulkUploadIconId() {
|
protected String getBulkUploadIconId() {
|
||||||
return SPUIComponetIdProvider.TARGET_TBL_BULK_UPLOAD_ICON_ID;
|
return SPUIComponentIdProvider.TARGET_TBL_BULK_UPLOAD_ICON_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -200,12 +200,12 @@ public class TargetTableHeader extends AbstractTableHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getDropFilterId() {
|
protected String getDropFilterId() {
|
||||||
return SPUIComponetIdProvider.TARGET_DROP_FILTER_ICON;
|
return SPUIComponentIdProvider.TARGET_DROP_FILTER_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getDropFilterWrapperId() {
|
protected String getDropFilterWrapperId() {
|
||||||
return SPUIComponetIdProvider.TARGET_FILTER_WRAPPER_ID;
|
return SPUIComponentIdProvider.TARGET_FILTER_WRAPPER_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -225,7 +225,7 @@ public class TargetTableHeader extends AbstractTableHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getShowFilterButtonLayoutId() {
|
protected String getShowFilterButtonLayoutId() {
|
||||||
return SPUIComponetIdProvider.SHOW_TARGET_TAGS;
|
return SPUIComponentIdProvider.SHOW_TARGET_TAGS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -249,7 +249,7 @@ public class TargetTableHeader extends AbstractTableHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getMaxMinIconId() {
|
protected String getMaxMinIconId() {
|
||||||
return SPUIComponetIdProvider.TARGET_MAX_MIN_TABLE_ICON;
|
return SPUIComponentIdProvider.TARGET_MAX_MIN_TABLE_ICON;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -337,7 +337,7 @@ public class TargetTableHeader extends AbstractTableHeader {
|
|||||||
if (doValidations(event)) {
|
if (doValidations(event)) {
|
||||||
final TableTransferable tableTransferable = (TableTransferable) event.getTransferable();
|
final TableTransferable tableTransferable = (TableTransferable) event.getTransferable();
|
||||||
final Table source = tableTransferable.getSourceComponent();
|
final Table source = tableTransferable.getSourceComponent();
|
||||||
if (source.getId().equals(SPUIComponetIdProvider.DIST_TABLE_ID)) {
|
if (source.getId().equals(SPUIComponentIdProvider.DIST_TABLE_ID)) {
|
||||||
final Set<DistributionSetIdName> distributionIdSet = getDropppedDistributionDetails(tableTransferable);
|
final Set<DistributionSetIdName> distributionIdSet = getDropppedDistributionDetails(tableTransferable);
|
||||||
if (distributionIdSet != null && !distributionIdSet.isEmpty()) {
|
if (distributionIdSet != null && !distributionIdSet.isEmpty()) {
|
||||||
final DistributionSetIdName distributionSetIdName = distributionIdSet.iterator().next();
|
final DistributionSetIdName distributionSetIdName = distributionIdSet.iterator().next();
|
||||||
@@ -361,7 +361,7 @@ public class TargetTableHeader extends AbstractTableHeader {
|
|||||||
final TableTransferable transferable = (TableTransferable) dragEvent.getTransferable();
|
final TableTransferable transferable = (TableTransferable) dragEvent.getTransferable();
|
||||||
final Table source = transferable.getSourceComponent();
|
final Table source = transferable.getSourceComponent();
|
||||||
|
|
||||||
if (!source.getId().equals(SPUIComponetIdProvider.DIST_TABLE_ID)) {
|
if (!source.getId().equals(SPUIComponentIdProvider.DIST_TABLE_ID)) {
|
||||||
notification.displayValidationError(i18n.get("message.action.not.allowed"));
|
notification.displayValidationError(i18n.get("message.action.not.allowed"));
|
||||||
isValid = Boolean.FALSE;
|
isValid = Boolean.FALSE;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import org.eclipse.hawkbit.ui.management.event.TargetFilterEvent;
|
|||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIButtonDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIButtonDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventBus;
|
import org.vaadin.spring.events.EventBus;
|
||||||
@@ -135,19 +135,19 @@ public class FilterByStatusLayout extends VerticalLayout implements Button.Click
|
|||||||
* Get - status of FILTER.
|
* Get - status of FILTER.
|
||||||
*/
|
*/
|
||||||
private void getTargetFilterStatuses() {
|
private void getTargetFilterStatuses() {
|
||||||
unknown = SPUIComponentProvider.getButton(SPUIComponetIdProvider.UNKNOWN_STATUS_ICON,
|
unknown = SPUIComponentProvider.getButton(SPUIComponentIdProvider.UNKNOWN_STATUS_ICON,
|
||||||
TargetUpdateStatus.UNKNOWN.toString(), i18n.get("tooltip.status.unknown"),
|
TargetUpdateStatus.UNKNOWN.toString(), i18n.get("tooltip.status.unknown"),
|
||||||
SPUIButtonDefinitions.SP_BUTTON_STATUS_STYLE, false, FontAwesome.SQUARE, SPUIButtonStyleSmall.class);
|
SPUIButtonDefinitions.SP_BUTTON_STATUS_STYLE, false, FontAwesome.SQUARE, SPUIButtonStyleSmall.class);
|
||||||
inSync = SPUIComponentProvider.getButton(SPUIComponetIdProvider.INSYNCH_STATUS_ICON,
|
inSync = SPUIComponentProvider.getButton(SPUIComponentIdProvider.INSYNCH_STATUS_ICON,
|
||||||
TargetUpdateStatus.IN_SYNC.toString(), i18n.get("tooltip.status.insync"),
|
TargetUpdateStatus.IN_SYNC.toString(), i18n.get("tooltip.status.insync"),
|
||||||
SPUIButtonDefinitions.SP_BUTTON_STATUS_STYLE, false, FontAwesome.SQUARE, SPUIButtonStyleSmall.class);
|
SPUIButtonDefinitions.SP_BUTTON_STATUS_STYLE, false, FontAwesome.SQUARE, SPUIButtonStyleSmall.class);
|
||||||
pending = SPUIComponentProvider.getButton(SPUIComponetIdProvider.PENDING_STATUS_ICON,
|
pending = SPUIComponentProvider.getButton(SPUIComponentIdProvider.PENDING_STATUS_ICON,
|
||||||
TargetUpdateStatus.PENDING.toString(), i18n.get("tooltip.status.pending"),
|
TargetUpdateStatus.PENDING.toString(), i18n.get("tooltip.status.pending"),
|
||||||
SPUIButtonDefinitions.SP_BUTTON_STATUS_STYLE, false, FontAwesome.SQUARE, SPUIButtonStyleSmall.class);
|
SPUIButtonDefinitions.SP_BUTTON_STATUS_STYLE, false, FontAwesome.SQUARE, SPUIButtonStyleSmall.class);
|
||||||
error = SPUIComponentProvider.getButton(SPUIComponetIdProvider.ERROR_STATUS_ICON,
|
error = SPUIComponentProvider.getButton(SPUIComponentIdProvider.ERROR_STATUS_ICON,
|
||||||
TargetUpdateStatus.ERROR.toString(), i18n.get("tooltip.status.error"),
|
TargetUpdateStatus.ERROR.toString(), i18n.get("tooltip.status.error"),
|
||||||
SPUIButtonDefinitions.SP_BUTTON_STATUS_STYLE, false, FontAwesome.SQUARE, SPUIButtonStyleSmall.class);
|
SPUIButtonDefinitions.SP_BUTTON_STATUS_STYLE, false, FontAwesome.SQUARE, SPUIButtonStyleSmall.class);
|
||||||
registered = SPUIComponentProvider.getButton(SPUIComponetIdProvider.REGISTERED_STATUS_ICON,
|
registered = SPUIComponentProvider.getButton(SPUIComponentIdProvider.REGISTERED_STATUS_ICON,
|
||||||
TargetUpdateStatus.REGISTERED.toString(), i18n.get("tooltip.status.registered"),
|
TargetUpdateStatus.REGISTERED.toString(), i18n.get("tooltip.status.registered"),
|
||||||
SPUIButtonDefinitions.SP_BUTTON_STATUS_STYLE, false, FontAwesome.SQUARE, SPUIButtonStyleSmall.class);
|
SPUIButtonDefinitions.SP_BUTTON_STATUS_STYLE, false, FontAwesome.SQUARE, SPUIButtonStyleSmall.class);
|
||||||
applyStatusBtnStyle();
|
applyStatusBtnStyle();
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
|||||||
import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent;
|
import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent;
|
||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventBus;
|
import org.vaadin.spring.events.EventBus;
|
||||||
@@ -90,7 +90,7 @@ public class MultipleTargetFilter extends Accordion implements SelectedTabChange
|
|||||||
filterByButtons.addStyleName(SPUIStyleDefinitions.NO_TOP_BORDER);
|
filterByButtons.addStyleName(SPUIStyleDefinitions.NO_TOP_BORDER);
|
||||||
targetFilterQueryButtonsTab.init(customTargetTagFilterButtonClick);
|
targetFilterQueryButtonsTab.init(customTargetTagFilterButtonClick);
|
||||||
if (permChecker.hasCreateTargetPermission() || permChecker.hasUpdateTargetPermission()) {
|
if (permChecker.hasCreateTargetPermission() || permChecker.hasUpdateTargetPermission()) {
|
||||||
config = SPUIComponentProvider.getButton(SPUIComponetIdProvider.ADD_TARGET_TAG, "", "", "", true,
|
config = SPUIComponentProvider.getButton(SPUIComponentIdProvider.ADD_TARGET_TAG, "", "", "", true,
|
||||||
FontAwesome.COG, SPUIButtonStyleSmallNoBorder.class);
|
FontAwesome.COG, SPUIButtonStyleSmallNoBorder.class);
|
||||||
config.addClickListener(event -> settingsIconClicked());
|
config.addClickListener(event -> settingsIconClicked());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import org.eclipse.hawkbit.ui.decorators.SPUITagButtonStyle;
|
|||||||
import org.eclipse.hawkbit.ui.filtermanagement.TargetFilterBeanQuery;
|
import org.eclipse.hawkbit.ui.filtermanagement.TargetFilterBeanQuery;
|
||||||
import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent;
|
import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent;
|
||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory;
|
import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory;
|
||||||
@@ -88,7 +88,7 @@ public class TargetFilterQueryButtons extends Table {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected String getButtonsTableId() {
|
protected String getButtonsTableId() {
|
||||||
return SPUIComponetIdProvider.CUSTOM_TARGET_TAG_TABLE_ID;
|
return SPUIComponentIdProvider.CUSTOM_TARGET_TAG_TABLE_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setStyle() {
|
private void setStyle() {
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
|||||||
import org.eclipse.hawkbit.ui.management.tag.TagIdName;
|
import org.eclipse.hawkbit.ui.management.tag.TagIdName;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.UINotification;
|
import org.eclipse.hawkbit.ui.utils.UINotification;
|
||||||
@@ -110,7 +110,7 @@ public class TargetTagFilterButtons extends AbstractFilterButtons {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getButtonsTableId() {
|
protected String getButtonsTableId() {
|
||||||
return SPUIComponetIdProvider.TARGET_TAG_TABLE_ID;
|
return SPUIComponentIdProvider.TARGET_TAG_TABLE_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -153,7 +153,7 @@ public class TargetTagFilterButtons extends AbstractFilterButtons {
|
|||||||
if (validate(event) && isNoTagAssigned(event)) {
|
if (validate(event) && isNoTagAssigned(event)) {
|
||||||
final TableTransferable tbl = (TableTransferable) event.getTransferable();
|
final TableTransferable tbl = (TableTransferable) event.getTransferable();
|
||||||
final Table source = tbl.getSourceComponent();
|
final Table source = tbl.getSourceComponent();
|
||||||
if (source.getId().equals(SPUIComponetIdProvider.TARGET_TABLE_ID)) {
|
if (source.getId().equals(SPUIComponentIdProvider.TARGET_TABLE_ID)) {
|
||||||
processTargetDrop(event);
|
processTargetDrop(event);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -253,7 +253,7 @@ public class TargetTagFilterButtons extends AbstractFilterButtons {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean validateIfSourceisTargetTable(final Table source) {
|
private boolean validateIfSourceisTargetTable(final Table source) {
|
||||||
if (!source.getId().equals(SPUIComponetIdProvider.TARGET_TABLE_ID)) {
|
if (!source.getId().equals(SPUIComponentIdProvider.TARGET_TABLE_ID)) {
|
||||||
notification.displayValidationError(i18n.get(SPUILabelDefinitions.ACTION_NOT_ALLOWED));
|
notification.displayValidationError(i18n.get(SPUILabelDefinitions.ACTION_NOT_ALLOWED));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader;
|
|||||||
import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent;
|
import org.eclipse.hawkbit.ui.management.event.ManagementUIEvent;
|
||||||
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
||||||
import com.vaadin.spring.annotation.SpringComponent;
|
import com.vaadin.spring.annotation.SpringComponent;
|
||||||
@@ -50,7 +50,7 @@ public class TargetTagFilterHeader extends AbstractFilterHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getHideButtonId() {
|
protected String getHideButtonId() {
|
||||||
return SPUIComponetIdProvider.HIDE_TARGET_TAGS;
|
return SPUIComponentIdProvider.HIDE_TARGET_TAGS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import org.eclipse.hawkbit.ui.common.UserDetailsFormatter;
|
|||||||
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
||||||
import org.eclipse.hawkbit.ui.menu.DashboardEvent.PostViewChangeEvent;
|
import org.eclipse.hawkbit.ui.menu.DashboardEvent.PostViewChangeEvent;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
||||||
import com.vaadin.server.FontAwesome;
|
import com.vaadin.server.FontAwesome;
|
||||||
@@ -148,7 +148,7 @@ public final class DashboardMenu extends CustomComponent {
|
|||||||
final String linkStyle = "v-link";
|
final String linkStyle = "v-link";
|
||||||
|
|
||||||
if (!uiProperties.getLinks().getDocumentation().getRoot().isEmpty()) {
|
if (!uiProperties.getLinks().getDocumentation().getRoot().isEmpty()) {
|
||||||
final Link docuLink = SPUIComponentProvider.getLink(SPUIComponetIdProvider.LINK_DOCUMENTATION,
|
final Link docuLink = SPUIComponentProvider.getLink(SPUIComponentIdProvider.LINK_DOCUMENTATION,
|
||||||
i18n.get("link.documentation.name"), uiProperties.getLinks().getDocumentation().getRoot(),
|
i18n.get("link.documentation.name"), uiProperties.getLinks().getDocumentation().getRoot(),
|
||||||
FontAwesome.QUESTION_CIRCLE, "_blank", linkStyle, true);
|
FontAwesome.QUESTION_CIRCLE, "_blank", linkStyle, true);
|
||||||
docuLink.setDescription(i18n.get("link.documentation.name"));
|
docuLink.setDescription(i18n.get("link.documentation.name"));
|
||||||
@@ -158,7 +158,7 @@ public final class DashboardMenu extends CustomComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!uiProperties.getLinks().getUserManagement().isEmpty()) {
|
if (!uiProperties.getLinks().getUserManagement().isEmpty()) {
|
||||||
final Link userManagementLink = SPUIComponentProvider.getLink(SPUIComponetIdProvider.LINK_USERMANAGEMENT,
|
final Link userManagementLink = SPUIComponentProvider.getLink(SPUIComponentIdProvider.LINK_USERMANAGEMENT,
|
||||||
i18n.get("link.usermanagement.name"), uiProperties.getLinks().getUserManagement(),
|
i18n.get("link.usermanagement.name"), uiProperties.getLinks().getUserManagement(),
|
||||||
FontAwesome.USERS, "_blank", linkStyle, true);
|
FontAwesome.USERS, "_blank", linkStyle, true);
|
||||||
userManagementLink.setDescription(i18n.get("link.usermanagement.name"));
|
userManagementLink.setDescription(i18n.get("link.usermanagement.name"));
|
||||||
@@ -168,7 +168,7 @@ public final class DashboardMenu extends CustomComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!uiProperties.getLinks().getSupport().isEmpty()) {
|
if (!uiProperties.getLinks().getSupport().isEmpty()) {
|
||||||
final Link supportLink = SPUIComponentProvider.getLink(SPUIComponetIdProvider.LINK_SUPPORT,
|
final Link supportLink = SPUIComponentProvider.getLink(SPUIComponentIdProvider.LINK_SUPPORT,
|
||||||
i18n.get("link.support.name"), uiProperties.getLinks().getSupport(), FontAwesome.ENVELOPE_O, "",
|
i18n.get("link.support.name"), uiProperties.getLinks().getSupport(), FontAwesome.ENVELOPE_O, "",
|
||||||
linkStyle, true);
|
linkStyle, true);
|
||||||
supportLink.setDescription(i18n.get("link.support.name"));
|
supportLink.setDescription(i18n.get("link.support.name"));
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
|||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPDateTimeUtil;
|
import org.eclipse.hawkbit.ui.utils.SPDateTimeUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -305,7 +305,7 @@ public class AddUpdateRolloutWindowLayout extends CustomComponent {
|
|||||||
private TextArea createTargetFilterQuery() {
|
private TextArea createTargetFilterQuery() {
|
||||||
final TextArea filterField = SPUIComponentProvider.getTextArea("text-area-style", ValoTheme.TEXTFIELD_TINY,
|
final TextArea filterField = SPUIComponentProvider.getTextArea("text-area-style", ValoTheme.TEXTFIELD_TINY,
|
||||||
false, null, null, SPUILabelDefinitions.TARGET_FILTER_QUERY_TEXT_FIELD_LENGTH);
|
false, null, null, SPUILabelDefinitions.TARGET_FILTER_QUERY_TEXT_FIELD_LENGTH);
|
||||||
filterField.setId(SPUIComponetIdProvider.ROLLOUT_TARGET_FILTER_QUERY_FIELD);
|
filterField.setId(SPUIComponentIdProvider.ROLLOUT_TARGET_FILTER_QUERY_FIELD);
|
||||||
filterField.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
|
filterField.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
|
||||||
filterField.setVisible(false);
|
filterField.setVisible(false);
|
||||||
filterField.setEnabled(false);
|
filterField.setEnabled(false);
|
||||||
@@ -327,7 +327,7 @@ public class AddUpdateRolloutWindowLayout extends CustomComponent {
|
|||||||
for (final ERRORTHRESOLDOPTIONS option : ERRORTHRESOLDOPTIONS.values()) {
|
for (final ERRORTHRESOLDOPTIONS option : ERRORTHRESOLDOPTIONS.values()) {
|
||||||
errorThresoldOptions.addItem(option.getValue());
|
errorThresoldOptions.addItem(option.getValue());
|
||||||
}
|
}
|
||||||
errorThresoldOptions.setId(SPUIComponetIdProvider.ROLLOUT_ERROR_THRESOLD_OPTION_ID);
|
errorThresoldOptions.setId(SPUIComponentIdProvider.ROLLOUT_ERROR_THRESOLD_OPTION_ID);
|
||||||
errorThresoldOptions.addStyleName(ValoTheme.OPTIONGROUP_HORIZONTAL);
|
errorThresoldOptions.addStyleName(ValoTheme.OPTIONGROUP_HORIZONTAL);
|
||||||
errorThresoldOptions.addStyleName(SPUIStyleDefinitions.ROLLOUT_OPTION_GROUP);
|
errorThresoldOptions.addStyleName(SPUIStyleDefinitions.ROLLOUT_OPTION_GROUP);
|
||||||
errorThresoldOptions.setSizeUndefined();
|
errorThresoldOptions.setSizeUndefined();
|
||||||
@@ -352,7 +352,7 @@ public class AddUpdateRolloutWindowLayout extends CustomComponent {
|
|||||||
targetFilter.setImmediate(true);
|
targetFilter.setImmediate(true);
|
||||||
targetFilter.setPageLength(7);
|
targetFilter.setPageLength(7);
|
||||||
targetFilter.setItemCaptionPropertyId(SPUILabelDefinitions.VAR_NAME);
|
targetFilter.setItemCaptionPropertyId(SPUILabelDefinitions.VAR_NAME);
|
||||||
targetFilter.setId(SPUIComponetIdProvider.ROLLOUT_TARGET_FILTER_COMBO_ID);
|
targetFilter.setId(SPUIComponentIdProvider.ROLLOUT_TARGET_FILTER_COMBO_ID);
|
||||||
targetFilter.setSizeFull();
|
targetFilter.setSizeFull();
|
||||||
targetFilter.addValueChangeListener(event -> onTargetFilterChange());
|
targetFilter.addValueChangeListener(event -> onTargetFilterChange());
|
||||||
return targetFilter;
|
return targetFilter;
|
||||||
@@ -395,7 +395,7 @@ public class AddUpdateRolloutWindowLayout extends CustomComponent {
|
|||||||
|
|
||||||
private Button createDiscardButton() {
|
private Button createDiscardButton() {
|
||||||
final Button discardRollloutBtn = SPUIComponentProvider.getButton(
|
final Button discardRollloutBtn = SPUIComponentProvider.getButton(
|
||||||
SPUIComponetIdProvider.ROLLOUT_CREATE_UPDATE_DISCARD_ID, "", "", "", true, FontAwesome.TIMES,
|
SPUIComponentIdProvider.ROLLOUT_CREATE_UPDATE_DISCARD_ID, "", "", "", true, FontAwesome.TIMES,
|
||||||
SPUIButtonStyleSmallNoBorder.class);
|
SPUIButtonStyleSmallNoBorder.class);
|
||||||
discardRollloutBtn.addClickListener(event -> onDiscard());
|
discardRollloutBtn.addClickListener(event -> onDiscard());
|
||||||
return discardRollloutBtn;
|
return discardRollloutBtn;
|
||||||
@@ -403,7 +403,7 @@ public class AddUpdateRolloutWindowLayout extends CustomComponent {
|
|||||||
|
|
||||||
private Button createSaveButton() {
|
private Button createSaveButton() {
|
||||||
final Button saveRolloutBtn = SPUIComponentProvider.getButton(
|
final Button saveRolloutBtn = SPUIComponentProvider.getButton(
|
||||||
SPUIComponetIdProvider.ROLLOUT_CREATE_UPDATE_SAVE_ID, "", "", "", true, FontAwesome.SAVE,
|
SPUIComponentIdProvider.ROLLOUT_CREATE_UPDATE_SAVE_ID, "", "", "", true, FontAwesome.SAVE,
|
||||||
SPUIButtonStyleSmallNoBorder.class);
|
SPUIButtonStyleSmallNoBorder.class);
|
||||||
saveRolloutBtn.addClickListener(event -> onRolloutSave());
|
saveRolloutBtn.addClickListener(event -> onRolloutSave());
|
||||||
saveRolloutBtn.setImmediate(true);
|
saveRolloutBtn.setImmediate(true);
|
||||||
@@ -588,7 +588,7 @@ public class AddUpdateRolloutWindowLayout extends CustomComponent {
|
|||||||
private TextArea createDescription() {
|
private TextArea createDescription() {
|
||||||
final TextArea descriptionField = SPUIComponentProvider.getTextArea("text-area-style", ValoTheme.TEXTFIELD_TINY,
|
final TextArea descriptionField = SPUIComponentProvider.getTextArea("text-area-style", ValoTheme.TEXTFIELD_TINY,
|
||||||
false, null, i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH);
|
false, null, i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH);
|
||||||
descriptionField.setId(SPUIComponetIdProvider.ROLLOUT_DESCRIPTION_ID);
|
descriptionField.setId(SPUIComponentIdProvider.ROLLOUT_DESCRIPTION_ID);
|
||||||
descriptionField.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
|
descriptionField.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
|
||||||
descriptionField.setSizeFull();
|
descriptionField.setSizeFull();
|
||||||
return descriptionField;
|
return descriptionField;
|
||||||
@@ -598,7 +598,7 @@ public class AddUpdateRolloutWindowLayout extends CustomComponent {
|
|||||||
final TextField errorField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
final TextField errorField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
||||||
i18n.get("prompt.error.threshold"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
i18n.get("prompt.error.threshold"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
||||||
errorField.addValidator(new ThresoldFieldValidator());
|
errorField.addValidator(new ThresoldFieldValidator());
|
||||||
errorField.setId(SPUIComponetIdProvider.ROLLOUT_ERROR_THRESOLD_ID);
|
errorField.setId(SPUIComponentIdProvider.ROLLOUT_ERROR_THRESOLD_ID);
|
||||||
errorField.setMaxLength(7);
|
errorField.setMaxLength(7);
|
||||||
errorField.setSizeFull();
|
errorField.setSizeFull();
|
||||||
return errorField;
|
return errorField;
|
||||||
@@ -607,7 +607,7 @@ public class AddUpdateRolloutWindowLayout extends CustomComponent {
|
|||||||
private TextField createTriggerThresold() {
|
private TextField createTriggerThresold() {
|
||||||
final TextField thresholdField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
final TextField thresholdField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
||||||
i18n.get("prompt.tigger.thresold"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
i18n.get("prompt.tigger.thresold"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
||||||
thresholdField.setId(SPUIComponetIdProvider.ROLLOUT_TRIGGER_THRESOLD_ID);
|
thresholdField.setId(SPUIComponentIdProvider.ROLLOUT_TRIGGER_THRESOLD_ID);
|
||||||
thresholdField.addValidator(new ThresoldFieldValidator());
|
thresholdField.addValidator(new ThresoldFieldValidator());
|
||||||
thresholdField.setSizeFull();
|
thresholdField.setSizeFull();
|
||||||
thresholdField.setMaxLength(3);
|
thresholdField.setMaxLength(3);
|
||||||
@@ -617,7 +617,7 @@ public class AddUpdateRolloutWindowLayout extends CustomComponent {
|
|||||||
private TextField createNoOfGroupsField() {
|
private TextField createNoOfGroupsField() {
|
||||||
final TextField noOfGroupsField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
final TextField noOfGroupsField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
||||||
i18n.get("prompt.number.of.groups"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
i18n.get("prompt.number.of.groups"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
||||||
noOfGroupsField.setId(SPUIComponetIdProvider.ROLLOUT_NO_OF_GROUPS_ID);
|
noOfGroupsField.setId(SPUIComponentIdProvider.ROLLOUT_NO_OF_GROUPS_ID);
|
||||||
noOfGroupsField.addValidator(new GroupNumberValidator());
|
noOfGroupsField.addValidator(new GroupNumberValidator());
|
||||||
noOfGroupsField.setSizeFull();
|
noOfGroupsField.setSizeFull();
|
||||||
noOfGroupsField.setMaxLength(3);
|
noOfGroupsField.setMaxLength(3);
|
||||||
@@ -640,7 +640,7 @@ public class AddUpdateRolloutWindowLayout extends CustomComponent {
|
|||||||
dsSet.setImmediate(true);
|
dsSet.setImmediate(true);
|
||||||
dsSet.setPageLength(7);
|
dsSet.setPageLength(7);
|
||||||
dsSet.setItemCaptionPropertyId(SPUILabelDefinitions.VAR_NAME);
|
dsSet.setItemCaptionPropertyId(SPUILabelDefinitions.VAR_NAME);
|
||||||
dsSet.setId(SPUIComponetIdProvider.ROLLOUT_DS_ID);
|
dsSet.setId(SPUIComponentIdProvider.ROLLOUT_DS_ID);
|
||||||
dsSet.setSizeFull();
|
dsSet.setSizeFull();
|
||||||
return dsSet;
|
return dsSet;
|
||||||
}
|
}
|
||||||
@@ -662,7 +662,7 @@ public class AddUpdateRolloutWindowLayout extends CustomComponent {
|
|||||||
private TextField createRolloutNameField() {
|
private TextField createRolloutNameField() {
|
||||||
final TextField rolloutNameField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
final TextField rolloutNameField = SPUIComponentProvider.getTextField("", ValoTheme.TEXTFIELD_TINY, true, null,
|
||||||
i18n.get("textfield.name"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
i18n.get("textfield.name"), true, SPUILabelDefinitions.TEXT_FIELD_MAX_LENGTH);
|
||||||
rolloutNameField.setId(SPUIComponetIdProvider.ROLLOUT_NAME_FIELD_ID);
|
rolloutNameField.setId(SPUIComponentIdProvider.ROLLOUT_NAME_FIELD_ID);
|
||||||
rolloutNameField.setSizeFull();
|
rolloutNameField.setSizeFull();
|
||||||
return rolloutNameField;
|
return rolloutNameField;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ import org.eclipse.hawkbit.ui.rollout.StatusFontIcon;
|
|||||||
import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
||||||
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -251,7 +251,7 @@ public class RolloutListGrid extends AbstractGrid {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getGridId() {
|
protected String getGridId() {
|
||||||
return SPUIComponetIdProvider.ROLLOUT_LIST_GRID_ID;
|
return SPUIComponentIdProvider.ROLLOUT_LIST_GRID_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -617,7 +617,7 @@ public class RolloutListGrid extends AbstractGrid {
|
|||||||
final StatusFontIcon statusFontIcon = statusIconMap.get(value);
|
final StatusFontIcon statusFontIcon = statusIconMap.get(value);
|
||||||
final String codePoint = HawkbitCommonUtil.getCodePoint(statusFontIcon);
|
final String codePoint = HawkbitCommonUtil.getCodePoint(statusFontIcon);
|
||||||
return HawkbitCommonUtil.getStatusLabelDetailsInString(codePoint, statusFontIcon.getStyle(),
|
return HawkbitCommonUtil.getStatusLabelDetailsInString(codePoint, statusFontIcon.getStyle(),
|
||||||
SPUIComponetIdProvider.ROLLOUT_STATUS_LABEL_ID);
|
SPUIComponentIdProvider.ROLLOUT_STATUS_LABEL_ID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import org.eclipse.hawkbit.ui.common.grid.AbstractGridHeader;
|
|||||||
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
||||||
import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
||||||
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -70,12 +70,12 @@ public class RolloutListHeader extends AbstractGridHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getSearchBoxId() {
|
protected String getSearchBoxId() {
|
||||||
return SPUIComponetIdProvider.ROLLOUT_LIST_SEARCH_BOX_ID;
|
return SPUIComponentIdProvider.ROLLOUT_LIST_SEARCH_BOX_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getSearchRestIconId() {
|
protected String getSearchRestIconId() {
|
||||||
return SPUIComponetIdProvider.ROLLOUT_LIST_SEARCH_RESET_ICON_ID;
|
return SPUIComponentIdProvider.ROLLOUT_LIST_SEARCH_RESET_ICON_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -86,7 +86,7 @@ public class RolloutListHeader extends AbstractGridHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getAddIconId() {
|
protected String getAddIconId() {
|
||||||
return SPUIComponetIdProvider.ROLLOUT_ADD_ICON_ID;
|
return SPUIComponentIdProvider.ROLLOUT_ADD_ICON_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ import org.eclipse.hawkbit.ui.rollout.StatusFontIcon;
|
|||||||
import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
||||||
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -207,7 +207,7 @@ public class RolloutGroupListGrid extends AbstractGrid {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getGridId() {
|
protected String getGridId() {
|
||||||
return SPUIComponetIdProvider.ROLLOUT_GROUP_LIST_GRID_ID;
|
return SPUIComponentIdProvider.ROLLOUT_GROUP_LIST_GRID_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -381,7 +381,7 @@ public class RolloutGroupListGrid extends AbstractGrid {
|
|||||||
final StatusFontIcon statusFontIcon = statusIconMap.get(value);
|
final StatusFontIcon statusFontIcon = statusIconMap.get(value);
|
||||||
final String codePoint = HawkbitCommonUtil.getCodePoint(statusFontIcon);
|
final String codePoint = HawkbitCommonUtil.getCodePoint(statusFontIcon);
|
||||||
return HawkbitCommonUtil.getStatusLabelDetailsInString(codePoint, statusFontIcon.getStyle(),
|
return HawkbitCommonUtil.getStatusLabelDetailsInString(codePoint, statusFontIcon.getStyle(),
|
||||||
SPUIComponetIdProvider.ROLLOUT_GROUP_STATUS_LABEL_ID);
|
SPUIComponentIdProvider.ROLLOUT_GROUP_STATUS_LABEL_ID);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
|||||||
import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
||||||
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventBus;
|
import org.vaadin.spring.events.EventBus;
|
||||||
@@ -124,7 +124,7 @@ public class RolloutGroupsListHeader extends AbstractGridHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getCloseButtonId() {
|
protected String getCloseButtonId() {
|
||||||
return SPUIComponetIdProvider.ROLLOUT_GROUP_CLOSE;
|
return SPUIComponentIdProvider.ROLLOUT_GROUP_CLOSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -150,7 +150,7 @@ public class RolloutGroupsListHeader extends AbstractGridHeader {
|
|||||||
@Override
|
@Override
|
||||||
protected HorizontalLayout getHeaderCaptionLayout() {
|
protected HorizontalLayout getHeaderCaptionLayout() {
|
||||||
headerCaption = SPUIComponentProvider.getLabel("", SPUILabelDefinitions.SP_WIDGET_CAPTION);
|
headerCaption = SPUIComponentProvider.getLabel("", SPUILabelDefinitions.SP_WIDGET_CAPTION);
|
||||||
headerCaption.setId(SPUIComponetIdProvider.ROLLOUT_GROUP_HEADER_CAPTION);
|
headerCaption.setId(SPUIComponentIdProvider.ROLLOUT_GROUP_HEADER_CAPTION);
|
||||||
final Button rolloutsListViewLink = SPUIComponentProvider.getButton(null, "", "", null, false, null,
|
final Button rolloutsListViewLink = SPUIComponentProvider.getButton(null, "", "", null, false, null,
|
||||||
SPUIButtonStyleSmallNoBorder.class);
|
SPUIButtonStyleSmallNoBorder.class);
|
||||||
rolloutsListViewLink.setStyleName(ValoTheme.LINK_SMALL + " " + "on-focus-no-border link rollout-caption-links");
|
rolloutsListViewLink.setStyleName(ValoTheme.LINK_SMALL + " " + "on-focus-no-border link rollout-caption-links");
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
|||||||
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -85,7 +85,7 @@ public class RolloutGroupTargetsCountLabelMessage extends Label {
|
|||||||
/* Create label for Targets count message displaying below the table */
|
/* Create label for Targets count message displaying below the table */
|
||||||
addStyleName(SPUILabelDefinitions.SP_LABEL_MESSAGE_STYLE);
|
addStyleName(SPUILabelDefinitions.SP_LABEL_MESSAGE_STYLE);
|
||||||
setContentMode(ContentMode.HTML);
|
setContentMode(ContentMode.HTML);
|
||||||
setId(SPUIComponetIdProvider.COUNT_LABEL);
|
setId(SPUIComponentIdProvider.COUNT_LABEL);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void displayRolloutGroupTargetMessage() {
|
private void displayRolloutGroupTargetMessage() {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ import org.eclipse.hawkbit.ui.rollout.StatusFontIcon;
|
|||||||
import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
||||||
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
@@ -131,7 +131,7 @@ public class RolloutGroupTargetsListGrid extends AbstractGrid {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getGridId() {
|
protected String getGridId() {
|
||||||
return SPUIComponetIdProvider.ROLLOUT_GROUP_TARGETS_LIST_GRID_ID;
|
return SPUIComponentIdProvider.ROLLOUT_GROUP_TARGETS_LIST_GRID_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
|||||||
import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
import org.eclipse.hawkbit.ui.rollout.event.RolloutEvent;
|
||||||
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
import org.eclipse.hawkbit.ui.rollout.state.RolloutUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventBus;
|
import org.vaadin.spring.events.EventBus;
|
||||||
@@ -135,7 +135,7 @@ public class RolloutGroupTargetsListHeader extends AbstractGridHeader {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getCloseButtonId() {
|
protected String getCloseButtonId() {
|
||||||
return SPUIComponetIdProvider.ROLLOUT_TARGET_VIEW_CLOSE_BUTTON_ID;
|
return SPUIComponentIdProvider.ROLLOUT_TARGET_VIEW_CLOSE_BUTTON_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import org.eclipse.hawkbit.repository.model.DistributionSetType;
|
|||||||
import org.eclipse.hawkbit.repository.model.TenantMetaData;
|
import org.eclipse.hawkbit.repository.model.TenantMetaData;
|
||||||
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.data.domain.PageRequest;
|
import org.springframework.data.domain.PageRequest;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
@@ -92,7 +92,7 @@ public class DefaultDistributionSetTypeLayout extends BaseConfigurationView impl
|
|||||||
.findDistributionSetTypesAll(pageReq);
|
.findDistributionSetTypesAll(pageReq);
|
||||||
|
|
||||||
combobox = SPUIComponentProvider.getComboBox("", "330", null, null, false, "", "label.combobox.tag");
|
combobox = SPUIComponentProvider.getComboBox("", "330", null, null, false, "", "label.combobox.tag");
|
||||||
combobox.setId(SPUIComponetIdProvider.SYSTEM_CONFIGURATION_DEFAULTDIS_COMBOBOX);
|
combobox.setId(SPUIComponentIdProvider.SYSTEM_CONFIGURATION_DEFAULTDIS_COMBOBOX);
|
||||||
combobox.setNullSelectionAllowed(false);
|
combobox.setNullSelectionAllowed(false);
|
||||||
for (final DistributionSetType distributionSetType : distributionSetTypeCollection) {
|
for (final DistributionSetType distributionSetType : distributionSetTypeCollection) {
|
||||||
combobox.addItem(distributionSetType.getId());
|
combobox.addItem(distributionSetType.getId());
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
|
|||||||
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
|
||||||
import org.eclipse.hawkbit.ui.tenantconfiguration.ConfigurationItem.ConfigurationItemChangeListener;
|
import org.eclipse.hawkbit.ui.tenantconfiguration.ConfigurationItem.ConfigurationItemChangeListener;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
|
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.UINotification;
|
import org.eclipse.hawkbit.ui.utils.UINotification;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
||||||
@@ -105,14 +105,14 @@ public class TenantConfigurationDashboardView extends CustomComponent implements
|
|||||||
|
|
||||||
final HorizontalLayout hlayout = new HorizontalLayout();
|
final HorizontalLayout hlayout = new HorizontalLayout();
|
||||||
hlayout.setSpacing(true);
|
hlayout.setSpacing(true);
|
||||||
saveConfigurationBtn = SPUIComponentProvider.getButton(SPUIComponetIdProvider.SYSTEM_CONFIGURATION_SAVE, "", "",
|
saveConfigurationBtn = SPUIComponentProvider.getButton(SPUIComponentIdProvider.SYSTEM_CONFIGURATION_SAVE, "", "",
|
||||||
"", true, FontAwesome.SAVE, SPUIButtonStyleSmallNoBorder.class);
|
"", true, FontAwesome.SAVE, SPUIButtonStyleSmallNoBorder.class);
|
||||||
saveConfigurationBtn.setEnabled(false);
|
saveConfigurationBtn.setEnabled(false);
|
||||||
saveConfigurationBtn.setDescription(i18n.get("configuration.savebutton.tooltip"));
|
saveConfigurationBtn.setDescription(i18n.get("configuration.savebutton.tooltip"));
|
||||||
saveConfigurationBtn.addClickListener(event -> saveConfiguration());
|
saveConfigurationBtn.addClickListener(event -> saveConfiguration());
|
||||||
hlayout.addComponent(saveConfigurationBtn);
|
hlayout.addComponent(saveConfigurationBtn);
|
||||||
|
|
||||||
undoConfigurationBtn = SPUIComponentProvider.getButton(SPUIComponetIdProvider.SYSTEM_CONFIGURATION_CANCEL, "",
|
undoConfigurationBtn = SPUIComponentProvider.getButton(SPUIComponentIdProvider.SYSTEM_CONFIGURATION_CANCEL, "",
|
||||||
"", "", true, FontAwesome.UNDO, SPUIButtonStyleSmallNoBorder.class);
|
"", "", true, FontAwesome.UNDO, SPUIButtonStyleSmallNoBorder.class);
|
||||||
undoConfigurationBtn.setEnabled(false);
|
undoConfigurationBtn.setEnabled(false);
|
||||||
undoConfigurationBtn.setDescription(i18n.get("configuration.cancellbutton.tooltip"));
|
undoConfigurationBtn.setDescription(i18n.get("configuration.cancellbutton.tooltip"));
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ package org.eclipse.hawkbit.ui.utils;
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public final class SPUIComponetIdProvider {
|
public final class SPUIComponentIdProvider {
|
||||||
/**
|
/**
|
||||||
* ID-Target.
|
* ID-Target.
|
||||||
*/
|
*/
|
||||||
@@ -891,7 +891,7 @@ public final class SPUIComponetIdProvider {
|
|||||||
/**
|
/**
|
||||||
* /* Private Constructor.
|
* /* Private Constructor.
|
||||||
*/
|
*/
|
||||||
private SPUIComponetIdProvider() {
|
private SPUIComponentIdProvider() {
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user