[ENG-610] Organization level users page improvements

web-admin/src/features/organizations/users/AddUsersDialog.svelte

@@ -40,7 +40,7 @@
     newRole: string,
     isSuperUser: boolean = false,
   ) {
     try {
       await $addOrganizationMemberUser.mutateAsync({
         organization: organization,
         data: {
@@ -63,7 +63,6 @@
       role = "";
       isSuperUser = false;
     } catch (error) {
-      console.error("Error adding user to organization", error);
       throw error;
     }
   }
@@ -141,9 +140,10 @@
           failedInvites = failed; // Store failed emails
           eventBus.emit("notification", {
             type: "error",
-            message: `Failed to invite ${failed.length} ${
-              failed.length === 1 ? "person" : "people"
-            }`,
+            message:
+              failed.length === 1
+                ? "That user is already a member of this organization"
+                : "Those users are already members of this organization",
           });
         }
 
@@ -220,7 +220,9 @@
       </MultiInput>
       {#if failedInvites.length > 0}
         <div class="text-sm text-red-500 py-2">
-          Failed to invite {failedInvites.join(", ")}
+          {failedInvites.length === 1
+            ? `${failedInvites[0]} is already a member of this organization`
+            : `${failedInvites.join(", ")} are already members of this organization`}
         </div>
       {/if}
     </form>

web-admin/src/features/organizations/users/AvatarListItem.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
   import Avatar from "@rilldata/web-common/components/avatar/Avatar.svelte";
+  import Chip from "@rilldata/web-common/components/chip/core/Chip.svelte";
   import { getRandomBgColor } from "@rilldata/web-common/features/themes/color-config";
   import { cn } from "@rilldata/web-common/lib/shadcn";
 
@@ -10,6 +11,7 @@
   export let pendingAcceptance: boolean = false;
   export let shape: "circle" | "square" = "circle";
   export let count: number = 0;
+  export let role: string | null = null;
 
   function getInitials(name: string) {
     return name.charAt(0).toUpperCase();
@@ -35,11 +37,16 @@
     </div>
   {/if}
   <div class="flex flex-col text-left">
-    <span class="text-sm font-medium text-gray-900">
+    <span class="text-sm font-medium text-gray-900 flex flex-row gap-x-1">
       {name}
       <span class="text-gray-500 font-normal">
         {isCurrentUser ? "(You)" : ""}
       </span>
+      {#if role === "guest"}
+        <Chip type="guest" label="Guest" compact readOnly>
+          <svelte:fragment slot="body">Guest</svelte:fragment>
+        </Chip>
+      {/if}
     </span>
     {#if pendingAcceptance || email}
       <span class="text-xs text-gray-500">

web-admin/src/features/organizations/users/OrgUpgradeGuestConfirmDialog.svelte

@@ -0,0 +1,53 @@
+<script lang="ts">
+  import {
+    AlertDialog,
+    AlertDialogContent,
+    AlertDialogDescription,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+    AlertDialogTrigger,
+  } from "@rilldata/web-common/components/alert-dialog/index.js";
+  import Button from "@rilldata/web-common/components/button/Button.svelte";
+
+  export let open = false;
+  export let email: string;
+  export let newRole: string;
+  export let onUpgrade: (email: string, role: string) => void;
+
+  async function handleUpgrade() {
+    try {
+      onUpgrade(email, newRole);
+      open = false;
+    } catch (error) {
+      console.error("Failed to upgrade user role:", error);
+    }
+  }
+</script>
+
+<AlertDialog bind:open>
+  <AlertDialogTrigger asChild>
+    <div class="hidden"></div>
+  </AlertDialogTrigger>
+  <AlertDialogContent>
+    <AlertDialogHeader>
+      <AlertDialogTitle>Upgrade guest to {newRole}?</AlertDialogTitle>
+      <AlertDialogDescription>
+        <div class="mt-1">
+          Upgrading a guest to {newRole} will grant this user access to all open
+          projects in the organization. Would you like to upgrade this guest user
+          to {newRole}?
+        </div>
+      </AlertDialogDescription>
+    </AlertDialogHeader>
+    <AlertDialogFooter>
+      <Button
+        type="plain"
+        on:click={() => {
+          open = false;
+        }}>Cancel</Button
+      >
+      <Button type="primary" on:click={handleUpgrade}>Yes, upgrade</Button>
+    </AlertDialogFooter>
+  </AlertDialogContent>
+</AlertDialog>

web-admin/src/features/organizations/users/OrgUsersTable.svelte

@@ -43,6 +43,7 @@
     RpcStatus
   >;
   export let currentUserEmail: string;
+  export let currentUserRole: string;
 
   const ROW_HEIGHT = 69;
   const OVERSCAN = 5;
@@ -72,19 +73,21 @@
           pendingAcceptance: Boolean(row.original.invitedBy),
           isCurrentUser: row.original.userEmail === currentUserEmail,
           photoUrl: row.original.userPhotoUrl,
+          role: row.original.roleName,
         }),
       meta: {
         widthPercent: 5,
       },
     },
     {
       accessorKey: "roleName",
-      header: "Role",
+      header: "Organization Role",
       cell: ({ row }) =>
         flexRender(OrgUsersTableRoleCell, {
           email: row.original.userEmail,
           role: row.original.roleName,
           isCurrentUser: row.original.userEmail === currentUserEmail,
+          currentUserRole: currentUserRole,
         }),
       meta: {
         widthPercent: 5,
@@ -98,7 +101,9 @@
       cell: ({ row }) =>
         flexRender(OrgUsersTableActionsCell, {
           email: row.original.userEmail,
+          role: row.original.roleName,
           isCurrentUser: row.original.userEmail === currentUserEmail,
+          currentUserRole: currentUserRole,
         }),
       meta: {
         widthPercent: 0,

web-admin/src/features/organizations/users/OrgUsersTableActionsCell.svelte

@@ -15,12 +15,21 @@
   import { page } from "$app/stores";
 
   export let email: string;
+  export let role: string;
   export let isCurrentUser: boolean;
+  export let currentUserRole: string;
 
   let isDropdownOpen = false;
   let isRemoveConfirmOpen = false;
 
   $: organization = $page.params.organization;
+  $: isAdmin = currentUserRole === "admin";
+  $: isEditor = currentUserRole === "editor";
+  $: canManageUser =
+    !isCurrentUser &&
+    (isAdmin ||
+      (isEditor &&
+        (role === "editor" || role === "viewer" || role === "guest")));
 
   const queryClient = useQueryClient();
   const removeOrganizationMemberUser =
@@ -81,7 +90,7 @@
   }
 </script>
 
-{#if !isCurrentUser}
+{#if canManageUser}
   <DropdownMenu.Root bind:open={isDropdownOpen}>
     <DropdownMenu.Trigger class="flex-none">
       <IconButton rounded active={isDropdownOpen}>

web-admin/src/features/organizations/users/OrgUsersTableRoleCell.svelte

@@ -10,21 +10,39 @@
   import { page } from "$app/stores";
   import { useQueryClient } from "@tanstack/svelte-query";
   import { eventBus } from "@rilldata/web-common/lib/event-bus/event-bus";
+  import OrgUpgradeGuestConfirmDialog from "./OrgUpgradeGuestConfirmDialog.svelte";
 
   export let email: string;
   export let role: string;
   export let isCurrentUser: boolean;
+  export let currentUserRole: string;
 
   let isDropdownOpen = false;
+  let isUpgradeConfirmOpen = false;
+  let newRole = "";
 
   $: organization = $page.params.organization;
+  $: isAdmin = currentUserRole === "admin";
+  $: isEditor = currentUserRole === "editor";
+  $: isGuest = role === "guest";
+  $: canManageUser =
+    !isCurrentUser &&
+    (isAdmin ||
+      (isEditor &&
+        (role === "editor" || role === "viewer" || role === "guest")));
 
   const queryClient = useQueryClient();
   const setOrganizationMemberUserRole =
     createAdminServiceSetOrganizationMemberUserRole();
 
   async function handleSetRole(role: string) {
     try {
+      if (isGuest) {
+        newRole = role;
+        isUpgradeConfirmOpen = true;
+        return;
+      }
+
       await $setOrganizationMemberUserRole.mutateAsync({
         organization: organization,
         email: email,
@@ -53,32 +71,65 @@
       });
     }
   }
+
+  async function handleUpgrade(email: string, role: string) {
+    try {
+      await $setOrganizationMemberUserRole.mutateAsync({
+        organization: organization,
+        email: email,
+        data: {
+          role: role,
+        },
+      });
+
+      await queryClient.invalidateQueries({
+        queryKey:
+          getAdminServiceListOrganizationMemberUsersQueryKey(organization),
+      });
+
+      await queryClient.invalidateQueries({
+        queryKey: getAdminServiceListOrganizationInvitesQueryKey(organization),
+      });
+
+      eventBus.emit("notification", {
+        message: `Guest upgraded to ${role}`,
+      });
+    } catch (error) {
+      console.error("Error upgrading user role", error);
+      eventBus.emit("notification", {
+        message: "Error upgrading user role",
+        type: "error",
+      });
+    }
+  }
 </script>
 
-{#if !isCurrentUser}
+{#if canManageUser}
   <DropdownMenu.Root bind:open={isDropdownOpen}>
     <DropdownMenu.Trigger
       class="w-18 flex flex-row gap-1 items-center rounded-sm {isDropdownOpen
         ? 'bg-slate-200'
         : 'hover:bg-slate-100'} px-2 py-1"
     >
-      {role ? `Org ${role}` : "-"}
+      <span class="capitalize">{role ? `${role}` : "-"}</span>
       {#if isDropdownOpen}
         <CaretUpIcon size="12px" />
       {:else}
         <CaretDownIcon size="12px" />
       {/if}
     </DropdownMenu.Trigger>
     <DropdownMenu.Content align="start">
-      <DropdownMenu.CheckboxItem
-        class="font-normal flex items-center"
-        checked={role === "admin"}
-        on:click={() => {
-          handleSetRole("admin");
-        }}
-      >
-        <span>Admin</span>
-      </DropdownMenu.CheckboxItem>
+      {#if isAdmin}
+        <DropdownMenu.CheckboxItem
+          class="font-normal flex items-center"
+          checked={role === "admin"}
+          on:click={() => {
+            handleSetRole("admin");
+          }}
+        >
+          <span>Admin</span>
+        </DropdownMenu.CheckboxItem>
+      {/if}
       <DropdownMenu.CheckboxItem
         class="font-normal flex items-center"
         checked={role === "editor"}
@@ -97,19 +148,28 @@
       >
         <span>Viewer</span>
       </DropdownMenu.CheckboxItem>
-      <DropdownMenu.CheckboxItem
-        class="font-normal flex items-center"
-        checked={role === "guest"}
-        on:click={() => {
-          handleSetRole("guest");
-        }}
-      >
-        <span>Guest</span>
-      </DropdownMenu.CheckboxItem>
+      {#if isAdmin}
+        <DropdownMenu.CheckboxItem
+          class="font-normal flex items-center"
+          checked={role === "guest"}
+          on:click={() => {
+            handleSetRole("guest");
+          }}
+        >
+          <span>Guest</span>
+        </DropdownMenu.CheckboxItem>
+      {/if}
     </DropdownMenu.Content>
   </DropdownMenu.Root>
 {:else}
   <div class="w-18 flex flex-row gap-1 items-center rounded-sm px-2 py-1">
-    <span>Org {role}</span>
+    <span class="capitalize">{role}</span>
   </div>
 {/if}
+
+<OrgUpgradeGuestConfirmDialog
+  bind:open={isUpgradeConfirmOpen}
+  {email}
+  {newRole}
+  onUpgrade={handleUpgrade}
+/>

web-admin/src/features/organizations/users/OrgUsersTableUserCompositeCell.svelte

@@ -6,6 +6,14 @@
   export let isCurrentUser: boolean;
   export let pendingAcceptance: boolean;
   export let photoUrl: string | null;
+  export let role: string;
 </script>
 
-<AvatarListItem {name} {email} {isCurrentUser} {pendingAcceptance} {photoUrl} />
+<AvatarListItem
+  {name}
+  {email}
+  {isCurrentUser}
+  {pendingAcceptance}
+  {photoUrl}
+  {role}
+/>

web-admin/src/features/projects/user-management/UserInviteForm.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import {
     createAdminServiceAddProjectMemberUser,
+    getAdminServiceListOrganizationMemberUsersQueryKey,
     getAdminServiceListProjectInvitesQueryKey,
     getAdminServiceListProjectMemberUsersQueryKey,
   } from "@rilldata/web-admin/client";
@@ -85,6 +86,12 @@
           ),
         });
 
+        await queryClient.invalidateQueries({
+          queryKey:
+            getAdminServiceListOrganizationMemberUsersQueryKey(organization),
+          type: "all", // Clear regular and inactive queries
+        });
+
         eventBus.emit("notification", {
           type: "success",
           message: `Invited ${succeeded.length} ${succeeded.length === 1 ? "person" : "people"} as ${values.role}`,

web-admin/src/routes/[organization]/-/users/+layout.svelte

@@ -19,7 +19,7 @@
   ];
 </script>
 
-<ContentContainer title="Users" maxWidth={1100}>
+<ContentContainer title="Manage users" maxWidth={1100}>
   <div class="container flex-col md:flex-row">
     <LeftNav {basePage} baseRoute="/[organization]/-/users" {navItems} />
     <slot />