From e6541df2a86b701cf9b1fe7615cb43a601b8b974 Mon Sep 17 00:00:00 2001
From: Alexander Mohr <thehesiod@hotmail.com>
Date: Fri, 26 Oct 2018 22:06:05 -0700
Subject: [PATCH] fix dashboard and tweak

---
 .../dashboard/dashboard-controller.js         |  4 ++--
 .../admin_ui/dashboard/dashboard.html         |  4 ++--
 .../frontend/admin_ui/hostpage/hosts.html     | 20 ++++++++++---------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/upvote/gae/modules/upvote_app/frontend/admin_ui/dashboard/dashboard-controller.js b/upvote/gae/modules/upvote_app/frontend/admin_ui/dashboard/dashboard-controller.js
index 5397dd9..a994782 100644
--- a/upvote/gae/modules/upvote_app/frontend/admin_ui/dashboard/dashboard-controller.js
+++ b/upvote/gae/modules/upvote_app/frontend/admin_ui/dashboard/dashboard-controller.js
@@ -49,7 +49,7 @@ upvote.admin.dashboard.DashboardController = class {
   /** @private */
   init_() {
     this.blockableQueryResource_['search'](
-            {'filter': 'suspect', 'platform': 'all', 'type': 'all'})['$promise']
+            {'filter': 'suspect', 'platform': 'all', 'type': 'all', 'withContext': 'true'})['$promise']
         .then((response) => {
           this.suspectBlockables = response['content'];
         })
@@ -57,7 +57,7 @@ upvote.admin.dashboard.DashboardController = class {
           this.errorService_.createToastFromError(response);
         });
     this.blockableQueryResource_['search'](
-            {'filter': 'flagged', 'platform': 'all', 'type': 'all'})['$promise']
+            {'filter': 'flagged', 'platform': 'all', 'type': 'all', 'withContext': 'true'})['$promise']
         .then((response) => {
           this.flaggedBlockables = response['content'];
         })
diff --git a/upvote/gae/modules/upvote_app/frontend/admin_ui/dashboard/dashboard.html b/upvote/gae/modules/upvote_app/frontend/admin_ui/dashboard/dashboard.html
index 6663611..ae151e0 100644
--- a/upvote/gae/modules/upvote_app/frontend/admin_ui/dashboard/dashboard.html
+++ b/upvote/gae/modules/upvote_app/frontend/admin_ui/dashboard/dashboard.html
@@ -13,7 +13,7 @@
         <listing-body>
           <uv-blockable-listing ng-repeat="item in dashboardCtrl.suspectBlockables"
                                  item="item"
-                                 on-selected="dashboardCtrl.onSelectedItem(item.id)">
+                                 on-selected="dashboardCtrl.onSelectedItem(item.blockable.id)">
           </uv-blockable-listing>
         </listing-body>
       </uv-listing>
@@ -33,7 +33,7 @@
         <listing-body>
           <uv-blockable-listing ng-repeat="item in dashboardCtrl.flaggedBlockables"
                                  item="item"
-                                 on-selected="dashboardCtrl.onSelectedItem(item.id)">
+                                 on-selected="dashboardCtrl.onSelectedItem(item.blockable.id)">
           </uv-blockable-listing>
         </listing-body>
       </uv-listing>
diff --git a/upvote/gae/modules/upvote_app/frontend/admin_ui/hostpage/hosts.html b/upvote/gae/modules/upvote_app/frontend/admin_ui/hostpage/hosts.html
index a7fe696..30dfe2f 100644
--- a/upvote/gae/modules/upvote_app/frontend/admin_ui/hostpage/hosts.html
+++ b/upvote/gae/modules/upvote_app/frontend/admin_ui/hostpage/hosts.html
@@ -75,32 +75,34 @@
           </span>
           <span ng-if="hostCtrl.hostUtils.isSantaHost(host)"
                 class="md-subhead uv-host-card-detail">
+            Should Upload Logs:
+            <span class="uv-host-card-value">
+              {{ host.shouldUploadLogs }}
+            </span>
+          </span>
+
+          <!-- Details -->
+          <span ng-if="hostCtrl.hostUtils.isSantaHost(host) && hostCtrl.detailsVisible(host.id)"
+                class="md-subhead uv-host-card-detail">
             Transitive Whitelisting Enabled:
             <span class="uv-host-card-value">
               {{ host.transitiveWhitelistingEnabled }}
             </span>
           </span>
-          <span ng-if="hostCtrl.hostUtils.isSantaHost(host)"
+          <span ng-if="hostCtrl.hostUtils.isSantaHost(host) && hostCtrl.detailsVisible(host.id)"
                 class="md-subhead uv-host-card-detail">
             Whitelist REGEX:
             <span class="uv-host-card-value">
               {{ host.directoryWhitelistRegex }}
             </span>
           </span>
-          <span ng-if="hostCtrl.hostUtils.isSantaHost(host)"
+          <span ng-if="hostCtrl.hostUtils.isSantaHost(host) && hostCtrl.detailsVisible(host.id)"
                 class="md-subhead uv-host-card-detail">
             Blacklist REGEX:
             <span class="uv-host-card-value">
               {{ host.directoryBlacklistRegex }}
             </span>
           </span>
-          <span ng-if="hostCtrl.hostUtils.isSantaHost(host)"
-                class="md-subhead uv-host-card-detail">
-            Should Upload Logs:
-            <span class="uv-host-card-value">
-              {{ host.shouldUploadLogs }}
-            </span>
-          </span>
           <span class="md-subhead uv-host-card-detail"
                 ng-if="hostCtrl.detailsVisible(host.id)">
             First Seen: