Merge branch 'release/1.4.1'

* release/1.4.1: (26 commits) bump version add eol to userd2apirepository file remove old version of rxjs bump version disable eslint rule show simple error when replicating from template remove unnecessary method add options type in usecase and add nvmrc file fix assign roles filter bug, simplify component small fix show snackbar with error message and response message update d2-ui-components package version for orgUnits shortName order fix, other small fix migrate remove, disable actions to clean architecture refactor remove users using clean arch. add owner to fields in order to get full existing user information before saving update i18n add createdBy and lastUpdatedBy columns add org. unit selector from d2-ui-components instead d2-ui library update d2-ui-components to 2.7.0_beta.2 showing default columns if value is empty in userdatastore ...
EyeSeeTea · Apr 15, 2024 · d72cdb1 · d72cdb1
2 parents 6381d30 + e81fd5a
commit d72cdb1
Show file tree

Hide file tree

Showing 37 changed files with 547 additions and 293 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v16.14.0
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,17 +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: 2023-06-12T19:57:22.426Z\n"
-"PO-Revision-Date: 2023-06-12T19:57:22.426Z\n"
-
-msgid "Enable users"
-msgstr ""
-
-msgid "Disable users"
-msgstr ""
-
-msgid "Remove users"
-msgstr ""
+"POT-Creation-Date: 2024-04-12T13:15:04.627Z\n"
+"PO-Revision-Date: 2024-04-12T13:15:04.627Z\n"
 
 msgid "Copy to clipboard"
 msgstr ""
@@ -26,6 +17,9 @@ msgstr ""
 msgid "User {{user}} replicated successfully {{n}} times"
 msgstr ""
 
+msgid "Error replicating user {{user}}: {{message}}"
+msgstr ""
+
 msgid "Replicate {{user}}"
 msgstr ""
 
@@ -314,9 +308,29 @@ msgstr ""
 msgid "Data view organisation units"
 msgstr ""
 
+msgid "Created By"
+msgstr ""
+
+msgid "Last Modified By"
+msgstr ""
+
 msgid "And {{overflow}} more..."
 msgstr ""
 
+msgid "Users {{action}}. {{users}} {{remainingCount}}"
+msgstr ""
+
+msgid "{{action}} users"
+msgstr ""
+
+msgid ""
+"Are you sure you want to {{action}} the selected users? {{users}} "
+"{{remainingCount}}"
+msgstr ""
+
+msgid "Confirm"
+msgstr ""
+
 msgid "Distributed under GNU GLPv3"
 msgstr ""
 
@@ -328,11 +342,11 @@ msgstr ""
 
 msgid ""
 "This application has been funded by the the Norwegian Refugee Council "
-"(NRC), the WHO Global Malaria Programme and Samaritan’s Purse to support "
-"countries in strengthening the collection and use of health data by using "
-"DHIS2. The application has been developed by [EyeSeeTea "
-"SL](http://eyeseetea.com). Source code, documentation and release notes can "
-"be found at the [EyeSeetea GitHub Project "
+"(NRC), the WHO Global Malaria Programme, Samaritan’s Purse and Medecins "
+"Sans Frontières (MSF) to support countries in strengthening the collection "
+"and use of health data by using DHIS2. The application has been developed "
+"by [EyeSeeTea SL](http://eyeseetea.com). Source code, documentation and "
+"release notes can be found at the [EyeSeetea GitHub Project "
 "Page](https://eyeseetea.github.io/user-extended-app-blessed/)"
 msgstr ""
 
@@ -356,6 +370,9 @@ msgstr ""
 msgid "Norwegian Refugee Council"
 msgstr ""
 
+msgid "MSF"
+msgstr ""
+
 msgid "Edit users"
 msgstr ""
 

diff --git a/i18n/es.po b/i18n/es.po
@@ -1,22 +1,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-06-12T19:57:22.426Z\n"
+"POT-Creation-Date: 2024-04-12T13:14:30.161Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-msgid "Enable users"
-msgstr ""
-
-msgid "Disable users"
-msgstr ""
-
-msgid "Remove users"
-msgstr "Eliminar usuarios"
-
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -26,6 +17,9 @@ msgstr ""
 msgid "User {{user}} replicated successfully {{n}} times"
 msgstr ""
 
+msgid "Error replicating user {{user}}: {{message}}"
+msgstr ""
+
 msgid "Replicate {{user}}"
 msgstr "Replicar {{user}}"
 
@@ -314,9 +308,29 @@ msgstr ""
 msgid "Data view organisation units"
 msgstr ""
 
+msgid "Created By"
+msgstr ""
+
+msgid "Last Modified By"
+msgstr ""
+
 msgid "And {{overflow}} more..."
 msgstr ""
 
+msgid "Users {{action}}. {{users}} {{remainingCount}}"
+msgstr ""
+
+msgid "{{action}} users"
+msgstr ""
+
+msgid ""
+"Are you sure you want to {{action}} the selected users? {{users}} "
+"{{remainingCount}}"
+msgstr ""
+
+msgid "Confirm"
+msgstr ""
+
 msgid "Distributed under GNU GLPv3"
 msgstr ""
 
