From d8b1674e971492ecdf534bc0f9591835bd8df895 Mon Sep 17 00:00:00 2001 From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com> Date: Thu, 23 Oct 2025 15:24:05 +0530 Subject: [PATCH] code cleanup --- src/lib/components/permissions/row.svelte | 86 ++++++++++------------- 1 file changed, 39 insertions(+), 47 deletions(-) diff --git a/src/lib/components/permissions/row.svelte b/src/lib/components/permissions/row.svelte index 0e7baced0..a670fc6e4 100644 --- a/src/lib/components/permissions/row.svelte +++ b/src/lib/components/permissions/row.svelte @@ -22,16 +22,15 @@ import { base } from '$app/paths'; import { formatName } from '$lib/helpers/string'; - const permissionDataCache: Map< - string, - Promise< - Partial> & Models.Team>> & { - notFound?: boolean; - roleName?: string; - customName?: string; - } - > - > = new Map(); + type PermissionData = Partial< + Models.User> & Models.Team> + > & { + notFound?: boolean; + roleName?: string; + customName?: string; + }; + + const permissionDataCache: Map> = new Map(); interface Props { role: string; @@ -75,47 +74,40 @@ } } - async function getData(permission: string): Promise< - Partial> & Models.Team>> & { - notFound?: boolean; - roleName?: string; - customName?: string; + async function fetchPermissionData(parsed: ParsedPermission): Promise { + if (!parsed.isValid || parsed.type === 'other') { + return { notFound: true, roleName: parsed.roleName, customName: parsed.id }; } - > { + + if (parsed.type === 'user') { + try { + return await sdk + .forProject(page.params.region, page.params.project) + .users.get({ userId: parsed.id }); + } catch (error) { + return { notFound: true, roleName: parsed.roleName, customName: parsed.id }; + } + } + + if (parsed.type === 'team') { + try { + return await sdk + .forProject(page.params.region, page.params.project) + .teams.get({ teamId: parsed.id }); + } catch (error) { + return { notFound: true, roleName: parsed.roleName, customName: parsed.id }; + } + } + + return { notFound: true, roleName: parsed.roleName, customName: parsed.id }; + } + + async function getData(permission: string): Promise { const cached = permissionDataCache.get(permission); if (cached) return cached; - const fetchPromise = (async () => { - const parsed = parsePermission(permission); - - if (!parsed.isValid || parsed.type === 'other') { - return { notFound: true, roleName: parsed.roleName, customName: parsed.id }; - } - - if (parsed.type === 'user') { - try { - const user = await sdk - .forProject(page.params.region, page.params.project) - .users.get({ userId: parsed.id }); - return user; - } catch (error) { - return { notFound: true, roleName: parsed.roleName, customName: parsed.id }; - } - } - - if (parsed.type === 'team') { - try { - const team = await sdk - .forProject(page.params.region, page.params.project) - .teams.get({ teamId: parsed.id }); - return team; - } catch (error) { - return { notFound: true, roleName: parsed.roleName, customName: parsed.id }; - } - } - - return { notFound: true, roleName: parsed.roleName, customName: parsed.id }; - })(); + const parsed = parsePermission(permission); + const fetchPromise = fetchPermissionData(parsed); permissionDataCache.set(permission, fetchPromise); return fetchPromise;