Skip to content

Commit

Permalink
Merge pull request #4142 from Coduz/chng-refactoredFillWithTemplateBu…
Browse files Browse the repository at this point in the history 
…tton

💄 [Console GWT] Changed position and behavior of 'Fill with template' button in JobStepAddDialog
  • Loading branch information
@Coduz
Coduz authored Nov 22, 2024
2 parents a09d19b + bea7e63 commit 97f6669
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 25 deletions.
83 changes: 60 additions & 23 deletions ...src/main/java/org/eclipse/kapua/app/console/module/job/client/steps/JobStepAddDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public class JobStepAddDialog extends EntityAddEditDialog {

protected static final String PROPERTY_NAME = "propertyName";
protected static final String PROPERTY_TYPE = "propertyType";
protected static final String PROPERTY_EXAMPLE_VALUE = "propertyExampleValue";


public JobStepAddDialog(GwtSession currentSession, String jobId) {
Expand All @@ -116,11 +117,11 @@ public JobStepAddDialog(GwtSession currentSession, String jobId) {
jobStepPropertiesPanel = new FormPanel(FORM_LABEL_WIDTH);
propertiesButtonPanel = new HorizontalPanel();

DialogUtils.resizeDialog(this, 600, 600);
DialogUtils.resizeDialog(this, 600, 630);
}

protected String getExampleButtonText() {
return MSGS.exampleButton();
return "Fill with example values";
}

@Override
Expand Down Expand Up @@ -291,8 +292,9 @@ protected void refreshJobStepDefinition(GwtJobStepDefinition gwtJobStepDefinitio
applyFieldLimits(property, textField);

textField.setEmptyText(KapuaSafeHtmlUtils.htmlUnescape(property.getPropertyValue()));
textField.setData(PROPERTY_TYPE, property.getPropertyType());
textField.setData(PROPERTY_NAME, property.getPropertyName());
textField.setData(PROPERTY_TYPE, property.getPropertyType());
textField.setData(PROPERTY_EXAMPLE_VALUE, property.getExampleValue());

jobStepPropertiesPanel.add(textField);
} else if (
Expand All @@ -305,9 +307,10 @@ protected void refreshJobStepDefinition(GwtJobStepDefinition gwtJobStepDefinitio
applyFieldLimits(property, numberField);

numberField.setEmptyText(KapuaSafeHtmlUtils.htmlUnescape(property.getPropertyValue()));
numberField.setData(PROPERTY_TYPE, property.getPropertyType());
numberField.setData(PROPERTY_NAME, property.getPropertyName());
numberField.setToolTip(JOB_MSGS.dialogAddStepTimeoutTooltip());
numberField.setData(PROPERTY_NAME, property.getPropertyName());
numberField.setData(PROPERTY_TYPE, property.getPropertyType());
numberField.setData(PROPERTY_EXAMPLE_VALUE, property.getExampleValue());

if (propertyType.equals(Long.class.getName())) {
numberField.setMinValue(property.getMinValue() != null ? Long.parseLong(property.getMinValue()) : -MAX_SAFE_INTEGER);
Expand All @@ -322,23 +325,28 @@ protected void refreshJobStepDefinition(GwtJobStepDefinition gwtJobStepDefinitio
numberField.setMinValue(property.getMinValue() != null ? Double.parseDouble(property.getMinValue()) : Double.MIN_VALUE);
numberField.setMaxValue(property.getMaxValue() != null ? Double.parseDouble(property.getMaxValue()) : Double.MAX_VALUE);
}

jobStepPropertiesPanel.add(numberField);
} else if (propertyType.equals(Boolean.class.getName())) {
String fieldLabel = camelCaseToNormalCase(property.getPropertyName());

CheckBox checkBox = new CheckBox();
checkBox.setFieldLabel(property.getRequired() ? "* " + fieldLabel : fieldLabel);
checkBox.setValue(Boolean.valueOf(property.getPropertyValue()));
checkBox.setData(PROPERTY_TYPE, property.getPropertyType());
checkBox.setData(PROPERTY_NAME, property.getPropertyName());
checkBox.setData(PROPERTY_TYPE, property.getPropertyType());
checkBox.setData(PROPERTY_EXAMPLE_VALUE, property.getExampleValue());

jobStepPropertiesPanel.add(checkBox);
} else {
final KapuaTextArea textArea = new KapuaTextArea();

applyFieldLimits(property, textArea);

textArea.setData(PROPERTY_TYPE, property.getPropertyType());
textArea.setData(PROPERTY_NAME, property.getPropertyName());
textArea.setData(PROPERTY_TYPE, property.getPropertyType());
textArea.setData(PROPERTY_EXAMPLE_VALUE, KapuaSafeHtmlUtils.htmlUnescape(property.getExampleValue()));

jobStepPropertiesPanel.add(textArea);

JOB_STEP_SERVICE.getJobStepPropertyLengthMax(new AsyncCallback<Integer>() {
Expand All @@ -354,22 +362,6 @@ public void onSuccess(Integer jobStepPropertyMaxLength) {
textArea.setMaxLength(jobStepPropertyMaxLength);
}
});

if (property.getExampleValue() != null) {
final String exampleValue = KapuaSafeHtmlUtils.htmlUnescape(property.getExampleValue());
exampleButton = new KapuaButton(getExampleButtonText(), new KapuaIcon(IconSet.EDIT), new SelectionListener<ButtonEvent>() {

@Override
public void componentSelected(ButtonEvent ce) {
textArea.setValue(exampleValue);
}

});
exampleButton.setStyleAttribute("padding-left", (FORM_LABEL_WIDTH + 5) + "px");
propertiesButtonPanel.add(exampleButton);
propertiesButtonPanel.setStyleAttribute("margin-bottom", "4px");
}
jobStepPropertiesPanel.add(propertiesButtonPanel);
}

if (property.getDescription() != null) {
Expand All @@ -384,6 +376,51 @@ public void componentSelected(ButtonEvent ce) {

jobStepPropertiesPanel.layout(true);
}

exampleButton = new KapuaButton(getExampleButtonText(), new KapuaIcon(IconSet.EDIT), new SelectionListener<ButtonEvent>() {

@Override
public void componentSelected(ButtonEvent ce) {
for (Component component : jobStepPropertiesPanel.getItems()) {
if (component instanceof Field &&
!(component instanceof LabelField)) { // Exclude LabelFields that contains the description of the JobStepDefinition.jobStepProperty

String fieldPropertyType = component.getData(PROPERTY_TYPE);
String fieldPropertyExampleValue = component.getData(PROPERTY_EXAMPLE_VALUE);

if (fieldPropertyExampleValue != null) {
if (fieldPropertyType.equals(Long.class.getName())) {
Field<Long> field = (Field<Long>) component;
field.setValue(Long.parseLong(fieldPropertyExampleValue));
} else if (fieldPropertyType.equals(Integer.class.getName())) {
Field<Integer> field = (Field<Integer>) component;
field.setValue(Integer.parseInt(fieldPropertyExampleValue));
} else if (fieldPropertyType.equals(Float.class.getName())) {
Field<Float> field = (Field<Float>) component;
field.setValue(Float.parseFloat(fieldPropertyExampleValue));
} else if (fieldPropertyType.equals(Double.class.getName())) {
Field<Double> field = (Field<Double>) component;
field.setValue(Double.parseDouble(fieldPropertyExampleValue));
} else if (fieldPropertyType.equals(Boolean.class.getName())) {
Field<Boolean> field = (Field<Boolean>) component;
field.setValue(Boolean.valueOf(fieldPropertyExampleValue));
}
else {
Field<String> field = (Field<String>) component;
field.setValue(fieldPropertyExampleValue);
}
}
}

}
}

});
exampleButton.setStyleAttribute("padding-left", (FORM_LABEL_WIDTH + 5) + "px");
propertiesButtonPanel.add(exampleButton);
propertiesButtonPanel.setStyleAttribute("margin-bottom", "4px");
jobStepPropertiesPanel.add(propertiesButtonPanel);

jobStepPropertiesPanel.layout(true);
}

Expand Down
21 changes: 19 additions & 2 deletions ...rc/main/java/org/eclipse/kapua/app/console/module/job/client/steps/JobStepEditDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.extjs.gxt.ui.client.event.LoadListener;
import com.extjs.gxt.ui.client.widget.Component;
import com.extjs.gxt.ui.client.widget.form.Field;
import com.extjs.gxt.ui.client.widget.form.LabelField;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.rpc.AsyncCallback;
import org.eclipse.kapua.app.console.module.api.client.GwtKapuaErrorCode;
Expand Down Expand Up @@ -89,16 +90,32 @@ public void onSuccess(GwtJobStepDefinition result) {

Map<String, Object> propertiesMap = new HashMap<String, Object>();
for (GwtJobStepProperty property : gwtJobStep.getStepProperties()) {
if (property.getPropertyType().equals(Long.class.getName())) {

String fieldPropertyType = property.getPropertyType();

if (fieldPropertyType.equals(Long.class.getName())) {
propertiesMap.put(property.getPropertyName(),
property.getPropertyValue() == null ? null : Long.valueOf(property.getPropertyValue()));
} else if (fieldPropertyType.equals(Integer.class.getName())) {
propertiesMap.put(property.getPropertyName(),
property.getPropertyValue() == null ? null : Integer.valueOf(property.getPropertyValue()));
} else if (fieldPropertyType.equals(Float.class.getName())) {
propertiesMap.put(property.getPropertyName(),
property.getPropertyValue() == null ? null : Float.valueOf(property.getPropertyValue()));
} else if (fieldPropertyType.equals(Double.class.getName())) {
propertiesMap.put(property.getPropertyName(),
property.getPropertyValue() == null ? null : Double.valueOf(property.getPropertyValue()));
} else if (fieldPropertyType.equals(Boolean.class.getName())) {
propertiesMap.put(property.getPropertyName(),
property.getPropertyValue() == null ? null : Boolean.valueOf(property.getPropertyValue()));
} else {
propertiesMap.put(property.getPropertyName(), property.getPropertyValue());
}
}

for (Component component : jobStepPropertiesPanel.getItems()) {
if (component instanceof Field) {
if (component instanceof Field &&
!(component instanceof LabelField)) { // Exclude LabelFields that contains the description of the JobStepDefinition.jobStepProperty
Field<Object> field = (Field<Object>) component;
field.setValue(propertiesMap.get(field.getData(PROPERTY_NAME)));
}
Expand Down

0 comments on commit 97f6669

Please sign in to comment.