Skip to content

Commit f534661

Browse files
ChavdaSachinChavdaSachin
committed
Fix TS errors
1 parent 86c08ea commit f534661

3 files changed

Lines changed: 45 additions & 34 deletions

File tree

‎src/ROUTES.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3933,12 +3933,10 @@ const ROUTES = {
39333933
},
39343934
POLICY_ACCOUNTING_CERTINIA_PREREQUISITES: {
39353935
route: 'workspaces/:policyID/accounting/certinia/prerequisites/:isSandbox?/:subPage?',
3936-
3937-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
3938-
getRoute: (policyID: string, isSandbox?: boolean, subPage?: string, backTo?: string) => {
3936+
getRoute: (policyID: string, isSandbox?: boolean, subPage?: string) => {
39393937
const sandboxSegment = isSandbox === undefined ? '' : `/${isSandbox ? 'true' : 'false'}`;
39403938
const subPageSegment = subPage ? `/${subPage}` : '';
3941-
return getUrlWithBackToParam(`workspaces/${policyID}/accounting/certinia/prerequisites${sandboxSegment}${subPageSegment}` as const, backTo);
3939+
return `workspaces/${policyID}/accounting/certinia/prerequisites${sandboxSegment}${subPageSegment}` as const;
39423940
},
39433941
},
39443942
POLICY_ACCOUNTING_CERTINIA_EXISTING_CONNECTIONS: {

‎src/libs/actions/connections/FinancialForce.ts‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import type {OnyxUpdate} from 'react-native-onyx';
22
import Onyx from 'react-native-onyx';
33
import type {ValueOf} from 'type-fest';
4-
import * as API from '@libs/API';
4+
import {read, write} from '@libs/API';
55
import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
66
import {getCommandURL} from '@libs/ApiUtils';
7-
import * as ErrorUtils from '@libs/ErrorUtils';
8-
import * as Link from '@userActions/Link';
7+
import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
8+
import {openLink} from '@userActions/Link';
99
import CONST from '@src/CONST';
1010
import ONYXKEYS from '@src/ONYXKEYS';
1111
import type {FinancialForceConnectionConfig} from '@src/types/onyx/Policy';
@@ -55,7 +55,7 @@ function prepareOnyxDataForFinancialForceCodingUpdate<K extends keyof FinancialF
5555
[settingName]: null,
5656
},
5757
errorFields: {
58-
[settingName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
58+
[settingName]: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
5959
},
6060
},
6161
},
@@ -133,7 +133,7 @@ function prepareOnyxDataForFinancialForceExportUpdate<K extends keyof FinancialF
133133
[settingName]: null,
134134
},
135135
errorFields: {
136-
[settingName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
136+
[settingName]: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
137137
},
138138
},
139139
},
@@ -166,7 +166,7 @@ function prepareOnyxDataForFinancialForceExportUpdate<K extends keyof FinancialF
166166
return {optimisticData, failureData, successData};
167167
}
168168

