@open-mercato/core 0.6.2-develop.3380.1.bb14509041 → 0.6.2-develop.3400.1.d948268f50

package/src/modules/attachments/lib/ocrQueue.ts

@@ -1,10 +1,11 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { Attachment, AttachmentPartition } from '../data/entities'
 import { OcrService } from './ocrService'
+import type { StorageDriver } from './drivers/types'
 
 export type OcrRequestedEvent = {
   attachmentId: string
-  filePath: string
+  storagePath: string
   mimeType: string
   partitionCode: string
   organizationId: string | null
@@ -13,13 +14,15 @@ export type OcrRequestedEvent = {
 
 export async function processAttachmentOcr(
   em: EntityManager,
-  payload: OcrRequestedEvent
+  payload: OcrRequestedEvent,
+  driver: StorageDriver,
 ): Promise<void> {
-  const { attachmentId, filePath, mimeType, partitionCode } = payload
+  const { attachmentId, storagePath, mimeType, partitionCode } = payload
 
   console.log(`[attachments.ocr] Processing started for attachment: ${attachmentId}`)
   const startTime = Date.now()
 
+  const { filePath, cleanup } = await driver.toLocalPath(partitionCode, storagePath)
   try {
     const partition = await em.findOne(AttachmentPartition, { code: partitionCode })
     const resolvedModel = partition?.ocrModel ?? process.env.OCR_MODEL ?? 'gpt-4o'
@@ -63,17 +66,22 @@ export async function processAttachmentOcr(
       attachmentId,
       error: error instanceof Error ? error.message : String(error),
     })
+  } finally {
+    await cleanup().catch((cleanupError) => {
+      console.warn(`[attachments.ocr] Temp file cleanup failed:`, cleanupError)
+    })
   }
 }
 
 export async function requestOcrProcessing(
   em: EntityManager,
   attachment: Attachment,
-  filePath: string
+  driver: StorageDriver,
+  storagePath: string,
 ): Promise<void> {
   const payload: OcrRequestedEvent = {
     attachmentId: attachment.id,
-    filePath,
+    storagePath,
     mimeType: attachment.mimeType,
     partitionCode: attachment.partitionCode,
     organizationId: attachment.organizationId ?? null,
@@ -82,7 +90,7 @@ export async function requestOcrProcessing(
 
   setImmediate(() => {
     const workerEm = typeof (em as any)?.fork === 'function' ? (em as any).fork() : em
-    processAttachmentOcr(workerEm, payload).catch((error) => {
+    processAttachmentOcr(workerEm, payload, driver).catch((error) => {
       console.error(`[attachments.ocr] Background processing error:`, error)
     })
   })

package/src/modules/attachments/lib/storage.ts

@@ -27,6 +27,10 @@ function resolveTenantSegment(tenantId: string | null | undefined): string {
   return 'tenant_shared'
 }
 
+/**
+ * @deprecated Use `StorageDriverFactory.resolveForPartition()` + `driver.store()` instead.
+ * Kept for backward compatibility with external callers.
+ */
 export type StorePartitionFilePayload = {
   partitionCode: string
   orgId: string | null | undefined
@@ -41,6 +45,9 @@ export type StoredPartitionFile = {
   fileName: string
 }
 
+/**
+ * @deprecated Use `StorageDriverFactory.resolveForPartition()` + `driver.store()` instead.
+ */
 export async function storePartitionFile(payload: StorePartitionFilePayload): Promise<StoredPartitionFile> {
   const root = resolvePartitionRoot(payload.partitionCode)
   const orgSegment = resolveOrgSegment(payload.orgId ?? null)
@@ -59,6 +66,9 @@ export async function storePartitionFile(payload: StorePartitionFilePayload): Pr
   }
 }
 
+/**
+ * @deprecated Use `StorageDriverFactory.resolveForAttachment()` + `driver.read()` / `driver.toLocalPath()` instead.
+ */
 export function resolveAttachmentAbsolutePath(
   partitionCode: string,
   storagePath: string,
@@ -78,6 +88,9 @@ export function resolveAttachmentAbsolutePath(
   return path.join(root, safeRelative)
 }
 
+/**
+ * @deprecated Use `StorageDriverFactory.resolveForAttachment()` + `driver.delete()` instead.
+ */
 export async function deletePartitionFile(
   partitionCode: string,
   storagePath: string,

package/src/modules/attachments/lib/thumbnailCache.ts

@@ -1,17 +1,31 @@
 import { promises as fs } from 'fs'
 import path from 'path'
-import { resolvePartitionRoot } from './storage'
-
-const CACHE_ROOT_SEGMENTS = ['.cache', 'thumbnails']
 
 function sanitizeSegment(value: string): string {
   return value.replace(/[^a-zA-Z0-9._-]/g, '_')
 }
 
+/**
+ * Resolves the thumbnail cache root. Uses a dedicated directory under
+ * `storage/.cache/thumbnails/<partitionCode>/` that is independent of
+ * the partition's storage backend (local or S3).
+ */
+function resolveCacheRoot(partitionCode: string): string {
+  return path.join(process.cwd(), 'storage', '.cache', 'thumbnails', sanitizeSegment(partitionCode))
+}
+
+function resolveCachePath(partitionCode: string, attachmentId: string, cacheKey: string): string {
+  return path.join(
+    resolveCacheRoot(partitionCode),
+    sanitizeSegment(attachmentId),
+    sanitizeSegment(cacheKey),
+  )
+}
+
 export function buildThumbnailCacheKey(
   width?: number,
   height?: number,
-  cropType?: 'cover' | 'contain'
+  cropType?: 'cover' | 'contain',
 ): string | null {
   if (!width && !height) return null
   const safeWidth = typeof width === 'number' && Number.isFinite(width) ? width : 'auto'
@@ -20,20 +34,10 @@ export function buildThumbnailCacheKey(
   return `w${safeWidth}-h${safeHeight}-c${safeCrop}`
 }
 
-function resolveCachePath(partitionCode: string, attachmentId: string, cacheKey: string): string {
-  const root = resolvePartitionRoot(partitionCode)
-  return path.join(
-    root,
-    ...CACHE_ROOT_SEGMENTS,
-    sanitizeSegment(attachmentId),
-    sanitizeSegment(cacheKey)
-  )
-}
-
 export async function readThumbnailCache(
   partitionCode: string,
   attachmentId: string,
-  cacheKey: string
+  cacheKey: string,
 ): Promise<Buffer | null> {
   const cachePath = resolveCachePath(partitionCode, attachmentId, cacheKey)
   try {
@@ -47,16 +51,18 @@ export async function writeThumbnailCache(
   partitionCode: string,
   attachmentId: string,
   cacheKey: string,
-  data: Buffer
+  data: Buffer,
 ): Promise<void> {
   const cachePath = resolveCachePath(partitionCode, attachmentId, cacheKey)
   await fs.mkdir(path.dirname(cachePath), { recursive: true })
   await fs.writeFile(cachePath, data)
 }
 
-export async function clearAttachmentThumbnailCache(partitionCode: string, attachmentId: string): Promise<void> {
-  const root = resolvePartitionRoot(partitionCode)
-  const dir = path.join(root, ...CACHE_ROOT_SEGMENTS, sanitizeSegment(attachmentId))
+export async function clearAttachmentThumbnailCache(
+  partitionCode: string,
+  attachmentId: string,
+): Promise<void> {
+  const dir = path.join(resolveCacheRoot(partitionCode), sanitizeSegment(attachmentId))
   try {
     await fs.rm(dir, { recursive: true, force: true })
   } catch {

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

@@ -295,6 +295,7 @@ function buildCredentialFields(credFields: CredentialField[]): CrudField[] {
       ) : field.helpText,
       placeholder: field.placeholder,
       required: field.required,
+      visibleWhen: field.visibleWhen,
     }
 
     if (field.type === 'secret') {
@@ -478,7 +479,15 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
       { fallback: null },
     )
     if (call.ok && call.result?.credentials) {
-      setCredValues(call.result.credentials)
+      const next = { ...call.result.credentials }
+      if (currentIntegrationId === 'storage_s3') {
+        const authMode = next.authMode
+        if (authMode !== 'access_keys' && authMode !== 'ambient') {
+          const hasKeys = Boolean(next.accessKeyId || next.secretAccessKey)
+          next.authMode = hasKeys ? 'access_keys' : 'ambient'
+        }
+      }
+      setCredValues(next)
       setCredentialsFormKey((current) => current + 1)
     }
   }, [resolveCurrentIntegrationId])
@@ -680,19 +689,32 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
     if (!currentIntegrationId) return
     setIsSavingCredentials(true)
     try {
+      const sanitizedValues = { ...values }
+      if (currentIntegrationId === 'storage_s3') {
+        const authMode = sanitizedValues.authMode
+        if (authMode !== 'access_keys' && authMode !== 'ambient') {
+          const hasKeys = Boolean(sanitizedValues.accessKeyId || sanitizedValues.secretAccessKey)
+          sanitizedValues.authMode = hasKeys ? 'access_keys' : 'ambient'
+        }
+        if (sanitizedValues.authMode === 'ambient') {
+          delete sanitizedValues.accessKeyId
+          delete sanitizedValues.secretAccessKey
+          delete sanitizedValues.sessionToken
+        }
+      }
       const call = await runMutationWithContext({
         actionId: 'save-credentials',
         tabId: 'credentials',
-        mutationPayload: { integrationId: currentIntegrationId, credentials: values },
+        mutationPayload: { integrationId: currentIntegrationId, credentials: sanitizedValues },
         operation: () => apiCall(`/api/integrations/${encodeURIComponent(currentIntegrationId)}/credentials`, {
           method: 'PUT',
           headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ credentials: values }),
+          body: JSON.stringify({ credentials: sanitizedValues }),
         }, { fallback: null }),
       })
 
       if (call.ok) {
-        setCredValues(values)
+        setCredValues(sanitizedValues)
         setCredentialsFormKey((current) => current + 1)
         flash(t('integrations.detail.credentials.saved'), 'success')
         return
@@ -792,6 +814,10 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
       const values = rawValues as Record<string, unknown>
 
       editableCredentialFields.forEach((field) => {
+        if (field.visibleWhen) {
+          const targetValue = values[field.visibleWhen.field]
+          if (targetValue !== field.visibleWhen.equals) return
+        }
         const value = values[field.key]
 
         if (field.type === 'boolean') {

package/src/modules/integrations/backend/integrations/bundle/[id]/page.tsx

@@ -122,7 +122,15 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
       { fallback: null },
     )
     if (credCall.ok && credCall.result?.credentials) {
-      setCredValues(credCall.result.credentials)
+      const next = { ...credCall.result.credentials }
+      if (currentBundleId === 'storage_s3') {
+        const authMode = next.authMode
+        if (authMode !== 'access_keys' && authMode !== 'ambient') {
+          const hasKeys = Boolean(next.accessKeyId || next.secretAccessKey)
+          next.authMode = hasKeys ? 'access_keys' : 'ambient'
+        }
+      }
+      setCredValues(next)
     }
     setIsLoading(false)
   }, [resolveCurrentBundleId, t])
@@ -180,6 +188,11 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
 
   const credFields = (detail.bundle.credentials?.fields ?? []).filter(isEditableCredentialField)
 
+  function isFieldVisible(field: CredentialField): boolean {
+    if (!field.visibleWhen) return true
+    return credValues[field.visibleWhen.field] === field.visibleWhen.equals
+  }
+
   return (
     <Page>
       <PageBody className="space-y-6">
@@ -202,7 +215,7 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
               <CardTitle>{t('integrations.bundle.sharedCredentials')}</CardTitle>
             </CardHeader>
             <CardContent className="space-y-4">
-              {credFields.map((field) => (
+              {credFields.filter(isFieldVisible).map((field) => (
                 <div key={field.key} className="space-y-1.5">
                   <label className="text-sm font-medium">
                     {field.label}{field.required && <span className="text-red-500 ml-0.5">*</span>}