From d4b453d71ccd88c662efc4138d23d22ed0a6f21a Mon Sep 17 00:00:00 2001 From: Markus Thielker Date: Mon, 7 Apr 2025 11:36:57 +0200 Subject: [PATCH] NORY-59: refactor server action parameters --- dashboard/src/app/(inside)/user/page.tsx | 2 +- .../identity/identity-credentials.tsx | 2 +- .../components/identity/identity-traits.tsx | 8 +++---- dashboard/src/lib/action/identity.ts | 24 +++---------------- 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/dashboard/src/app/(inside)/user/page.tsx b/dashboard/src/app/(inside)/user/page.tsx index ebb9079..8218dc3 100644 --- a/dashboard/src/app/(inside)/user/page.tsx +++ b/dashboard/src/app/(inside)/user/page.tsx @@ -34,7 +34,7 @@ export default async function UserPage( let pageSize = 50; let paginationRange = 11; - const users = pmAccessUser && await queryIdentities({ page, pageSize, query }); + const users = pmAccessUser && await queryIdentities(page, pageSize, query); return (
diff --git a/dashboard/src/components/identity/identity-credentials.tsx b/dashboard/src/components/identity/identity-credentials.tsx index f362971..78e1fe6 100644 --- a/dashboard/src/components/identity/identity-credentials.tsx +++ b/dashboard/src/components/identity/identity-credentials.tsx @@ -36,7 +36,7 @@ export function IdentityCredentials({ identity }: IdentityCredentialsProps) { ( { - deleteIdentityCredential({ id: identity.id, type: key as never }) + deleteIdentityCredential(identity.id, key as never) .then(() => toast.success(`Credential ${key} deleted`)) .catch(() => toast.error(`Deleting credential ${key} failed`)); }} diff --git a/dashboard/src/components/identity/identity-traits.tsx b/dashboard/src/components/identity/identity-traits.tsx index 3feb314..1a9205c 100644 --- a/dashboard/src/components/identity/identity-traits.tsx +++ b/dashboard/src/components/identity/identity-traits.tsx @@ -48,16 +48,16 @@ export function IdentityTraits({ schema, identity, disabled }: IdentityTraitForm delete traits['metadata_public']; delete traits['metadata_admin']; - updateIdentity({ - id: currentIdentity.id, - body: { + updateIdentity( + currentIdentity.id, + { schema_id: currentIdentity.schema_id, state: currentIdentity.state!, traits: traits, metadata_public: data.metadata_public, metadata_admin: data.metadata_admin, }, - }) + ) .then((identity) => { setCurrentIdentity(identity); toast.success('Identity updated'); diff --git a/dashboard/src/lib/action/identity.ts b/dashboard/src/lib/action/identity.ts index d214e17..236e4b0 100644 --- a/dashboard/src/lib/action/identity.ts +++ b/dashboard/src/lib/action/identity.ts @@ -42,14 +42,7 @@ export async function getIdentitySchema(id: string) { return data; } - -interface QueryIdentitiesProps { - page: number, - pageSize: number, - query?: string, -} - -export async function queryIdentities({ page, pageSize, query }: QueryIdentitiesProps) { +export async function queryIdentities(page: number, pageSize: number, query?: string) { const session = await requireSession(); const allowed = await checkPermission(permission.user.it, relation.access, session.identity!.id); @@ -109,13 +102,7 @@ export async function queryIdentities({ page, pageSize, query }: QueryIdentities }; } - -interface UpdatedIdentityProps { - id: string; - body: UpdateIdentityBody; -} - -export async function updateIdentity({ id, body }: UpdatedIdentityProps) { +export async function updateIdentity(id: string, body: UpdateIdentityBody) { const session = await requireSession(); const allowed = await checkPermission(permission.user.it, relation.edit, session.identity!.id); @@ -136,12 +123,7 @@ export async function updateIdentity({ id, body }: UpdatedIdentityProps) { return data; } -interface DeleteIdentityCredentialProps { - id: string; - type: DeleteIdentityCredentialsTypeEnum; -} - -export async function deleteIdentityCredential({ id, type }: DeleteIdentityCredentialProps) { +export async function deleteIdentityCredential(id: string, type: DeleteIdentityCredentialsTypeEnum) { const session = await requireSession(); const allowed = await checkPermission(permission.user.credential, relation.delete, session.identity!.id);