#1863 mCR/MT tree view - debug filterJson removed

AbsaOSS · Oct 5, 2021 · 604cbe4 · 604cbe4
1 parent 1865651
commit 604cbe4
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 13 deletions.
diff --git a/menas/ui/components/dataset/conformanceRule/MappingConformanceRule/display.fragment.xml b/menas/ui/components/dataset/conformanceRule/MappingConformanceRule/display.fragment.xml
@@ -47,9 +47,6 @@
                         </CustomListItem>
                     </items>
                 </List>
-                <!-- todo remove debug filter -->
-                <Label text="Debug Filter"/>
-                <Text text="{filterJson}"/>
                 <Label text="Filter" />
                 <Tree id="filterTree" items="{path: 'filterViewTree', parameters: {numberOfExpandedLevels: 1}}" noDataText="No filter set.">
                     <StandardTreeItem title="{text}" icon="{icon}"/>

diff --git a/menas/ui/components/dataset/datasetDetail.controller.js b/menas/ui/components/dataset/datasetDetail.controller.js
@@ -428,7 +428,6 @@ sap.ui.define([
         oContext.getObject().joinConditions = aJoinConditions;
 
         let filterTreeData = oContext.getProperty("mappingTableFilter");
-        oContext.getObject().filterJson = JSON.stringify(filterTreeData); // todo remove
 
         // view filter with icons in a tree
         let treeDataWithIcons = FilterTreeUtils.addIconsAndNiceNamesToFilterData(filterTreeData);

diff --git a/menas/ui/components/mappingTable/addMappingTable.fragment.xml b/menas/ui/components/mappingTable/addMappingTable.fragment.xml
@@ -58,9 +58,6 @@
                                               HDFSPath="{entity>/hdfsPath}"/>
 
                         </VBox>
-                        <!-- todo remove -->
-                        <Label text="Filter"/>
-                        <Text text="{entity>/filterJson}"/>
                         <Label text="Filter Tree"/>
                         <!-- using common fragment for MT & Mapping CR for filter editing -->
                         <core:Fragment type="XML" fragmentName="components.mappingTable.filterEdit.filterTreeEdit"/>

diff --git a/menas/ui/components/mappingTable/mappingTableDetail.controller.js b/menas/ui/components/mappingTable/mappingTableDetail.controller.js
@@ -296,9 +296,6 @@ sap.ui.define([
     load: function() {
       let currentMT = this._model.getProperty("/currentMappingTable");
 
-      // todo remove when "debug filter" gets removed from UI
-      currentMT.filterJson = JSON.stringify(currentMT.filter);
-
       let filterDataWithNamesAndIcons = FilterTreeUtils.addIconsAndNiceNamesToFilterData(currentMT.filter);
       currentMT.filterTree = [filterDataWithNamesAndIcons];
 

diff --git a/menas/ui/components/mappingTable/mappingTableInfo.fragment.xml b/menas/ui/components/mappingTable/mappingTableInfo.fragment.xml
@@ -41,9 +41,6 @@
                 text="{path: 'mappingTable>/dateCreated', formatter: 'Formatters.stringDateShortFormatter'}"/>
             <Label text="Created By"/>
             <Text text="{mappingTable>/userCreated}"/>
-            <!-- todo remove debug filter -->
-            <Label text="Debug Filter"/>
-            <Text text="{mappingTable>/filterJson}"/>
             <Label text="Filter" />
             <Tree id="filterTree" items="{path: 'mappingTable>/filterTree', parameters: {numberOfExpandedLevels: 1}}" noDataText="No filter set.">
                 <StandardTreeItem title="{mappingTable>text}" icon="{mappingTable>icon}"/>