Merge pull request #84 from EyeSeeTea/release/1.4.1

Release/1.4.1
EyeSeeTea · Apr 15, 2024 · 9d143b4 · 9d143b4
2 parents 3553013 + 7e0387d
commit 9d143b4
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 28 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,18 +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-01-22T16:20:16.511Z\n"
-"PO-Revision-Date: 2024-01-22T16:20:16.511Z\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 ""
@@ -27,6 +17,9 @@ msgstr ""
 msgid "User {{user}} replicated successfully {{n}} times"
 msgstr ""
 
+msgid "Error replicating user {{user}}: {{message}}"
+msgstr ""
+
 msgid "Replicate {{user}}"
 msgstr ""
 

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: 2024-01-22T16:20:16.511Z\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"
@@ -17,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}}"
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "user-extended-app",
     "description": "DHIS2 Extended User app",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",
@@ -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/src/data/repositories/UserD2ApiRepository.ts b/src/data/repositories/UserD2ApiRepository.ts
@@ -424,4 +424,4 @@ type Dhis2Response = MetadataResponse & {
 type UserAudit = {
     createdBy?: { displayName: string };
     lastUpdatedBy?: { displayName: string };
-};
+};
diff --git a/src/legacy/List/List.component.js b/src/legacy/List/List.component.js
@@ -187,6 +187,7 @@ export class ListHybrid extends React.Component {
                     userToReplicateId={info.user}
                     onRequestClose={this.onReplicateDialogClose}
                     settings={this.state.settings}
+                    api={this.props.api}
                 />
             );
         } else {

diff --git a/src/legacy/List/list.actions.js b/src/legacy/List/list.actions.js
@@ -1,6 +1,6 @@
 import Action from "d2-ui/lib/action/Action";
 import listStore from "./list.store";
-import { Observable } from "rx";
+import { Observable } from "rxjs/Rx";
 
 const listActions = Action.createActionsFromNames([
     "loadList",

diff --git a/src/legacy/List/list.store.js b/src/legacy/List/list.store.js
@@ -1,6 +1,6 @@
 import Store from "d2-ui/lib/store/Store";
 import { getInstance as getD2 } from "d2/lib/d2";
-import { Observable, Subject } from "rx";
+import { Observable, Subject } from "rxjs/Rx";
 import { getUserList } from "../models/userList";
 
 export const columns = [
@@ -36,7 +36,7 @@ export default Store.create({
                     fields: "id,displayName",
                 });
                 Observable.fromPromise(rolesPromise).subscribe(res => {
-                    this.listRolesSubject.onNext(res);
+                    this.listRolesSubject.next(res);
                 });
             }
         });
@@ -50,25 +50,25 @@ export default Store.create({
                     fields: "id,displayName",
                 });
                 Observable.fromPromise(groupsPromise).subscribe(res => {
-                    this.listGroupsSubject.onNext(res);
+                    this.listGroupsSubject.next(res);
                 });
             }
         });
     },
 
     getNextPage() {
-        this.listSourceSubject.onNext(Observable.fromPromise(this.state.pager.getNextPage()));
+        this.listSourceSubject.next(Observable.fromPromise(this.state.pager.getNextPage()));
     },
 
     getPreviousPage() {
-        this.listSourceSubject.onNext(Observable.fromPromise(this.state.pager.getPreviousPage()));
+        this.listSourceSubject.next(Observable.fromPromise(this.state.pager.getPreviousPage()));
     },
 
     filter(options, complete) {
         getD2().then(d2 => {
             const { filters, ...listOptions } = options;
             const listSearchPromise = getUserList(d2, filters, listOptions);
-            this.listSourceSubject.onNext(Observable.fromPromise(listSearchPromise));
+            this.listSourceSubject.next(Observable.fromPromise(listSearchPromise));
             complete(`list with filters '${filters}' is loading`);
         });
     },

diff --git a/src/legacy/components/ReplicateUserFromTable.component.js b/src/legacy/components/ReplicateUserFromTable.component.js
@@ -44,6 +44,7 @@ class ReplicateUserFromTable extends React.Component {
             const errorMessage = i18n.t("Error replicating user {{user}}: {{message}}", {
                 user: userToReplicate.displayName,
                 message: response.error,
+                nsSeparator: false,
             });
             snackActions.show({ message: errorMessage });
             return null;
@@ -69,6 +70,7 @@ class ReplicateUserFromTable extends React.Component {
                 onRequestClose={onRequestClose}
                 columns={this.columns}
                 settings={this.props.settings}
+                api={this.props.api}
             />
         );
     }

diff --git a/src/legacy/components/ReplicateUserFromTemplate.component.js b/src/legacy/components/ReplicateUserFromTemplate.component.js
@@ -136,6 +136,7 @@ class ReplicateUserFromTemplate extends React.Component {
             const errorMessage = i18n.t("Error replicating user {{user}}: {{message}}", {
                 user: userToReplicate.displayName,
                 message: response.error,
+                nsSeparator: false,
             });
             snackActions.show({ message: errorMessage });
             onRequestClose();

diff --git a/yarn.lock b/yarn.lock
@@ -14669,11 +14669,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-[email protected]:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
-  integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
-
 [email protected]:
   version "6.6.3"
   resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.6.3.tgz#141405fcee11f48718d428b99c8f01826f594e5c"