fix(oracle-epm-tax-reporting): align block and registration contracts

Author: Bill Leoutsakos

apps/docs/content/docs/integrations/oracle_epm_tax_reporting.mdx

@@ -526,7 +526,7 @@ Import an uploaded collection CSV for a year, period, and configured frequency d
 | `year` | string | Yes | Collection year member, for example FY26; tenant-specific. |
 | `period` | string | Yes | Collection period member, for example Jan; tenant-specific. |
 | `frequencyDimensions` | json | No | JSON object of additional collection-interval frequency dimension names and member strings. Preserve case. For template deployment supply all configured dimensions \(up to four\), including Year/Period when applicable. |
-| `jobName` | string | No | Exact deployed rule, ruleset, or saved job definition name. Names are case-sensitive. |
+| `jobName` | string | No | Optional name for this supplemental job submission, not a deployed Planning job definition. |
 | `waitForCompletion` | boolean | No | Wait at most 120 seconds, subject to the execution deadline. Default false. Timeout or local cancellation does not cancel the Oracle job; check its status before resubmitting. |
 
 #### Output
@@ -557,7 +557,7 @@ Deploy Supplemental Data templates for a collection interval. Empty templates de
 | `templates` | array | Yes | Template name array. An explicit empty array deploys ALL templates for the interval; use named templates to limit scope. |
 | `frequencyDimensions` | json | No | JSON object of additional collection-interval frequency dimension names and member strings. Preserve case. For template deployment supply all configured dimensions \(up to four\), including Year/Period when applicable. |
 | `resetWorkflows` | boolean | No | Reset existing form workflows during deployment \(default false\). |
-| `jobName` | string | No | Exact deployed rule, ruleset, or saved job definition name. Names are case-sensitive. |
+| `jobName` | string | No | Optional name for this supplemental job submission, not a deployed Planning job definition. |
 | `waitForCompletion` | boolean | No | Wait at most 120 seconds, subject to the execution deadline. Default false. Timeout or local cancellation does not cancel the Oracle job; check its status before resubmitting. |
 
 #### Output

apps/sim/blocks/blocks/oracle_epm_tax_reporting.ts

@@ -2,7 +2,7 @@ import { NetSuiteIcon } from '@/components/icons'
 import type { BlockConfig, BlockMeta } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
 import { normalizeFileInput, parseOptionalNumberInput } from '@/blocks/utils'
