From 78763d13a5c7a988d93c5a75aaaa757ae76af3e1 Mon Sep 17 00:00:00 2001
From: Barbara Wulnikowska <barbara.wulnikowska@cognifide.com>
Date: Wed, 2 Dec 2020 10:22:03 +0100
Subject: [PATCH 1/4] Modify table in request monitoring

---
 .../main/url/reports/request-monitoring.html  | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html b/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html
index a5058c48e..679293bbf 100644
--- a/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html
+++ b/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html
@@ -25,8 +25,27 @@
     </div>
   </div>
 </div>
+<!--<div>-->
+<!--  <h4>Total size: {{case.result.totalSize.toFixed(2)}} kB</h4>-->
+<!--  <table class="table table-hover">-->
+<!--    <thead>-->
+<!--    <tr>-->
+<!--      <th>No.</th>-->
+<!--      <th>URL</th>-->
+<!--      <th>Size (kB)</th>-->
+<!--    </tr>-->
+<!--    </thead>-->
+<!--    <tbody>-->
+<!--    <tr ng-repeat="item in case.result.results">-->
+<!--      <td>{{$index+1}}</td>-->
+<!--      <td><a href="{{item.url}}">{{item.url}}</a></td>-->
+<!--      <td>{{item.size.toFixed(2)}}</td>-->
+<!--    </tr>-->
+<!--    </tbody>-->
+<!--  </table>-->
+<!--</div>-->
 <div>
-  <h4>Total size: {{case.result.totalSize.toFixed(2)}} kB</h4>
+  <h4>Total size: {{case.result.totalSize.toFixed(4)}} kB</h4>
   <table class="table table-hover">
     <thead>
     <tr>
@@ -36,9 +55,27 @@ <h4>Total size: {{case.result.totalSize.toFixed(2)}} kB</h4>
     </tr>
     </thead>
     <tbody>
-    <tr ng-repeat="item in case.result.results">
+    <tr class="divider-row" ng-if="case.result.filteredAssets.length > 0">
+        <td>{{$index+1}}</td>
+        <td><a href="{{item.url}}">{{item.url}}</a></td>
+        <td>{{item.size.toFixed(2)}}</td>
+      <td colspan="3">
+        Unexpected assets:
+      </td>
+    </tr>
+    <tr class="danger"
+        ng-repeat="item in case.result.filteredAssets">
+      <td>{{item.code}}</td>
+    </tr>
+    <tr class="divider-row">
+      <td colspan="4">
+        All gathered assets:
+      </td>
+    </tr>
+    <tr class="info" ng-repeat="item in case.result.results">
       <td>{{$index+1}}</td>
-      <td><a href="{{item.url}}">{{item.url}}</a></td>
+      <td>{{item.code}}</td>
+      <td><a href="{{item.url}}" title="{{item.url}}">{{item.url}}</a></td>
       <td>{{item.size.toFixed(2)}}</td>
     </tr>
     </tbody>

From af59e659561bf7e9d9fe74fbbe903f2bdb72d1b1 Mon Sep 17 00:00:00 2001
From: Barbara Wulnikowska <barbara.wulnikowska@cognifide.com>
Date: Wed, 2 Dec 2020 14:16:44 +0100
Subject: [PATCH 2/4] Additional section with unexpected assets

---
 .../app/layout/main/url/mainView.url.controller.js     |  1 +
 .../layout/main/url/reports/request-monitoring.html    | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/report/src/main/webapp/app/layout/main/url/mainView.url.controller.js b/report/src/main/webapp/app/layout/main/url/mainView.url.controller.js
index aca6ebba0..f3721f78e 100644
--- a/report/src/main/webapp/app/layout/main/url/mainView.url.controller.js
+++ b/report/src/main/webapp/app/layout/main/url/mainView.url.controller.js
@@ -64,6 +64,7 @@ define([], function () {
           cases.push(caseFactory.getCase(step, comparator, index));
         });
       });
+      console.log({cases});
       return cases;
     }
 
diff --git a/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html b/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html
index 679293bbf..5d7183312 100644
--- a/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html
+++ b/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html
@@ -55,16 +55,16 @@ <h4>Total size: {{case.result.totalSize.toFixed(4)}} kB</h4>
     </tr>
     </thead>
     <tbody>
-    <tr class="divider-row" ng-if="case.result.filteredAssets.length > 0">
-        <td>{{$index+1}}</td>
-        <td><a href="{{item.url}}">{{item.url}}</a></td>
-        <td>{{item.size.toFixed(2)}}</td>
-      <td colspan="3">
+    <tr class="divider-row" ng-if="case.status == 'FAILED'">
+      <td colspan="4">
         Unexpected assets:
       </td>
     </tr>
     <tr class="danger"
         ng-repeat="item in case.result.filteredAssets">
+      <td>{{$index+1}}</td>
+      <td><a href="{{item.url}}">{{item.url}}</a></td>
+      <td>{{item.size.toFixed(2)}}</td>
       <td>{{item.code}}</td>
     </tr>
     <tr class="divider-row">

