Release 1.3.2

Bugfixing: - Include openID and password outside userCredentials to keep compatibility with 2.38.1 DHIS2 builds - Fix OU tree selection in CSV import Merge remote-tracking branch 'upstream/master'
EyeSeeTea · Jul 5, 2023 · 34e7498 · 34e7498
2 parents 3435414 + 0330ea4
commit 34e7498
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "user-extended-app",
     "description": "DHIS2 Extended User app",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",

diff --git a/src/data/repositories/UserD2ApiRepository.ts b/src/data/repositories/UserD2ApiRepository.ts
@@ -133,6 +133,8 @@ export class UserD2ApiRepository implements UserRepository {
                         userRoles: user?.userCredentials.userRoles,
                         username: user?.userCredentials.username,
                         disabled: user?.userCredentials.disabled,
+                        openId: user?.userCredentials.openId,
+                        password: user?.userCredentials.password,
                         userCredentials: {
                             ...existingUser.userCredentials,
                             disabled: user?.userCredentials.disabled,

diff --git a/src/legacy/components/OrgUnitForm.js b/src/legacy/components/OrgUnitForm.js
@@ -3,7 +3,7 @@ import LoadingMask from "d2-ui/lib/loading-mask/LoadingMask.component";
 import TextField from "material-ui/TextField/TextField";
 import Action from "d2-ui/lib/action/Action";
 import { Observable } from "rxjs/Rx";
-import OrgUnitTree from "d2-ui/lib/org-unit-tree/OrgUnitTree.component";
+import { OrganisationUnitTree } from "@dhis2/ui";
 import OrgUnitSelectByLevel from "d2-ui/lib/org-unit-select/OrgUnitSelectByLevel.component";
 import OrgUnitSelectByGroup from "d2-ui/lib/org-unit-select/OrgUnitSelectByGroup.component";
 import OrgUnitSelectAll from "d2-ui/lib/org-unit-select/OrgUnitSelectAll.component";
@@ -93,7 +93,7 @@ class OrgUnitForm extends React.Component {
         this.props.onChange(newSelected);
     }
 
-    toggleOrgUnit(ev, orgUnitModel) {
+    toggleOrgUnit(orgUnitModel) {
         const orgUnit = _(orgUnitModel).pick(["id", "shortName", "path", "displayName"]).value();
         const newSelected = _(this.props.selected).find(selectedOu => selectedOu.path === orgUnit.path)
             ? this.props.selected.filter(selectedOu => selectedOu.path !== orgUnit.path)
@@ -107,16 +107,17 @@ class OrgUnitForm extends React.Component {
         if (this.state.rootOrgUnits.length) {
             return (
                 <div style={{ maxHeight: 350, maxWidth: 480, overflow: "auto" }}>
-                    {this.state.rootOrgUnits.map(rootOu => (
-                        <OrgUnitTree
-                            key={rootOu.id}
-                            selected={selectedPaths}
-                            root={rootOu}
-                            onSelectClick={this.toggleOrgUnit}
-                            emitModel
-                            initiallyExpanded={[rootOu.path]}
-                        />
-                    ))}
+                    {this.state.rootOrgUnits.map(rootOu => {
+                        return (
+                            <OrganisationUnitTree
+                                key={rootOu.id}
+                                selected={selectedPaths}
+                                roots={[rootOu.id]}
+                                onChange={this.toggleOrgUnit}
+                                initiallyExpanded={[rootOu.path]}
+                            />
+                        );
+                    })}
                 </div>
             );
         }

diff --git a/src/legacy/models/userHelpers.js b/src/legacy/models/userHelpers.js
@@ -18,7 +18,7 @@ const propertiesIgnoredOnImport = ["id", "created", "lastUpdated", "lastLogin"];
 
 const userCredentialsFields = ["username", "password", "userRoles", "disabled", "openId"];
 
-const user238MissingFields = ["username", "userRoles", "disabled"];
+const user238MissingFields = ["username", "userRoles", "disabled", "openId", "password"];
 
 const columnNameFromPropertyMapping = {
     id: "ID",