-import type { TaxReportingResponse } from '@/tools/oracle_epm_tax_reporting/types'
+import type { TaxReportingBlockResponse } from '@/tools/oracle_epm_tax_reporting/types'
 import { parseTaxBooleanInput, parseTaxJsonInput } from '@/tools/oracle_epm_tax_reporting/utils'
 
 const OPERATION_FIELDS: Record<string, readonly string[]> = {
@@ -86,6 +86,7 @@ const OPERATION_FIELDS: Record<string, readonly string[]> = {
     'period',
     'frequencyDimensions',
     'waitForCompletion',
+    'jobName',
   ],
   oracle_epm_tax_reporting_deploy_form_templates: [
     'application',
@@ -94,6 +95,7 @@ const OPERATION_FIELDS: Record<string, readonly string[]> = {
     'frequencyDimensions',
     'resetWorkflows',
     'waitForCompletion',
+    'jobName',
   ],
   oracle_epm_tax_reporting_import_supplemental_dimension_members: [
     'dimension',
@@ -146,7 +148,7 @@ const BOOLEAN_FIELDS = new Set([
   'downloadReport',
 ])
 
-export const OracleEpmTaxReportingBlock: BlockConfig<TaxReportingResponse> = {
+export const OracleEpmTaxReportingBlock: BlockConfig<TaxReportingBlockResponse> = {
   type: 'oracle_epm_tax_reporting',
   name: 'Oracle EPM Tax Reporting',
   description:
@@ -1144,6 +1146,20 @@ export const OracleEpmTaxReportingBlock: BlockConfig<TaxReportingResponse> = {
         ],
       },
     },
+    {
+      id: 'submissionName',
+      title: 'Submission Name',
+      type: 'short-input',
+      placeholder: 'Optional name for this supplemental job submission',
+      mode: 'advanced',
+      condition: {
+        field: 'operation',
+        value: [
+          'oracle_epm_tax_reporting_import_supplemental_collection_data',
+          'oracle_epm_tax_reporting_deploy_form_templates',
+        ],
+      },
+    },
     {
       id: 'collection',
       title: 'Collection',
@@ -1301,9 +1317,9 @@ export const OracleEpmTaxReportingBlock: BlockConfig<TaxReportingResponse> = {
       title: 'Format',
       type: 'dropdown',
       value: () => '',
-      options: (values) => [
+      options: (params) => [
         { id: '', label: 'Oracle default (PDF report / CSV user details)' },
-        ...(values?.operation === 'oracle_epm_tax_reporting_generate_user_details_report'
+        ...(params?.values.operation === 'oracle_epm_tax_reporting_generate_user_details_report'
           ? ['CSV', 'XLS']
           : ['HTML', 'PDF', 'XLSX', 'CSV']
         ).map((id) => ({ id, label: id })),
@@ -1322,8 +1338,8 @@ export const OracleEpmTaxReportingBlock: BlockConfig<TaxReportingResponse> = {
       id: 'module',
       title: 'Module',
       type: 'dropdown',
-      options: (values) =>
-        (values?.operation === 'oracle_epm_tax_reporting_generate_report'
+      options: (params) =>
+        (params?.values.operation === 'oracle_epm_tax_reporting_generate_report'
           ? ['FCM', 'SDM']
           : ['FCCS', 'SDM']
         ).map((id) => ({ id, label: id })),
@@ -1442,7 +1458,10 @@ export const OracleEpmTaxReportingBlock: BlockConfig<TaxReportingResponse> = {
         if (!fields) return {}
         const result: Record<string, unknown> = { oauthCredential: params.oauthCredential }
         for (const key of fields) {
-          const value = params[key]
+          const supplemental =
+            params.operation === 'oracle_epm_tax_reporting_import_supplemental_collection_data' ||
+            params.operation === 'oracle_epm_tax_reporting_deploy_form_templates'
+          const value = key === 'jobName' && supplemental ? params.submissionName : params[key]
           if (value === undefined || value === null || value === '') continue
           if (JSON_FIELDS.has(key)) result[key] = parseTaxJsonInput(value, key)
           else if (BOOLEAN_FIELDS.has(key)) result[key] = parseTaxBooleanInput(value)

apps/sim/lib/integrations/credential-display.test.ts

@@ -68,6 +68,7 @@ const EXPECTED_COVERAGE: Record<string, string[]> = {
   // NetSuite remains an API-key catalog integration, like Snowflake, while its
   // block uses the shared reusable-credential selector.
   'netsuite-service-account': [],
+  'oracle-epm-service-account': [],
   'pipedrive-service-account': ['pipedrive'],
   'salesforce-service-account': ['salesforce'],
   'shopify-service-account': ['shopify'],

apps/sim/lib/oauth/types.ts

@@ -93,6 +93,7 @@ export type OAuthProvider =
   | 'zoho-desk'
 
 export type OAuthService =
+  | 'oracle_epm_tax_reporting'
   | 'google'
   | 'google-email'
   | 'google-drive'

apps/sim/lib/selectors/manifest.test.ts

@@ -9,8 +9,8 @@ describe('selector manifest', () => {
     const count = (classification: (typeof classifications)[number]) =>
       classifications.filter((value) => value === classification).length
 
-    expect(Object.keys(selectorManifest)).toHaveLength(94)
-    expect(count('provider-server')).toBe(82)
+    expect(Object.keys(selectorManifest)).toHaveLength(96)
+    expect(count('provider-server')).toBe(84)
     expect(count('internal-server')).toBe(11)
     expect(count('local')).toBe(1)
     expect(classifications).not.toContain('provider-legacy')
@@ -36,7 +36,7 @@ describe('selector manifest', () => {
     const rawConnectionKeys = providerKeys.filter(
       (key) => !serverSelectorRegistry[key as keyof typeof serverSelectorRegistry].credential
     )
-    expect(providerKeys).toHaveLength(82)
+    expect(providerKeys).toHaveLength(84)
     expect(rawConnectionKeys.sort()).toEqual([
       'cloudwatch.logGroups',
       'cloudwatch.logStreams',
@@ -98,7 +98,7 @@ describe('selector manifest', () => {
       (attachment) => attachment.destination !== 'fixed'
     )
 
-    expect(preparedDestinations).toHaveLength(13)
+    expect(preparedDestinations).toHaveLength(15)
     for (const attachment of preparedDestinations) {
       expect(attachment.destination).toEqual(
         expect.objectContaining({

apps/sim/tools/generated/tool-metadata.ts

@@ -25,7 +25,12 @@ export const oracleEpmTaxReportingDeployFormTemplatesTool: InternalToolConfig<
     templates: taxFields.templates,
     frequencyDimensions: taxFields.frequencyDimensions,
     resetWorkflows: taxFields.resetWorkflows,
-    jobName: { ...taxFields.jobName, required: false },
+    jobName: {
+      ...taxFields.jobName,
+      required: false,
+      description:
+        'Optional name for this supplemental job submission, not a deployed Planning job definition.',
+    },
     waitForCompletion: taxFields.waitForCompletion,
   },
   operation: { input: createInternalToolOperationInput },

apps/sim/tools/oracle_epm_tax_reporting/deploy_form_templates.ts

@@ -26,7 +26,12 @@ export const oracleEpmTaxReportingImportSupplementalCollectionDataTool: Internal
     year: taxFields.year,
     period: taxFields.period,
     frequencyDimensions: taxFields.frequencyDimensions,
-    jobName: { ...taxFields.jobName, required: false },
+    jobName: {
+      ...taxFields.jobName,
+      required: false,
+      description:
+        'Optional name for this supplemental job submission, not a deployed Planning job definition.',
+    },
     waitForCompletion: taxFields.waitForCompletion,
   },
   operation: { input: createInternalToolOperationInput },

apps/sim/tools/oracle_epm_tax_reporting/import_supplemental_collection_data.ts

@@ -16,6 +16,47 @@ const block = OracleEpmTaxReportingBlock
 const tools = Object.values(toolExports)
 
 describe('Tax Reporting integration contracts', () => {
+  it.each(['import_supplemental_collection_data', 'deploy_form_templates'])(
+    'maps only the supplemental submission label for %s',
+    (operation) => {
+      const params = {
+        operation: `oracle_epm_tax_reporting_${operation}`,
+        oauthCredential: 'credential',
+        jobName: 'Stale saved rule',
+        submissionName: '<trigger.label>',
+      }
+      expect(block.tools.config.params?.(params)).toEqual({
+        oauthCredential: 'credential',
+        jobName: '<trigger.label>',
+      })
+      expect(block.tools.config.params?.({ ...params, submissionName: '' })).toEqual({
+        oauthCredential: 'credential',
+      })
+      expect(
+        block.tools.config.params?.({ ...params, operation: 'oracle_epm_tax_reporting_run_rule' })
+      ).toEqual({ oauthCredential: 'credential', jobName: 'Stale saved rule' })
+    }
+  )
+
+  it('derives report enums from the current block values wrapper', () => {
+    const format = block.subBlocks.find((item) => item.id === 'format')!
+    const module = block.subBlocks.find((item) => item.id === 'module')!
+    if (typeof format.options !== 'function' || typeof module.options !== 'function')
+      throw new Error('Expected derived options')
+    const values = { operation: 'oracle_epm_tax_reporting_generate_user_details_report' }
+    expect(format.options({ values }).map((option) => option.id)).toEqual(['', 'CSV', 'XLS'])
+    expect(
+      module
+        .options({ values: { operation: 'oracle_epm_tax_reporting_generate_report' } })
+        .map((option) => option.id)
+    ).toEqual(['FCM', 'SDM'])
+    expect(
+      module
+        .options({ values: { operation: 'oracle_epm_tax_reporting_get_report_status' } })
+        .map((option) => option.id)
+    ).toEqual(['FCCS', 'SDM'])
+  })
+
   it('requires the active application and report module according to their route family', () => {
     const required = (id: string, values: Record<string, unknown>) => {
       const config = block.subBlocks.find((item) => item.id === id)!

apps/sim/tools/oracle_epm_tax_reporting/oracle_epm_tax_reporting.test.ts

@@ -180,6 +180,23 @@ export interface TaxFileResponse extends ToolResponse {
   output: { file: UserFile }
 }
 
+export type TaxReportingBlockResponse =
+  | TaxVersionResponse
+  | TaxApplicationsResponse
+  | TaxDefinitionsResponse
+  | TaxMemberResponse
+  | TaxJobStatusResponse
+  | TaxSupplementalResponse
+  | TaxReportResponse
+  | TaxUploadResponse
+  | TaxGridResponse
+  | TaxImportSliceResponse
+  | TaxClearSliceResponse
+  | TaxDetailsResponse
+  | TaxChildDetailsResponse
+  | TaxFilesResponse
+  | TaxFileResponse
+
 export type TaxReportingConnection = Pick<
   TaxReportingParams,
   'oauthCredential' | 'accessToken' | 'instanceUrl'