Merge branch 'development' of https://github.com/EyeSeeTea/zebra-dev …

…into feat/create-text-editor-field
EyeSeeTea · Jan 20, 2025 · 808a39d · 808a39d
2 parents 831f272 + 7a050ea
commit 808a39d
Show file tree

Hide file tree

Showing 61 changed files with 2,533 additions and 1,000 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -159,9 +159,6 @@ msgstr ""
 msgid "Status: "
 msgstr ""
 
-msgid "Dashboard"
-msgstr ""
-
 msgid "Select duration"
 msgstr ""
 
@@ -171,16 +168,97 @@ msgstr ""
 msgid "All public health events"
 msgstr ""
 
-msgid "Alerts 7-1-7 performance"
+msgid "7-1-7 performance"
 msgstr ""
 
 msgid "events"
 msgstr ""
 
-msgid "7-1-7 performance"
+msgid "Performance overview"
 msgstr ""
 
-msgid "Performance overview"
+msgid "Dashboard"
+msgstr ""
+
+msgid "Alerts"
+msgstr ""
+
+msgid "National"
+msgstr ""
+
+msgid "Disease - Hazard type"
+msgstr ""
+
+msgid "Province"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Organisation unit"
+msgstr ""
+
+msgid "Organisation unit type"
+msgstr ""
+
+msgid "Cases"
+msgstr ""
+
+msgid "Deaths"
+msgstr ""
+
+msgid "Manager"
+msgstr ""
+
+msgid "Detect 7d"
+msgstr ""
+
+msgid "Notify 1d"
+msgstr ""
+
+msgid "Respond 7d"
+msgstr ""
+
+msgid "Incident Status"
+msgstr ""
+
+msgid "Event"
+msgstr ""
+
+msgid "ERA1"
+msgstr ""
+
+msgid "ERA2"
+msgstr ""
+
+msgid "ERA3"
+msgstr ""
+
+msgid "ERA4"
+msgstr ""
+
+msgid "ERA5"
+msgstr ""
+
+msgid "ERA6"
+msgstr ""
+
+msgid "ERA7"
+msgstr ""
+
+msgid "Alert"
+msgstr ""
+
+msgid "Closed"
+msgstr ""
+
+msgid "Discarded"
+msgstr ""
+
+msgid "Respond"
+msgstr ""
+
+msgid "Watch"
 msgstr ""
 
 msgid "Event Tracker"

diff --git a/i18n/es.po b/i18n/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2025-01-03T08:28:56.703Z\n"
+"POT-Creation-Date: 2025-01-14T15:51:01.421Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -158,9 +158,6 @@ msgstr ""
 msgid "Status: "
 msgstr ""
 
-msgid "Dashboard"
-msgstr ""
-
 msgid "Select duration"
 msgstr ""
 
@@ -170,16 +167,97 @@ msgstr ""
 msgid "All public health events"
 msgstr ""
 
-msgid "Alerts 7-1-7 performance"
+msgid "7-1-7 performance"
 msgstr ""
 
 msgid "events"
 msgstr ""
 
-msgid "7-1-7 performance"
+msgid "Performance overview"
 msgstr ""
 
-msgid "Performance overview"
+msgid "Dashboard"
+msgstr ""
+
+msgid "Alerts"
+msgstr ""
+
+msgid "National"
+msgstr ""
+
+msgid "Disease - Hazard type"
+msgstr ""
+
+msgid "Province"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Organisation unit"
+msgstr ""
+
+msgid "Organisation unit type"
+msgstr ""
+
+msgid "Cases"
+msgstr ""
+
+msgid "Deaths"
+msgstr ""
+
+msgid "Manager"
+msgstr ""
+
+msgid "Detect 7d"
+msgstr ""
+
+msgid "Notify 1d"
+msgstr ""
+
+msgid "Respond 7d"
+msgstr ""
+
+msgid "Incident Status"
+msgstr ""
+
+msgid "Event"
+msgstr ""
+
+msgid "ERA1"
+msgstr ""
+
+msgid "ERA2"
+msgstr ""
+
+msgid "ERA3"
+msgstr ""
+
+msgid "ERA4"
+msgstr ""
+
+msgid "ERA5"
+msgstr ""
+
+msgid "ERA6"
+msgstr ""
+
+msgid "ERA7"
+msgstr ""
+
+msgid "Alert"
+msgstr ""
+
+msgid "Closed"
+msgstr ""
+
+msgid "Discarded"
+msgstr ""
+
+msgid "Respond"
+msgstr ""
+
+msgid "Watch"
 msgstr ""
 
 msgid "Event Tracker"

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "zebra",
     "description": "Zambia Emergency Bridge for Response Application",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",
