From 451c55ae679209b7011c9f576f643709e705d859 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 1 Aug 2022 13:04:58 +0100 Subject: [PATCH] Fix stale data in group details page, fix role colour in group app access --- .../portal/manage/groups/[groupId].svelte | 174 +++++++++--------- 1 file changed, 91 insertions(+), 83 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte index 314ab62d26..4683f572d5 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte @@ -18,9 +18,10 @@ import { users, apps, groups } from "stores/portal" import { onMount } from "svelte" import { RoleUtils } from "@budibase/frontend-core" - import { roles } from "../../../../../stores/backend" + import { roles } from "stores/backend" export let groupId + let popoverAnchor let popover let searchTerm = "" @@ -28,6 +29,7 @@ let prevSearch = undefined, search = undefined let pageInfo = createPaginationStore() + let loaded = false $: page = $pageInfo.page $: fetchUsers(page, search) @@ -113,98 +115,104 @@ onMount(async () => { try { - await groups.actions.init() - await apps.load() - await roles.fetch() + await Promise.all([groups.actions.init(), apps.load(), roles.fetch()]) + loaded = true } catch (error) { - notifications.error("Error fetching User Group data") + notifications.error("Error fetching user group data") } }) - -
- $goto("../groups")} size="S" icon="ArrowLeft"> - Back - -
-
-
-
-
- +{#if loaded} + +
+ $goto("../groups")} + size="S" + icon="ArrowLeft" + > + Back + +
+
+
+
+
+ +
+
+
+ {group?.name}
-
- {group?.name} +
+ +
+ + + +
+ + + {#if group?.users.length} + {#each group.users as user} + removeUser(user?._id)} + hoverable + size="L" + name="Close" + /> + {/each} + {:else} + + {/if} + +
+ Apps +
+ Manage apps that this User group has been assigned to
-
- -
- - - -
- - {#if group?.users.length} - {#each group.users as user} - removeUser(user?._id)} - hoverable - size="L" - name="Close" - /> - {/each} - {:else} - - {/if} - -
- Apps -
- Manage apps that this User group has been assigned to -
-
- - - {#if groupApps.length} - {#each groupApps as app} - -
- - {getRoleLabel(app.appId)} - -
- - {/each} - {:else} - - {/if} - - + + {#if groupApps.length} + {#each groupApps as app} + +
+ + {getRoleLabel(app.appId)} + +
+ + {/each} + {:else} + + {/if} + + +{/if}