Skip to content

Commit 30ddd70

Browse files
yuwenmemonyuwenmemon
authored
Merge pull request #92759 from thelullabyy/feat/89438
[No QA] [Certinia] R2 PSA: Scaffolding (CONST, SCREENS, ROUTES, navigators, API commands, actions)
2 parents e54894f + 996de87 commit 30ddd70

13 files changed

Lines changed: 294 additions & 1 deletion

File tree

‎knip.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
".storybook/**/*.{js,ts,tsx}",
2929
".github/actions/javascript/**/*.ts"
3030
],
31-
"ignore": [".github/actions/**/index.js", "tests/perf-test/**", "web/snippets/gib.js"],
31+
"ignore": [".github/actions/**/index.js", "tests/perf-test/**", "web/snippets/gib.js", "src/libs/actions/connections/FinancialForce.ts"],
3232
"eslint": {
3333
"config": ["config/eslint/eslint.config.mjs", "eslint.changed.config.mjs"]
3434
},

‎src/CONST/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2998,6 +2998,7 @@ const CONST = {
29982998
REPORT_EXPORT_STATUS: 'reportExportStatus',
29992999
TAX_NON_BILLABLE: 'taxNonBillable',
30003000
EXPORT_FOREIGN_CURRENCY: 'exportForeignCurrency',
3001+
COMPANY: 'company',
30013002
},
30023003

30033004
CERTINIA_EXPORT_STATUS: {

‎src/ROUTES.ts‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,14 @@ const DYNAMIC_ROUTES = {
222222
path: 'certinia/advanced',
223223
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.ROOT],
224224
},
225+
POLICY_ACCOUNTING_CERTINIA_REPORT_EXPORT_STATUS: {
226+
path: 'certinia-report-status/select',
227+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_EXPORT],
228+
},
229+
POLICY_ACCOUNTING_CERTINIA_COMPANY_SELECTOR: {
230+
path: 'certinia/company',
231+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.ROOT],
232+
},
225233
POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_VENDOR_SELECT: {
226234
path: 'vendor/select',
227235
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_NETSUITE_EXPORT_EXPENSES],
@@ -3944,6 +3952,33 @@ const ROUTES = {
39443952
return `workspaces/${policyID}/accounting/certinia/advanced` as const;
39453953
},
39463954
},
3955+
POLICY_ACCOUNTING_CERTINIA_TAGS_MAPPING: {
3956+
route: 'workspaces/:policyID/accounting/certinia/import/tags-mapping',
3957+
getRoute: (policyID: string | undefined) => {
3958+
if (!policyID) {
3959+
Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING_CERTINIA_TAGS_MAPPING route');
3960+
}
3961+
return `workspaces/${policyID}/accounting/certinia/import/tags-mapping` as const;
3962+
},
3963+
},
3964+
POLICY_ACCOUNTING_CERTINIA_REPORT_EXPORT_STATUS: {
3965+
route: 'workspaces/:policyID/accounting/certinia/export/report-status',
3966+
getRoute: (policyID: string | undefined) => {
3967+
if (!policyID) {
3968+
Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING_CERTINIA_REPORT_EXPORT_STATUS route');
3969+
}
3970+
return `workspaces/${policyID}/accounting/certinia/export/report-status` as const;
3971+
},
3972+
},
3973+
POLICY_ACCOUNTING_CERTINIA_COMPANY_SELECTOR: {
3974+
route: 'workspaces/:policyID/accounting/certinia/company',
3975+
getRoute: (policyID: string | undefined) => {
3976+
if (!policyID) {
3977+
Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING_CERTINIA_COMPANY_SELECTOR route');
3978+
}
3979+
return `workspaces/${policyID}/accounting/certinia/company` as const;
3980+
},
3981+
},
39473982
ADD_EXISTING_EXPENSE: {
39483983
route: 'search/r/:reportID/add-existing-expense/:backToReport?',
39493984
getRoute: (reportID: string | undefined, backToReport?: string) => `search/r/${reportID}/add-existing-expense/${backToReport ?? ''}` as const,

‎src/SCREENS.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,9 @@ const SCREENS = {
702702
CERTINIA_EXPORT_DATE: 'Policy_Accounting_Certinia_Export_Date',
703703
CERTINIA_DEFAULT_VENDOR: 'Policy_Accounting_Certinia_Default_Vendor',
704704
CERTINIA_ADVANCED: 'Policy_Accounting_Certinia_Advanced',
705+
CERTINIA_TAGS_MAPPING: 'Policy_Accounting_Certinia_Tags_Mapping',
706+
CERTINIA_REPORT_EXPORT_STATUS: 'Policy_Accounting_Certinia_Report_Export_Status',
707+
CERTINIA_COMPANY_SELECTOR: 'Policy_Accounting_Certinia_Company_Selector',
705708
CARD_RECONCILIATION: 'Policy_Accounting_Card_Reconciliation',
706709
CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC: 'Policy_Accounting_Card_Reconciliation_Sage_Intacct_Auto_Sync',
707710
DYNAMIC_RECONCILIATION_ACCOUNT_SETTINGS: 'Dynamic_Policy_Accounting_Reconciliation_Account_Settings',

‎src/libs/API/types.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,11 @@ type WriteCommandParameters = {
11111111
[WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_REPORT_EXPORT_STATUS]: Parameters.UpdateFinancialForceGenericTypeParams<'exportStatus', FinancialForceReportExportStatus>;
11121112
[WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_AUTO_SYNC]: Parameters.UpdateFinancialForceGenericTypeParams<'enabled', boolean>;
11131113
[WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_SYNC_REIMBURSED_REPORTS]: Parameters.UpdateFinancialForceGenericTypeParams<'enabled', boolean>;
1114+
[WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_PARENT_TAG_MAPPING]: Parameters.UpdateFinancialForceGenericTypeParams<'parentTagMapping', ValueOf<typeof CONST.CERTINIA_PARENT_TAG_MAPPING>>;
1115+
[WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_SYNC_MILESTONES]: Parameters.UpdateFinancialForceGenericTypeParams<'enabled', boolean>;
1116+
[WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_TAX_NON_BILLABLE]: Parameters.UpdateFinancialForceGenericTypeParams<'enabled', boolean>;
1117+
[WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_EXPORT_FOREIGN_CURRENCY]: Parameters.UpdateFinancialForceGenericTypeParams<'enabled', boolean>;
1118+
[WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_COMPANY]: Parameters.UpdateFinancialForceGenericTypeParams<'companyID', string>;
11141119
[WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_TAX_NON_BILLABLE]: Parameters.UpdateFinancialForceGenericTypeParams<'enabled', boolean>;
11151120
[WRITE_COMMANDS.UPDATE_FINANCIAL_FORCE_EXPORT_FOREIGN_CURRENCY]: Parameters.UpdateFinancialForceGenericTypeParams<'enabled', boolean>;
11161121

‎src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -913,6 +913,9 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
913913
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_EXPORT_DATE]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/certinia/export/CertiniaExportDatePage').default,
914914
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_DEFAULT_VENDOR]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/certinia/export/CertiniaDefaultVendorPage').default,
915915
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_ADVANCED]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/certinia/advanced/CertiniaAdvancedPage').default,
916+
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_REPORT_EXPORT_STATUS]: () =>
917+
require<ReactComponentModule>('../../../../pages/workspace/accounting/certinia/export/CertiniaReportExportStatusPage').default,
918+
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_COMPANY_SELECTOR]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/certinia/CertiniaCompanySelectorPage').default,
916919
[SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/reconciliation/CardReconciliationPage').default,
917920
[SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC]: () =>
918921
require<ReactComponentModule>('../../../../pages/workspace/accounting/reconciliation/CardReconciliationSageIntacctAutoSyncPage').default,
@@ -1003,6 +1006,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
10031006
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/certinia/import/CertiniaImportPage').default,
10041007
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_DIMENSION_MAPPING]: () =>
10051008
require<ReactComponentModule>('../../../../pages/workspace/accounting/certinia/import/CertiniaDimensionMappingPage').default,
1009+
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_TAGS_MAPPING]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/certinia/import/CertiniaTagsMappingPage').default,
10061010
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/import/SageIntacctImportPage').default,
10071011
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_TOGGLE_MAPPING]: () =>
10081012
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage').default,

