#1863 mt filter tree edit: column type hinting from a predefined list…

… (but open to new values)
AbsaOSS · Sep 16, 2021 · 3e8747b · 3e8747b
1 parent 17035fe
commit 3e8747b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/menas/ui/components/mappingTable/addMappingTable.fragment.xml b/menas/ui/components/mappingTable/addMappingTable.fragment.xml
@@ -105,7 +105,15 @@
 
                                 <t:Column label="ValueType">
                                     <t:template>
-                                        <Input type="Text" value="{entity>valueType}" visible="{= !!${entity>valueType}}"/>
+                                        <Input type="Text" value="{entity>valueType}"
+                                               visible="{= !!${entity>valueType}}"
+                                               showSuggestion="true"
+                                               suggestionItems="{suggestedColumnTypes>/}">
+                                            <suggestionItems>
+                                                <core:Item key="{suggestedColumnTypes>name}" text="{suggestedColumnTypes>name}"/>
+                                            </suggestionItems>
+                                        </Input>
+
                                     </t:template>
                                 </t:Column>
                             </t:columns>

diff --git a/menas/ui/service/EntityDialog.js b/menas/ui/service/EntityDialog.js
@@ -605,11 +605,23 @@ class MappingTableDialog extends EntityDialog {
       }
     );
   }
+
+  // on MTDialog open - base
+  onPress() {
+    const suggestedColumnTypes = FilterTreeUtils.columnTypeNames.map(function (val) {
+      return {name: val}
+    }); // [ {name: string}, ...]
+
+    const typeModel = new sap.ui.model.json.JSONModel(suggestedColumnTypes);
+    this.oDialog.setModel(typeModel, "suggestedColumnTypes");
+  }
 }
 
 class AddMappingTableDialog extends MappingTableDialog {
 
   onPress() {
+    super.onPress();
+
     this.schemaService.getList(this.oDialog).then(() => {
       this.oDialog.setModel(new sap.ui.model.json.JSONModel({
         name: "",
@@ -631,10 +643,10 @@ class AddMappingTableDialog extends MappingTableDialog {
 class EditMappingTableDialog extends MappingTableDialog {
 
   onPress() {
+    super.onPress();
+
     this.schemaService.getList(this.oDialog).then(() => {
       const current = this.oController._model.getProperty("/currentMappingTable");
-      //current.filterJson = JSON.stringify(current.filter);
-      //console.log(`current MT: ${JSON.stringify(current)}`);
       current.updatedFilters = [this.addNiceNamesToFilterData(current.filter)];
       console.log(`current filters: ${JSON.stringify(current.updatedFilters)}`);
 

diff --git a/menas/ui/service/FilterTreeUtils.js b/menas/ui/service/FilterTreeUtils.js
@@ -42,4 +42,10 @@ class FilterTreeUtils {
     return filterDataNode;
   }
 
+  // simple spark-sql types for hinting, origin: https://spark.apache.org/docs/latest/sql-ref-datatypes.htm
+  static columnTypeNames = [
+    "boolean", "byte", "short", "integer", "long", "bigint", "float", "double", "decimal", "numeric",
+    "date", "timestamp", "string", "binary", "interval"
+  ]
+
 }