169-
function getFinancialForceSetupLink(policyID: string, isSandbox: boolean = false) {
169+
function getFinancialForceSetupLink(policyID: string, isSandbox = false) {
170170
const commandURL = getCommandURL({
171171
command: READ_COMMANDS.CONNECT_POLICY_TO_FINANCIAL_FORCE,
172172
shouldSkipWebProxy: true,
@@ -176,7 +176,7 @@ function getFinancialForceSetupLink(policyID: string, isSandbox: boolean = false
176176
}
177177

178178
function connectPolicyToFinancialForce(policyID: string, isSandbox: boolean, environmentURL: string) {
179-
Link.openLink(getFinancialForceSetupLink(policyID, isSandbox), environmentURL);
179+
openLink(getFinancialForceSetupLink(policyID, isSandbox), environmentURL);
180180
}
181181

182182
function clearFinancialForceErrorField(policyID: string | undefined, fieldName: string) {
@@ -189,47 +189,47 @@ function clearFinancialForceErrorField(policyID: string | undefined, fieldName:
189189
}
190190

191191
function syncPolicyToFinancialForce(policyID: string) {
192-
API.read(READ_COMMANDS.SYNC_POLICY_TO_FINANCIAL_FORCE, {policyID}, {});
192+
read(READ_COMMANDS.SYNC_POLICY_TO_FINANCIAL_FORCE, {policyID}, {});
193193
}
194194

195195
function updateFinancialForceDimension1Mapping(policyID: string, value: ValueOf<typeof CONST.CERTINIA_MAPPING_VALUE>, previousValue: ValueOf<typeof CONST.CERTINIA_MAPPING_VALUE> | null) {
196196
const {optimisticData, failureData, successData} = prepareOnyxDataForFinancialForceCodingUpdate(policyID, CONST.CERTINIA_CONFIG.CODING_DIMENSION1, value, previousValue ?? undefined);
197-
API.write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_DIMENSION1_MAPPING, {policyID, value}, {optimisticData, failureData, successData});
197+
write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_DIMENSION1_MAPPING, {policyID, value}, {optimisticData, failureData, successData});
198198
}
199199

200200
function updateFinancialForceDimension2Mapping(policyID: string, value: ValueOf<typeof CONST.CERTINIA_MAPPING_VALUE>, previousValue: ValueOf<typeof CONST.CERTINIA_MAPPING_VALUE> | null) {
201201
const {optimisticData, failureData, successData} = prepareOnyxDataForFinancialForceCodingUpdate(policyID, CONST.CERTINIA_CONFIG.CODING_DIMENSION2, value, previousValue ?? undefined);
202-
API.write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_DIMENSION2_MAPPING, {policyID, value}, {optimisticData, failureData, successData});
202+
write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_DIMENSION2_MAPPING, {policyID, value}, {optimisticData, failureData, successData});
203203
}
204204

205205
function updateFinancialForceDimension3Mapping(policyID: string, value: ValueOf<typeof CONST.CERTINIA_MAPPING_VALUE>, previousValue: ValueOf<typeof CONST.CERTINIA_MAPPING_VALUE> | null) {
206206
const {optimisticData, failureData, successData} = prepareOnyxDataForFinancialForceCodingUpdate(policyID, CONST.CERTINIA_CONFIG.CODING_DIMENSION3, value, previousValue ?? undefined);
207-
API.write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_DIMENSION3_MAPPING, {policyID, value}, {optimisticData, failureData, successData});
207+
write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_DIMENSION3_MAPPING, {policyID, value}, {optimisticData, failureData, successData});
208208
}
209209

210210
function updateFinancialForceDimension4Mapping(policyID: string, value: ValueOf<typeof CONST.CERTINIA_MAPPING_VALUE>, previousValue: ValueOf<typeof CONST.CERTINIA_MAPPING_VALUE> | null) {
211211
const {optimisticData, failureData, successData} = prepareOnyxDataForFinancialForceCodingUpdate(policyID, CONST.CERTINIA_CONFIG.CODING_DIMENSION4, value, previousValue ?? undefined);
212-
API.write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_DIMENSION4_MAPPING, {policyID, value}, {optimisticData, failureData, successData});
212+
write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_DIMENSION4_MAPPING, {policyID, value}, {optimisticData, failureData, successData});
213213
}
214214

215215
function updateFinancialForceSyncTax(policyID: string, enabled: boolean, previousValue?: boolean) {
216216
const {optimisticData, failureData, successData} = prepareOnyxDataForFinancialForceCodingUpdate(policyID, CONST.CERTINIA_CONFIG.SYNC_TAX, enabled, previousValue);
217-
API.write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_SYNC_TAX, {policyID, enabled}, {optimisticData, failureData, successData});
217+
write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_SYNC_TAX, {policyID, enabled}, {optimisticData, failureData, successData});
218218
}
219219

220220
function updateFinancialForceExporter(policyID: string, exporter: string, previousExporter: string | null) {
221221
const {optimisticData, failureData, successData} = prepareOnyxDataForFinancialForceExportUpdate(policyID, CONST.CERTINIA_CONFIG.EXPORTER, exporter, previousExporter ?? undefined);
222-
API.write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_EXPORTER, {policyID, email: exporter}, {optimisticData, failureData, successData});
222+
write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_EXPORTER, {policyID, email: exporter}, {optimisticData, failureData, successData});
223223
}
224224

