From 847fc6c4e5e2c1ff801a332c4091e7fd3e7a0ba0 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 1 Aug 2022 09:03:47 +0100
Subject: [PATCH] pr comments

---
 .../builder/src/pages/builder/portal/_layout.svelte | 13 +++++++++----
 packages/worker/src/sdk/users/users.ts              |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte
index 17209b1786..26409ef695 100644
--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@@ -53,10 +53,6 @@
           href: "/builder/portal/manage/users",
           heading: "Manage",
         },
-        isEnabled(FEATURE_FLAGS.USER_GROUPS) && {
-          title: "User Groups",
-          href: "/builder/portal/manage/groups",
-        },
         { title: "Auth", href: "/builder/portal/manage/auth" },
         { title: "Email", href: "/builder/portal/manage/email" },
         {
@@ -70,6 +66,15 @@
         },
       ])
 
+      if (isEnabled(FEATURE_FLAGS.USER_GROUPS)) {
+        let item = {
+          title: "User Groups",
+          href: "/builder/portal/manage/groups",
+        }
+
+        menu.splice(1, 0, item)
+      }
+
       if (!$adminStore.cloud) {
         menu = menu.concat([
           {
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 17d5ec1767..ea7f2517e0 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -31,7 +31,7 @@ export const allUsers = async () => {
 }
 
 export const countUsersByApp = async (appId: string) => {
-  let response: any = await usersCore.searchGlobalUsersByApp(appId)
+  let response: any = await usersCore.searchGlobalUsersByApp(appId, {})
   return {
     userCount: response.length,
   }