Groups page project column #8883
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| <script lang="ts"> | ||
| import { onMount } from "svelte"; | ||
| import * as Dropdown from "@rilldata/web-common/components/dropdown-menu"; | ||
| import { | ||
| adminServiceListProjectsForOrganization, | ||
| adminServiceListProjectMemberUsergroups, | ||
| } from "@rilldata/web-admin/client"; | ||
| import CaretDownIcon from "@rilldata/web-common/components/icons/CaretDownIcon.svelte"; | ||
| import CaretUpIcon from "@rilldata/web-common/components/icons/CaretUpIcon.svelte"; | ||
|
|
||
| export let organization: string; | ||
| export let groupName: string; | ||
|
|
||
| interface ProjectWithRole { | ||
| id: string; | ||
| name: string; | ||
| roleName: string; | ||
| } | ||
|
|
||
| let isDropdownOpen = false; | ||
| let isPending = true; | ||
| let accessibleProjects: ProjectWithRole[] = []; | ||
| let hasLoaded = false; | ||
|
|
||
| async function loadProjectsForGroup() { | ||
| if (hasLoaded) return; | ||
|
|
||
| isPending = true; | ||
|
|
||
| try { | ||
| const projectsResponse = | ||
| await adminServiceListProjectsForOrganization(organization); | ||
|
Collaborator
There was a problem hiding this comment. We should use a tanstack query. This direct call will not cache the results. |
||
| const allProjects = projectsResponse.projects ?? []; | ||
|
|
||
| const projectAccessResults = await Promise.all( | ||
|
Collaborator
There was a problem hiding this comment. Is this really the best way to get projects? We should add a new API that fetches all projects accessible by the user group. |
||
| allProjects.map(async (project) => { | ||
| try { | ||
| const usergroupsResponse = | ||
| await adminServiceListProjectMemberUsergroups( | ||
|
|
||
| organization, | ||
| project.name ?? "", | ||
| ); | ||
| const members = usergroupsResponse.members ?? []; | ||
| const groupMember = members.find((m) => m.groupName === groupName); | ||
| if (groupMember) { | ||
| return { | ||
| project: { | ||
| id: project.id ?? "", | ||
| name: project.name ?? "", | ||
| roleName: groupMember.roleName ?? "", | ||
| }, | ||
| hasAccess: true, | ||
| }; | ||
| } | ||
| return { project: null, hasAccess: false }; | ||
| } catch { | ||
| return { project: null, hasAccess: false }; | ||
| } | ||
| }), | ||
| ); | ||
|
|
||
| accessibleProjects = projectAccessResults | ||
| .filter((r) => r.hasAccess && r.project) | ||
| .map((r) => r.project as ProjectWithRole); | ||
| hasLoaded = true; | ||
| } catch { | ||
| // Ignore errors, will show "No projects" | ||
| } finally { | ||
| isPending = false; | ||
| } | ||
| } | ||
|
|
||
| onMount(() => { | ||
| void loadProjectsForGroup(); | ||
|
Collaborator
There was a problem hiding this comment.
|
||
| }); | ||
|
|
||
| $: projectCount = accessibleProjects.length; | ||
| $: hasProjects = projectCount > 0; | ||
|
|
||
| function getProjectUrl(projectName: string) { | ||
| return `/${organization}/${projectName}/-/share`; | ||
| } | ||
|
|
||
| function formatRoleName(roleName: string): string { | ||
| return roleName.charAt(0).toUpperCase() + roleName.slice(1).toLowerCase(); | ||
| } | ||
| </script> | ||
|
|
||
| {#if hasLoaded && hasProjects} | ||
| <Dropdown.Root bind:open={isDropdownOpen}> | ||
| <Dropdown.Trigger | ||
| class="flex flex-row gap-1 items-center rounded-sm {isDropdownOpen | ||
| ? 'bg-gray-200' | ||
| : 'hover:bg-surface-hover'} px-2 py-1" | ||
| > | ||
| <span class="capitalize"> | ||
| {projectCount} Project{projectCount !== 1 ? "s" : ""} | ||
| </span> | ||
| {#if isDropdownOpen} | ||
| <CaretUpIcon size="12px" /> | ||
| {:else} | ||
| <CaretDownIcon size="12px" /> | ||
| {/if} | ||
| </Dropdown.Trigger> | ||
| <Dropdown.Content align="start"> | ||
| {#each accessibleProjects as project (project.id)} | ||
| <Dropdown.Item | ||
| href={getProjectUrl(project.name)} | ||
| class="flex items-center justify-between gap-4" | ||
| > | ||
| <span class="truncate">{project.name}</span> | ||
| <span class="text-fg-secondary text-xs shrink-0" | ||
| >{formatRoleName(project.roleName)}</span | ||
| > | ||
| </Dropdown.Item> | ||
| {/each} | ||
| </Dropdown.Content> | ||
| </Dropdown.Root> | ||
| {:else if isPending} | ||
| <div class="rounded-sm px-2 py-1 text-fg-secondary">Loading...</div> | ||
| {:else} | ||
| <div class="rounded-sm px-2 py-1 text-fg-secondary">No projects</div> | ||
| {/if} | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are adding all users in serial vs here where we are adding in parallel. We should do this in serial as well to keep things consistent. Also add a TODO to make sure we handle partial updates like group is created but only one project got added.