225-
function updateFinancialForceExportStatus(policyID: string, status: string, previousStatus: string | null) {
225+
function updateFinancialForceExportStatus(policyID: string, status: ValueOf<typeof CONST.CERTINIA_EXPORT_STATUS>, previousStatus: ValueOf<typeof CONST.CERTINIA_EXPORT_STATUS> | null) {
226226
const {optimisticData, failureData, successData} = prepareOnyxDataForFinancialForceExportUpdate(policyID, CONST.CERTINIA_CONFIG.EXPORT_STATUS, status, previousStatus ?? undefined);
227-
API.write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_EXPORT_STATUS, {policyID, value: status}, {optimisticData, failureData, successData});
227+
write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_EXPORT_STATUS, {policyID, value: status}, {optimisticData, failureData, successData});
228228
}
229229

230230
function updateFinancialForceExportDate(policyID: string, date: ValueOf<typeof CONST.CERTINIA_EXPORT_DATE>, previousDate: ValueOf<typeof CONST.CERTINIA_EXPORT_DATE> | null) {
231231
const {optimisticData, failureData, successData} = prepareOnyxDataForFinancialForceExportUpdate(policyID, CONST.CERTINIA_CONFIG.EXPORT_DATE, date, previousDate ?? undefined);
232-
API.write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_EXPORT_DATE, {policyID, value: date}, {optimisticData, failureData, successData});
232+
write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_EXPORT_DATE, {policyID, value: date}, {optimisticData, failureData, successData});
233233
}
234234

235235
function updateFinancialForceDefaultVendor(policyID: string, vendorAccountID: string, previousVendorAccountID: string | null) {
@@ -239,7 +239,7 @@ function updateFinancialForceDefaultVendor(policyID: string, vendorAccountID: st
239239
vendorAccountID,
240240
previousVendorAccountID ?? undefined,
241241
);
242-
API.write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_DEFAULT_VENDOR, {policyID, vendorID: vendorAccountID}, {optimisticData, failureData, successData});
242+
write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_DEFAULT_VENDOR, {policyID, vendorID: vendorAccountID}, {optimisticData, failureData, successData});
243243
}
244244

245245
function updateFinancialForceAutoSync(policyID: string, enabled: boolean, previousValue?: boolean) {
@@ -282,7 +282,7 @@ function updateFinancialForceAutoSync(policyID: string, enabled: boolean, previo
282282
[CONST.CERTINIA_CONFIG.AUTO_SYNC_ENABLED]: null,
283283
},
284284
errorFields: {
285-
[CONST.CERTINIA_CONFIG.AUTO_SYNC_ENABLED]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
285+
[CONST.CERTINIA_CONFIG.AUTO_SYNC_ENABLED]: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
286286
},
287287
},
288288
},
@@ -312,7 +312,7 @@ function updateFinancialForceAutoSync(policyID: string, enabled: boolean, previo
312312
},
313313
];
314314

315-
API.write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_AUTO_SYNC, {policyID, enabled}, {optimisticData, failureData, successData});
315+
write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_AUTO_SYNC, {policyID, enabled}, {optimisticData, failureData, successData});
316316
}
317317

318318
function updateFinancialForceSyncReimbursedReports(policyID: string, enabled: boolean, previousValue?: boolean) {
@@ -355,7 +355,7 @@ function updateFinancialForceSyncReimbursedReports(policyID: string, enabled: bo
355355
[CONST.CERTINIA_CONFIG.SYNC_REIMBURSED_REPORTS]: null,
356356
},
357357
errorFields: {
358-
[CONST.CERTINIA_CONFIG.SYNC_REIMBURSED_REPORTS]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
358+
[CONST.CERTINIA_CONFIG.SYNC_REIMBURSED_REPORTS]: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
359359
},
360360
},
361361
},
@@ -385,7 +385,7 @@ function updateFinancialForceSyncReimbursedReports(policyID: string, enabled: bo
385385
},
386386
];
387387

