From 7269c726fca09c985f71c2ab4a7cb7fe675dcf6b Mon Sep 17 00:00:00 2001
From: Zaid Abdulla <zaid@genieacs.com>
Date: Mon, 20 May 2019 16:54:40 -0700
Subject: [PATCH] Fix exception when using 'true' as filter

---
 ui/devices-page.ts            | 4 ++--
 ui/faults-page.ts             | 4 ++--
 ui/files-page.ts              | 4 ++--
 ui/permissions-page.ts        | 4 ++--
 ui/presets-page.ts            | 4 ++--
 ui/provisions-page.ts         | 4 ++--
 ui/users-page.ts              | 4 ++--
 ui/virtual-parameters-page.ts | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ui/devices-page.ts b/ui/devices-page.ts
index 01d6d5a..07922c6 100644
--- a/ui/devices-page.ts
+++ b/ui/devices-page.ts
@@ -47,8 +47,8 @@ export function init(args): Promise<{}> {
     if (!window.authorizer.hasAccess("devices", 2))
       return void reject(new Error("You are not authorized to view this page"));
 
-    const filter = args.filter;
-    const sort = args.sort;
+    const filter = args.hasOwnProperty("filter") ? "" + args["filter"] : "";
+    const sort = args.hasOwnProperty("sort") ? "" + args["sort"] : "";
     const indexParameters = Object.values(config.ui.index);
     resolve({ filter, indexParameters, sort });
   });
diff --git a/ui/faults-page.ts b/ui/faults-page.ts
index 13cecb2..acbac2a 100644
--- a/ui/faults-page.ts
+++ b/ui/faults-page.ts
@@ -53,8 +53,8 @@ export function init(args): Promise<{}> {
     );
   }
 
-  const sort = args.sort;
-  const filter = args.filter;
+  const sort = args.hasOwnProperty("sort") ? "" + args["sort"] : "";
+  const filter = args.hasOwnProperty("filter") ? "" + args["filter"] : "";
   return new Promise((resolve, reject) => {
     loadYaml()
       .then(() => {
diff --git a/ui/files-page.ts b/ui/files-page.ts
index a8c6955..a2699a8 100644
--- a/ui/files-page.ts
+++ b/ui/files-page.ts
@@ -125,8 +125,8 @@ export function init(args): Promise<{}> {
     );
   }
 
-  const sort = args.sort;
-  const filter = args.filter;
+  const sort = args.hasOwnProperty("sort") ? "" + args["sort"] : "";
+  const filter = args.hasOwnProperty("filter") ? "" + args["filter"] : "";
   return Promise.resolve({ filter, sort });
 }
 
diff --git a/ui/permissions-page.ts b/ui/permissions-page.ts
index fa64c96..e5a86b6 100644
--- a/ui/permissions-page.ts
+++ b/ui/permissions-page.ts
@@ -151,8 +151,8 @@ export function init(args): Promise<{}> {
       new Error("You are not authorized to view this page")
     );
   }
-  const sort = args.sort;
-  const filter = args.filter;
+  const sort = args.hasOwnProperty("sort") ? "" + args["sort"] : "";
+  const filter = args.hasOwnProperty("filter") ? "" + args["filter"] : "";
   return Promise.resolve({ filter, sort });
 }
 
diff --git a/ui/presets-page.ts b/ui/presets-page.ts
index 2858cb6..c6624a9 100644
--- a/ui/presets-page.ts
+++ b/ui/presets-page.ts
@@ -128,8 +128,8 @@ export function init(args): Promise<{}> {
     );
   }
 
-  const sort = args.sort;
-  const filter = args.filter;
+  const sort = args.hasOwnProperty("sort") ? "" + args["sort"] : "";
+  const filter = args.hasOwnProperty("filter") ? "" + args["filter"] : "";
   return Promise.resolve({ filter, sort });
 }
 
diff --git a/ui/provisions-page.ts b/ui/provisions-page.ts
index e7081a1..9f07d52 100644
--- a/ui/provisions-page.ts
+++ b/ui/provisions-page.ts
@@ -108,8 +108,8 @@ export function init(args): Promise<{}> {
     );
   }
 
-  const sort = args.sort;
-  const filter = args.filter;
+  const sort = args.hasOwnProperty("sort") ? "" + args["sort"] : "";
+  const filter = args.hasOwnProperty("filter") ? "" + args["filter"] : "";
 
   return new Promise((resolve, reject) => {
     loadCodeMirror()
diff --git a/ui/users-page.ts b/ui/users-page.ts
index 6fa69bb..5547706 100644
--- a/ui/users-page.ts
+++ b/ui/users-page.ts
@@ -134,8 +134,8 @@ export function init(args): Promise<{}> {
     );
   }
 
-  const sort = args.sort;
-  const filter = args.filter;
+  const sort = args.hasOwnProperty("sort") ? "" + args["sort"] : "";
+  const filter = args.hasOwnProperty("filter") ? "" + args["filter"] : "";
   return Promise.resolve({ filter, sort });
 }
 
diff --git a/ui/virtual-parameters-page.ts b/ui/virtual-parameters-page.ts
index 6dbc72e..4099ccb 100644
--- a/ui/virtual-parameters-page.ts
+++ b/ui/virtual-parameters-page.ts
@@ -108,8 +108,8 @@ export function init(args): Promise<{}> {
     );
   }
 
-  const sort = args.sort;
-  const filter = args.filter;
+  const sort = args.hasOwnProperty("sort") ? "" + args["sort"] : "";
+  const filter = args.hasOwnProperty("filter") ? "" + args["filter"] : "";
 
   return new Promise((resolve, reject) => {
     loadCodeMirror()