From b8655b173124c251f12c56d6627f36eea6f936b9 Mon Sep 17 00:00:00 2001
From: Barbara Wulnikowska <barbara.wulnikowska@cognifide.com>
Date: Fri, 4 Dec 2020 08:41:27 +0100
Subject: [PATCH 3/4] Change ng-if for item with danger style

---
 .../webapp/app/layout/main/url/reports/request-monitoring.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html b/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html
index 5d7183312..73a36480c 100644
--- a/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html
+++ b/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html
@@ -61,7 +61,7 @@ <h4>Total size: {{case.result.totalSize.toFixed(4)}} kB</h4>
       </td>
     </tr>
     <tr class="danger"
-        ng-repeat="item in case.result.filteredAssets">
+        ng-repeat="item in case.result.results.size >= maxSize">
       <td>{{$index+1}}</td>
       <td><a href="{{item.url}}">{{item.url}}</a></td>
       <td>{{item.size.toFixed(2)}}</td>

From 705f463fc9666af1c195fe86a2365f829e65c62f Mon Sep 17 00:00:00 2001
From: Barbara Wulnikowska <barbara.wulnikowska@cognifide.com>
Date: Tue, 8 Dec 2020 11:43:21 +0100
Subject: [PATCH 4/4] Remove console log and comment part of code for colouring
 failing items with proper comment

---
 .../main/url/mainView.url.controller.js       |  1 -
 .../main/url/reports/request-monitoring.html  | 47 ++++++-------------
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/report/src/main/webapp/app/layout/main/url/mainView.url.controller.js b/report/src/main/webapp/app/layout/main/url/mainView.url.controller.js
index f3721f78e..aca6ebba0 100644
--- a/report/src/main/webapp/app/layout/main/url/mainView.url.controller.js
+++ b/report/src/main/webapp/app/layout/main/url/mainView.url.controller.js
@@ -64,7 +64,6 @@ define([], function () {
           cases.push(caseFactory.getCase(step, comparator, index));
         });
       });
-      console.log({cases});
       return cases;
     }
 
diff --git a/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html b/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html
index 73a36480c..971da9d69 100644
--- a/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html
+++ b/report/src/main/webapp/app/layout/main/url/reports/request-monitoring.html
@@ -25,27 +25,8 @@
     </div>
   </div>
 </div>
-<!--<div>-->
-<!--  <h4>Total size: {{case.result.totalSize.toFixed(2)}} kB</h4>-->
-<!--  <table class="table table-hover">-->
-<!--    <thead>-->
-<!--    <tr>-->
-<!--      <th>No.</th>-->
-<!--      <th>URL</th>-->
-<!--      <th>Size (kB)</th>-->
-<!--    </tr>-->
-<!--    </thead>-->
-<!--    <tbody>-->
-<!--    <tr ng-repeat="item in case.result.results">-->
-<!--      <td>{{$index+1}}</td>-->
-<!--      <td><a href="{{item.url}}">{{item.url}}</a></td>-->
-<!--      <td>{{item.size.toFixed(2)}}</td>-->
-<!--    </tr>-->
-<!--    </tbody>-->
-<!--  </table>-->
-<!--</div>-->
 <div>
-  <h4>Total size: {{case.result.totalSize.toFixed(4)}} kB</h4>
+  <h4>Total size: {{case.result.totalSize.toFixed(2)}} kB</h4>
   <table class="table table-hover">
     <thead>
     <tr>
@@ -55,18 +36,20 @@ <h4>Total size: {{case.result.totalSize.toFixed(4)}} kB</h4>
     </tr>
     </thead>
     <tbody>
-    <tr class="divider-row" ng-if="case.status == 'FAILED'">
-      <td colspan="4">
-        Unexpected assets:
-      </td>
-    </tr>
-    <tr class="danger"
-        ng-repeat="item in case.result.results.size >= maxSize">
-      <td>{{$index+1}}</td>
-      <td><a href="{{item.url}}">{{item.url}}</a></td>
-      <td>{{item.size.toFixed(2)}}</td>
-      <td>{{item.code}}</td>
-    </tr>
+<!--    TO DO: Uncomment and test if it's working after implementing improvement checking max size for one specific item-->
+
+<!--    <tr class="divider-row" ng-if="case.status == 'FAILED'">-->
+<!--      <td colspan="4">-->
+<!--        Unexpected assets:-->
+<!--      </td>-->
+<!--    </tr>-->
+<!--    <tr class="danger"-->
+<!--        ng-repeat="item in case.result.results.size >= maxSize">-->
+<!--      <td>{{$index+1}}</td>-->
+<!--      <td><a href="{{item.url}}">{{item.url}}</a></td>-->
+<!--      <td>{{item.size.toFixed(2)}}</td>-->
+<!--      <td>{{item.code}}</td>-->
+<!--    </tr>-->
     <tr class="divider-row">
       <td colspan="4">
         All gathered assets: