@open-mercato/core 0.6.6-develop.6551.1.1511bfa890 → 0.6.6

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

@@ -4,211 +4,6 @@
     "public"
   ],
   "tables": [
-    {
-      "name": "gateway_session_initializations",
-      "schema": "public",
-      "columns": {
-        "claim_token": {
-          "name": "claim_token",
-          "type": "uuid",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "uuid"
-        },
-        "claimed_at": {
-          "name": "claimed_at",
-          "type": "timestamptz(6)",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "unique": false,
-          "length": 6,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "datetime"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamptz(6)",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": false,
-          "length": 6,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "datetime"
-        },
-        "gateway_transaction_id": {
-          "name": "gateway_transaction_id",
-          "type": "uuid",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "uuid"
-        },
-        "id": {
-          "name": "id",
-          "type": "uuid",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": true,
-          "nullable": false,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": "gen_random_uuid()",
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "uuid"
-        },
-        "operation_key": {
-          "name": "operation_key",
-          "type": "text",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": true,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "text"
-        },
-        "organization_id": {
-          "name": "organization_id",
-          "type": "uuid",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "uuid"
-        },
-        "provider_key": {
-          "name": "provider_key",
-          "type": "text",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "text"
-        },
-        "tenant_id": {
-          "name": "tenant_id",
-          "type": "uuid",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "uuid"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamptz(6)",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": false,
-          "length": 6,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "datetime"
-        }
-      },
-      "indexes": [
-        {
-          "columnNames": [
-            "id"
-          ],
-          "composite": false,
-          "constraint": true,
-          "keyName": "gateway_session_initializations_pkey",
-          "primary": true,
-          "unique": true
-        },
-        {
-          "columnNames": [
-            "operation_key",
-            "provider_key",
-            "organization_id",
-            "tenant_id"
-          ],
-          "composite": true,
-          "constraint": true,
-          "keyName": "gateway_session_initializations_scope_operation_unique",
-          "primary": false,
-          "unique": true
-        }
-      ],
-      "checks": [],
-      "triggers": [],
-      "foreignKeys": {},
-      "comment": null
-    },
     {
       "name": "gateway_transactions",
       "schema": "public",
@@ -226,7 +21,6 @@
           "scale": 4,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "decimal"
         },
@@ -243,7 +37,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -260,7 +53,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -277,7 +69,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -294,7 +85,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -311,7 +101,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -328,7 +117,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "json"
         },
@@ -345,7 +133,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -362,7 +149,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -379,7 +165,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -396,7 +181,6 @@
           "scale": null,
           "default": "gen_random_uuid()",
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -413,7 +197,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -430,7 +213,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -447,7 +229,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -464,7 +245,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -481,7 +261,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -498,7 +277,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -515,7 +293,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -532,7 +309,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -549,7 +325,6 @@
           "scale": null,
           "default": "'pending'",
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -566,7 +341,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -583,7 +357,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "json"
         }
@@ -637,7 +410,6 @@
         }
       ],
       "checks": [],
-      "triggers": [],
       "foreignKeys": {},
       "comment": null
     },
@@ -658,7 +430,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -675,7 +446,6 @@
           "scale": null,
           "default": "gen_random_uuid()",
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -692,7 +462,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -709,7 +478,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -726,7 +494,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -743,7 +510,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -760,7 +526,6 @@
           "scale": null,
           "default": null,
           "comment": null,
-          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         }
@@ -791,7 +556,6 @@
         }
       ],
       "checks": [],
-      "triggers": [],
       "foreignKeys": {},
       "comment": null
     }

package/src/modules/planner/backend/planner/availability-rulesets/[id]/page.tsx

@@ -3,7 +3,7 @@
 import * as React from 'react'
 import { useRouter } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
-import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
+import { Button } from '@open-mercato/ui/primitives/button'
 import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
