@commercetools-frontend-extensions/operations 3.4.0 → 3.6.0

package/src/@errors/invalid-response-error.ts

@@ -1,4 +1,9 @@
-export class InvalidResponseError extends Error {
+import { ErrorCode, OperationsError } from './base'
+
+export class InvalidResponseError extends OperationsError {
+  readonly code = ErrorCode.INVALID_RESPONSE
+  readonly isRetryable = false
+
   constructor(message: string) {
     super(message)
     this.name = 'InvalidResponseError'

package/src/@errors/no-resources-to-export-error.ts

@@ -1,4 +1,9 @@
-export class NoResourcesToExportError extends Error {
+import { ErrorCode, OperationsError } from './base'
+
+export class NoResourcesToExportError extends OperationsError {
+  readonly code = ErrorCode.NO_RESOURCES_TO_EXPORT
+  readonly isRetryable = false
+
   constructor(message: string = 'There are no resources to export.') {
     super(message)
     this.name = 'NoResourcesToExportError'

package/src/@errors/polling-aborted-error.ts

@@ -1,4 +1,9 @@
-export class PollingAbortedError extends Error {
+import { ErrorCode, OperationsError } from './base'
+
+export class PollingAbortedError extends OperationsError {
+  readonly code = ErrorCode.POLLING_ABORTED
+  readonly isRetryable = false
+
   constructor() {
     super('Polling was aborted')
     this.name = 'PollingAbortedError'

package/src/@errors/polling-timeout-error.ts

@@ -0,0 +1,17 @@
+import { ErrorCode, OperationsError } from './base'
+
+export class PollingTimeoutError extends OperationsError {
+  readonly code = ErrorCode.POLLING_TIMEOUT
+  readonly isRetryable = true
+  readonly maxAttempts: number
+  readonly totalTimeSeconds: number
+
+  constructor(maxAttempts: number, totalTimeSeconds: number) {
+    super(
+      `Polling timeout after ${maxAttempts} attempts (${totalTimeSeconds}s)`
+    )
+    this.name = 'PollingTimeoutError'
+    this.maxAttempts = maxAttempts
+    this.totalTimeSeconds = totalTimeSeconds
+  }
+}

package/src/@errors/project-key-not-available-error.ts

@@ -1,4 +1,9 @@
-export class ProjectKeyNotAvailableError extends Error {
+import { ErrorCode, OperationsError } from './base'
+
+export class ProjectKeyNotAvailableError extends OperationsError {
+  readonly code = ErrorCode.PROJECT_KEY_NOT_AVAILABLE
+  readonly isRetryable = false
+
   constructor(message: string = 'Project key is not available') {
     super(message)
     this.name = 'ProjectKeyNotAvailableError'

package/src/@errors/query-predicate-error.ts

@@ -1,5 +1,9 @@
-export class QueryPredicateError extends Error {
-  field = 'queryPredicate'
+import { ErrorCode, OperationsError } from './base'
+
+export class QueryPredicateError extends OperationsError {
+  readonly code = ErrorCode.QUERY_PREDICATE_ERROR
+  readonly isRetryable = false
+  readonly field = 'queryPredicate'
 
   constructor(
     message: string = 'There is an error with the query predicate. Make sure the syntax is correct.'

package/src/@errors/unexpected-column-error.ts

@@ -1,6 +1,13 @@
-export class UnexpectedColumnError extends Error {
+import { ErrorCode, OperationsError } from './base'
+
+export class UnexpectedColumnError extends OperationsError {
+  readonly code = ErrorCode.UNEXPECTED_COLUMN
+  readonly isRetryable = false
+  readonly columnName: string
+
   constructor(columnName: string) {
     super(`Unexpected column "${columnName}"`)
     this.name = 'UnexpectedColumnError'
+    this.columnName = columnName
   }
 }

package/src/@errors/unexpected-operation-state-error.ts

@@ -1,8 +1,14 @@
 import { ProcessingState } from '@commercetools/importapi-sdk'
+import { ErrorCode, OperationsError } from './base'
+
+export class UnexpectedOperationStateError extends OperationsError {
+  readonly code = ErrorCode.UNEXPECTED_OPERATION_STATE
+  readonly isRetryable = false
+  readonly state: ProcessingState
 
-export class UnexpectedOperationStateError extends Error {
   constructor(state: ProcessingState) {
     super(`Unexpected operation state "${state}"`)
     this.name = 'UnexpectedOperationStateError'
+    this.state = state
   }
 }

package/src/@errors/unexpected-resource-type-error.ts

@@ -1,6 +1,13 @@
-export class UnexpectedResourceTypeError extends Error {
+import { ErrorCode, OperationsError } from './base'
+
+export class UnexpectedResourceTypeError extends OperationsError {
+  readonly code = ErrorCode.UNEXPECTED_RESOURCE_TYPE
+  readonly isRetryable = false
+  readonly resourceType: string
+
   constructor(resourceType: string) {
     super(`Unexpected resource type "${resourceType}"`)
     this.name = 'UnexpectedResourceTypeError'
+    this.resourceType = resourceType
   }
 }

package/src/@hooks/use-file-import-job-upload.spec.ts

@@ -262,6 +262,55 @@ describe('useFileImportJobUpload', () => {
     expect(result.current.progress).toBe(100)
   })
 
+  it('should use explicit fileType override instead of deriving from resourceType', async () => {
+    const onSuccess = jest.fn()
+
+    const { result } = renderHook(() => useFileImportJobUpload({ projectKey }))
+
+    await act(async () => {
+      await result.current.upload({
+        file: mockFile,
+        resourceType: 'product',
+        fileType: 'json',
+        onSuccess,
+      })
+    })
+
+    expect(mockCreateFileImportJob).toHaveBeenCalledWith(
+      expect.objectContaining({
+        payload: expect.objectContaining({
+          fileType: 'json',
+        }),
+      })
+    )
+
+    expect(mockGetFileImportJobFileType).not.toHaveBeenCalled()
+    expect(onSuccess).toHaveBeenCalledWith('job-123', importContainerKey)
+  })
+
+  it('should fall back to derived fileType when fileType override is not provided', async () => {
+    const onSuccess = jest.fn()
+
+    const { result } = renderHook(() => useFileImportJobUpload({ projectKey }))
+
+    await act(async () => {
+      await result.current.upload({
+        file: mockFile,
+        resourceType: 'product',
+        onSuccess,
+      })
+    })
+
+    expect(mockGetFileImportJobFileType).toHaveBeenCalledWith('product')
+    expect(mockCreateFileImportJob).toHaveBeenCalledWith(
+      expect.objectContaining({
+        payload: expect.objectContaining({
+          fileType: 'csv',
+        }),
+      })
+    )
+  })
+
   it('should work without optional settings', async () => {
     const onSuccess = jest.fn()
 

package/src/@hooks/use-file-import-job-upload.ts

@@ -16,6 +16,7 @@ import type { ExtendedImportContainerDraft } from '../@types'
 export type UseFileImportJobUploadConfig = {
   file: File
   resourceType: ResourceTypeId
+  fileType?: 'csv' | 'json'
   settings?: ExtendedImportContainerDraft['settings']
   autoProcess?: boolean
   operationType?: 'delete'
@@ -57,12 +58,15 @@ export const useFileImportJobUpload = ({
           projectKey,
         })
 
+        const fileType =
+          config.fileType ?? getFileImportJobFileType(config.resourceType)
+
         const jobResponse = await createFileImportJob({
           projectKey,
           resourceType: config.resourceType,
           importContainerKey,
           payload: {
-            fileType: getFileImportJobFileType(config.resourceType),
+            fileType,
             fileName: config.file.name,
             file: config.file,
           },

package/src/@hooks/use-file-upload.ts

@@ -19,6 +19,7 @@ export type ValidationProgress = {
 export type FileUploadConfig = {
   file: File
   resourceType: ResourceTypeId
+  fileType?: 'csv' | 'json'
   settings?: ExtendedImportContainerDraft['settings']
   autoProcess?: boolean
   skipValidationPolling?: boolean
@@ -85,6 +86,7 @@ export const useFileUpload = ({
           await jobUpload.upload({
             file: config.file,
             resourceType: config.resourceType,
+            fileType: config.fileType,
             settings: config.settings,
             autoProcess: config.autoProcess,
             operationType: config.operationType,

package/src/@utils/poll-job-until-processing.ts

@@ -1,5 +1,5 @@
 import { getFileImportJob } from '../@api'
-import { PollingAbortedError } from '../@errors'
+import { PollingAbortedError, PollingTimeoutError } from '../@errors'
 import type { FileImportJob } from '../@types'
 import { hasImportJobStartedProcessing } from './file-import-job-helpers'
 
@@ -64,9 +64,6 @@ export const pollJobUntilProcessing = async ({
     attempts++
   }
 
-  throw new Error(
-    `Job did not start processing after ${maxAttempts} attempts (${
-      (maxAttempts * pollingInterval) / 1000
-    }s)`
-  )
+  const totalTimeSeconds = (maxAttempts * pollingInterval) / 1000
+  throw new PollingTimeoutError(maxAttempts, totalTimeSeconds)
 }

package/src/@utils/poll-job-until-validated.ts

@@ -1,5 +1,5 @@
 import { getFileImportJob } from '../@api'
-import { PollingAbortedError } from '../@errors'
+import { PollingAbortedError, PollingTimeoutError } from '../@errors'
 import type { FileImportJob } from '../@types'
 import { isImportJobTerminal } from './file-import-job-helpers'
 
@@ -68,9 +68,6 @@ export const pollJobUntilValidated = async ({
     attempts++
   }
 
-  throw new Error(
-    `Job validation timeout after ${maxAttempts} attempts (${
-      (maxAttempts * pollingInterval) / 1000
-    }s)`
-  )
+  const totalTimeSeconds = (maxAttempts * pollingInterval) / 1000
+  throw new PollingTimeoutError(maxAttempts, totalTimeSeconds)
 }