@@ -18,6 +18,7 @@
         "@emotion/react": "11.11.4",
         "@emotion/styled": "11.11.5",
         "@eyeseetea/d2-api": "1.16.0-beta.12",
+        "@eyeseetea/d2-logger": "^1.1.0",
         "@eyeseetea/d2-ui-components": "v2.9.0-beta.2",
         "@eyeseetea/feedback-component": "0.0.3",
         "@material-ui/core": "4.12.4",

diff --git a/src/CompositionRoot.ts b/src/CompositionRoot.ts
@@ -35,7 +35,7 @@ import { MapConfigTestRepository } from "./data/repositories/test/MapConfigTestR
 import { GetMapConfigUseCase } from "./domain/usecases/GetMapConfigUseCase";
 import { GetProvincesOrgUnits } from "./domain/usecases/GetProvincesOrgUnits";
 import { PerformanceOverviewRepository } from "./domain/repositories/PerformanceOverviewRepository";
-import { GetAllPerformanceOverviewMetricsUseCase } from "./domain/usecases/GetAllPerformanceOverviewMetricsUseCase";
+import { GetAllNationalPerformanceOverviewMetricsUseCase } from "./domain/usecases/GetAllNationalPerformanceOverviewMetricsUseCase";
 import { PerformanceOverviewD2Repository } from "./data/repositories/PerformanceOverviewD2Repository";
 import { PerformanceOverviewTestRepository } from "./data/repositories/test/PerformanceOverviewTestRepository";
 import { AlertSyncDataStoreRepository } from "./data/repositories/AlertSyncDataStoreRepository";
@@ -73,6 +73,7 @@ import { CasesFileTestRepository } from "./data/repositories/test/CasesFileTestR
 import { UserGroupD2Repository } from "./data/repositories/UserGroupD2Repository";
 import { UserGroupRepository } from "./domain/repositories/UserGroupRepository";
 import { UserGroupTestRepository } from "./data/repositories/test/UserGroupTestRepository";
+import { GetAllAlertsPerformanceOverviewMetricsUseCase } from "./domain/usecases/GetAllAlertsPerformanceOverviewMetricsUseCase";
 
 export type CompositionRoot = ReturnType<typeof getCompositionRoot>;
 
@@ -128,7 +129,9 @@ function getCompositionRoot(repositories: Repositories) {
                 new DeleteIncidentManagementTeamMemberRolesUseCase(repositories),
         },
         performanceOverview: {
-            getPerformanceOverviewMetrics: new GetAllPerformanceOverviewMetricsUseCase(
+            getNationalPerformanceOverviewMetrics:
+                new GetAllNationalPerformanceOverviewMetricsUseCase(repositories),
+            getAlertsPerformanceOverviewMetrics: new GetAllAlertsPerformanceOverviewMetricsUseCase(
                 repositories
             ),
             getTotalCardCounts: new GetTotalCardCountsUseCase(repositories),

diff --git a/src/data/entities/Instance.ts b/src/data/entities/Instance.ts
@@ -0,0 +1,23 @@
+export interface InstanceData {
+    url: string;
+    username?: string;
+    password?: string;
+}
+
+export class Instance {
+    public readonly url: string;
+    private username: string | undefined;
+    private password: string | undefined;
+
+    constructor(data: InstanceData) {
+        this.url = data.url;
+        this.username = data.username;
+        this.password = data.password;
+    }
+
+    public get auth(): { username: string; password: string } | undefined {
+        return this.username && this.password
+            ? { username: this.username, password: this.password }
+            : undefined;
+    }
+}