The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
feat: Show all partner audit logs fields (#49305)
David Camacho Cateura1a483ab25506
diff --git a/apps/studio/components/interfaces/AuditLogs/LogDetailsPanel.tsx b/apps/studio/components/interfaces/AuditLogs/LogDetailsPanel.tsxindex 488e5b7386d..4dbe508ee01 100644--- a/apps/studio/components/interfaces/AuditLogs/LogDetailsPanel.tsx+++ b/apps/studio/components/interfaces/AuditLogs/LogDetailsPanel.tsx@@ -94,6 +94,30 @@ export const LogDetailsPanel = ({ selectedLog, onClose }: LogDetailsPanelProps)<Input readOnly size="small" value={selectedLog?.actor.app_name ?? ''} /></FormItemLayout>)}+ {selectedLog?.actor.partner && (+ <FormItemLayout label="Partner" isReactForm={false}>+ <Input readOnly size="small" value={selectedLog?.actor.partner ?? ''} />+ </FormItemLayout>+ )}+ {selectedLog?.actor.partner_installation_id && (+ <FormItemLayout label="Partner installation ID" isReactForm={false}>+ <Input+ readOnly+ size="small"+ value={selectedLog?.actor.partner_installation_id ?? ''}+ />+ </FormItemLayout>+ )}+ {selectedLog?.actor.partner_user_email && (+ <FormItemLayout label="Partner user email" isReactForm={false}>+ <Input readOnly size="small" value={selectedLog?.actor.partner_user_email ?? ''} />+ </FormItemLayout>+ )}+ {selectedLog?.actor.partner_user_id && (+ <FormItemLayout label="Partner user ID" isReactForm={false}>+ <Input readOnly size="small" value={selectedLog?.actor.partner_user_id ?? ''} />+ </FormItemLayout>+ )}</FormSectionContent></FormSection>diff --git a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsxindex f104b5ed191..04af2231f0f 100644--- a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx+++ b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx@@ -9,7 +9,12 @@ import { useEffect, useMemo, useState } from 'react'import { Alert, AlertDescription, AlertTitle, Button, WarningIcon } from 'ui'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'-import { filterByProjects, filterByUsers, sortAuditLogs } from './AuditLogs.utils'+import {+ filterByProjects,+ filterByUsers,+ formatPartnerIfExists,+ sortAuditLogs,+} from './AuditLogs.utils'import { LogDetailsPanel } from '@/components/interfaces/AuditLogs/LogDetailsPanel'import { LogsDatePicker } from '@/components/interfaces/Settings/Logs/Logs.DatePickers'import { ScaffoldContainer, ScaffoldSection } from '@/components/layouts/Scaffold'@@ -351,6 +356,12 @@ export const AuditLogs = () => {/>)+ const actorDisplayName =+ user?.username ||+ log.actor.email ||+ formatPartnerIfExists(log.actor.partner, log.actor.partner_user_email) ||+ '-'+return (<Table.trkey={log.request_id}@@ -361,9 +372,7 @@ export const AuditLogs = () => {<div className="flex items-center space-x-4"><div>{userIcon}</div><div>- <p className="text-foreground-light">- {user?.username ?? log.actor.email ?? '-'}- </p>+ <p className="text-foreground-light">{actorDisplayName}</p>{role && (<p className="mt-0.5 text-xs text-foreground-light">{role?.name}diff --git a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.utils.ts b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.utils.tsindex 92a61306543..d69f65a85d3 100644--- a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.utils.ts+++ b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.utils.ts@@ -50,3 +50,13 @@ export const formatSelectedDateRange = (value: DatePickerToFrom) => {return { from: from.utc().toISOString(), to: to.utc().toISOString() }}}++export function formatPartnerIfExists(+ partner: string | undefined,+ partnerEmail: string | undefined+) {+ if (!partner) return undefined++ const capitalized = `${partner[0].toUpperCase()}${partner.slice(1).toLowerCase()}`+ return partnerEmail ? `${partnerEmail} (${capitalized})` : capitalized+}diff --git a/apps/studio/data/organizations/organization-audit-logs-query.ts b/apps/studio/data/organizations/organization-audit-logs-query.tsindex 77870c3c7b1..e7b2ff688d4 100644--- a/apps/studio/data/organizations/organization-audit-logs-query.ts+++ b/apps/studio/data/organizations/organization-audit-logs-query.ts@@ -29,6 +29,10 @@ export type AuditLog = {app_id?: stringapp_name?: stringip?: string+ partner?: string+ partner_installation_id?: string+ partner_user_email?: string+ partner_user_id?: string}timestamp: number}diff --git a/apps/studio/tests/components/AuditLogs/OrgAuditLogs.utils.test.ts b/apps/studio/tests/components/AuditLogs/OrgAuditLogs.utils.test.tsindex 86b1a30f501..ca3820398e2 100644--- a/apps/studio/tests/components/AuditLogs/OrgAuditLogs.utils.test.ts+++ b/apps/studio/tests/components/AuditLogs/OrgAuditLogs.utils.test.ts@@ -1,7 +1,10 @@import dayjs from 'dayjs'import { afterEach, describe, expect, test, vi } from 'vitest'-import { formatSelectedDateRange } from '@/components/interfaces/Organization/AuditLogs/AuditLogs.utils'+import {+ formatPartnerIfExists,+ formatSelectedDateRange,+} from '@/components/interfaces/Organization/AuditLogs/AuditLogs.utils'// Pin "now" to a fixed point so date comparisons are deterministicconst NOW = dayjs('2024-06-15T14:30:00')@@ -81,3 +84,25 @@ describe('formatSelectedDateRange', () => {expect(result.to).toMatch(/Z$/)})})++describe('formatPartnerIfExists', () => {+ test('capitalizes the partner name', () => {+ expect(formatPartnerIfExists('github', undefined)).toBe('Github')+ })++ test('prefixes with the partner email when provided', () => {+ expect(formatPartnerIfExists('github', '[email protected]')).toBe('[email protected] (Github)')+ })++ test('normalizes casing regardless of input case', () => {+ expect(formatPartnerIfExists('GITHUB', undefined)).toBe('Github')+ })++ test('returns undefined when partner is undefined', () => {+ expect(formatPartnerIfExists(undefined, '[email protected]')).toBeUndefined()+ })++ test('returns undefined when partner is an empty string', () => {+ expect(formatPartnerIfExists('', '[email protected]')).toBeUndefined()+ })+})