Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3957,6 +3957,7 @@ const CONST = {
ZENEFITS_SYNC_TITLE: 'zenefitsSyncTitle',
ZENEFITS_SYNC_LOAD_DATA: 'zenefitsSyncLoadData',
ZENEFITS_SYNC_PROVISIONING: 'zenefitsSyncProvisioning',
MERGE_HR_SYNC_TITLE: 'mergeHRSyncTitle',

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Add translations before using the Merge HR sync stage

When syncMergeHR() or the generic syncConnection(..., MERGE_HR) starts a sync, this new stage value is written to POLICY_CONNECTION_SYNC_PROGRESS and the HR page renders it via translate('workspace.hr.syncStageName', {stage}); I checked the language switches and they only handle Gusto/Zenefits stages, so this falls through to Translation missing for stage: mergeHRSyncTitle for users during a Merge HR sync. Please add the corresponding workspace.hr.syncStageName cases in the language files before emitting this stage.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, we should list out all of the connection stages for merge hr along with translations for each of them. but we can do it as part of the connection flow implementation

FINANCIAL_FORCE_SYNC_CONNECTION: 'financialForceSyncConnection',
},
SYNC_STAGE_TIMEOUT_MINUTES: 20,
Expand Down
4 changes: 4 additions & 0 deletions src/ONYXKEYS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,9 @@ const ONYXKEYS = {
/** Token needed to initialize Plaid link */
RAM_ONLY_PLAID_LINK_TOKEN: 'plaidLinkToken',

/** Token needed to initialize the Merge Link SDK for HR integrations */
RAM_ONLY_MERGE_HR_LINK_TOKEN: 'mergeHRLinkToken',

/** Capture Plaid event */
PLAID_CURRENT_EVENT: 'plaidCurrentEvent',

Expand Down Expand Up @@ -1436,6 +1439,7 @@ type OnyxValuesMapping = {
[ONYXKEYS.PLAID_DATA]: OnyxTypes.PlaidData;
[ONYXKEYS.IS_PLAID_DISABLED]: boolean;
[ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN]: string;
[ONYXKEYS.RAM_ONLY_MERGE_HR_LINK_TOKEN]: string;
[ONYXKEYS.ONFIDO_TOKEN]: string;
[ONYXKEYS.ONFIDO_APPLICANT_ID]: string;
[ONYXKEYS.NVP_PREFERRED_LOCALE]: OnyxTypes.Locale;
Expand Down
11 changes: 11 additions & 0 deletions src/libs/API/parameters/ConnectPolicyToMergeParams.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import type {MergeHRProviderSlug} from '@src/CONST/MERGE_HR_PROVIDERS';

type ConnectPolicyToMergeParams = {
/** The ID of the policy to connect */
policyID: string;

/** The Merge HR provider slug identifying which HR system to integrate with via merge dev */
integration: MergeHRProviderSlug;
};

export default ConnectPolicyToMergeParams;
6 changes: 6 additions & 0 deletions src/libs/API/parameters/SyncPolicyToMergeHRParams.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
type SyncPolicyToMergeHRParams = {
/** The ID of the policy to sync */
policyID: string;
};

export default SyncPolicyToMergeHRParams;
12 changes: 12 additions & 0 deletions src/libs/API/parameters/UpdateMergeHRApprovalModeParams.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import type {ValueOf} from 'type-fest';
import type CONST from '@src/CONST';

type UpdateMergeHRApprovalModeParams = {
/** The ID of the policy to update */
policyID: string;

/** The new approval mode to apply to the Merge HR connection */
approvalMode: ValueOf<typeof CONST.MERGE_HR.APPROVAL_MODE>;
};

export default UpdateMergeHRApprovalModeParams;
9 changes: 9 additions & 0 deletions src/libs/API/parameters/UpdateMergeHRFinalApproverParams.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
type UpdateMergeHRFinalApproverParams = {
/** The ID of the policy to update */
policyID: string;

/** Login of the member who will act as the final approver, or null to clear */
finalApprover: string | null;
};

export default UpdateMergeHRFinalApproverParams;
4 changes: 4 additions & 0 deletions src/libs/API/parameters/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ export type {default as ConnectBankAccountParams} from './ConnectBankAccountPara
export type {default as OpenDuplicatePolicyPageParams} from './OpenDuplicatePolicyPageParams';
export type {default as ConnectPolicyToAccountingIntegrationParams} from './ConnectPolicyToAccountingIntegrationParams';
export type {default as ConnectPolicyToGustoParams} from './ConnectPolicyToGustoParams';
export type {default as ConnectPolicyToMergeParams} from './ConnectPolicyToMergeParams';
export type {default as ConnectPolicyToZenefitsParams} from './ConnectPolicyToZenefitsParams';
export type {default as OpenPolicyProfilePageParams} from './OpenPolicyProfilePageParams';
export type {default as OpenPolicyInitialPageParams} from './OpenPolicyInitialPageParams';
export type {default as SyncPolicyToGustoParams} from './SyncPolicyToGustoParams';
export type {default as SyncPolicyToMergeHRParams} from './SyncPolicyToMergeHRParams';
export type {default as SyncPolicyToZenefitsParams} from './SyncPolicyToZenefitsParams';
export type {default as SyncPolicyToQuickbooksOnlineParams} from './SyncPolicyToQuickbooksOnlineParams';
export type {default as SyncPolicyToXeroParams} from './SyncPolicyToXeroParams';
Expand Down Expand Up @@ -255,6 +257,8 @@ export type {default as EnablePolicyReportFieldsParams} from './EnablePolicyRepo
export type {default as EnablePolicyExpensifyCardsParams} from './EnablePolicyExpensifyCardsParams';
export type {default as UpdateGustoApprovalModeParams} from './UpdateGustoApprovalModeParams';
export type {default as UpdateGustoFinalApproverParams} from './UpdateGustoFinalApproverParams';
export type {default as UpdateMergeHRApprovalModeParams} from './UpdateMergeHRApprovalModeParams';
export type {default as UpdateMergeHRFinalApproverParams} from './UpdateMergeHRFinalApproverParams';
export type {default as UpdateZenefitsApprovalModeParams} from './UpdateZenefitsApprovalModeParams';
export type {default as UpdateZenefitsFinalApproverParams} from './UpdateZenefitsFinalApproverParams';
export type {default as AcceptJoinRequestParams} from './AcceptJoinRequest';
Expand Down
8 changes: 8 additions & 0 deletions src/libs/API/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,8 @@ const WRITE_COMMANDS = {
UPGRADE_TO_CORPORATE: 'UpgradeToCorporate',
UPDATE_GUSTO_APPROVAL_MODE: 'UpdateGustoApprovalMode',
UPDATE_GUSTO_FINAL_APPROVER: 'UpdateGustoFinalApprover',
UPDATE_MERGE_HR_APPROVAL_MODE: 'UpdateMergeHRApprovalMode',
UPDATE_MERGE_HR_FINAL_APPROVER: 'UpdateMergeHRFinalApprover',
UPDATE_ZENEFITS_APPROVAL_MODE: 'UpdateZenefitsApprovalMode',
UPDATE_ZENEFITS_FINAL_APPROVER: 'UpdateZenefitsFinalApprover',
DOWNGRADE_TO_TEAM: 'Policy_DowngradeToTeam',
Expand Down Expand Up @@ -1009,6 +1011,8 @@ type WriteCommandParameters = {
[WRITE_COMMANDS.SET_PROMO_CODE]: Parameters.SetPromoCodeParams;
[WRITE_COMMANDS.UPDATE_GUSTO_APPROVAL_MODE]: Parameters.UpdateGustoApprovalModeParams;
[WRITE_COMMANDS.UPDATE_GUSTO_FINAL_APPROVER]: Parameters.UpdateGustoFinalApproverParams;
[WRITE_COMMANDS.UPDATE_MERGE_HR_APPROVAL_MODE]: Parameters.UpdateMergeHRApprovalModeParams;
[WRITE_COMMANDS.UPDATE_MERGE_HR_FINAL_APPROVER]: Parameters.UpdateMergeHRFinalApproverParams;
[WRITE_COMMANDS.UPDATE_ZENEFITS_APPROVAL_MODE]: Parameters.UpdateZenefitsApprovalModeParams;
[WRITE_COMMANDS.UPDATE_ZENEFITS_FINAL_APPROVER]: Parameters.UpdateZenefitsFinalApproverParams;
[WRITE_COMMANDS.REQUEST_TAX_EXEMPTION]: null;
Expand Down Expand Up @@ -1247,6 +1251,8 @@ const READ_COMMANDS = {
CONNECT_POLICY_TO_XERO: 'ConnectPolicyToXero',
CONNECT_POLICY_TO_GUSTO: 'ConnectPolicyToGusto',
CONNECT_POLICY_TO_ZENEFITS: 'ConnectPolicyToZenefits',
CONNECT_POLICY_TO_MERGE: 'ConnectPolicyToMerge',
SYNC_POLICY_TO_MERGE_HR: 'SyncPolicyToMergeHR',
SYNC_POLICY_TO_QUICKBOOKS_ONLINE: 'SyncPolicyToQuickbooksOnline',
SYNC_POLICY_TO_XERO: 'SyncPolicyToXero',
SYNC_POLICY_TO_NETSUITE: 'SyncPolicyToNetSuite',
Expand Down Expand Up @@ -1348,6 +1354,8 @@ type ReadCommandParameters = {
[READ_COMMANDS.CONNECT_POLICY_TO_XERO]: Parameters.ConnectPolicyToAccountingIntegrationParams;
[READ_COMMANDS.CONNECT_POLICY_TO_GUSTO]: Parameters.ConnectPolicyToGustoParams;
[READ_COMMANDS.CONNECT_POLICY_TO_ZENEFITS]: Parameters.ConnectPolicyToZenefitsParams;
[READ_COMMANDS.CONNECT_POLICY_TO_MERGE]: Parameters.ConnectPolicyToMergeParams;
[READ_COMMANDS.SYNC_POLICY_TO_MERGE_HR]: Parameters.SyncPolicyToMergeHRParams;
[READ_COMMANDS.CONNECT_POLICY_TO_FINANCIAL_FORCE]: Parameters.ConnectPolicyToFinancialForceParams;
[READ_COMMANDS.SYNC_POLICY_TO_QUICKBOOKS_ONLINE]: Parameters.SyncPolicyToQuickbooksOnlineParams;
[READ_COMMANDS.SYNC_POLICY_TO_XERO]: Parameters.SyncPolicyToXeroParams;
Expand Down
1 change: 1 addition & 0 deletions src/libs/ExportOnyxState/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ const onyxKeysToRemove = new Set<ValueOf<typeof ONYXKEYS> | ValueOf<typeof ONYXK
ONYXKEYS.NVP_PRIVATE_BILLING_DISPUTE_PENDING,
ONYXKEYS.NVP_PRIVATE_BILLING_STATUS,
ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN,
ONYXKEYS.RAM_ONLY_MERGE_HR_LINK_TOKEN,
ONYXKEYS.ONFIDO_TOKEN,
ONYXKEYS.ONFIDO_APPLICANT_ID,
...Object.values(ONYXKEYS.DERIVED),
Expand Down
Loading
Loading