From 6a889eb84ef252086712d5155169b381021cdeb6 Mon Sep 17 00:00:00 2001
From: eldadfux <eldad.fux@gmail.com>
Date: Sat, 19 Oct 2019 02:59:33 +0300
Subject: [PATCH] Bugfix for UI not showing user prefs properly

---
 app/views/console/users/view.phtml | 4 ++--
 public/dist/scripts/app-all.js     | 2 +-
 public/dist/scripts/app.js         | 2 +-
 public/scripts/filters.js          | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/views/console/users/view.phtml b/app/views/console/users/view.phtml
index 7a484a97c9..10dbb32530 100644
--- a/app/views/console/users/view.phtml
+++ b/app/views/console/users/view.phtml
@@ -53,7 +53,7 @@
                             data-success="trigger"
                             data-success-param-trigger-events="user-prefs-load">
 
-                            <div data-ls-if="{{user-prefs.length}}" style="display: none;">
+                            <div data-ls-if="!{{user-prefs|isEmptyObject}}" style="display: none;">
                                 <table class="vertical">
                                     <thead>
                                         <tr>
@@ -74,7 +74,7 @@
                                 </table>
                             </div>
 
-                            <div data-ls-if="!{{user-prefs.length}}" style="display: none;">
+                            <div data-ls-if="{{user-prefs|isEmptyObject}}" style="display: none;">
                                 No user preferences found
                             </div>
                         </div>
diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js
index f1343292ea..399a3b63f0 100644
--- a/public/dist/scripts/app-all.js
+++ b/public/dist/scripts/app-all.js
@@ -2556,7 +2556,7 @@ return"< 1s";}).add("markdown",function($value,markdown){return markdown.render(
 let thresh=1000;if(Math.abs($value)<thresh){return $value+" B";}
 let units=["kB","MB","GB","TB","PB","EB","ZB","YB"];let u=-1;do{$value/=thresh;++u;}while(Math.abs($value)>=thresh&&u<units.length-1);return($value.toFixed(1)+'<span class="text-size-small unit">'+
 units[u]+"</span>");}).add("statsTotal",function($value){if(!$value){return 0;}
-$value=abbreviate($value,1,false,false);return $value==="0"?"N/A":$value;});function abbreviate(number,maxPlaces,forcePlaces,forceLetter){number=Number(number);forceLetter=forceLetter||false;if(forceLetter!==false){return annotate(number,maxPlaces,forcePlaces,forceLetter);}
+$value=abbreviate($value,1,false,false);return $value==="0"?"N/A":$value;}).add("isEmptyObject",function($value){return((Object.keys($value).length===0&&$value.constructor===Object)||$value.length===0)});function abbreviate(number,maxPlaces,forcePlaces,forceLetter){number=Number(number);forceLetter=forceLetter||false;if(forceLetter!==false){return annotate(number,maxPlaces,forcePlaces,forceLetter);}
 let abbr;if(number>=1e12){abbr="T";}else if(number>=1e9){abbr="B";}else if(number>=1e6){abbr="M";}else if(number>=1e3){abbr="K";}else{abbr="";}
 return annotate(number,maxPlaces,forcePlaces,abbr);}
 function annotate(number,maxPlaces,forcePlaces,abbr){let rounded=0;switch(abbr){case"T":rounded=number/1e12;break;case"B":rounded=number/1e9;break;case"M":rounded=number/1e6;break;case"K":rounded=number/1e3;break;case"":rounded=number;break;}
diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js
index c90636ccf3..b2627c2797 100644
--- a/public/dist/scripts/app.js
+++ b/public/dist/scripts/app.js
@@ -285,7 +285,7 @@ return"< 1s";}).add("markdown",function($value,markdown){return markdown.render(
 let thresh=1000;if(Math.abs($value)<thresh){return $value+" B";}
 let units=["kB","MB","GB","TB","PB","EB","ZB","YB"];let u=-1;do{$value/=thresh;++u;}while(Math.abs($value)>=thresh&&u<units.length-1);return($value.toFixed(1)+'<span class="text-size-small unit">'+
 units[u]+"</span>");}).add("statsTotal",function($value){if(!$value){return 0;}
-$value=abbreviate($value,1,false,false);return $value==="0"?"N/A":$value;});function abbreviate(number,maxPlaces,forcePlaces,forceLetter){number=Number(number);forceLetter=forceLetter||false;if(forceLetter!==false){return annotate(number,maxPlaces,forcePlaces,forceLetter);}
+$value=abbreviate($value,1,false,false);return $value==="0"?"N/A":$value;}).add("isEmptyObject",function($value){return((Object.keys($value).length===0&&$value.constructor===Object)||$value.length===0)});function abbreviate(number,maxPlaces,forcePlaces,forceLetter){number=Number(number);forceLetter=forceLetter||false;if(forceLetter!==false){return annotate(number,maxPlaces,forcePlaces,forceLetter);}
 let abbr;if(number>=1e12){abbr="T";}else if(number>=1e9){abbr="B";}else if(number>=1e6){abbr="M";}else if(number>=1e3){abbr="K";}else{abbr="";}
 return annotate(number,maxPlaces,forcePlaces,abbr);}
 function annotate(number,maxPlaces,forcePlaces,abbr){let rounded=0;switch(abbr){case"T":rounded=number/1e12;break;case"B":rounded=number/1e9;break;case"M":rounded=number/1e6;break;case"K":rounded=number/1e3;break;case"":rounded=number;break;}
diff --git a/public/scripts/filters.js b/public/scripts/filters.js
index 8e1b9e2584..4bda20ebec 100644
--- a/public/scripts/filters.js
+++ b/public/scripts/filters.js
@@ -354,6 +354,9 @@ window.ls.filter
     $value = abbreviate($value, 1, false, false);
 
     return $value === "0" ? "N/A" : $value;
+  })
+  .add("isEmptyObject", function($value) {
+    return ((Object.keys($value).length === 0 && $value.constructor === Object) || $value.length === 0)
   });
 
 function abbreviate(number, maxPlaces, forcePlaces, forceLetter) {