[Fix] risk and iap fixes

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-08T16:32:23.115Z\n"
-"PO-Revision-Date: 2024-11-08T16:32:23.115Z\n"
+"POT-Creation-Date: 2024-11-22T15:21:43.931Z\n"
+"PO-Revision-Date: 2024-11-22T15:21:43.931Z\n"
 
 msgid "Low"
 msgstr ""
@@ -135,9 +135,6 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-msgid "Respond, alert, watch"
-msgstr ""
-
 msgid "Select duration"
 msgstr ""
 
@@ -165,7 +162,10 @@ msgstr ""
 msgid "Create Risk Assessment"
 msgstr ""
 
-msgid "Add new Assessment"
+msgid "Edit Risk Assessment"
+msgstr ""
+
+msgid "Add new Grade"
 msgstr ""
 
 msgid "Risk assessment incomplete"

i18n/es.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-11-08T16:32:23.115Z\n"
+"POT-Creation-Date: 2024-11-22T15:21:43.931Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -134,9 +134,6 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-msgid "Respond, alert, watch"
-msgstr ""
-
 msgid "Select duration"
 msgstr ""
 
@@ -164,7 +161,10 @@ msgstr ""
 msgid "Create Risk Assessment"
 msgstr ""
 
-msgid "Add new Assessment"
+msgid "Edit Risk Assessment"
+msgstr ""
+
+msgid "Add new Grade"
 msgstr ""
 
 msgid "Risk assessment incomplete"

src/CompositionRoot.ts

@@ -68,6 +68,9 @@ import { ConfigurationsRepository } from "./domain/repositories/ConfigurationsRe
 import { ConfigurationsD2Repository } from "./data/repositories/ConfigurationsD2Repository";
 import { ConfigurationsTestRepository } from "./data/repositories/test/ConfigurationsTestRepository";
 import { CompleteEventTrackerUseCase } from "./domain/usecases/CompleteEventTrackerUseCase";
+import { UserGroupD2Repository } from "./data/repositories/UserGroupD2Repository";
+import { UserGroupRepository } from "./domain/repositories/UserGroupRepository";
+import { UserGroupTestRepository } from "./data/repositories/test/UserGroupTestRepository";
 
 export type CompositionRoot = ReturnType<typeof getCompositionRoot>;
 
@@ -87,6 +90,7 @@ type Repositories = {
     chartConfigRepository: ChartConfigRepository;
     systemRepository: SystemRepository;
     configurationsRepository: ConfigurationsRepository;
+    userGroupRepository: UserGroupRepository;
 };
 
 function getCompositionRoot(repositories: Repositories) {
@@ -105,7 +109,8 @@ function getCompositionRoot(repositories: Repositories) {
             ),
             getConfigurations: new GetConfigurationsUseCase(
                 repositories.configurationsRepository,
-                repositories.teamMemberRepository
+                repositories.teamMemberRepository,
+                repositories.userGroupRepository
             ),
             complete: new CompleteEventTrackerUseCase(repositories),
         },
@@ -160,6 +165,7 @@ export function getWebappCompositionRoot(api: D2Api) {
         chartConfigRepository: new ChartConfigD2Repository(dataStoreClient),
         systemRepository: new SystemD2Repository(api),
         configurationsRepository: new ConfigurationsD2Repository(api),
+        userGroupRepository: new UserGroupD2Repository(api),
     };
 
     return getCompositionRoot(repositories);
@@ -182,6 +188,7 @@ export function getTestCompositionRoot() {
         chartConfigRepository: new ChartConfigTestRepository(),
         systemRepository: new SystemTestRepository(),
         configurationsRepository: new ConfigurationsTestRepository(),
+        userGroupRepository: new UserGroupTestRepository(),
     };
 
     return getCompositionRoot(repositories);

src/data/repositories/IncidentActionD2Repository.ts

@@ -17,13 +17,18 @@ import {
     mapDataElementsToIncidentResponseActions,
     mapIncidentActionToDataElements,
 } from "./utils/IncidentActionMapper";