388-
API.write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_SYNC_REIMBURSED_REPORTS, {policyID, enabled}, {optimisticData, failureData, successData});
388+
write(WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_SYNC_REIMBURSED_REPORTS, {policyID, enabled}, {optimisticData, failureData, successData});
389389
}
390390

391391
export {

‎src/types/onyx/Policy.ts‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,19 +1367,28 @@ type FinancialForceParentTagMappingMode = ValueOf<typeof CONST.CERTINIA_PARENT_T
13671367
/** Keys on {@link FinancialForceConnectionConfig} tracked for offline pending / error field state */
13681368
type FinancialForceOfflineStateKeys = ValueOf<typeof CONST.CERTINIA_CONFIG>;
13691369

1370+
/** Synced Certinia entity with display name and external ID */
1371+
type FinancialForceSyncedEntity = {
1372+
/** Display name of the synced entity */
1373+
name: string;
1374+
1375+
/** External ID of the synced entity */
1376+
id: string;
1377+
};
1378+
13701379
/** Data synced from Certinia (parent sync service); arrays may be empty until sync completes */
13711380
type FinancialForceConnectionData = {
13721381
/** Salesforce Accounts used as Default Vendor options (FFA) */
1373-
vendors: Array<{name: string; id: string}>;
1382+
vendors: Array<FinancialForceSyncedEntity>;
13741383

13751384
/** Certinia companies (c2g__codaCompany__c); FFA validates presence when applicable */
1376-
companies: Array<{name: string; id: string}>;
1385+
companies: Array<FinancialForceSyncedEntity>;
13771386

13781387
/** PSA: projects synced for mapping (Release 2) */
1379-
projects?: Array<{name: string; id: string}>;
1388+
projects?: Array<FinancialForceSyncedEntity>;
13801389

13811390
/** PSA: assignments synced for mapping (Release 2) */
1382-
assignments?: Array<{name: string; id: string}>;
1391+
assignments?: Array<FinancialForceSyncedEntity>;
13831392
};
13841393

13851394
/** Certinia credentials (Salesforce / Certinia org); fields populate as OAuth / sync complete */
@@ -1426,8 +1435,8 @@ type FinancialForceExportConfig = {
14261435
/** FFA / PSA: non-reimbursable expenses destination */
14271436
nonReimbursable?: FinancialForceExportDestination;
14281437

1429-
/** Payable invoice / expense report export status (FFA vs PSA enums differ by module) */
1430-
exportStatus?: ValueOf<typeof CONST.CERTINIA_EXPORT_STATUS> | string;
1438+
/** Payable invoice / expense report export status.*/
1439+
exportStatus?: ValueOf<typeof CONST.CERTINIA_EXPORT_STATUS>;
14311440

14321441
/** Date basis for export */
14331442
exportDate?: ValueOf<typeof CONST.CERTINIA_EXPORT_DATE>;
@@ -1441,8 +1450,8 @@ type FinancialForceExportConfig = {
14411450
/** PSA / SRP: company ID for export */
14421451
companyID?: string;
14431452

1444-
/** PSA: report-level export status */
1445-
reportExportStatus?: ValueOf<typeof CONST.CERTINIA_EXPORT_STATUS> | string;
1453+
/** PSA: report-level export status.*/
1454+
reportExportStatus?: ValueOf<typeof CONST.CERTINIA_EXPORT_STATUS>;
14461455
};
14471456

14481457
/** Certinia auto-sync */
@@ -1477,12 +1486,16 @@ type FinancialForceConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<
14771486
/** Whether the connection has been fully set up */
14781487
isConfigured?: boolean;
14791488

1489+
/** Certinia import / coding settings */
14801490
coding: FinancialForceCodingConfig;
14811491

1492+
/** Certinia export settings */
14821493
export: FinancialForceExportConfig;
14831494

1495+
/** Certinia auto-sync settings */
14841496
autoSync: FinancialForceAutoSyncConfig;
14851497

1498+
/** Certinia advanced settings */
14861499
advanced: FinancialForceAdvancedConfig;
14871500

14881501
/** Collection of errors coming from the backend */

0 commit comments

Comments
 (0)