From f59a9da809755ea7db3040885d9bcb480bd7a789 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 May 2023 11:31:35 +0200
Subject: [PATCH 1/5] Display error when populated from the backend

---
 .../builder/src/pages/builder/portal/users/groups/index.svelte  | 2 ++
 packages/pro                                                    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/portal/users/groups/index.svelte b/packages/builder/src/pages/builder/portal/users/groups/index.svelte
index 6abc63811f..f01d306df2 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/index.svelte
@@ -66,6 +66,8 @@
     } catch (error) {
       if (error.status === 400) {
         notifications.error(error.message)
+      } else if (error.message) {
+        notifications.error(error.message)
       } else {
         notifications.error(`Failed to save group`)
       }
diff --git a/packages/pro b/packages/pro
index 79bc94b17b..546ca5e9fb 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 79bc94b17baba885eb20e72f9abba3ac8b9c0eab
+Subproject commit 546ca5e9fb90b65c8a566da5d3ce295a24cd21b0

From 51f5f4c018b72d92cbb3bb9e73fa3267d9b32af9 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 May 2023 11:53:14 +0200
Subject: [PATCH 2/5] Display error when populated from the backend

---
 .../src/pages/builder/portal/users/groups/[groupId].svelte  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
index 1be019b83e..0c139ad8be 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
@@ -130,7 +130,11 @@
     try {
       await groups.actions.save(group)
     } catch (error) {
-      notifications.error(`Failed to save user group`)
+      if (error.message) {
+        notifications.error(error.message)
+      } else {
+        notifications.error(`Failed to save user group`)
+      }
     }
   }
 

From 0c95e07183dd36fcf0497797fe48d41f8dcf4035 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 10 May 2023 10:28:40 +0200
Subject: [PATCH 3/5] Update pro ref

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 546ca5e9fb..cb75e655eb 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 546ca5e9fb90b65c8a566da5d3ce295a24cd21b0
+Subproject commit cb75e655eb70818d35515a11b2c3113973631900

From e318eda5f494bf74956715c2f1b6c22a4fe8f12a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 10 May 2023 11:44:05 +0200
Subject: [PATCH 4/5] Update pro ref

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index cb75e655eb..a0a7b5e156 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit cb75e655eb70818d35515a11b2c3113973631900
+Subproject commit a0a7b5e1566467cc0625fb69309364c750847962

From 8bbfa7e0ab09e053bc2c2ab4a5823e1a75dca534 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 10 May 2023 12:31:09 +0200
Subject: [PATCH 5/5] Dynamic groups for testing

---
 .../worker/src/tests/structures/groups.ts     | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/worker/src/tests/structures/groups.ts b/packages/worker/src/tests/structures/groups.ts
index 0f7e518895..33af533bd4 100644
--- a/packages/worker/src/tests/structures/groups.ts
+++ b/packages/worker/src/tests/structures/groups.ts
@@ -1,10 +1,25 @@
+import { generator } from "@budibase/backend-core/tests"
+import { db } from "@budibase/backend-core"
+import { UserGroupRoles } from "@budibase/types"
+
 export const UserGroup = () => {
+  const appsCount = generator.integer({ min: 0, max: 3 })
+  const roles = Array.from({ length: appsCount }).reduce(
+    (p: UserGroupRoles, v) => {
+      return {
+        ...p,
+        [db.generateAppID()]: generator.pickone(["ADMIN", "POWER", "BASIC"]),
+      }
+    },
+    {}
+  )
+
   let group = {
     apps: [],
-    color: "var(--spectrum-global-color-blue-600)",
-    icon: "UserGroup",
-    name: "New group",
-    roles: { app_uuid1: "ADMIN", app_uuid2: "POWER" },
+    color: generator.color(),
+    icon: generator.word(),
+    name: generator.word({ length: 2 }),
+    roles: roles,
     users: [],
   }
   return group