-import { ActionPlanFormData, ResponseActionFormData } from "../../domain/entities/ConfigurableForm";
+import {
+    ActionPlanFormData,
+    ResponseActionFormData,
+    SingleResponseActionFormData,
+} from "../../domain/entities/ConfigurableForm";
 import { getProgramStage } from "./utils/MetadataHelper";
 import { Future } from "../../domain/entities/generic/Future";
 import { Status, Verification } from "../../domain/entities/incident-action-plan/ResponseAction";
 import { assertOrError } from "./utils/AssertOrError";
 import { D2TrackerEvent } from "@eyeseetea/d2-api/api/trackerEvents";
 import { statusCodeMap, verificationCodeMap } from "./consts/IncidentActionConstants";
+import { FormType } from "../../webapp/pages/form-page/FormPage";
 
 export const incidentActionPlanIds = {
     iapType: "wr1I51WTHhl",
@@ -128,7 +133,7 @@ export class IncidentActionD2Repository implements IncidentActionRepository {
     }
 
     saveIncidentAction(
-        formData: ActionPlanFormData | ResponseActionFormData,
+        formData: ActionPlanFormData | ResponseActionFormData | SingleResponseActionFormData,
         diseaseOutbreakId: Id
     ): FutureData<void> {
         const programStageId = this.getProgramStageByFormType(formData.type);
@@ -242,10 +247,11 @@ export class IncidentActionD2Repository implements IncidentActionRepository {
             });
     }
 