@@ -196,22 +196,28 @@ export default function PlannerAvailabilityRuleSetDetailPage({ params }: { param
     <Page>
       <PageBody>
         <div className="space-y-6">
-          <Tabs
-            value={activeTab}
-            onValueChange={(value) => setActiveTab(value as 'details' | 'availability')}
-            variant="underline"
-          >
-            <TabsList
-              className="w-full flex-wrap"
-              aria-label={translate('planner.availabilityRuleSets.tabs.label', 'Schedule sections')}
-            >
+          <div className="border-b">
+            <nav className="flex flex-wrap items-center gap-5 text-sm" aria-label={translate('planner.availabilityRuleSets.tabs.label', 'Schedule sections')}>
               {tabs.map((tab) => (
-                <TabsTrigger key={tab.id} value={tab.id}>
+                <Button
+                  key={tab.id}
+                  type="button"
+                  role="tab"
+                  aria-selected={activeTab === tab.id}
+                  variant="ghost"
+                  size="sm"
+                  className={`relative -mb-px h-auto rounded-none border-b-2 px-0 py-2 font-medium ${
+                    activeTab === tab.id
+                      ? 'border-accent-indigo text-foreground'
+                      : 'border-transparent text-muted-foreground hover:text-foreground'
+                  }`}
+                  onClick={() => setActiveTab(tab.id as 'details' | 'availability')}
+                >
                   {tab.label}
-                </TabsTrigger>
+                </Button>
               ))}
-            </TabsList>
-          </Tabs>
+            </nav>
+          </div>
 
           {activeTab === 'details' ? (
             <AvailabilityRuleSetForm

package/src/modules/planner/components/AvailabilityRulesEditor.tsx

@@ -21,7 +21,6 @@ import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimi
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
-import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
 import { ComboboxInput, TimePicker } from '@open-mercato/ui/backend/inputs'
 import { DictionaryEntrySelect, type DictionarySelectLabels } from '@open-mercato/core/modules/dictionaries/components/DictionaryEntrySelect'
 import {
@@ -1857,25 +1856,44 @@ export function AvailabilityRulesEditor({
                   <div className="rounded-lg border bg-muted/30 p-4">
                     <div className="space-y-4">
                       <div className="space-y-2">
-                        <Tabs
-                          value={editorScope}
-                          onValueChange={(value) => {
-                            const nextScope = value as 'date' | 'weekday'
-                            setEditorScope(nextScope)
-                            if (nextScope === 'weekday') {
+                        <div role="tablist" aria-label={listLabels.applyScopeLabel} className="inline-flex rounded-lg border bg-muted p-1 text-xs">
+                          <Button
+                            type="button"
+                            role="tab"
+                            aria-selected={editorScope === 'date'}
+                            variant="ghost"
+                            size="sm"
+                            className={`h-auto rounded-md px-3 py-1.5 font-medium ${
+                              editorScope === 'date'
+                                ? 'bg-background text-foreground shadow-sm'
+                                : 'text-muted-foreground hover:text-foreground'
+                            }`}
+                            onClick={() => setEditorScope('date')}
+                          >
+                            {listLabels.applyScopeDate}
+                          </Button>
+                          <Button
+                            type="button"
+                            role="tab"
+                            aria-selected={editorScope === 'weekday'}
+                            variant="ghost"
+                            size="sm"
+                            className={`h-auto rounded-md px-3 py-1.5 font-medium ${
+                              editorScope === 'weekday'
+                                ? 'bg-background text-foreground shadow-sm'
+                                : 'text-muted-foreground hover:text-foreground'
+                            }`}
+                            onClick={() => {
+                              setEditorScope('weekday')
                               setEditorUnavailable(false)
                               setEditorNote('')
                               setEditorReasonEntryId(null)
                               setEditorReasonValue('')
-                            }
-                          }}
-                          variant="underline"
-                        >
-                          <TabsList aria-label={listLabels.applyScopeLabel}>
-                            <TabsTrigger value="date">{listLabels.applyScopeDate}</TabsTrigger>
-                            <TabsTrigger value="weekday">{listLabels.editAllLabel}</TabsTrigger>
-                          </TabsList>
-                        </Tabs>
+                            }}
+                          >
+                            {listLabels.editAllLabel}
+                          </Button>
+                        </div>
                       </div>
 
                       {editorScope === 'date' ? (

package/src/modules/query_index/api/status.ts

@@ -415,7 +415,10 @@ export async function GET(req: Request) {
     errorQuery = errorQuery.where('tenant_id' as any, 'is', null as any)
   }
   if (Array.isArray(organizationScopeIds) && organizationScopeIds.length) {
-    errorQuery = errorQuery.where('organization_id' as any, 'in', organizationScopeIds)
+    errorQuery = errorQuery.where((eb: any) => eb.or([
+      eb('organization_id' as any, 'is', null),
+      eb('organization_id' as any, 'in', organizationScopeIds),
+    ]))
   } else {
     errorQuery = errorQuery.where('organization_id' as any, 'is', null as any)
   }
@@ -453,7 +456,10 @@ export async function GET(req: Request) {
     logsQuery = logsQuery.where('tenant_id' as any, 'is', null as any)
   }
   if (Array.isArray(organizationScopeIds) && organizationScopeIds.length) {
-    logsQuery = logsQuery.where('organization_id' as any, 'in', organizationScopeIds)
+    logsQuery = logsQuery.where((eb: any) => eb.or([
+      eb('organization_id' as any, 'is', null),
+      eb('organization_id' as any, 'in', organizationScopeIds),
+    ]))
   } else {
     logsQuery = logsQuery.where('organization_id' as any, 'is', null as any)
   }

package/src/modules/resources/backend/resources/resources/[id]/page.tsx

@@ -5,7 +5,6 @@ import { usePathname, useRouter, useSearchParams } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { FormHeader } from '@open-mercato/ui/backend/forms'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
 import { apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
@@ -664,40 +663,51 @@ export default function ResourcesResourceDetailPage({ params }: { params?: { id?
             subtitle={t('resources.resources.detail.subtitle', 'Resource profile and activity')}
           />
 
-          <Tabs
-            value={activeTab}
-            onValueChange={(value) => setActiveTab(value as 'details' | 'availability')}
-            variant="underline"
-          >
-            <TabsList
-              className="w-full flex-wrap"
-              aria-label={t('resources.resources.tabs.label', 'Resource sections')}
-            >
+          <div className="border-b">
+            <nav className="flex flex-wrap items-center gap-5 text-sm" aria-label={t('resources.resources.tabs.label', 'Resource sections')}>
               {tabs.map((tab) => (
-                <TabsTrigger key={tab.id} value={tab.id}>
+                <Button
+                  key={tab.id}
+                  type="button"
+                  role="tab"
+                  aria-selected={activeTab === tab.id}
+                  variant="ghost"
+                  size="sm"
+                  className={`relative -mb-px h-auto rounded-none border-b-2 px-0 py-2 font-medium ${
+                    activeTab === tab.id
+                      ? 'border-accent-indigo text-foreground'
+                      : 'border-transparent text-muted-foreground hover:text-foreground'
+                  }`}
+                  onClick={() => setActiveTab(tab.id as 'details' | 'availability')}
+                >
                   {tab.label}
-                </TabsTrigger>
+                </Button>
               ))}
-            </TabsList>
-          </Tabs>
+            </nav>
+          </div>
 
           {activeTab === 'details' ? (
             <>
               <div className="rounded-lg border bg-card p-4">
                 <div className="flex flex-wrap items-center justify-between gap-3">
-                  <Tabs
-                    value={activeDetailTab}
-                    onValueChange={(value) => setActiveDetailTab(value as 'notes' | 'activities')}
-                    variant="underline"
-                  >
-                    <TabsList className="h-auto flex-wrap border-b-0">
-                      {detailTabs.map((tab) => (
-                        <TabsTrigger key={tab.id} value={tab.id}>
-                          {tab.label}
-                        </TabsTrigger>
-                      ))}
-                    </TabsList>
-                  </Tabs>
+                  <div className="flex gap-2">
+                    {detailTabs.map((tab) => (
+                      <Button
+                        key={tab.id}
+                        type="button"
+                        variant="ghost"
+                        size="sm"
+                        className={`relative -mb-px h-auto rounded-none border-b-2 px-0 py-1 font-medium ${
+                          activeDetailTab === tab.id
+                            ? 'border-accent-indigo text-foreground'
+                            : 'border-transparent text-muted-foreground hover:text-foreground'
+                        }`}
+                        onClick={() => setActiveDetailTab(tab.id)}
+                      >
+                        {tab.label}
+                      </Button>
+                    ))}
+                  </div>
                   {sectionAction ? (
                     <Button
                       type="button"