types are broken (supabase#39866)

hf · joshenlim · web-flow · commit 1af6b8479008 · 2025-10-28T10:38:07.000+08:00
* types are broken

* Fix TS issues

---------

Co-authored-by: Joshen Lim &lt;joshenlimek@gmail.com&gt;
diff --git a/apps/studio/components/interfaces/Database/Privileges/Privileges.utils.ts b/apps/studio/components/interfaces/Database/Privileges/Privileges.utils.ts
@@ -300,14 +300,14 @@ export function useApplyPrivilegeOperations(callback?: () => void) {
         .map((op) => ({
           column_id: String(op.id),
           grantee: op.grantee,
-          privilege_type: op.privilege_type as ColumnPrivilegesRevoke[number]['privilege_type'],
+          privilege_type: op.privilege_type as ColumnPrivilegesRevoke['privilege_type'],
         }))
       const revokeColumnOperations = columnOperations
         .filter((op) => op.type === 'revoke')
         .map((op) => ({
           column_id: String(op.id),
           grantee: op.grantee,
-          privilege_type: op.privilege_type as ColumnPrivilegesRevoke[number]['privilege_type'],
+          privilege_type: op.privilege_type as ColumnPrivilegesRevoke['privilege_type'],
         }))
 
       // annoyingly these can't be run all at once
diff --git a/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx b/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx
@@ -55,6 +55,14 @@ const formUnion = z.discriminatedUnion('type', [
     api_key: z.string().min(1, { message: 'API key is required' }),
     region: z.string().min(1, { message: 'Region is required' }),
   }),
+  z.object({
+    type: z.literal('loki'),
+    url: z.string().min(1, { message: 'Loki URL is required' }),
+    headers: z.record(z.string(), z.string()),
+    username: z.string().optional(),
+    password: z.string().optional(),
+  }),
+  // [Joshen] To fix API types, not supported in the UI
   z.object({
     type: z.literal('elastic'),
   }),
@@ -65,11 +73,13 @@ const formUnion = z.discriminatedUnion('type', [
     type: z.literal('bigquery'),
   }),
   z.object({
-    type: z.literal('loki'),
-    url: z.string().min(1, { message: 'Loki URL is required' }),
-    headers: z.record(z.string(), z.string()),
-    username: z.string().optional(),
-    password: z.string().optional(),
+    type: z.literal('clickhouse'),
+  }),
+  z.object({
+    type: z.literal('s3'),
+  }),
+  z.object({
+    type: z.literal('sentry'),
   }),
 ])
 
diff --git a/apps/studio/components/interfaces/LogDrains/LogDrains.constants.tsx b/apps/studio/components/interfaces/LogDrains/LogDrains.constants.tsx
@@ -1,5 +1,6 @@
-import { BracesIcon } from 'lucide-react'
+import { components } from 'api-types'
 import { Datadog, Grafana } from 'icons'
