Merge pull request #243 from EyeSeeTea/development

Release 1.1.1
EyeSeeTea · Oct 6, 2022 · 9ce12df · 9ce12df
2 parents 349b560 + 553e798
commit 9ce12df
Show file tree

Hide file tree

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

diff --git a/src/data/models/UserModel.ts b/src/data/models/UserModel.ts
@@ -40,7 +40,7 @@ export const UserModel: Codec<User> = Schema.object({
     ldapId: Schema.optional(Schema.string),
     externalAuth: Schema.boolean,
     password: Schema.string,
-    accountExpiry: Schema.string,
+    // accountExpiry: Schema.string,
 });
 
 export const ApiUserModel: Codec<ApiUser> = Schema.object({
@@ -76,6 +76,6 @@ export const ApiUserModel: Codec<ApiUser> = Schema.object({
         ldapId: Schema.optionalSafe(Schema.string, ""),
         externalAuth: Schema.boolean,
         password: Schema.string,
-        accountExpiry: Schema.string,
+        // accountExpiry: Schema.string,
     }),
 });
diff --git a/src/data/repositories/UserD2ApiRepository.ts b/src/data/repositories/UserD2ApiRepository.ts
@@ -136,7 +136,7 @@ export class UserD2ApiRepository implements UserRepository {
                             ldapId: user?.userCredentials.ldapId,
                             externalAuth: user?.userCredentials.externalAuth,
                             password: user?.userCredentials.password,
-                            accountExpiry: user?.userCredentials.accountExpiry,
+                            // accountExpiry: user?.userCredentials.accountExpiry,
                         },
                     };
                 });
@@ -281,7 +281,7 @@ export class UserD2ApiRepository implements UserRepository {
             ldapId: userCredentials.ldapId,
             externalAuth: userCredentials.externalAuth,
             password: userCredentials.password,
-            accountExpiry: userCredentials.accountExpiry,
+            // accountExpiry: userCredentials.accountExpiry,
             authorities,
         };
     }
@@ -314,7 +314,7 @@ export class UserD2ApiRepository implements UserRepository {
                 ldapId: input.ldapId ?? "",
                 externalAuth: input.externalAuth ?? "",
                 password: input.password ?? "",
-                accountExpiry: input.accountExpiry ?? "",
+                // accountExpiry: input.accountExpiry ?? "",
             },
         };
     }
@@ -347,7 +347,7 @@ const fields = {
         ldapId: true,
         externalAuth: true,
         password: true,
-        accountExpiry: true,
+        // accountExpiry: true,
     },
 } as const;
 

diff --git a/src/domain/entities/User.ts b/src/domain/entities/User.ts
@@ -28,7 +28,7 @@ export interface User {
     ldapId?: string;
     externalAuth: boolean;
     password: string;
-    accountExpiry: string;
+    // accountExpiry: string;
     authorities: string[];
 }
 
@@ -59,7 +59,7 @@ export const defaultUser: User = {
     ldapId: "",
     externalAuth: false,
     password: "",
-    accountExpiry: "",
+    // accountExpiry: "",
     authorities: [""],
 };
 export interface AccessPermissions {

diff --git a/src/legacy/List/organisation-unit-dialog/OrgUnitDialog.component.js b/src/legacy/List/organisation-unit-dialog/OrgUnitDialog.component.js
@@ -124,6 +124,7 @@ class OrgUnitDialog extends React.Component {
                         filterByProgram: false,
                         selectAll: false,
                     }}
+                    showNameSetting={true}
                 />
             </ConfirmationDialog>
         );

diff --git a/src/webapp/components/user-form/UserForm.tsx b/src/webapp/components/user-form/UserForm.tsx
@@ -122,8 +122,8 @@ export const RenderUserWizardField: React.FC<{ row: number; field: UserFormField
                 />
             );
         // TODO: Convert to date field
-        case "accountExpiry":
-            return <FormField {...props} component={InputFieldFF} type="datetime-local" />;
+        // case "accountExpiry":
+        //     return <FormField {...props} component={InputFieldFF} type="datetime-local" />;
         case "userGroups":
             return <FormField {...props} component={UserRoleGroupFF} modelType="userGroups" />;
         case "userRoles":

diff --git a/src/webapp/components/user-form/components/OrgUnitSelectorFF.tsx b/src/webapp/components/user-form/components/OrgUnitSelectorFF.tsx
@@ -50,6 +50,7 @@ export const OrgUnitSelectorFF = ({ input, meta, validationText, ...rest }: OrgU
                     filterByProgram: false,
                     selectAll: false,
                 }}
+                showNameSetting={true}
             />
 
             {!!message && <WarningBox warning={true} title={message} />}

diff --git a/src/webapp/components/user-form/utils.ts b/src/webapp/components/user-form/utils.ts
@@ -40,8 +40,8 @@ export const getUserName = (field: UserFormField) => {
             return i18n.t("Name");
         case "password":
             return i18n.t("Password");
-        case "accountExpiry":
-            return i18n.t("Account expiration date");
+        // case "accountExpiry":
+        //     return i18n.t("Account expiration date");
         case "surname":
             return i18n.t("Surname");
         case "username":