Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: restrict PDP list to assigned activities (M2-7475) #1917

Closed
Closed
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
10 changes: 10 additions & 0 deletions src/modules/Dashboard/api/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ import {
CreateTemporaryMultiInformantRelation,
GetAssignmentsParams,
PostAssignmentsParams,
GetSubjectActivitiesParams,
AppletSubjectActivitiesResponse,
} from './api.types';
import { DEFAULT_ROWS_PER_PAGE } from './api.const';
import { ApiSuccessResponse } from './base.types';
Expand Down Expand Up @@ -920,6 +922,14 @@ export const getAppletActivitiesApi = (
signal,
});

export const getAppletSubjectActivitiesApi = (
{ appletId, subjectId }: GetSubjectActivitiesParams,
signal?: AbortSignal,
): Promise<AxiosResponse<AppletSubjectActivitiesResponse>> =>
authApiClient.get(`/activities/applet/${appletId}/subject/${subjectId}`, {
signal,
});

export const createTemporaryMultiInformantRelationApi = (
{ subjectId, sourceSubjectId }: CreateTemporaryMultiInformantRelation,
signal?: AbortSignal,
Expand Down
21 changes: 20 additions & 1 deletion src/modules/Dashboard/api/api.types.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { ActivityId, AppletId } from 'shared/api';
import { Activity, Item, SingleApplet, SubscaleSetting } from 'shared/state';
import { Activity, ActivityFlow, Item, SingleApplet, SubscaleSetting } from 'shared/state';
import { ParticipantTag, Roles } from 'shared/consts';
import { RetentionPeriods, EncryptedAnswerSharedProps, ExportActivity } from 'shared/types';
import { Encryption } from 'shared/utils';
import { User } from 'modules/Auth/state';

import { RespondentDetails } from '../types';

export type GetAppletsParams = {
params: {
ownerId?: string;
Expand Down Expand Up @@ -32,6 +34,23 @@ export type GetActivitiesParams = {
};
};

export type GetSubjectActivitiesParams = AppletId & SubjectId;

export type HydratedAssignment = {
id: string;
activityId: string;
activityFlowId: string;
respondentSubject: RespondentDetails;
targetSubject: RespondentDetails;
};

export type AppletSubjectActivitiesResponse = {
result: {
activities: Array<Activity & { assignments: HydratedAssignment[] }>;
activityFlows: Array<ActivityFlow & { assignments: HydratedAssignment[] }>;
};
};

export type RespondentId = { respondentId: string };

export type TargetSubjectId = { targetSubjectId: string };
Expand Down
10 changes: 8 additions & 2 deletions src/modules/Dashboard/components/ActivityGrid/ActivityGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,19 @@ export const ActivityGrid = ({
onClickItem,
}: ActivityGridProps) => {
const { t } = useTranslation('app');
const { appletId } = useParams();
const { appletId, subjectId } = useParams();

const isEmpty = !rows?.length;

const getEmptyComponent = () => {
if (isEmpty) {
return appletId ? t('noActivitiesForApplet') : t('noActivities');
if (subjectId) {
return t('noActivitiesForParticipant');
} else if (appletId) {
return t('noActivitiesForApplet');
} else {
return t('noActivities');
}
}
};

Expand Down
Loading
Loading