@@ -328,11 +342,12 @@ msgstr ""
 
 msgid ""
 "This application has been funded by the the Norwegian Refugee Council (NRC), "
-"the WHO Global Malaria Programme and Samaritan’s Purse to support countries "
-"in strengthening the collection and use of health data by using DHIS2. The "
-"application has been developed by [EyeSeeTea SL](http://eyeseetea.com). "
-"Source code, documentation and release notes can be found at the [EyeSeetea "
-"GitHub Project Page](https://eyeseetea.github.io/user-extended-app-blessed/)"
+"the WHO Global Malaria Programme, Samaritan’s Purse and Medecins Sans "
+"Frontières (MSF) to support countries in strengthening the collection and "
+"use of health data by using DHIS2. The application has been developed by "
+"[EyeSeeTea SL](http://eyeseetea.com). Source code, documentation and release "
+"notes can be found at the [EyeSeetea GitHub Project Page](https://eyeseetea."
+"github.io/user-extended-app-blessed/)"
 msgstr ""
 
 msgid ""
@@ -355,6 +370,9 @@ msgstr ""
 msgid "Norwegian Refugee Council"
 msgstr ""
 
+msgid "MSF"
+msgstr ""
+
 msgid "Edit users"
 msgstr ""
 
@@ -388,3 +406,6 @@ msgstr ""
 
 msgid " and {{overflow}} more..."
 msgstr ""
+
+#~ msgid "Remove users"
+#~ msgstr "Eliminar usuarios"
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "user-extended-app",
     "description": "DHIS2 Extended User app",
-    "version": "1.3.3",
+    "version": "1.4.1",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",
@@ -16,7 +16,7 @@
         "@dhis2/d2-i18n-generate": "1.2.0",
         "@dhis2/ui": "7.8.1",
         "@eyeseetea/d2-api": "1.11.0",
-        "@eyeseetea/d2-ui-components": "2.6.12-beta.4",
+        "@eyeseetea/d2-ui-components": "2.7.0-beta.3",
         "@material-ui/core": "4.12.3",
         "@material-ui/icons": "4.11.2",
         "@types/react-virtualized-auto-sizer": "1.0.1",
@@ -53,7 +53,6 @@
         "react-window": "1.8.6",
         "rehype-raw": "^6.1.1",
         "rehype-sanitize": "^5.0.1",
-        "rx": "4.1.0",
         "rxjs": "6.6.7",
         "styled-components": "5.3.3",
         "styled-jsx": "4.0.1",

diff --git a/public/img/logo-msf.svg b/public/img/logo-msf.svg
diff --git a/src/CompositionRoot.ts b/src/CompositionRoot.ts
@@ -11,7 +11,9 @@ import { GetUsersByIdsUseCase } from "./domain/usecases/GetUsersByIdsUseCase";
 import { ListAllUserIdsUseCase } from "./domain/usecases/ListAllUserIdsUseCase";
 import { ListMetadataUseCase } from "./domain/usecases/ListMetadataUseCase";
 import { ListUsersUseCase } from "./domain/usecases/ListUsersUseCase";
+import { RemoveUsersUseCase } from "./domain/usecases/RemoveUsersUseCase";
 import { SaveColumnsUseCase } from "./domain/usecases/SaveColumnsUseCase";
+import { SaveUserStatusUseCase } from "./domain/usecases/SaveUserStatusUseCase";
 import { SaveUsersUseCase } from "./domain/usecases/SaveUsersUseCase";
 import { UpdateUserPropUseCase } from "./domain/usecases/UpdateUserPropUseCase";
 
@@ -31,9 +33,11 @@ export function getCompositionRoot(instance: Instance) {
             listAllIds: new ListAllUserIdsUseCase(userRepository),
             get: new GetUsersByIdsUseCase(userRepository),
             save: new SaveUsersUseCase(userRepository),
+            saveStatus: new SaveUserStatusUseCase(userRepository),
             updateProp: new UpdateUserPropUseCase(userRepository),
             getColumns: new GetColumnsUseCase(userRepository),
             saveColumns: new SaveColumnsUseCase(userRepository),
+            remove: new RemoveUsersUseCase(userRepository),
         }),
         metadata: getExecute({
             list: new ListMetadataUseCase(metadataRepository),

diff --git a/src/data/models/UserModel.ts b/src/data/models/UserModel.ts
@@ -40,7 +40,8 @@ export const UserModel: Codec<User> = Schema.object({
     ldapId: Schema.optional(Schema.string),
     externalAuth: Schema.boolean,
     password: Schema.string,
-    // accountExpiry: Schema.string,
+    createdBy: Schema.optionalSafe(Schema.string, ""),
+    lastModifiedBy: Schema.optionalSafe(Schema.string, ""),
 });
 
 export const ApiUserModel: Codec<ApiUser> = Schema.object({