‎src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
193193
SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_EXPORT_DATE,
194194
SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_DEFAULT_VENDOR,
195195
SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_ADVANCED,
196+
SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_TAGS_MAPPING,
197+
SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_REPORT_EXPORT_STATUS,
198+
SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_COMPANY_SELECTOR,
196199
],
197200
[SCREENS.WORKSPACE.TAXES]: [
198201
SCREENS.WORKSPACE.TAXES_SETTINGS,

‎src/libs/Navigation/linkingConfig/config.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,9 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
803803
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_EXPORT_DATE]: DYNAMIC_ROUTES.POLICY_ACCOUNTING_CERTINIA_EXPORT_DATE.path,
804804
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_DEFAULT_VENDOR]: DYNAMIC_ROUTES.POLICY_ACCOUNTING_CERTINIA_DEFAULT_VENDOR.path,
805805
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_ADVANCED]: DYNAMIC_ROUTES.POLICY_ACCOUNTING_CERTINIA_ADVANCED.path,
806+
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_TAGS_MAPPING]: {path: ROUTES.POLICY_ACCOUNTING_CERTINIA_TAGS_MAPPING.route},
807+
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_REPORT_EXPORT_STATUS]: DYNAMIC_ROUTES.POLICY_ACCOUNTING_CERTINIA_REPORT_EXPORT_STATUS.path,
808+
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_COMPANY_SELECTOR]: DYNAMIC_ROUTES.POLICY_ACCOUNTING_CERTINIA_COMPANY_SELECTOR.path,
806809
[SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: {path: ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.route},
807810
[SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC]: {
808811
path: ROUTES.POLICY_ACCOUNTING_CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC.route,

‎src/libs/Navigation/types.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,15 @@ type SettingsNavigatorParamList = {
11751175
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_ADVANCED]: {
11761176
policyID: string;
11771177
};
1178+
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_TAGS_MAPPING]: {
1179+
policyID: string;
1180+
};
1181+
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_REPORT_EXPORT_STATUS]: {
1182+
policyID: string;
1183+
};
1184+
[SCREENS.WORKSPACE.ACCOUNTING.CERTINIA_COMPANY_SELECTOR]: {
1185+
policyID: string;
1186+
};
11781187
[SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: {
11791188
policyID: string;
11801189
connection: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>;

0 commit comments

Comments
 (0)