@open-mercato/core 0.6.6-develop.6257.1.6d0af84d26 → 0.6.6-develop.6290.1.4bb5a8ba3f

package/src/modules/messages/components/message-detail/hooks/useMessageDetailsQueries.ts

@@ -26,10 +26,19 @@ export function useMessageDetailsQueries({
     [id, scopeVersion],
   )
 
+  const suppressAutoMarkReadRef = React.useRef(false)
+
+  React.useEffect(() => {
+    suppressAutoMarkReadRef.current = false
+  }, [id])
+
   const detailQuery = useQuery<MessageDetail | null>({
     queryKey: detailQueryKey,
     queryFn: async () => {
-      const call = await apiCall<MessageDetail>(`/api/messages/${encodeURIComponent(id)}`)
+      const detailUrl = suppressAutoMarkReadRef.current
+        ? `/api/messages/${encodeURIComponent(id)}?skipMarkRead=1`
+        : `/api/messages/${encodeURIComponent(id)}`
+      const call = await apiCall<MessageDetail>(detailUrl)
       if (call.status === 404) {
         return null
       }
@@ -97,6 +106,10 @@ export function useMessageDetailsQueries({
     return call.result
   }, [detailQueryKey, id, queryClient, t])
 
+  const suppressAutoMarkRead = React.useCallback(() => {
+    suppressAutoMarkReadRef.current = true
+  }, [])
+
   const listItemComponentKey = detail?.typeDefinition.ui?.listItemComponent ?? null
   const contentComponentKey = detail?.typeDefinition.ui?.contentComponent ?? null
   const actionsComponentKey = detail?.typeDefinition.ui?.actionsComponent ?? null
@@ -111,6 +124,7 @@ export function useMessageDetailsQueries({
     attachmentsQuery,
     attachments,
     refreshDetailWithoutAutoMarkRead,
+    suppressAutoMarkRead,
     listItemComponentKey,
     contentComponentKey,
     actionsComponentKey,

package/src/modules/payment_gateways/api/cancel/route.ts

@@ -2,6 +2,7 @@ import { NextResponse } from 'next/server'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { cancelSchema } from '../../data/validators'
 import type { PaymentGatewayService } from '../../lib/gateway-service'
 import { paymentGatewaysTag } from '../openapi'
@@ -73,6 +74,9 @@ export async function POST(req: Request) {
     })
     return NextResponse.json(result)
   } catch (err: unknown) {
+    if (isCrudHttpError(err)) {
+      return NextResponse.json(err.body, { status: err.status })
+    }
     const message = err instanceof Error ? err.message : 'Cancel failed'
     return NextResponse.json({ error: message }, { status: 502 })
   }
@@ -87,6 +91,7 @@ export const openApi = {
       tags: [paymentGatewaysTag],
       responses: [
         { status: 200, description: 'Payment cancelled' },
+        { status: 409, description: 'Invalid payment status transition' },
         { status: 422, description: 'Invalid payload' },
         { status: 502, description: 'Gateway provider error' },
       ],

package/src/modules/payment_gateways/api/capture/route.ts

@@ -2,6 +2,7 @@ import { NextResponse } from 'next/server'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { captureSchema } from '../../data/validators'
 import type { PaymentGatewayService } from '../../lib/gateway-service'
 import { paymentGatewaysTag } from '../openapi'
@@ -73,6 +74,9 @@ export async function POST(req: Request) {
     })
     return NextResponse.json(result)
   } catch (err: unknown) {
+    if (isCrudHttpError(err)) {
+      return NextResponse.json(err.body, { status: err.status })
+    }
     const message = err instanceof Error ? err.message : 'Capture failed'
     return NextResponse.json({ error: message }, { status: 502 })
   }
@@ -87,6 +91,7 @@ export const openApi = {
       tags: [paymentGatewaysTag],
       responses: [
         { status: 200, description: 'Payment captured' },
+        { status: 409, description: 'Invalid payment status transition' },
         { status: 422, description: 'Invalid payload' },
         { status: 502, description: 'Gateway provider error' },
       ],

package/src/modules/payment_gateways/api/refund/route.ts

@@ -2,6 +2,7 @@ import { NextResponse } from 'next/server'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { refundSchema } from '../../data/validators'
 import type { PaymentGatewayService } from '../../lib/gateway-service'
 import { paymentGatewaysTag } from '../openapi'
@@ -74,6 +75,9 @@ export async function POST(req: Request) {
     })
     return NextResponse.json(result)
   } catch (err: unknown) {
+    if (isCrudHttpError(err)) {
+      return NextResponse.json(err.body, { status: err.status })
+    }
     const message = err instanceof Error ? err.message : 'Refund failed'
     return NextResponse.json({ error: message }, { status: 502 })
   }
@@ -88,6 +92,7 @@ export const openApi = {
       tags: [paymentGatewaysTag],
       responses: [
         { status: 200, description: 'Payment refunded' },
+        { status: 409, description: 'Invalid payment status transition' },
         { status: 422, description: 'Invalid payload' },
         { status: 502, description: 'Gateway provider error' },
       ],

package/src/modules/payment_gateways/lib/gateway-service.ts

@@ -14,10 +14,34 @@ import {
 import type { CredentialsService } from '../../integrations/lib/credentials-service'
 import type { IntegrationStateService } from '../../integrations/lib/state-service'
 import type { IntegrationLogService } from '../../integrations/lib/log-service'
+import { conflict } from '@open-mercato/shared/lib/crud/errors'
 import { GatewayTransaction } from '../data/entities'
-import { isValidTransition } from './status-machine'
+import { canApplyManualAction, isValidTransition, type ManualGatewayAction } from './status-machine'
 import { emitPaymentGatewayEvent } from '../events'
 
+function assertManualActionAllowed(action: ManualGatewayAction, transaction: GatewayTransaction): void {
+  const current = transaction.unifiedStatus as UnifiedPaymentStatus
+  if (!canApplyManualAction(action, current)) {
+    throw conflict(`Cannot ${action} a payment in status "${current}"`)
+  }
+}
+
+function applyAdapterResultStatus(
+  action: ManualGatewayAction,
+  transaction: GatewayTransaction,
+  resultStatus: UnifiedPaymentStatus,
+): boolean {
+  const current = transaction.unifiedStatus as UnifiedPaymentStatus
+  if (resultStatus === current) return false
+  if (!isValidTransition(current, resultStatus)) {
+    throw conflict(
+      `Gateway returned status "${resultStatus}" which is not a valid transition from "${current}" for ${action}`,
+    )
+  }
+  transaction.unifiedStatus = resultStatus
+  return true
+}
+
 export interface PaymentGatewayServiceDeps {
   em: EntityManager
   integrationCredentialsService: CredentialsService
@@ -197,6 +221,7 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
 
     async capturePayment(transactionId: string, amount: number | undefined, scope: { organizationId: string; tenantId: string }): Promise<CaptureResult> {
       const transaction = await findTransactionOrThrow(transactionId, scope)
+      assertManualActionAllowed('capture', transaction)
       const { adapter, credentials } = await resolveAdapterAndCredentials(
         transaction.providerKey,
         { organizationId: transaction.organizationId, tenantId: transaction.tenantId },
@@ -208,16 +233,18 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
         credentials,
       })
 
-      transaction.unifiedStatus = result.status
+      const statusChanged = applyAdapterResultStatus('capture', transaction, result.status)
       transaction.gatewayMetadata = { ...transaction.gatewayMetadata, captureResult: result.providerData }
       await em.flush()
-      await emitStatusEvent(result.status, {
-        transactionId: transaction.id,
-        paymentId: transaction.paymentId,
-        providerKey: transaction.providerKey,
-        organizationId: transaction.organizationId,
-        tenantId: transaction.tenantId,
-      })
+      if (statusChanged) {
+        await emitStatusEvent(result.status, {
+          transactionId: transaction.id,
+          paymentId: transaction.paymentId,
+          providerKey: transaction.providerKey,
+          organizationId: transaction.organizationId,
+          tenantId: transaction.tenantId,
+        })
+      }
       await writeTransactionLog(
         transaction.providerKey,
         { organizationId: transaction.organizationId, tenantId: transaction.tenantId },
@@ -241,6 +268,7 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
       scope: { organizationId: string; tenantId: string },
     ): Promise<RefundResult> {
       const transaction = await findTransactionOrThrow(transactionId, scope)
+      assertManualActionAllowed('refund', transaction)
       const { adapter, credentials } = await resolveAdapterAndCredentials(
         transaction.providerKey,
         { organizationId: transaction.organizationId, tenantId: transaction.tenantId },
@@ -253,17 +281,19 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
         credentials,
       })
 
-      transaction.unifiedStatus = result.status
+      const statusChanged = applyAdapterResultStatus('refund', transaction, result.status)
       transaction.gatewayRefundId = result.refundId
       transaction.gatewayMetadata = { ...transaction.gatewayMetadata, refundResult: result.providerData }
       await em.flush()
-      await emitStatusEvent(result.status, {
-        transactionId: transaction.id,
-        paymentId: transaction.paymentId,
-        providerKey: transaction.providerKey,
-        organizationId: transaction.organizationId,
-        tenantId: transaction.tenantId,
-      })
+      if (statusChanged) {
+        await emitStatusEvent(result.status, {
+          transactionId: transaction.id,
+          paymentId: transaction.paymentId,
+          providerKey: transaction.providerKey,
+          organizationId: transaction.organizationId,
+          tenantId: transaction.tenantId,
+        })
+      }
       await writeTransactionLog(
         transaction.providerKey,
         { organizationId: transaction.organizationId, tenantId: transaction.tenantId },
@@ -287,6 +317,7 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
       scope: { organizationId: string; tenantId: string },
     ): Promise<CancelResult> {
       const transaction = await findTransactionOrThrow(transactionId, scope)
+      assertManualActionAllowed('cancel', transaction)
       const { adapter, credentials } = await resolveAdapterAndCredentials(
         transaction.providerKey,
         { organizationId: transaction.organizationId, tenantId: transaction.tenantId },
@@ -298,15 +329,17 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
         credentials,
       })
 
-      transaction.unifiedStatus = result.status
+      const statusChanged = applyAdapterResultStatus('cancel', transaction, result.status)
       await em.flush()
-      await emitStatusEvent(result.status, {
-        transactionId: transaction.id,
-        paymentId: transaction.paymentId,
-        providerKey: transaction.providerKey,
-        organizationId: transaction.organizationId,
-        tenantId: transaction.tenantId,
-      })
+      if (statusChanged) {
+        await emitStatusEvent(result.status, {
+          transactionId: transaction.id,
+          paymentId: transaction.paymentId,
+          providerKey: transaction.providerKey,
+          organizationId: transaction.organizationId,
+          tenantId: transaction.tenantId,
+        })
+      }
       await writeTransactionLog(
         transaction.providerKey,
         { organizationId: transaction.organizationId, tenantId: transaction.tenantId },

package/src/modules/payment_gateways/lib/status-machine.ts

@@ -26,3 +26,19 @@ export function isValidTransition(from: UnifiedPaymentStatus, to: UnifiedPayment
 export function isTerminalStatus(status: UnifiedPaymentStatus): boolean {
   return TERMINAL_STATUSES.has(status)
 }
+
+export type ManualGatewayAction = 'capture' | 'refund' | 'cancel'
+
+const MANUAL_ACTION_TARGET_STATUSES: Record<ManualGatewayAction, UnifiedPaymentStatus[]> = {
+  capture: ['captured', 'partially_captured'],
+  refund: ['refunded', 'partially_refunded'],
+  cancel: ['cancelled'],
+}
+
+export function canApplyManualAction(action: ManualGatewayAction, from: UnifiedPaymentStatus): boolean {
+  if (isTerminalStatus(from)) return false
+  const targets = MANUAL_ACTION_TARGET_STATUSES[action]
+  if (!targets) return false
+  if (targets.includes(from)) return true
+  return targets.some((target) => isValidTransition(from, target))
+}

package/src/modules/perspectives/api/[tableId]/route.ts

@@ -3,7 +3,7 @@ import { z } from 'zod'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
-import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { isCrudHttpError, isUniqueViolation } from '@open-mercato/shared/lib/crud/errors'
 import {
   runCrudMutationGuardAfterSuccess,
   validateCrudMutationGuard,
@@ -308,6 +308,12 @@ export async function POST(req: Request, ctx: { params: { tableId: string } }) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    if (isUniqueViolation(err)) {
+      return NextResponse.json({
+        error: 'A view with this name already exists.',
+        code: 'duplicate_name',
+      }, { status: 409 })
+    }
     throw err
   }
 
@@ -380,7 +386,7 @@ const perspectivesPostDoc: OpenApiMethodDoc = {
     { status: 400, description: 'Validation failed or invalid roles provided', schema: perspectivesErrorSchema },
     { status: 401, description: 'Authentication required', schema: perspectivesErrorSchema },
     { status: 403, description: 'Missing perspectives.role_defaults feature for role updates', schema: perspectivesErrorSchema },
-    { status: 409, description: 'Optimistic lock conflict', schema: perspectivesErrorSchema },
+    { status: 409, description: 'Optimistic lock conflict or perspective name already exists', schema: perspectivesErrorSchema },
   ],
 }
 

package/src/modules/perspectives/data/entities.ts

@@ -1,8 +1,28 @@
-import { Entity, Index, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
+import { Entity, Index, PrimaryKey, Property } from '@mikro-orm/decorators/legacy'
 
 @Entity({ tableName: 'perspectives' })
 @Index({ name: 'perspectives_user_scope_idx', properties: ['userId', 'tenantId', 'organizationId', 'tableId'] })
-@Unique({ properties: ['userId', 'tenantId', 'organizationId', 'tableId', 'name'] })
+// Live-row uniqueness is owned by partial indexes; ordinary unique decorators cannot express these scope rules.
+@Index({
+  name: 'perspectives_live_user_org_uq',
+  expression:
+    'create unique index "perspectives_live_user_org_uq" on "perspectives" ("user_id", "tenant_id", "organization_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is not null and "organization_id" is not null',
+})
+@Index({
+  name: 'perspectives_live_user_tenant_uq',
+  expression:
+    'create unique index "perspectives_live_user_tenant_uq" on "perspectives" ("user_id", "tenant_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is not null and "organization_id" is null',
+})
+@Index({
+  name: 'perspectives_live_user_org_only_uq',
+  expression:
+    'create unique index "perspectives_live_user_org_only_uq" on "perspectives" ("user_id", "organization_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is null and "organization_id" is not null',
+})
+@Index({
+  name: 'perspectives_live_user_global_uq',
+  expression:
+    'create unique index "perspectives_live_user_global_uq" on "perspectives" ("user_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is null and "organization_id" is null',
+})
 export class Perspective {
   @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
   id!: string
@@ -40,7 +60,27 @@ export class Perspective {
 
 @Entity({ tableName: 'role_perspectives' })
 @Index({ name: 'role_perspectives_role_scope_idx', properties: ['roleId', 'tenantId', 'organizationId', 'tableId'] })
-@Unique({ properties: ['roleId', 'tenantId', 'organizationId', 'tableId', 'name'] })
+// Live-row uniqueness is owned by partial indexes; ordinary unique decorators cannot express these scope rules.
+@Index({
+  name: 'role_perspectives_live_role_org_uq',
+  expression:
+    'create unique index "role_perspectives_live_role_org_uq" on "role_perspectives" ("role_id", "tenant_id", "organization_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is not null and "organization_id" is not null',
+})
+@Index({
+  name: 'role_perspectives_live_role_tenant_uq',
+  expression:
+    'create unique index "role_perspectives_live_role_tenant_uq" on "role_perspectives" ("role_id", "tenant_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is not null and "organization_id" is null',
+})
+@Index({
+  name: 'role_perspectives_live_role_org_only_uq',
+  expression:
+    'create unique index "role_perspectives_live_role_org_only_uq" on "role_perspectives" ("role_id", "organization_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is null and "organization_id" is not null',
+})
+@Index({
+  name: 'role_perspectives_live_role_global_uq',
+  expression:
+    'create unique index "role_perspectives_live_role_global_uq" on "role_perspectives" ("role_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is null and "organization_id" is null',
+})
 export class RolePerspective {
   @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
   id!: string

package/src/modules/perspectives/migrations/.snapshot-open-mercato.json

@@ -175,7 +175,7 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
-          "unique": true,
+          "unique": false,
           "length": null,
           "precision": null,
           "scale": null,
@@ -197,18 +197,40 @@
           "unique": true
         },
         {
-          "columnNames": [
-            "user_id",
-            "tenant_id",
-            "organization_id",
-            "table_id",
-            "name"
-          ],
-          "composite": true,
-          "constraint": true,
-          "keyName": "perspectives_user_id_tenant_id_organization_id_ta_0c702_unique",
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "keyName": "perspectives_live_user_global_uq",
           "primary": false,
-          "unique": true
+          "unique": false,
+          "expression": "create unique index \"perspectives_live_user_global_uq\" on \"perspectives\" (\"user_id\", \"table_id\", \"name\") where \"deleted_at\" is null and \"tenant_id\" is null and \"organization_id\" is null"
+        },
+        {
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "keyName": "perspectives_live_user_org_only_uq",
+          "primary": false,
+          "unique": false,
+          "expression": "create unique index \"perspectives_live_user_org_only_uq\" on \"perspectives\" (\"user_id\", \"organization_id\", \"table_id\", \"name\") where \"deleted_at\" is null and \"tenant_id\" is null and \"organization_id\" is not null"
+        },
+        {
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "keyName": "perspectives_live_user_org_uq",
+          "primary": false,
+          "unique": false,
+          "expression": "create unique index \"perspectives_live_user_org_uq\" on \"perspectives\" (\"user_id\", \"tenant_id\", \"organization_id\", \"table_id\", \"name\") where \"deleted_at\" is null and \"tenant_id\" is not null and \"organization_id\" is not null"
+        },
+        {
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "keyName": "perspectives_live_user_tenant_uq",
+          "primary": false,
+          "unique": false,
+          "expression": "create unique index \"perspectives_live_user_tenant_uq\" on \"perspectives\" (\"user_id\", \"tenant_id\", \"table_id\", \"name\") where \"deleted_at\" is null and \"tenant_id\" is not null and \"organization_id\" is null"
         },
         {
           "columnNames": [
@@ -335,7 +357,7 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
-          "unique": true,
+          "unique": false,
           "length": null,
           "precision": null,
           "scale": null,
@@ -421,18 +443,40 @@
           "unique": true
         },
         {
-          "columnNames": [
-            "role_id",
-            "tenant_id",
-            "organization_id",
-            "table_id",
-            "name"
-          ],
-          "composite": true,
-          "constraint": true,
-          "keyName": "role_perspectives_role_id_tenant_id_organization__f0fc6_unique",
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "keyName": "role_perspectives_live_role_global_uq",
           "primary": false,
-          "unique": true
+          "unique": false,
+          "expression": "create unique index \"role_perspectives_live_role_global_uq\" on \"role_perspectives\" (\"role_id\", \"table_id\", \"name\") where \"deleted_at\" is null and \"tenant_id\" is null and \"organization_id\" is null"
+        },
+        {
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "keyName": "role_perspectives_live_role_org_only_uq",
+          "primary": false,
+          "unique": false,
+          "expression": "create unique index \"role_perspectives_live_role_org_only_uq\" on \"role_perspectives\" (\"role_id\", \"organization_id\", \"table_id\", \"name\") where \"deleted_at\" is null and \"tenant_id\" is null and \"organization_id\" is not null"
+        },
+        {
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "keyName": "role_perspectives_live_role_org_uq",
+          "primary": false,
+          "unique": false,
+          "expression": "create unique index \"role_perspectives_live_role_org_uq\" on \"role_perspectives\" (\"role_id\", \"tenant_id\", \"organization_id\", \"table_id\", \"name\") where \"deleted_at\" is null and \"tenant_id\" is not null and \"organization_id\" is not null"
+        },
+        {
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "keyName": "role_perspectives_live_role_tenant_uq",
+          "primary": false,
+          "unique": false,
+          "expression": "create unique index \"role_perspectives_live_role_tenant_uq\" on \"role_perspectives\" (\"role_id\", \"tenant_id\", \"table_id\", \"name\") where \"deleted_at\" is null and \"tenant_id\" is not null and \"organization_id\" is null"
         },
         {
           "columnNames": [
@@ -455,4 +499,4 @@
   ],
   "views": [],
   "nativeEnums": {}
-}
+}

package/src/modules/perspectives/migrations/Migration20260619120000_perspectives_live_row_uniqueness.ts

@@ -0,0 +1,65 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260619120000_perspectives_live_row_uniqueness extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`
+      with ranked as (
+        select id,
+               row_number() over (
+                 partition by user_id, tenant_id, organization_id, table_id, name
+                 order by coalesce(updated_at, created_at) desc, created_at desc, id desc
+               ) as rn
+        from perspectives
+        where deleted_at is null
+      )
+      update perspectives
+      set deleted_at = now(), is_default = false
+      from ranked
+      where perspectives.id = ranked.id and ranked.rn > 1;
+    `);
+    this.addSql(`alter table "perspectives" drop constraint if exists "perspectives_user_id_tenant_id_organization_id_ta_2d725_unique";`);
+    this.addSql(`alter table "perspectives" drop constraint if exists "perspectives_user_id_tenant_id_organization_id_ta_0c702_unique";`);
+    this.addSql(`create unique index if not exists "perspectives_live_user_org_uq" on "perspectives" ("user_id", "tenant_id", "organization_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is not null and "organization_id" is not null;`);
+    this.addSql(`create unique index if not exists "perspectives_live_user_tenant_uq" on "perspectives" ("user_id", "tenant_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is not null and "organization_id" is null;`);
+    this.addSql(`create unique index if not exists "perspectives_live_user_org_only_uq" on "perspectives" ("user_id", "organization_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is null and "organization_id" is not null;`);
+    this.addSql(`create unique index if not exists "perspectives_live_user_global_uq" on "perspectives" ("user_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is null and "organization_id" is null;`);
+
+    this.addSql(`
+      with ranked as (
+        select id,
+               row_number() over (
+                 partition by role_id, tenant_id, organization_id, table_id, name
+                 order by coalesce(updated_at, created_at) desc, created_at desc, id desc
+               ) as rn
+        from role_perspectives
+        where deleted_at is null
+      )
+      update role_perspectives
+      set deleted_at = now(), is_default = false
+      from ranked
+      where role_perspectives.id = ranked.id and ranked.rn > 1;
+    `);
+    this.addSql(`alter table "role_perspectives" drop constraint if exists "role_perspectives_role_id_tenant_id_organization__c5467_unique";`);
+    this.addSql(`alter table "role_perspectives" drop constraint if exists "role_perspectives_role_id_tenant_id_organization__f0fc6_unique";`);
+    this.addSql(`create unique index if not exists "role_perspectives_live_role_org_uq" on "role_perspectives" ("role_id", "tenant_id", "organization_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is not null and "organization_id" is not null;`);
+    this.addSql(`create unique index if not exists "role_perspectives_live_role_tenant_uq" on "role_perspectives" ("role_id", "tenant_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is not null and "organization_id" is null;`);
+    this.addSql(`create unique index if not exists "role_perspectives_live_role_org_only_uq" on "role_perspectives" ("role_id", "organization_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is null and "organization_id" is not null;`);
+    this.addSql(`create unique index if not exists "role_perspectives_live_role_global_uq" on "role_perspectives" ("role_id", "table_id", "name") where "deleted_at" is null and "tenant_id" is null and "organization_id" is null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop index if exists "perspectives_live_user_org_uq";`);
+    this.addSql(`drop index if exists "perspectives_live_user_tenant_uq";`);
+    this.addSql(`drop index if exists "perspectives_live_user_org_only_uq";`);
+    this.addSql(`drop index if exists "perspectives_live_user_global_uq";`);
+    this.addSql(`alter table "perspectives" add constraint "perspectives_user_id_tenant_id_organization_id_ta_2d725_unique" unique ("user_id", "tenant_id", "organization_id", "table_id", "name");`);
+
+    this.addSql(`drop index if exists "role_perspectives_live_role_org_uq";`);
+    this.addSql(`drop index if exists "role_perspectives_live_role_tenant_uq";`);
+    this.addSql(`drop index if exists "role_perspectives_live_role_org_only_uq";`);
+    this.addSql(`drop index if exists "role_perspectives_live_role_global_uq";`);
+    this.addSql(`alter table "role_perspectives" add constraint "role_perspectives_role_id_tenant_id_organization__c5467_unique" unique ("role_id", "tenant_id", "organization_id", "table_id", "name");`);
+  }
+
+}

package/src/modules/perspectives/services/perspectiveService.ts

@@ -296,6 +296,23 @@ export async function saveUserPerspective(
       current: entity.updatedAt ?? null,
       request: options.request ?? null,
     })
+    if (entity.name !== input.name) {
+      const duplicate = await em.findOne(Perspective, {
+        userId: scope.userId,
+        tenantId,
+        organizationId,
+        tableId,
+        name: input.name,
+        id: { $ne: entity.id } as any,
+        deletedAt: null,
+      })
+      if (duplicate) {
+        throw new CrudHttpError(409, {
+          error: 'A view with this name already exists.',
+          code: 'duplicate_name',
+        })
+      }
+    }
   } else {
     entity = await em.findOne(Perspective, {
       userId: scope.userId,