Skip to content

Commit b5a2e70

Browse files
committed
typescript fixes
1 parent a92215a commit b5a2e70

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/libs/PolicyUtils.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,8 @@ function getValidConnectedIntegration(policy: Policy | undefined, accountingInte
11891189
}
11901190

11911191
function hasIntegrationAutoSync(policy: Policy | undefined, connectedIntegration?: ConnectionName) {
1192-
return (connectedIntegration && policy?.connections?.[connectedIntegration]?.config?.autoSync?.enabled) ?? false;
1192+
const connectionConfig = connectedIntegration ? policy?.connections?.[connectedIntegration]?.config : undefined;
1193+
return !!(connectionConfig && 'autoSync' in connectionConfig && connectionConfig.autoSync && typeof connectionConfig.autoSync === 'object' && 'enabled' in connectionConfig.autoSync && connectionConfig.autoSync.enabled);
11931194
}
11941195

11951196
function hasUnsupportedIntegration(policy: Policy | undefined, accountingIntegrations?: ConnectionName[]) {

src/libs/actions/connections/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import type Policy from '@src/types/onyx/Policy';
1313
import {isEmptyObject} from '@src/types/utils/EmptyObject';
1414

1515
type ConnectionNameExceptNetSuite = Exclude<ConnectionName, typeof CONST.POLICY.CONNECTIONS.NAME.NETSUITE>;
16+
type ConnectionConfigType<T extends ConnectionNameExceptNetSuite> = T extends keyof Connections ? Connections[T] extends {config: infer C} ? C : never : never;
1617

1718
function removePolicyConnection(policyID: string, connectionName: PolicyConnectionName) {
1819
const optimisticData: OnyxUpdate[] = [
@@ -160,7 +161,7 @@ function syncConnection(policy: Policy | undefined, connectionName: PolicyConnec
160161
});
161162
}
162163

163-
function updateManyPolicyConnectionConfigs<TConnectionName extends ConnectionNameExceptNetSuite, TConfigUpdate extends Partial<Connections[TConnectionName]['config']>>(
164+
function updateManyPolicyConnectionConfigs<TConnectionName extends ConnectionNameExceptNetSuite, TConfigUpdate extends Partial<(Connections[TConnectionName] & {config: Record<string, unknown>})['config']>>(
164165
policyID: string | undefined,
165166
connectionName: TConnectionName,
166167
configUpdate: TConfigUpdate,

0 commit comments

Comments
 (0)