Skip to content

Commit be56d24

Browse files
authored
Merge pull request #56987 from Expensify/yuwen-nsqsFixes
Add defaults for missing NSQS values
2 parents 01b103c + 903c8ea commit be56d24

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

src/pages/workspace/accounting/nsqs/advanced/NSQSAdvancedPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function NSQSAdvancedPage({policy}: WithPolicyProps) {
2222
const styles = useThemeStyles();
2323
const policyID = policy?.id;
2424
const nsqsConfig = policy?.connections?.netsuiteQuickStart?.config;
25-
const isAutoSyncEnabled = nsqsConfig?.autoSync.enabled ?? false;
25+
const isAutoSyncEnabled = nsqsConfig?.autoSync?.enabled ?? false;
2626
const approvalAccount = nsqsConfig?.approvalAccount ?? '';
2727
const nsqsData = policy?.connections?.netsuiteQuickStart?.data;
2828
const payableAccounts: NSQSPayableAccount[] = useMemo(() => nsqsData?.payableAccounts ?? [], [nsqsData?.payableAccounts]);

src/pages/workspace/accounting/nsqs/import/NSQSCustomersDisplayedAsPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function NSQSCustomersDisplayedAsPage({policy}: WithPolicyProps) {
2323
const styles = useThemeStyles();
2424
const policyID = policy?.id;
2525
const nsqsConfig = policy?.connections?.netsuiteQuickStart?.config;
26-
const importType = nsqsConfig?.syncOptions.mapping.customers ?? CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
26+
const importType = nsqsConfig?.syncOptions?.mapping?.customers ?? CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
2727

2828
const sectionData: Array<SelectorType<Option>> = Options.map((option) => ({
2929
keyForList: option,

src/pages/workspace/accounting/nsqs/import/NSQSCustomersPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function NSQSCustomersPage({policy}: WithPolicyProps) {
2323
const styles = useThemeStyles();
2424
const policyID = policy?.id;
2525
const nsqsConfig = policy?.connections?.netsuiteQuickStart?.config;
26-
const importType = nsqsConfig?.syncOptions.mapping.customers ?? CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
26+
const importType = nsqsConfig?.syncOptions?.mapping?.customers ?? CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
2727
const isImportEnabled = importType !== CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
2828

2929
const toggleImport = useCallback(() => {

src/pages/workspace/accounting/nsqs/import/NSQSImportPage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ function NSQSImportPage({policy}: WithPolicyProps) {
1919
const styles = useThemeStyles();
2020
const policyID = policy?.id;
2121
const nsqsConfig = policy?.connections?.netsuiteQuickStart?.config;
22-
const customersImportType = nsqsConfig?.syncOptions.mapping.customers ?? CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
23-
const projectsImportType = nsqsConfig?.syncOptions.mapping.projects ?? CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
22+
const customersImportType = nsqsConfig?.syncOptions?.mapping?.customers ?? CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
23+
const projectsImportType = nsqsConfig?.syncOptions?.mapping?.projects ?? CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
2424

2525
return (
2626
<ConnectionLayout

src/pages/workspace/accounting/nsqs/import/NSQSProjectsDisplayedAsPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function NSQSProjectsDisplayedAsPage({policy}: WithPolicyProps) {
2323
const styles = useThemeStyles();
2424
const policyID = policy?.id;
2525
const nsqsConfig = policy?.connections?.netsuiteQuickStart?.config;
26-
const importType = nsqsConfig?.syncOptions.mapping.projects ?? CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
26+
const importType = nsqsConfig?.syncOptions?.mapping?.projects ?? CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
2727

2828
const sectionData: Array<SelectorType<Option>> = Options.map((option) => ({
2929
keyForList: option,

src/pages/workspace/accounting/nsqs/import/NSQSProjectsPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function NSQSProjectsPage({policy}: WithPolicyProps) {
2323
const styles = useThemeStyles();
2424
const policyID = policy?.id;
2525
const nsqsConfig = policy?.connections?.netsuiteQuickStart?.config;
26-
const importType = nsqsConfig?.syncOptions.mapping.projects ?? CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
26+
const importType = nsqsConfig?.syncOptions?.mapping?.projects ?? CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
2727
const isImportEnabled = importType !== CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
2828

2929
const toggleImport = useCallback(() => {

src/types/onyx/Policy.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ type NSQSConnectionData = {
11051105
*/
11061106
type NSQSConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
11071107
/** Configuration of automatic synchronization from NSQS to the app */
1108-
autoSync: {
1108+
autoSync?: {
11091109
/** Job ID of the synchronization */
11101110
jobID: string;
11111111

@@ -1114,9 +1114,9 @@ type NSQSConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
11141114
};
11151115

11161116
/** Configuration options pertaining to sync */
1117-
syncOptions: {
1117+
syncOptions?: {
11181118
/** Configuration of import settings from NSQS to Expensify */
1119-
mapping: {
1119+
mapping?: {
11201120
/** How NSQS customers are displayed as */
11211121
customers: ValueOf<typeof CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES>;
11221122

@@ -1136,7 +1136,7 @@ type NSQSConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
11361136

11371137
/** NSQS credentials */
11381138
credentials: {
1139-
/** Encrypted token for NSQS authentification */
1139+
/** Encrypted token for NSQS authentication */
11401140
accessToken: string;
11411141

11421142
/** The company ID */

0 commit comments

Comments
 (0)