-    private getProgramStageByFormType(formType: string) {
+    private getProgramStageByFormType(formType: FormType): Id {
         switch (formType) {
             case "incident-action-plan":
                 return RTSL_ZEBRA_INCIDENT_ACTION_PLAN_PROGRAM_STAGE_ID;
+            case "incident-response-actions":
             case "incident-response-action":
                 return RTSL_ZEBRA_INCIDENT_RESPONSE_ACTION_PROGRAM_STAGE_ID;
             default:

src/data/repositories/TeamMemberD2Repository.ts

@@ -6,7 +6,7 @@ import { apiToFuture, FutureData } from "../api-futures";
 import { assertOrError } from "./utils/AssertOrError";
 import { Future } from "../../domain/entities/generic/Future";
 
-const RTSL_ZEBRA_INCIDENTMANAGER = "RTSL_ZEBRA_INCIDENTMANAGER";
+export const RTSL_ZEBRA_INCIDENTMANAGER = "RTSL_ZEBRA_INCIDENTMANAGER";
 const RTSL_ZEBRA_RISKASSESSOR = "RTSL_ZEBRA_RISKASSESSOR";
 const RTSL_ZEBRA_INCIDENT_MANAGEMENT_TEAM_MEMBERS = "RTSL_ZEBRA_INCIDENT_MANAGEMENT_TEAM_MEMBERS";
 const RTSL_ZEBRA_INCIDENT_RESPONSE_OFFICERS = "RTSL_ZEBRA_INCIDENT_RESPONSE_OFFICERS";

src/data/repositories/UserGroupD2Repository.ts

@@ -0,0 +1,29 @@
+import { D2Api } from "@eyeseetea/d2-api/2.36";
+import { UserGroupRepository } from "../../domain/repositories/UserGroupRepository";
+import { apiToFuture, FutureData } from "../api-futures";
+import { assertOrError } from "./utils/AssertOrError";
+import { UserGroup } from "../../domain/entities/UserGroup";
+import { RTSL_ZEBRA_INCIDENTMANAGER } from "./TeamMemberD2Repository";
+
+export class UserGroupD2Repository implements UserGroupRepository {
+    constructor(private api: D2Api) {}
+
+    getIncidentManagerUserGroupByCode(): FutureData<UserGroup> {
+        return apiToFuture(
+            this.api.metadata.get({
+                userGroups: {
+                    fields: {
+                        id: true,
+                    },
+                    filter: {
+                        code: { eq: RTSL_ZEBRA_INCIDENTMANAGER },
+                    },
+                },
+            })
+        )
+            .flatMap(response =>
+                assertOrError(response.userGroups[0], `User group ${RTSL_ZEBRA_INCIDENTMANAGER}`)
+            )
+            .map(userGroup => userGroup);
+    }
+}

src/data/repositories/consts/IncidentActionConstants.ts

@@ -82,9 +82,9 @@ export const statusCodeMap: Record<ResponseActionStatusType, string> = {
     Complete: "RTSL_ZEB_OS_STATUS_COMPLETE",
 } as const;
 
-export function getStatusTypeByCode(iapTypeCode: string): Maybe<ResponseActionStatusType> {
+export function getStatusTypeByCode(statusCode: string): Maybe<ResponseActionStatusType> {
     return (Object.keys(statusCodeMap) as ResponseActionStatusType[]).find(
-        key => statusCodeMap[key] === iapTypeCode
+        key => statusCodeMap[key] === statusCode
     );
 }
 
@@ -94,10 +94,10 @@ export const verificationCodeMap: Record<ResponseActionVerificationType, string>
 };
 
 export function getVerificationTypeByCode(
-    iapTypeCode: string
+    verificationCode: string
 ): Maybe<ResponseActionVerificationType> {
     return (Object.keys(verificationCodeMap) as ResponseActionVerificationType[]).find(
-        key => verificationCodeMap[key] === iapTypeCode
+        key => verificationCodeMap[key] === verificationCode
     );
 }
 

src/data/repositories/test/UserGroupTestRepository.ts

@@ -0,0 +1,12 @@
+import { Future } from "../../../domain/entities/generic/Future";
+import { UserGroup } from "../../../domain/entities/UserGroup";
+import { UserGroupRepository } from "../../../domain/repositories/UserGroupRepository";
+import { FutureData } from "../../api-futures";
+
+export class UserGroupTestRepository implements UserGroupRepository {
+    getIncidentManagerUserGroupByCode(): FutureData<UserGroup> {
+        return Future.success({
+            id: "1",
+        });
+    }
+}

src/data/repositories/utils/IncidentActionMapper.ts

@@ -10,6 +10,7 @@ import { Maybe } from "../../../utils/ts-utils";
 import {
     ActionPlanFormData,
     ResponseActionFormData,
+    SingleResponseActionFormData,
 } from "../../../domain/entities/ConfigurableForm";
 import { D2ProgramStageDataElementsMetadata } from "./RiskAssessmentMapper";
 import { ActionPlanAttrs } from "../../../domain/entities/incident-action-plan/ActionPlan";
@@ -29,6 +30,7 @@ import {
     Status,
     Verification,
 } from "../../../domain/entities/incident-action-plan/ResponseAction";
+import _c from "../../../domain/entities/generic/Collection";
 
 export function mapDataElementsToIncidentActionPlan(
     id: Id,
@@ -101,7 +103,7 @@ export function mapDataElementsToIncidentResponseActions(
 }
 
 export function mapIncidentActionToDataElements(
-    formData: ActionPlanFormData | ResponseActionFormData,
+    formData: ActionPlanFormData | ResponseActionFormData | SingleResponseActionFormData,
     programStageId: Id,
     teiId: Id,
     enrollmentId: Id,
@@ -118,6 +120,7 @@ export function mapIncidentActionToDataElements(
                 formData.entity,
                 programStageDataElementsMetadata
             );
+        case "incident-response-actions":
         case "incident-response-action":
             return mapIncidentResponseActionToDataElements(
                 programStageId,
@@ -164,40 +167,66 @@ export function mapIncidentResponseActionToDataElements(
     programStageId: Id,
     teiId: Id,
     enrollmentId: Id,
-    incidentResponseActions: ResponseAction[],
+    incidentResponseActions: ResponseAction | ResponseAction[],
     programStageDataElementsMetadata: D2ProgramStageDataElementsMetadata[]
 ): D2TrackerEvent[] {
-    return incidentResponseActions.map(incidentResponseAction => {
-        const dataElementValues: Record<ResponseActionCodes, string> =
-            getValueFromIncidentResponseAction(incidentResponseAction);
-
-        const dataValues: DataValue[] = programStageDataElementsMetadata
-            .filter(
-                programStageDataElement =>
-                    programStageDataElement.dataElement.id !== incidentResponseActionsIds.timeLine
-            )
-            .map(programStage => {
-                if (!isStringInIncidentResponseActionCodes(programStage.dataElement.code)) {
-                    throw new Error(
-                        `DataElement code ${programStage.dataElement.code} not found in Incident Action Plan Codes`
-                    );
-                }
-                const typedCode: IncidentResponseActionKeyCode = programStage.dataElement.code;
-
-                return getPopulatedDataElement(
-                    programStage.dataElement.id,
-                    dataElementValues[typedCode]
+    return Array.isArray(incidentResponseActions)
+        ? incidentResponseActions.map(incidentResponseAction => {
+              return buildDataValuesFromResponseAction(
+                  programStageId,
+                  teiId,
+                  enrollmentId,
+                  incidentResponseAction,
+                  programStageDataElementsMetadata
+              );
+          })
+        : [
+              buildDataValuesFromResponseAction(
+                  programStageId,
+                  teiId,
+                  enrollmentId,
+                  incidentResponseActions,
+                  programStageDataElementsMetadata
+              ),
+          ];
+}
+
+function buildDataValuesFromResponseAction(
+    programStageId: Id,
+    teiId: Id,
+    enrollmentId: Id,
+    responseAction: ResponseAction,
+    programStageDataElementsMetadata: D2ProgramStageDataElementsMetadata[]
+): D2TrackerEvent {
+    const dataElementValues: Record<ResponseActionCodes, string> =
+        getValueFromIncidentResponseAction(responseAction);
+
+    const dataValues: DataValue[] = programStageDataElementsMetadata
+        .filter(
+            programStageDataElement =>
+                programStageDataElement.dataElement.id !== incidentResponseActionsIds.timeLine
+        )
+        .map(programStage => {
+            if (!isStringInIncidentResponseActionCodes(programStage.dataElement.code)) {
+                throw new Error(
+                    `DataElement code ${programStage.dataElement.code} not found in Incident Action Plan Codes`
                 );
-            });
+            }
+            const typedCode: IncidentResponseActionKeyCode = programStage.dataElement.code;
 
-        return getIncidentActionTrackerEvent(
-            programStageId,
-            incidentResponseAction.id,
-            enrollmentId,
-            dataValues,
-            teiId
-        );
-    });
+            return getPopulatedDataElement(
+                programStage.dataElement.id,
+                dataElementValues[typedCode]
+            );
+        });
+
+    return getIncidentActionTrackerEvent(
+        programStageId,
+        responseAction.id,
+        enrollmentId,
+        dataValues,
+        teiId
+    );
 }
 
 function getPopulatedDataElement(dataElement: Id, value: Maybe<string>): DataValue {

src/domain/entities/AppConfigurations.ts

@@ -23,6 +23,7 @@ import {
     Capability1,
     Capability2,
 } from "./risk-assessment/RiskAssessmentGrading";
+import { UserGroup } from "./UserGroup";
 
 export type SelectableOptions = {
     eventTrackerConfigurations: DiseaseOutbreakEventOptions;
@@ -43,6 +44,7 @@ export type SelectableOptions = {
     incidentResponseActionConfigurations: IncidentResponseActionOptions;
 };
 export type Configurations = {
+    incidentManagerUserGroup: UserGroup;
     selectableOptions: SelectableOptions;
     teamMembers: {
         all: TeamMember[];

src/domain/entities/ConfigurableForm.ts

@@ -107,12 +107,19 @@ export type ActionPlanFormData = BaseFormData & {
 };
 
 export type ResponseActionFormData = BaseFormData & {
-    type: "incident-response-action";
+    type: "incident-response-actions";
     eventTrackerDetails: DiseaseOutbreakEvent;
     entity: ResponseAction[];
     options: IncidentResponseActionOptions;
 };
 
+export type SingleResponseActionFormData = BaseFormData & {
+    type: "incident-response-action";
+    eventTrackerDetails: DiseaseOutbreakEvent;
+    entity: ResponseAction;
+    options: IncidentResponseActionOptions;
+};
+
 export type IncidentManagementTeamRoleOptions = {
     roles: Role[];
     teamMembers: TeamMember[];
@@ -135,4 +142,5 @@ export type ConfigurableForm =
     | RiskAssessmentQuestionnaireFormData
     | ActionPlanFormData
     | ResponseActionFormData
+    | SingleResponseActionFormData
     | IncidentManagementTeamMemberFormData;