Skip to content

Update dev deps #1941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-crespo merged 1 commit into from
Feb 7, 2024
Merged

Update dev deps #1941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/pages/project/access/ProjectAccessPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,9 @@ export function ProjectAccessPage() {
return groupBy(siloRows.concat(projectRows), (u) => u.id)
.map(([userId, userAssignments]) => {
const siloRole = userAssignments.find((a) => a.roleSource === 'silo')?.roleName
const projectRole = userAssignments.find((a) => a.roleSource === 'project')
?.roleName
const projectRole = userAssignments.find(
(a) => a.roleSource === 'project'
)?.roleName

const roles = [siloRole, projectRole].filter(isTruthy)

Expand Down
9 changes: 5 additions & 4 deletions libs/api/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ import { navToLogin } from './nav-to-login'
/* eslint-disable @typescript-eslint/no-explicit-any */
export type Params<F> = F extends (p: infer P) => any ? P : never
export type Result<F> = F extends (p: any) => Promise<ApiResult<infer R>> ? R : never
export type ResultItem<F> = Result<F> extends { items: (infer R)[] }
? R extends Record<string, unknown>
? R
export type ResultItem<F> =
Result<F> extends { items: (infer R)[] }
? R extends Record<string, unknown>
? R
: never
: never
: never

type ApiClient = Record<string, (...args: any) => Promise<ApiResult<any>>>
/* eslint-enable @typescript-eslint/no-explicit-any */
Expand Down
Loading