[NoQA] [HR Import] Initial sync modal, sync action and info on Members page #91315
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import {useEffect, useEffectEvent} from 'react'; | ||
| import type {OnyxEntry} from 'react-native-onyx'; | ||
| import {setMergeHRInitialSyncModalShown} from '@libs/actions/connections/MergeHR'; | ||
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import type {PolicyConnectionSyncProgress} from '@src/types/onyx/Policy'; | ||
| import useConfirmModal from './useConfirmModal'; | ||
| import useLocalize from './useLocalize'; | ||
| import useOnyx from './useOnyx'; | ||
|
|
||
| /** | ||
| * Shows a one-time informational modal when the Merge HR connection's first backend-initiated sync starts. | ||
| * The modal is suppressed for subsequent page loads during the same sync by persisting the sync timestamp in Onyx. | ||
| */ | ||
| function useMergeHRInitialSyncingModal(policyID: string, connectionSyncProgress: OnyxEntry<PolicyConnectionSyncProgress>, isFocused: boolean) { | ||
| const {showConfirmModal} = useConfirmModal(); | ||
| const {translate} = useLocalize(); | ||
| const [shownForTimestamp] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_MERGE_HR_INITIAL_SYNC_MODAL_SHOWN}${policyID}`); | ||
|
|
||
| const showSyncingModal = useEffectEvent((timestamp: string) => { | ||
| if (shownForTimestamp === timestamp) { | ||
| return; | ||
| } | ||
| setMergeHRInitialSyncModalShown(policyID, timestamp); | ||
| showConfirmModal({ | ||
| id: `merge-hr-syncing-${policyID}`, | ||
| title: translate('workspace.hr.syncingModalTitle'), | ||
| prompt: translate('workspace.hr.syncingModalDescription'), | ||
| confirmText: translate('common.buttonConfirm'), | ||
| shouldShowCancelButton: false, | ||
| }); | ||
| }); | ||
|
|
||
| useEffect(() => { | ||
| const isMergeHRInitialSyncStarting = | ||
| connectionSyncProgress?.connectionName === CONST.POLICY.CONNECTIONS.NAME.MERGE_HR && | ||
| connectionSyncProgress?.stageInProgress === CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.MERGE_HR_SYNC_TITLE && | ||
| connectionSyncProgress?.isInitialSync; | ||
|
|
||
| if (!isFocused || !isMergeHRInitialSyncStarting || !connectionSyncProgress?.timestamp) { | ||
| return; | ||
| } | ||
|
|
||
| showSyncingModal(connectionSyncProgress.timestamp); | ||
| }, [connectionSyncProgress?.connectionName, connectionSyncProgress?.stageInProgress, connectionSyncProgress?.isInitialSync, connectionSyncProgress?.timestamp, isFocused]); | ||
| } | ||
|
|
||
| export default useMergeHRInitialSyncingModal; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,6 +66,7 @@ import {isPersonalDetailsReady, sortAlphabetically} from '@libs/OptionsListUtils | |
| import {getDisplayNameOrDefault, getPersonalDetailsByIDs} from '@libs/PersonalDetailsUtils'; | ||
| import { | ||
| canEditWorkspaceSettings, | ||
| getConnectedHRProvider, | ||
| getConnectionExporters, | ||
| getMemberAccountIDsForWorkspace, | ||
| isControlPolicy, | ||
|
|
@@ -582,10 +583,10 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers | |
| }, [isLoading, policy?.employeeList, translate, isOfflineAndNoMemberDataAvailable]); | ||
|
|
||
| const memberCount = data.filter((member) => member.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE).length; | ||
| const connectedHRProvider = getConnectedHRProvider(policy); | ||
| const shouldShowHRSyncLink = isPolicyAdmin && !!connectedHRProvider; | ||
| const isHRSyncInProgress = | ||
| shouldShowHRSyncLink && connectionSyncProgress?.connectionName === connectedHRProvider?.connectionName && isConnectionInProgress(connectionSyncProgress, policy); | ||
| const isPendingAddOrDelete = | ||
| isOffline && data?.some((member) => member.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || member.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD); | ||
| const shouldShowSearchBar = data.length > CONST.SEARCH_ITEM_LIMIT; | ||
|
|
@@ -633,16 +634,18 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers | |
| <View style={[styles.pl5, styles.mb5, styles.mt3, styles.flexRow, styles.alignItemsCenter]}> | ||
| <Text style={[styles.textSupporting, styles.flexShrink1, isPendingAddOrDelete && styles.offlineFeedbackPending]}> | ||
| {translate('workspace.people.workspaceMembersCount', memberCount)} | ||
|
Contributor
There was a problem hiding this comment. @mhawryluk do we hide the three dot modal during initial sync?
Contributor
Author
There was a problem hiding this comment. no, there's a spinner in its place |
||
| {shouldShowHRSyncLink && '. '} | ||
| {shouldShowHRSyncLink && ( | ||
| <TextLink onPress={() => Navigation.navigate(ROUTES.WORKSPACE_HR.getRoute(policyID))}> | ||
| {translate('workspace.people.configureHRSync', connectedHRProvider?.displayName ?? '')} | ||
| </TextLink> | ||
| )} | ||
| </Text> | ||
| {shouldShowHRSyncLink && isHRSyncInProgress && ( | ||
| <ActivityIndicator | ||
| size="small" | ||
| style={styles.ml2} | ||
| reasonAttributes={{context: 'WorkspaceMembersPage.hrSync'}} | ||
| /> | ||
| )} | ||
| </View> | ||
|
|
@@ -841,20 +844,21 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers | |
| }, | ||
| ]; | ||
|
|
||
| const hrProvider = getConnectedHRProvider(policy); | ||
|
Contributor
There was a problem hiding this comment. ❌ CONSISTENCY-3 (docs)
if (connectedHRProvider) {
menuItems.push({
icon: icons.Sync,
text: translate('workspace.people.syncWithHR', connectedHRProvider.displayName),
...
close(() => syncConnection(policy, connectedHRProvider.connectionName));
});
}Add Reviewed at: 38199e7 | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.
Contributor
Author
There was a problem hiding this comment. it causes an eslint/react-compiler error, because we pass both policy and connectedHRProvider which depends on policy |
||
| if (hrProvider) { | ||
|
Contributor
There was a problem hiding this comment. We already have
Contributor
Author
There was a problem hiding this comment. when I put |
||
| menuItems.push({ | ||
| icon: icons.Sync, | ||
| text: translate('workspace.people.syncWithHR', hrProvider.displayName), | ||
| onSelected: () => { | ||
| if (isOffline) { | ||
| close(showRequiresInternetModal); | ||
| return; | ||
| } | ||
|
|
||
| close(() => syncConnection(policy, hrProvider.connectionName)); | ||
| }, | ||
| value: CONST.POLICY.SECONDARY_ACTIONS.SYNC_WITH_HR, | ||
| disabled: isHRSyncInProgress, | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -870,8 +874,7 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers | |
| policyID, | ||
| showLockedAccountModal, | ||
| showRequiresInternetModal, | ||
| isHRSyncInProgress, | ||
| policy, | ||
| ]); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[isInitialSyncInProgress, isFocused] @mhawryluk have you tried passing in isInitialSyncInProgress rather than rerender on both changes?