[DROOLS-4698] Managing user defined expressions for Collections #1276
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,6 @@ | |
| import javax.inject.Inject; | ||
|
|
||
| import com.google.gwt.dom.client.LIElement; | ||
| import com.google.gwt.dom.client.UListElement; | ||
| import com.google.gwt.json.client.JSONArray; | ||
| import com.google.gwt.json.client.JSONObject; | ||
|
|
@@ -73,8 +72,6 @@ public class CollectionPresenter implements CollectionView.Presenter { | |
|
|
||
| protected CollectionView collectionView; | ||
|
|
||
| @Override | ||
| public void initListStructure(String key, Map<String, String> simplePropertiesMap, Map<String, Map<String, String>> expandablePropertiesMap, CollectionView collectionView) { | ||
| commonInit(key, collectionView); | ||
|
|
@@ -101,10 +98,22 @@ public void setValue(String jsonString) { | |
| return; | ||
| } | ||
| JSONValue jsonValue = getJSONValue(jsonString); | ||
| if (jsonValue instanceof JSONString) { | ||
| populateExpression(jsonValue); | ||
| } else { | ||
| populateCreateCollection(jsonValue); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * It populates the guided "Create Collection" editor | ||
| * @param value | ||
| */ | ||
| protected void populateCreateCollection(JSONValue value) { | ||
| if (collectionView.isListWidget()) { | ||
| populateList(value); | ||
| } else { | ||
| populateMap(value); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -160,17 +169,28 @@ public void addMapItem(Map<String, String> keyPropertiesValues, Map<String, Stri | |
| public void save() { | ||
| try { | ||
| String updatedValue; | ||
| if (collectionView.isExpressionWidget()) { | ||
|
There was a problem hiding this comment. @yesamer |
||
| updatedValue = getExpressionValue(); | ||
| } else { | ||
| updatedValue = getValueFromCreateCollection(); | ||
| } | ||
| collectionView.updateValue(updatedValue); | ||
| } catch (IllegalStateException e) { | ||
| confirmPopupPresenter.show(ScenarioSimulationEditorConstants.INSTANCE.collectionError(), e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * It gets the guided "Create Collection" editor | ||
| */ | ||
| protected String getValueFromCreateCollection() { | ||
| if (collectionView.isListWidget()) { | ||
| return getListValue(); | ||
| } else { | ||
| return getMapValue(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void remove() { | ||
| org.uberfire.mvp.Command okRemoveCommand = this::okRemoveCommandMethod; | ||
|
|
@@ -206,12 +226,9 @@ protected void okRemoveCommandMethod() { | |
|
|
||
| protected void commonInit(String key, CollectionView collectionView) { | ||
| this.collectionView = collectionView; | ||
| String propertyName = key.substring(key.lastIndexOf('#') + 1); | ||
| this.collectionView.getEditorTitle().setInnerText(key); | ||
| this.collectionView.getPropertyTitle().setInnerText(propertyName); | ||
| } | ||
|
|
||
| protected void populateList(JSONValue jsonValue) { | ||
|
|
@@ -246,6 +263,11 @@ protected void populateMap(JSONValue jsonValue) { | |
| }); | ||
| } | ||
|
|
||
| protected void populateExpression(JSONValue jsonValue) { | ||
| final JSONString jsonString = jsonValue.isString(); | ||
| collectionView.setExpression(jsonString.stringValue()); | ||
| } | ||
|
|
||
| protected JSONObject getJSONObject(String jsonString) { | ||
| try { | ||
| return getJSONValue(jsonString).isObject(); | ||
|
|
@@ -262,6 +284,11 @@ protected JSONValue getJSONValue(String jsonString) { | |
| } | ||
| } | ||
|
|
||
| protected String getExpressionValue() { | ||
| final JSONString jsonString = new JSONString(collectionView.getExpression()); | ||
| return jsonString.toString(); | ||
| } | ||
|
|
||
| protected String getListValue() { | ||
| Map<String, Map<String, String>> simpleItemsProperties = listElementPresenter.getSimpleItemsProperties(); | ||
| Map<String, Map<String, Map<String, String>>> nestedItemsProperties = listElementPresenter.getExpandableItemsProperties(); | ||
|
|
@@ -317,8 +344,7 @@ protected Map<String, Map<String, String>> getExpandablePropertiesValues(JSONObj | |
| jsonObject.keySet().forEach(propertyName -> { | ||
| final JSONValue jsonValue = jsonObject.get(propertyName); | ||
| if (jsonValue.isObject() != null) { | ||
| toReturn.put(propertyName, getSimplePropertiesMap(jsonValue.isObject())); | ||
| } | ||
| }); | ||
| return toReturn; | ||
|
|
@@ -327,7 +353,7 @@ protected Map<String, Map<String, String>> getExpandablePropertiesValues(JSONObj | |
| /** | ||
| * @return | ||
| */ | ||
| protected String getMapValue() { | ||
| Map<Map<String, String>, Map<String, String>> itemsProperties = mapElementPresenter.getItemsProperties(); | ||
| JSONObject toReturnModel = new JSONObject(); | ||
| itemsProperties.forEach((keyPropertiesValues, valuePropertiesMap) -> { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@yesamer
I think those nested
ifs will lead to multiplication of tests - maybe cleaner to add another method to manage them?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gitgabrio I wrapped the logic in a new method, it should be cleaner now.