-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support to call new API endpoint for By Participant view, `/activities/applet/${appletId}/respondent/${subjectId}`. Add empty states to By Participant view and make adjustments to `ActivityListItem` component to support the new view. Fix some menu item logic to detect assignments correctly from the new view and handle disabled menu items properly for hidden activities/flows.
- Loading branch information
1 parent
322646b
commit 3088de6
Showing
10 changed files
with
193 additions
and
22 deletions.
There are no files selected for viewing
This file contains 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 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 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 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
105 changes: 103 additions & 2 deletions
105
src/modules/Dashboard/features/Participant/Assignments/ByParticipant/ByParticipant.tsx
This file contains 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 |
---|---|---|
@@ -1,5 +1,106 @@ | ||
import { AssignmentsTab } from '../AssignmentsTab'; | ||
import { useCallback, useEffect } from 'react'; | ||
import { useParams } from 'react-router-dom'; | ||
import { useTranslation } from 'react-i18next'; | ||
|
||
const ByParticipant = () => <AssignmentsTab />; | ||
import { useAsync } from 'shared/hooks'; | ||
import { getAppletRespondentSubjectActivitiesApi } from 'api'; | ||
import { users } from 'redux/modules'; | ||
import { ActionsMenu, Spinner } from 'shared/components'; | ||
|
||
import { AssignmentsTab, useAssignmentsTab } from '../AssignmentsTab'; | ||
import { EmptyState } from './EmptyState'; | ||
import { ActivitiesList } from '../ActivitiesList'; | ||
import { ActivityListItem } from '../ActivityListItem'; | ||
|
||
const dataTestId = 'participant-details-about-participant'; | ||
|
||
const ByParticipant = () => { | ||
const { t } = useTranslation('app'); | ||
const { appletId, subjectId } = useParams(); | ||
const { useSubject, useSubjectStatus } = users; | ||
const isLoadingSubject = useSubjectStatus() !== 'success'; | ||
const { result: respondentSubject } = useSubject() ?? {}; | ||
|
||
const { | ||
execute: fetchActivities, | ||
isLoading: isLoadingActivities, | ||
value: fetchedActivities, | ||
} = useAsync(getAppletRespondentSubjectActivitiesApi, { retainValue: true }); | ||
|
||
const activities = fetchedActivities?.data.result ?? []; | ||
|
||
const handleRefetch = useCallback(() => { | ||
// Avoid fetching activities for respondent if respondent is a limited account | ||
if (!appletId || !subjectId || !respondentSubject?.userId) return; | ||
|
||
fetchActivities({ appletId, subjectId }); | ||
}, [appletId, fetchActivities, respondentSubject?.userId, subjectId]); | ||
|
||
const { | ||
getActionsMenu, | ||
onClickAssign, | ||
isLoading: isLoadingHook, | ||
modals, | ||
} = useAssignmentsTab({ appletId, respondentSubject, handleRefetch, dataTestId }); | ||
|
||
/* | ||
TODO: Handler for navigating to data when card is expanded | ||
https://mindlogger.atlassian.net/browse/M2-7921 | ||
const handleClickNavigateToData = (activityOrFlow: ParticipantActivityOrFlow, targetSubject: RespondentDetails) => { | ||
if (!respondentSubject) return; | ||
onClickNavigateToData(activityOrFlow, targetSubject.id); | ||
}; | ||
*/ | ||
|
||
useEffect(() => { | ||
handleRefetch(); | ||
}, [handleRefetch]); | ||
|
||
const isLoading = isLoadingSubject || isLoadingActivities || isLoadingHook; | ||
|
||
return ( | ||
<AssignmentsTab> | ||
{isLoading && <Spinner />} | ||
|
||
{!isLoading && !activities.length && ( | ||
<EmptyState onClickAssign={onClickAssign} isLimitedAccount={!respondentSubject?.userId} /> | ||
)} | ||
|
||
{!!activities.length && ( | ||
<ActivitiesList | ||
title={t('participantDetails.activitiesAndFlows')} | ||
count={fetchedActivities?.data.count ?? 0} | ||
> | ||
{activities.map((activity, index) => ( | ||
<ActivityListItem key={activity.id} activityOrFlow={activity}> | ||
<ActionsMenu | ||
anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }} | ||
transformOrigin={{ vertical: -6, horizontal: 'right' }} | ||
buttonColor="secondary" | ||
menuItems={getActionsMenu(activity)} | ||
data-testid={`${dataTestId}-${index}`} | ||
/> | ||
|
||
{/* TODO: Add expand/collapse button | ||
https://mindlogger.atlassian.net/browse/M2-7921 */} | ||
</ActivityListItem> | ||
))} | ||
|
||
{/* TODO: Add lazy load button | ||
https://mindlogger.atlassian.net/browse/M2-7827 */} | ||
</ActivitiesList> | ||
)} | ||
|
||
{/* TODO: Add deleted entries | ||
https://mindlogger.atlassian.net/browse/M2-7827 | ||
<ActivitiesList title={t('deleted')} count={deleted.length}> | ||
{deleted.map(…)} | ||
</ActivitiesList> */} | ||
|
||
{modals} | ||
</AssignmentsTab> | ||
); | ||
}; | ||
|
||
export default ByParticipant; |
27 changes: 27 additions & 0 deletions
27
...odules/Dashboard/features/Participant/Assignments/ByParticipant/EmptyState/EmptyState.tsx
This file contains 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,27 @@ | ||
import { Button } from '@mui/material'; | ||
import { useTranslation } from 'react-i18next'; | ||
|
||
import { Svg } from 'shared/components'; | ||
import { StyledFlexAllCenter, StyledFlexColumn, StyledHeadline, variables } from 'shared/styles'; | ||
|
||
import { EmptyStateProps } from './EmptyState.types'; | ||
|
||
export const EmptyState = ({ onClickAssign, isLimitedAccount }: EmptyStateProps) => { | ||
const { t } = useTranslation('app', { keyPrefix: 'participantDetails' }); | ||
|
||
return ( | ||
<StyledFlexAllCenter sx={{ flexDirection: 'column', flex: 1, m: 'auto', textAlign: 'center' }}> | ||
<StyledFlexColumn sx={{ alignItems: 'center', gap: 1.6, maxWidth: '50.7rem' }}> | ||
<Svg id="by-participant" width="80" height="80" fill={variables.palette.outline} /> | ||
<StyledHeadline as="h2" sx={{ color: variables.palette.outline, m: 0 }}> | ||
{isLimitedAccount ? t('byParticipantEmptyLimitedAccount') : t('byParticipantEmpty')} | ||
</StyledHeadline> | ||
</StyledFlexColumn> | ||
{!isLimitedAccount && ( | ||
<Button variant="contained" color="primary" onClick={onClickAssign} sx={{ mt: 2.4 }}> | ||
{t('assignActivityButton')} | ||
</Button> | ||
)} | ||
</StyledFlexAllCenter> | ||
); | ||
}; |
4 changes: 4 additions & 0 deletions
4
...s/Dashboard/features/Participant/Assignments/ByParticipant/EmptyState/EmptyState.types.ts
This file contains 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,4 @@ | ||
export type EmptyStateProps = { | ||
onClickAssign: () => void; | ||
isLimitedAccount: boolean; | ||
}; |
1 change: 1 addition & 0 deletions
1
src/modules/Dashboard/features/Participant/Assignments/ByParticipant/EmptyState/index.ts
This file contains 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 @@ | ||
export * from './EmptyState'; |
This file contains 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 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