From 09292c4aaa232cd962e6cefa2b8c543a399aee0b Mon Sep 17 00:00:00 2001
From: serenaponta <42769540+serenaponta@users.noreply.github.com>
Date: Thu, 24 Mar 2022 17:17:44 +0100
Subject: [PATCH 1/5] added construct counter to deps rest api

---
 .../src/main/java/org/eclipse/steady/backend/model/Library.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest-backend/src/main/java/org/eclipse/steady/backend/model/Library.java b/rest-backend/src/main/java/org/eclipse/steady/backend/model/Library.java
index 0b4daba64..405565e5a 100644
--- a/rest-backend/src/main/java/org/eclipse/steady/backend/model/Library.java
+++ b/rest-backend/src/main/java/org/eclipse/steady/backend/model/Library.java
@@ -461,7 +461,7 @@ public Set<ProgrammingLanguage> getDevelopedIn() {
    * @return a {@link org.eclipse.steady.backend.model.ConstructIdFilter} object.
    */
   @JsonProperty(value = "constructTypeCounters")
-  @JsonView(Views.CountDetails.class)
+  @JsonView(Views.Default.class)
   @JsonIgnoreProperties(
       value = {"constructTypeCounters"},
       allowGetters = true)

From d54882f7fbea43ea4ff45d70f29a22884ef17d61 Mon Sep 17 00:00:00 2001
From: serenaponta <42769540+serenaponta@users.noreply.github.com>
Date: Thu, 24 Mar 2022 18:08:16 +0100
Subject: [PATCH 2/5] added deps column

---
 frontend-apps/src/main/webapp/view/Component.view.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/frontend-apps/src/main/webapp/view/Component.view.xml b/frontend-apps/src/main/webapp/view/Component.view.xml
index b2293dd5c..da4b23599 100755
--- a/frontend-apps/src/main/webapp/view/Component.view.xml
+++ b/frontend-apps/src/main/webapp/view/Component.view.xml
@@ -333,6 +333,15 @@
 										</template>
 										<!-- Text text="App actually executes library code" / -->
 									</Column>
+									<Column xmlns="sap.ui.table" width="10%" sorted="true">
+										<multiLabels>
+											<Label text="Library executable " xmlns="sap.ui.commons" />
+											<Label text="constructs" xmlns="sap.ui.commons" />
+										</multiLabels>
+										<template>
+											<TextView xmlns="sap.ui.commons" text="{lib/constructTypeCounters/countExecutable}"></TextView>
+										</template>
+									</Column>
 								</Table>
 							</IconTabFilter>
 

From 09f216c5ab3fd16b17730af797bfa35d6d98cf0e Mon Sep 17 00:00:00 2001
From: serenaponta <42769540+serenaponta@users.noreply.github.com>
Date: Mon, 28 Mar 2022 14:52:04 +0200
Subject: [PATCH 3/5] added filter property

---
 frontend-apps/src/main/webapp/view/Component.view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend-apps/src/main/webapp/view/Component.view.xml b/frontend-apps/src/main/webapp/view/Component.view.xml
index da4b23599..a363f8b4a 100755
--- a/frontend-apps/src/main/webapp/view/Component.view.xml
+++ b/frontend-apps/src/main/webapp/view/Component.view.xml
@@ -249,14 +249,14 @@
 										</template>
 									</Column>
 									<Column xmlns="sap.ui.table" width="10%" sorted="true"
-										sortProperty="scope">
+										sortProperty="scope" filterProperty="scope">
 										<Label text="Dependency Scope" xmlns="sap.ui.commons" />
 										<template>
 											<TextView xmlns="sap.ui.commons" text="{scope}"></TextView>
 										</template>
 									</Column>
 									<Column xmlns="sap.ui.table" width="10%" sorted="true"
-										sortProperty="transitive">
+										sortProperty="transitive" filterProperty="transitive">
 										<Label text="Direct / Transitive" xmlns="sap.ui.commons" />
 										<template>
 											<TextView xmlns="sap.ui.commons"

From 63cd8c74ad94dfa6403af7f221e2c827d8a33773 Mon Sep 17 00:00:00 2001
From: serenaponta <42769540+serenaponta@users.noreply.github.com>
Date: Thu, 31 Mar 2022 15:06:37 +0200
Subject: [PATCH 4/5] added bloat icontab

---
 .../main/webapp/i18n/messageBundle.properties |   1 +
 .../src/main/webapp/model/Formatter.js        |   6 +
 .../main/webapp/view/Component.controller.js  | 154 ++++++++++++++++--
 .../src/main/webapp/view/Component.view.xml   | 144 ++++++++++++++--
 4 files changed, 280 insertions(+), 25 deletions(-)

diff --git a/frontend-apps/src/main/webapp/i18n/messageBundle.properties b/frontend-apps/src/main/webapp/i18n/messageBundle.properties
index 636c5bb83..3f71f9599 100755
--- a/frontend-apps/src/main/webapp/i18n/messageBundle.properties
+++ b/frontend-apps/src/main/webapp/i18n/messageBundle.properties
@@ -38,6 +38,7 @@ masterCreateSpaceTooltip=Create workspace
 
 
 Archives=Dependencies
+Bloat=Bloat
 patchAnalysis=Vulnerabilities
 mavenVerified=Maven-verified archive
 testCoverageTitle=Testcoverage for 
diff --git a/frontend-apps/src/main/webapp/model/Formatter.js b/frontend-apps/src/main/webapp/model/Formatter.js
index fd2acbb34..8cad8d71f 100755
--- a/frontend-apps/src/main/webapp/model/Formatter.js
+++ b/frontend-apps/src/main/webapp/model/Formatter.js
@@ -239,6 +239,12 @@ model.Formatter = {
 		return a;
 	},
 	
+	debloat: function(reach,traced,exec){
+		if( reach==0 && traced==0 && exec>0)
+			return true;
+		else return false;
+	},
+	
 	parentDepth : function(parent) {
 		let a=0;
 		if(parent){
diff --git a/frontend-apps/src/main/webapp/view/Component.controller.js b/frontend-apps/src/main/webapp/view/Component.controller.js
index c9484e7d7..e26130570 100755
--- a/frontend-apps/src/main/webapp/view/Component.controller.js
+++ b/frontend-apps/src/main/webapp/view/Component.controller.js
@@ -70,6 +70,115 @@ sap.ui.controller("view.Component", {
 		return emptyModel;
 	},
 	
+	computeDebloatViewMetrics : function(_test){
+		var archiveInScope = this.getView().byId("archiveInScope");
+		var archiveDebloat = this.getView().byId("archiveDebloat");
+		var archiveTraced = this.getView().byId("archiveTraced");
+		var archiveReachable = this.getView().byId("archiveReachable");
+		var archiveTotalTraces = this.getView().byId("archiveTotalTraces");
+		
+		var archivesInTable = this.getView().byId("idBloatList").getModel().getObject("/");
+		var archives = 0;
+		var traced = 0;
+		var reachable = 0;
+		var traces = 0;
+		var debloatable = 0;
+		for (var a=0;a<archivesInTable.length;a++){
+			if(_test || archivesInTable[a].scope!="TEST"){
+				archives++;
+				if(archivesInTable[a].tracedExecConstructsCounter>0){
+					traced++;
+					traces = traces + archivesInTable[a].tracedExecConstructsCounter;
+				}
+				if(archivesInTable[a].reachExecConstructsCounter>0){
+					reachable++;
+				}
+				if(archivesInTable[a].tracedExecConstructsCounter==0 && archivesInTable[a].reachExecConstructsCounter==0 && archivesInTable[a].lib.constructTypeCounters.countExecutable>0){
+					debloatable++;
+				}
+			}
+		}
+		
+		archiveInScope.setText("Archives in selected scopes: " + archives);
+		archiveDebloat.setText("Debloatable archives: " + debloatable);
+		archiveTraced.setText("Archives Traced: " + traced);
+		archiveReachable.setText("Archives Reachable: " + reachable);
+		archiveTotalTraces.setText("Total Number of Traces: " + traces);
+	},
+	
+//	includeTestDeps: function(){
+//		if(this.getView().byId("showDebloat").getSelected()==true){
+//			this.showDebloatableArchives();
+//		}
+//		else{
+//			var scopeColumn = this.getView().byId("scopeColumn");
+//			var oBloatView = this.getView().byId("idBloatList");
+//			if(scopeColumn.getFiltered()==true){
+//				scopeColumn.setFilterValue("");
+//				scopeColumn.setFiltered(false);
+//				oBloatView.filter(scopeColumn,"")
+//				this.computeDebloatViewMetrics(true);
+//			}
+//			else{
+//				scopeColumn.setFilterValue("!=TEST");
+//				scopeColumn.setFiltered(true);
+//				oBloatView.filter(scopeColumn,"!=TEST")
+//				this.computeDebloatViewMetrics(false);
+//			}
+//		}
+//	},
+	
+	showDebloatableArchives: function(){
+		var array=[];
+		var scopeColumn = this.getView().byId("scopeColumn");
+		if(this.getView().byId("showDebloat").getSelected()==true){
+			var filter1 = new sap.ui.model.Filter(
+				    "reachExecConstructsCounter", 
+				    sap.ui.model.FilterOperator.EQ, 
+				    "0");
+			var filter2 = new sap.ui.model.Filter(
+				    "tracedExecConstructsCounter", 
+				    sap.ui.model.FilterOperator.EQ, 
+				    "0");
+			var filter3 = new sap.ui.model.Filter(
+				    "lib/constructTypeCounters/countExecutable", 
+				    sap.ui.model.FilterOperator.NE, 
+				    "0");
+			
+			array.push(filter1);
+			array.push(filter2);
+			array.push(filter3);
+		}
+		if(this.getView().byId("includeTest").getSelected()==false){
+			var filter4 = new sap.ui.model.Filter(
+				    "scope", 
+				    sap.ui.model.FilterOperator.NE, 
+				    "TEST");
+			array.push(filter4);
+			scopeColumn.setFilterValue("!=TEST");
+			scopeColumn.setFiltered(true);
+			this.computeDebloatViewMetrics(false);
+		}
+		else if (this.getView().byId("includeTest").getSelected()==true){
+			scopeColumn.setFilterValue("");
+			scopeColumn.setFiltered(false);
+			this.computeDebloatViewMetrics(true);
+		}
+		
+		if(array!=[]){
+			var tableFilter = new sap.ui.model.Filter({
+					    filters: array,
+					    and: true
+			});
+
+			this.getView().byId("idBloatList").getBinding("rows").filter(tableFilter);
+	
+		}
+	
+		else
+			this.getView().byId("idBloatList").getBinding("rows").filter();
+	},
+	
 	// Vulnerabilities tab: Sets the 2 counters
 	setVulnDepCounters:function(_archives, _vulns) {
 		var archiveCount = this.getView().byId("archiveCount");
@@ -271,6 +380,10 @@ sap.ui.controller("view.Component", {
 		oArchiveView.setModel(this.getEmptyModel());
 		oArchiveView.setBusy(true);
 		
+		var oBloatView = this.getView().byId("idBloatList");
+		oBloatView.setModel(this.getEmptyModel());
+		oBloatView.setBusy(true);
+		
 		//var oConstructView = this.getView().byId("idPatchAnalysisList");		
 		//oConstructView.setModel(emptyModel);
 		//oConstructView.setBusy(true);
@@ -321,14 +434,28 @@ sap.ui.controller("view.Component", {
 			}
 			sUrl = model.Config.getArchivesServiceUrl(groupId,artifactId,versionId, cache);
 
+			
 			var archiveTotal = this.getView().byId("archiveTotal");
+			var archiveAvgAge = this.getView().byId("archiveAvgAge");
+			
+			var archiveInScope = this.getView().byId("archiveInScope");
+			var archiveDebloat = this.getView().byId("archiveDebloat");
 			var archiveTraced = this.getView().byId("archiveTraced");
+			var archiveReachable = this.getView().byId("archiveReachable");
 			var archiveTotalTraces = this.getView().byId("archiveTotalTraces");
-			var archiveAvgAge = this.getView().byId("archiveAvgAge");
+			
+			var scopeColumn = this.getView().byId("scopeColumn");
+			
 			archiveTotal.setText("Archives Total: ");
+			archiveAvgAge.setText("Average age (in months): ");
+			
+
+			archiveInScope.setText("Archives in selected scopes: ");
+			archiveDebloat.setText("Debloatable archives: ");
 			archiveTraced.setText("Archives Traced: ");
+			archiveReachable.setText("Archives Reachable: ");
 			archiveTotalTraces.setText("Total Number of Traces: ");
-			archiveAvgAge.setText("Average age (in months): ");
+			
 			
 			model.Config.addToQueue(oArchiveModel);
 			model.Config.loadData(oArchiveModel, sUrl, 'GET');
@@ -338,16 +465,18 @@ sap.ui.controller("view.Component", {
 				oArchiveView.setVisibleRowCount(oArchiveModel.getObject("/").length);
 				oArchiveView.setModel(oArchiveModel);
 				oArchiveView.setBusy(false);
+
+				oBloatView.setVisibleRowCount(oArchiveModel.getObject("/").length);
+				oBloatView.setModel(oArchiveModel);
+				scopeColumn.setFilterValue("!=TEST");
+				scopeColumn.setFiltered(true);
+				oBloatView.filter(scopeColumn,"!=TEST")
+				oBloatView.setBusy(false);
 				
 				var archives = oArchiveModel.getObject("/");
-				var traced = 0;
-				var traces = 0;
 				var days = 0, archives_with_timestamp = 0, now = Date.now();
 				for(var a=0;a<archives.length; a++){
-					if(archives[a].tracedExecConstructsCounter>0){
-						traced++;
-						traces = traces + archives[a].tracedExecConstructsCounter;
-					}
+					
 					if(archives[a].lib.digestTimestamp!=null) {
 						archives_with_timestamp++;
 						var timestamp19 = archives[a].lib.digestTimestamp.substring(0,19);
@@ -355,12 +484,12 @@ sap.ui.controller("view.Component", {
 						days += Math.floor(Math.abs(now-timestamp)/86400000);
 					}
 				}
-				
 				archiveTotal.setText("Archives Total: " + archives.length);
-				archiveTraced.setText("Archives Traced: " + traced);
-				archiveTotalTraces.setText("Total Number of Traces: " + traces);
 				archiveAvgAge.setText("Average age (in months): " + (archives_with_timestamp==0 ? "n/a" : Math.floor(days/30/archives_with_timestamp)));
-			});
+				
+				this.computeDebloatViewMetrics(false);
+				
+			}.bind(this));
 		}
 		
 		// Goal-Executions-Tab
@@ -696,6 +825,7 @@ sap.ui.controller("view.Component", {
 //		oEvent.getSource().removeSelections();
 //	},
 	
+	
 	onSearchButtonPress : function() {
 		
 		// Search string
diff --git a/frontend-apps/src/main/webapp/view/Component.view.xml b/frontend-apps/src/main/webapp/view/Component.view.xml
index a363f8b4a..9f985c81a 100755
--- a/frontend-apps/src/main/webapp/view/Component.view.xml
+++ b/frontend-apps/src/main/webapp/view/Component.view.xml
@@ -219,16 +219,16 @@
 											<Text id="archiveTotal" xmlns="sap.m" text="None" />
 										</m:MatrixLayoutCell>
 									</m:MatrixLayoutRow>
-									<m:MatrixLayoutRow>
-										<m:MatrixLayoutCell>
-											<Text id="archiveTraced" xmlns="sap.m" text="None" />
-										</m:MatrixLayoutCell>
-									</m:MatrixLayoutRow>
-									<m:MatrixLayoutRow>
-										<m:MatrixLayoutCell>
-											<Text id="archiveTotalTraces" xmlns="sap.m" text="None" />
-										</m:MatrixLayoutCell>
-									</m:MatrixLayoutRow>
+<!-- 									<m:MatrixLayoutRow> -->
+<!-- 										<m:MatrixLayoutCell> -->
+<!-- 											<Text id="archiveTraced" xmlns="sap.m" text="None" /> -->
+<!-- 										</m:MatrixLayoutCell> -->
+<!-- 									</m:MatrixLayoutRow> -->
+<!-- 									<m:MatrixLayoutRow> -->
+<!-- 										<m:MatrixLayoutCell> -->
+<!-- 											<Text id="archiveTotalTraces" xmlns="sap.m" text="None" /> -->
+<!-- 										</m:MatrixLayoutCell> -->
+<!-- 									</m:MatrixLayoutRow> -->
 									<m:MatrixLayoutRow>
 										<m:MatrixLayoutCell>
 											<Text id="archiveAvgAge" xmlns="sap.m" text="None" />
@@ -310,8 +310,114 @@
 											</commons:TextView>
 										</template>
 									</Column>
+<!-- 									<Column xmlns="sap.ui.table" width="10%" sorted="true" -->
+<!-- 										sortProperty="reachExecConstructsCounter"> -->
+<!-- 										Text text="App potentially executes library code" / -->
+<!-- 										<multiLabels> -->
+<!-- 											<Label text="Library constructs" xmlns="sap.ui.commons" /> -->
+<!-- 											<Label text="potentially executable" xmlns="sap.ui.commons" /> -->
+<!-- 										</multiLabels> -->
+<!-- 										<template> -->
+<!-- 											<TextView xmlns="sap.ui.commons" -->
+<!-- 												text="{reachExecConstructsCounter}"></TextView> -->
+<!-- 										</template> -->
+<!-- 									</Column> -->
+<!-- 									<Column xmlns="sap.ui.table" width="10%" sorted="true" -->
+<!-- 										sortProperty="tracedExecConstructsCounter"> -->
+<!-- 										<multiLabels> -->
+<!-- 											<Label text="Library constructs " xmlns="sap.ui.commons" /> -->
+<!-- 											<Label text="actually executed" xmlns="sap.ui.commons" /> -->
+<!-- 										</multiLabels> -->
+<!-- 										<template> -->
+<!-- 											<TextView xmlns="sap.ui.commons" text="{tracedExecConstructsCounter}"></TextView> -->
+<!-- 										</template> -->
+<!-- 										Text text="App actually executes library code" / -->
+<!-- 									</Column> -->
+<!-- 									<Column xmlns="sap.ui.table" width="10%" sorted="true"> -->
+<!-- 										<multiLabels> -->
+<!-- 											<Label text="Library executable " xmlns="sap.ui.commons" /> -->
+<!-- 											<Label text="constructs" xmlns="sap.ui.commons" /> -->
+<!-- 										</multiLabels> -->
+<!-- 										<template> -->
+<!-- 											<TextView xmlns="sap.ui.commons" text="{lib/constructTypeCounters/countExecutable}"></TextView> -->
+<!-- 										</template> -->
+<!-- 									</Column> -->
+								</Table>
+							</IconTabFilter>
+
+							<IconTabFilter text="{i18n>Bloat}" icon="sap-icon://scissors" id="id_debloat">
+
+								<m:MatrixLayout columns="1">
+									<m:MatrixLayoutRow>
+										<m:MatrixLayoutCell>
+											<Text id="archiveInScope" xmlns="sap.m" text="None" />
+										</m:MatrixLayoutCell>
+									</m:MatrixLayoutRow>
+									<m:MatrixLayoutRow>
+										<m:MatrixLayoutCell>
+											<Text id="archiveDebloat" xmlns="sap.m" text="None" />
+										</m:MatrixLayoutCell>
+									</m:MatrixLayoutRow>
+									<m:MatrixLayoutRow>
+										<m:MatrixLayoutCell>
+											<Text id="archiveTraced" xmlns="sap.m" text="None" />
+										</m:MatrixLayoutCell>
+									</m:MatrixLayoutRow>
+									<m:MatrixLayoutRow>
+										<m:MatrixLayoutCell>
+											<Text id="archiveReachable" xmlns="sap.m" text="None" />
+										</m:MatrixLayoutCell>
+									</m:MatrixLayoutRow>
+									<m:MatrixLayoutRow>
+										<m:MatrixLayoutCell>
+											<Text id="archiveTotalTraces" xmlns="sap.m" text="None" />
+										</m:MatrixLayoutCell>
+									</m:MatrixLayoutRow>
+									<m:MatrixLayoutRow>
+									<m:MatrixLayoutCell>
+											<CheckBox id="includeTest" text="Include TEST dependencies" selected="false" select="showDebloatableArchives"/>
+										</m:MatrixLayoutCell>
+									</m:MatrixLayoutRow>
+									<m:MatrixLayoutRow>
+										<m:MatrixLayoutCell>
+											<CheckBox id="showDebloat" text="Show Debloatable" selected="false" select="showDebloatableArchives"/>
+										</m:MatrixLayoutCell>
+									</m:MatrixLayoutRow>
+								</m:MatrixLayout>
+
+
+								<Table xmlns="sap.ui.table" id="idBloatList"
+									rows="{ path: '/', sorter: { path: 'filename'} }"
+									selectionMode="None">
+									<Column xmlns="sap.ui.table" width="30%" sorted="true"
+										filtered="true" sortProperty="filename" filterProperty="filename">
+										<Label text="Archive Filename&#13;&#10;(Digest)" xmlns="sap.ui.commons" />
+										<template>
+											<ObjectIdentifier title="{filename}" text="{lib/digest}"
+												xmlns="sap.m" titleActive="true" titlePress="onArchiveListItemTap" />
+										</template>
+									</Column>
+									<Column xmlns="sap.ui.table" width="10%" sorted="true"
+										sortProperty="scope" filterProperty="scope" id='scopeColumn'>
+										<Label text="Dependency Scope" xmlns="sap.ui.commons" />
+										<template>
+											<TextView xmlns="sap.ui.commons" text="{scope}"></TextView>
+										</template>
+									</Column>
+									<Column xmlns="sap.ui.table" width="10%" sorted="true"
+										sortProperty="transitive" filterProperty="transitive">
+										<Label text="Direct / Transitive" xmlns="sap.ui.commons" />
+										<template>
+											<TextView xmlns="sap.ui.commons"
+												text="{
+		 												path: 'transitive',
+		 												formatter: 'model.Formatter.directTransitive'}"></TextView>
+										</template>
+									</Column>
 									<Column xmlns="sap.ui.table" width="10%" sorted="true"
-										sortProperty="reachExecConstructsCounter">
+										sortProperty="reachExecConstructsCounter" 
+										filterProperty="reachExecConstructsCounter" filtered="false">
+										
 										<!-- Text text="App potentially executes library code" / -->
 										<multiLabels>
 											<Label text="Library constructs" xmlns="sap.ui.commons" />
@@ -323,7 +429,8 @@
 										</template>
 									</Column>
 									<Column xmlns="sap.ui.table" width="10%" sorted="true"
-										sortProperty="tracedExecConstructsCounter">
+										sortProperty="tracedExecConstructsCounter"
+										filterProperty="tracedExecConstructsCounter" filtered="false">
 										<multiLabels>
 											<Label text="Library constructs " xmlns="sap.ui.commons" />
 											<Label text="actually executed" xmlns="sap.ui.commons" />
@@ -333,7 +440,9 @@
 										</template>
 										<!-- Text text="App actually executes library code" / -->
 									</Column>
-									<Column xmlns="sap.ui.table" width="10%" sorted="true">
+									<Column xmlns="sap.ui.table" width="10%" sorted="true"
+									    sortProperty="lib/constructTypeCounters/countExecutable"
+									    filterProperty="lib/constructTypeCounters/countExecutable" filtered="false">
 										<multiLabels>
 											<Label text="Library executable " xmlns="sap.ui.commons" />
 											<Label text="constructs" xmlns="sap.ui.commons" />
@@ -342,6 +451,15 @@
 											<TextView xmlns="sap.ui.commons" text="{lib/constructTypeCounters/countExecutable}"></TextView>
 										</template>
 									</Column>
+									<Column xmlns="sap.ui.table" width="10%" >
+											<Label text="Debloat? " xmlns="sap.ui.commons" />
+										<template>
+												<TextView xmlns="sap.ui.commons"
+												text="{
+		 												parts: ['reachExecConstructsCounter','tracedExecConstructsCounter','lib/constructTypeCounters/countExecutable'],
+		 												formatter: 'model.Formatter.debloat'}"></TextView>
+										</template>
+									</Column>
 								</Table>
 							</IconTabFilter>
 

From f4e0e95b75d1defa3697e0aa279224d4b27972fd Mon Sep 17 00:00:00 2001
From: serenaponta <42769540+serenaponta@users.noreply.github.com>
Date: Thu, 31 Mar 2022 16:55:16 +0200
Subject: [PATCH 5/5] adapt row count; improved text

---
 .../src/main/webapp/view/Component.controller.js         | 9 +++++----
 frontend-apps/src/main/webapp/view/Component.view.xml    | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend-apps/src/main/webapp/view/Component.controller.js b/frontend-apps/src/main/webapp/view/Component.controller.js
index e26130570..dd5fbd717 100755
--- a/frontend-apps/src/main/webapp/view/Component.controller.js
+++ b/frontend-apps/src/main/webapp/view/Component.controller.js
@@ -104,6 +104,7 @@ sap.ui.controller("view.Component", {
 		archiveTraced.setText("Archives Traced: " + traced);
 		archiveReachable.setText("Archives Reachable: " + reachable);
 		archiveTotalTraces.setText("Total Number of Traces: " + traces);
+		
 	},
 	
 //	includeTestDeps: function(){
@@ -172,11 +173,12 @@ sap.ui.controller("view.Component", {
 			});
 
 			this.getView().byId("idBloatList").getBinding("rows").filter(tableFilter);
-	
 		}
-	
-		else
+		else{
 			this.getView().byId("idBloatList").getBinding("rows").filter();
+		}
+		this.getView().byId("idBloatList").setVisibleRowCount(this.getView().byId("idBloatList").getBinding("rows").iLength);
+		
 	},
 	
 	// Vulnerabilities tab: Sets the 2 counters
@@ -466,7 +468,6 @@ sap.ui.controller("view.Component", {
 				oArchiveView.setModel(oArchiveModel);
 				oArchiveView.setBusy(false);
 
-				oBloatView.setVisibleRowCount(oArchiveModel.getObject("/").length);
 				oBloatView.setModel(oArchiveModel);
 				scopeColumn.setFilterValue("!=TEST");
 				scopeColumn.setFiltered(true);
diff --git a/frontend-apps/src/main/webapp/view/Component.view.xml b/frontend-apps/src/main/webapp/view/Component.view.xml
index 9f985c81a..dcef462ec 100755
--- a/frontend-apps/src/main/webapp/view/Component.view.xml
+++ b/frontend-apps/src/main/webapp/view/Component.view.xml
@@ -380,7 +380,7 @@
 									</m:MatrixLayoutRow>
 									<m:MatrixLayoutRow>
 										<m:MatrixLayoutCell>
-											<CheckBox id="showDebloat" text="Show Debloatable" selected="false" select="showDebloatableArchives"/>
+											<CheckBox id="showDebloat" text="Show debloatable only (libraries with executable constructs where none was actually executed nor found potentially reachable)" selected="false" select="showDebloatableArchives"/>
 										</m:MatrixLayoutCell>
 									</m:MatrixLayoutRow>
 								</m:MatrixLayout>
@@ -452,7 +452,7 @@
 										</template>
 									</Column>
 									<Column xmlns="sap.ui.table" width="10%" >
-											<Label text="Debloat? " xmlns="sap.ui.commons" />
+											<Label text="Debloatable? " xmlns="sap.ui.commons" />
 										<template>
 												<TextView xmlns="sap.ui.commons"
 												text="{