improvement(tables): align Expiration feature messages

Author: j15z

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/new-column-dropdown/new-column-dropdown.tsx

@@ -5,6 +5,7 @@ import {
   chipContentIconClass,
   chipContentLabelClass,
   chipVariants,
+  cn,
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
@@ -50,9 +51,7 @@ function ColumnTypeMenuItem({ option, onSelect }: ColumnTypeMenuItemProps) {
   const item = (
     <DropdownMenuItem
       aria-disabled={option.disabledReason ? true : undefined}
-      className={
-        option.disabledReason ? 'cursor-not-allowed opacity-50 focus:bg-transparent' : undefined
-      }
+      className={cn(option.disabledReason && 'cursor-not-allowed opacity-50 focus:bg-transparent')}
       onSelect={(event) => {
         if (option.disabledReason) {
           event.preventDefault()

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/inline-editors.test.ts

@@ -120,10 +120,8 @@ describe('dateEditorRawValue', () => {
 
     act(() => root.render(createElement(InlineEditor, props)))
 
-    expect(container.querySelector('input')).toMatchObject({
-      disabled: true,
-      placeholder: 'Loading timezone...',
-    })
+    expect(container.querySelector('input')).toBeNull()
+    expect(container.querySelector('[role="status"]')?.textContent).toBe('Loading timezone…')
 
     mockUseTimezoneState.mockReturnValue({
       timezone: 'America/Los_Angeles',

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/inline-editors.tsx

@@ -81,15 +81,9 @@ function InlineDateEditor(props: InlineEditorProps) {
 
   if (ttlTimezoneUnavailable) {
     return (
-      <input
-        type='text'
-        value=''
-        disabled
-        placeholder={
-          timezoneState.status === 'error' ? 'Timezone unavailable' : 'Loading timezone...'
-        }
-        className='w-full min-w-0 border-none bg-transparent p-0 text-[var(--text-muted)] text-small outline-none'
-      />
+      <span role='status' className='w-full min-w-0 truncate text-[var(--text-muted)] text-small'>
+        {timezoneState.status === 'error' ? 'Timezone unavailable' : 'Loading timezone…'}
+      </span>
     )
   }
 

apps/sim/lib/core/config/env.ts

@@ -590,7 +590,7 @@ export const env = createEnv({
     SESSION_POLICIES_ENABLED:             z.boolean().optional(),                 // Enable org session policies on self-hosted (bypasses hosted requirements)
     FORKING_ENABLED:                      z.boolean().optional(),                 // Enable workspace forking on self-hosted (bypasses hosted requirements)
     TABLES_V2_API:                        z.boolean().optional(),                 // Enable the v2 tables HTTP API (public /api/v2/tables + internal /api/table/[tableId]/query predicate-grammar route)
-    TABLE_ROW_TTL:                        z.boolean().optional(),                 // Enable table row expiration through TTL columns
+    TABLE_ROW_TTL:                        z.boolean().optional(),
     CREDENTIAL_GROUPS:                    z.boolean().optional(),                 // Enable enterprise Credential Groups globally
 
     // Organizations - for self-hosted deployments

apps/sim/lib/table/columns/ttl-limit.test.ts

@@ -67,20 +67,20 @@ describe('TTL column mutation limit', () => {
   })
 
   it('rejects adding a TTL column before locking when the feature is disabled', async () => {
-    mockAssertTableRowTtlEnabled.mockRejectedValue(new Error('TTL columns are not enabled'))
+    mockAssertTableRowTtlEnabled.mockRejectedValue(new Error('Expiration columns are not enabled'))
 
     await expect(
       addTableColumn('table-1', { name: 'expiry', type: 'ttl' }, 'request-1')
-    ).rejects.toThrow('TTL columns are not enabled')
+    ).rejects.toThrow('Expiration columns are not enabled')
     expect(mockWithLockedTable).not.toHaveBeenCalled()
   })
 
   it('rejects retyping to TTL before locking when the feature is disabled', async () => {
-    mockAssertTableRowTtlEnabled.mockRejectedValue(new Error('TTL columns are not enabled'))
+    mockAssertTableRowTtlEnabled.mockRejectedValue(new Error('Expiration columns are not enabled'))
 
     await expect(
       updateColumnType({ tableId: 'table-1', columnName: 'name', newType: 'ttl' }, 'request-1')
-    ).rejects.toThrow('TTL columns are not enabled')
+    ).rejects.toThrow('Expiration columns are not enabled')
     expect(mockWithLockedTable).not.toHaveBeenCalled()
   })
 

apps/sim/lib/table/service.test.ts

@@ -70,11 +70,11 @@ describe('createTable schema invariants', () => {
   })
 
   it('rejects a TTL schema before persistence when the feature is disabled', async () => {
-    mockAssertTableRowTtlEnabled.mockRejectedValue(new Error('TTL columns are not enabled'))
+    mockAssertTableRowTtlEnabled.mockRejectedValue(new Error('Expiration columns are not enabled'))
 
     await expect(
       create({ columns: [{ name: 'expires_at', type: 'ttl' }] } as TableSchema)
-    ).rejects.toThrow('TTL columns are not enabled')
+    ).rejects.toThrow('Expiration columns are not enabled')
     expect(dbChainMockFns.insert).not.toHaveBeenCalled()
   })
 

apps/sim/lib/table/ttl-availability.test.ts

@@ -28,7 +28,7 @@ describe('table row TTL availability', () => {
 
     await expect(assertTableRowTtlEnabled()).rejects.toMatchObject({
       code: 'validation',
-      message: 'TTL columns are not enabled',
+      message: 'Expiration columns are not enabled',
     })
   })
 })

apps/sim/lib/table/ttl-availability.ts

@@ -9,5 +9,5 @@ export function isTableRowTtlEnabled(): Promise<boolean> {
 /** Rejects attempts to introduce a TTL column while the feature is disabled. */
 export async function assertTableRowTtlEnabled(): Promise<void> {
   if (await isTableRowTtlEnabled()) return
-  throw new OrchestrationError('validation', 'TTL columns are not enabled')
+  throw new OrchestrationError('validation', 'Expiration columns are not enabled')
 }