+import { BracesIcon } from 'lucide-react'
 
 const iconProps = {
   height: 24,
@@ -31,11 +32,13 @@ export const LOG_DRAIN_TYPES = [
 
 export const LOG_DRAIN_SOURCE_VALUES = LOG_DRAIN_TYPES.map((source) => source.value)
 
-export type LogDrainType =
-  | (typeof LOG_DRAIN_TYPES)[number]['value']
-  | 'postgres'
-  | 'bigquery'
-  | 'elastic'
+// export type LogDrainType =
+//   | (typeof LOG_DRAIN_TYPES)[number]['value']
+//   | 'postgres'
+//   | 'bigquery'
+//   | 'elastic'
+
+export type LogDrainType = components['schemas']['LFBackend']['type']
 
 export const DATADOG_REGIONS = [
   {
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
@@ -4,15 +4,15 @@ import type { Dictionary } from 'types'
 
 import { FOREIGN_KEY_CASCADE_ACTION } from 'data/database/database-query-constants'
 import type { ForeignKeyConstraint } from 'data/database/foreign-key-constraints-query'
+import type { RetrievedTableColumn, RetrieveTableResult } from 'data/tables/table-retrieve-query'
 import { uuidv4 } from 'lib/helpers'
+import { toast } from 'sonner'
 import {
   ColumnField,
   CreateColumnPayload,
   ExtendedPostgresRelationship,
   UpdateColumnPayload,
 } from '../SidePanelEditor.types'
-import type { RetrievedTableColumn, RetrieveTableResult } from 'data/tables/table-retrieve-query'
-import { toast } from 'sonner'
 
 const isSQLExpression = (input: string) => {
   if (['CURRENT_DATE'].includes(input)) return true
@@ -136,10 +136,10 @@ export const generateUpdateColumnPayload = (
     payload.name = name
   }
   if (!isEqual(originalColumn.comment?.trim(), comment)) {
-    payload.comment = comment || null
+    payload.comment = comment
   }
   if (!isEqual(originalColumn.check?.trim(), check)) {
-    payload.check = check || null
+    payload.check = check
   }
 
   if (!isEqual(originalColumn.format, type)) {
diff --git a/apps/studio/data/database-columns/database-column-create-mutation.ts b/apps/studio/data/database-columns/database-column-create-mutation.ts
@@ -2,13 +2,23 @@ import pgMeta from '@supabase/pg-meta'
 import { useMutation, UseMutationOptions } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
-import type { components } from 'data/api'
 import { executeSql } from 'data/sql/execute-sql-query'
 import type { ResponseError } from 'types'
 
-export type CreateColumnBody = Omit<components['schemas']['CreateColumnBody'], 'tableId'> & {
+export type CreateColumnBody = {
   schema: string
   table: string
+  name: string
+  type: string
+  check?: string
+  comment?: string
+  defaultValue?: any
+  defaultValueFormat?: 'expression' | 'literal'
+  identityGeneration?: 'BY DEFAULT' | 'ALWAYS'
+  isIdentity?: boolean
+  isNullable?: boolean
+  isPrimaryKey?: boolean
+  isUnique?: boolean
 }
 
 export type DatabaseColumnCreateVariables = {
diff --git a/apps/studio/data/database-columns/database-column-update-mutation.ts b/apps/studio/data/database-columns/database-column-update-mutation.ts
@@ -3,16 +3,14 @@ import { PGColumn } from '@supabase/pg-meta/src/pg-meta-columns'
 import { useMutation, UseMutationOptions } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
-import type { components } from 'data/api'
 import { executeSql } from 'data/sql/execute-sql-query'
 import type { ResponseError } from 'types'
+import { CreateColumnBody } from './database-column-create-mutation'
 
-export type UpdateColumnBody = Omit<
-  components['schemas']['UpdateColumnBody'],
-  'check' | 'comment'
+export type UpdateColumnBody = Partial<
+  Omit<CreateColumnBody, 'schema' | 'table' | 'isPrimaryKey'>
 > & {
-  check?: string | null
-  comment?: string | null
+  dropDefault?: boolean
 }
 
 export type DatabaseColumnUpdateVariables = {
diff --git a/apps/studio/data/database-policies/database-policy-create-mutation.ts b/apps/studio/data/database-policies/database-policy-create-mutation.ts
@@ -2,12 +2,20 @@ import pgMeta from '@supabase/pg-meta'
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
-import type { components } from 'data/api'
 import { executeSql } from 'data/sql/execute-sql-query'
 import type { ResponseError } from 'types'
 import { databasePoliciesKeys } from './keys'
 
-type CreatePolicyBody = components['schemas']['CreatePolicyBody']
+type CreatePolicyBody = {
+  name: string
+  table: string
+  schema?: string
+  definition?: string
+  check?: string
+  action?: 'PERMISSIVE' | 'RESTRICTIVE'
+  command?: 'SELECT' | 'INSERT' | 'UPDATE' | 'DELETE' | 'ALL'
+  roles?: string[]
+}
 
 export type DatabasePolicyCreateVariables = {
   projectRef: string
diff --git a/apps/studio/data/privileges/column-privileges-grant-mutation.ts b/apps/studio/data/privileges/column-privileges-grant-mutation.ts
@@ -1,17 +1,21 @@
+import pgMeta from '@supabase/pg-meta'
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
+import { executeSql } from 'data/sql/execute-sql-query'
 import { toast } from 'sonner'
-import type { components } from 'data/api'
 import type { ResponseError } from 'types'
 import { privilegeKeys } from './keys'
-import pgMeta from '@supabase/pg-meta'
-import { executeSql } from 'data/sql/execute-sql-query'
 
-export type ColumnPrivilegesGrant = components['schemas']['GrantColumnPrivilegesBody']
+export type ColumnPrivilegesGrant = {
+  column_id: string
+  grantee: string
+  privilege_type: 'ALL' | 'SELECT' | 'INSERT' | 'UPDATE' | 'REFERENCES'
+  is_grantable?: boolean
+}
 
 export type ColumnPrivilegesGrantVariables = {
   projectRef: string
   connectionString?: string | null
-  grants: ColumnPrivilegesGrant
+  grants: ColumnPrivilegesGrant[]
 }
 
 export async function grantColumnPrivileges({
diff --git a/apps/studio/data/privileges/column-privileges-revoke-mutation.ts b/apps/studio/data/privileges/column-privileges-revoke-mutation.ts
@@ -1,17 +1,20 @@
+import pgMeta from '@supabase/pg-meta'
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
+import { executeSql } from 'data/sql/execute-sql-query'
 import { toast } from 'sonner'
-import type { components } from 'data/api'
 import type { ResponseError } from 'types'
-import pgMeta from '@supabase/pg-meta'
-import { executeSql } from 'data/sql/execute-sql-query'
 import { privilegeKeys } from './keys'
 
-export type ColumnPrivilegesRevoke = components['schemas']['RevokeColumnPrivilegesBody']
+export type ColumnPrivilegesRevoke = {
+  column_id: string
+  grantee: string
+  privilege_type: 'ALL' | 'SELECT' | 'INSERT' | 'UPDATE' | 'REFERENCES'
+}
 
 export type ColumnPrivilegesRevokeVariables = {
   projectRef: string
   connectionString?: string | null
-  revokes: ColumnPrivilegesRevoke
+  revokes: ColumnPrivilegesRevoke[]
 }
 
 export async function revokeColumnPrivileges({
diff --git a/apps/studio/data/tables/table-create-mutation.ts b/apps/studio/data/tables/table-create-mutation.ts
@@ -2,12 +2,15 @@ import pgMeta from '@supabase/pg-meta'
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
-import type { components } from 'data/api'
 import { executeSql } from 'data/sql/execute-sql-query'
 import type { ResponseError } from 'types'
 import { tableKeys } from './keys'
 
-export type CreateTableBody = components['schemas']['CreateTableBody']
+export type CreateTableBody = {
+  name: string
+  schema?: string
+  comment?: string
+}
 
 export type TableCreateVariables = {
   projectRef: string
diff --git a/apps/studio/data/tables/table-update-mutation.ts b/apps/studio/data/tables/table-update-mutation.ts
@@ -2,14 +2,20 @@ import pgMeta from '@supabase/pg-meta'
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
-import type { components } from 'data/api'
-import { executeSql } from 'data/sql/execute-sql-query'
 import { lintKeys } from 'data/lint/keys'
+import { executeSql } from 'data/sql/execute-sql-query'
 import { tableEditorKeys } from 'data/table-editor/keys'
 import type { ResponseError } from 'types'
 import { tableKeys } from './keys'
+import { CreateTableBody } from './table-create-mutation'
 
-export type UpdateTableBody = components['schemas']['UpdateTableBody']
+export type UpdateTableBody = Partial<CreateTableBody> & {
+  id?: number
+  rls_enabled?: boolean
+  rls_forced?: boolean
+  replica_identity?: 'DEFAULT' | 'INDEX' | 'FULL' | 'NOTHING'
+  replica_identity_index?: string
+}
 
 export type TableUpdateVariables = {
   projectRef: string
diff --git a/packages/api-types/types/api.d.ts b/packages/api-types/types/api.d.ts
diff --git a/packages/api-types/types/platform.d.ts b/packages/api-types/types/platform.d.ts
