#1863 mCR/MT edit dialog default width=950px, some cleanup

AbsaOSS · Oct 5, 2021 · a278969 · a278969
1 parent 0e539df
commit a278969
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/menas/ui/components/dataset/conformanceRule/upsert.fragment.xml b/menas/ui/components/dataset/conformanceRule/upsert.fragment.xml
@@ -15,7 +15,7 @@
 
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:form="sap.ui.layout.form">
     <Dialog id="upsertConformanceRuleDialog" title="{/newRule/title} Conformance Rule" resizable="true"
-            draggable="true" class="minW40rem" beforeOpen="onBeforeOpen" afterOpen="onAfterOpen">
+            draggable="true" beforeOpen="onBeforeOpen" afterOpen="onAfterOpen" contentWidth="950px">
         <content>
             <form:SimpleForm id="addConformanceRuleForm" adjustLabelSpan="false" editable="true">
                 <form:content>

diff --git a/menas/ui/components/dataset/datasetDetail.controller.js b/menas/ui/components/dataset/datasetDetail.controller.js
@@ -400,11 +400,6 @@ sap.ui.define([
 
       let sFragmentName = "components.dataset.conformanceRule." + oContext.getProperty("_t") + ".display";
       if (oContext.getProperty("_t") === "MappingConformanceRule") {
-
-        // todo remove debug print
-        let conf = this._model.getProperty("/currentDataset/conformance")
-        console.log(`conformance: ${JSON.stringify(conf)}`);
-
         let oAttributeMappings = oContext.getProperty("attributeMappings");
         let aJoinConditions = [];
         for (let key in oAttributeMappings) {
@@ -454,7 +449,7 @@ sap.ui.define([
         return {
           menasRef: e.menasRef
         };
-      })
+      });
       aAuditEntries.unshift({
         menasRef: {
           name: oCurrentDataset.name,

diff --git a/menas/ui/components/mappingTable/addDefaultValue.fragment.xml b/menas/ui/components/mappingTable/addDefaultValue.fragment.xml
@@ -15,7 +15,7 @@
 
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:form="sap.ui.layout.form" xmlns:l="sap.ui.layout"
     xmlns:table="sap.ui.table" xmlns:cust="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1">
-    <Dialog id="addDefaultValueDialog" title="{/newDefaultValue/title} Default Value" resizable="true" draggable="true" class="minW40rem">
+    <Dialog id="addDefaultValueDialog" title="{/newDefaultValue/title} Default Value" resizable="true" draggable="true">
         <content>
             <form:SimpleForm adjustLabelSpan="true" editable="true">
                 <form:content>

diff --git a/menas/ui/components/mappingTable/addMappingTable.fragment.xml b/menas/ui/components/mappingTable/addMappingTable.fragment.xml
@@ -17,7 +17,7 @@
                          xmlns:t="sap.ui.table"
                          xmlns:hdfs="components.hdfs">
     <Dialog id="addMappingTableDialog" title="{entity>/title} Mapping Table" resizable="true" draggable="true"
-            class="minW40rem">
+            contentWidth="950px">
         <content>
             <VBox class="sapUiSmallMargin">
                 <form:SimpleForm adjustLabelSpan="true" editable="true">

diff --git a/menas/ui/generic/formatters.js b/menas/ui/generic/formatters.js
@@ -109,7 +109,7 @@ var Formatters = new function() {
     if (!oDate)
       return "";
     return this.infoDateFormat.format(oDate)
-  }
+  };
 
   this.toStringInfoDate = function(oDate) {
     return this.infoDateFormat.format(oDate);

diff --git a/menas/ui/service/EntityDialog.js b/menas/ui/service/EntityDialog.js
@@ -36,8 +36,6 @@ class EntityDialog {
 
   submit() {
     let newEntity = this.oDialog.getModel("entity").oData;
-    console.log(`submitted entity: ${JSON.stringify(newEntity)}`);
-
     if (!newEntity.isEdit && newEntity.name && typeof (newEntity.nameUnique) === "undefined") {
       // need to wait for the service call
       setTimeout(this.submit.bind(this), 500);
@@ -515,7 +513,6 @@ class EditMappingTableDialog extends MappingTableDialog {
       const current = this.oController._model.getProperty("/currentMappingTable");
 
       const updatedFilters = [FilterTreeUtils.addNiceNamesToFilterData(this.filterEdit.resetFilterDataValidation(current.filter))];
-      console.log(`current filters: ${JSON.stringify(updatedFilters)}`);
 
       current.isEdit = true;
       current.title = "Edit";