From d7b7963095d52c565757226403626e49611ff3d2 Mon Sep 17 00:00:00 2001 From: dipan dhali Date: Fri, 13 Sep 2024 02:45:29 +0530 Subject: [PATCH] added user-management including jbpm --- .gitignore | 1 + env.sample | 12 + .../authentication/authentication.service.ts | 2 +- .../keycloak/oauth-keycloak.service.ts | 12 + .../core/shell/content/content.component.html | 2 +- .../core/shell/content/content.component.scss | 20 +- src/app/core/shell/shell.component.html | 2 - src/app/core/shell/shell.component.scss | 9 +- .../core/shell/sidenav/sidenav.component.html | 54 ++- .../core/shell/sidenav/sidenav.component.scss | 187 +++------- .../core/shell/sidenav/sidenav.component.ts | 12 + .../core/shell/toolbar/toolbar.component.html | 19 +- .../core/shell/toolbar/toolbar.component.scss | 68 +--- src/app/core/utils/passwords-utility.ts | 37 ++ src/app/shared/icons.module.ts | 16 +- .../language-selector.component.scss | 5 +- .../language-selector.component.ts | 2 +- src/app/shared/material.module.ts | 4 +- src/app/shared/shared.module.ts | 10 +- .../success-dialog.component.html | 11 + .../success-dialog.component.scss | 21 ++ .../success-dialog.component.spec.ts | 21 ++ .../success-dialog.component.ts | 18 + .../update-password-dialog.component.html | 101 ++++++ .../update-password-dialog.component.scss | 38 +++ .../update-password-dialog.component.spec.ts | 21 ++ .../update-password-dialog.component.ts | 61 ++++ .../create-user/create-user.component.html | 246 ++++++++------ .../create-user/create-user.component.scss | 93 ++++- .../create-user/create-user.component.ts | 192 ++++++++--- src/app/users/models/jbpm.model.ts | 44 +++ src/app/users/models/user.model.ts | 27 ++ src/app/users/services/users-jbpm.service.ts | 162 +++++++++ .../users/services/users-keycloak.service.ts | 249 ++++++++++++++ src/app/users/services/users.service.ts | 321 ++++++++++++++++++ .../user-requests.component.html | 238 +++++++++++++ .../user-requests.component.scss | 59 ++++ .../user-requests.component.spec.ts | 21 ++ .../user-requests/user-requests.component.ts | 158 +++++++++ src/app/users/user.resolver.ts | 8 +- src/app/users/users-routing.module.ts | 16 +- src/app/users/users-template.resolver.ts | 2 +- src/app/users/users.module.ts | 6 +- src/app/users/users.resolver.ts | 8 +- src/app/users/users/users.component.html | 100 ++++++ src/app/users/users/users.component.scss | 49 +++ src/app/users/users/users.component.spec.ts | 25 ++ src/app/users/users/users.component.ts | 123 +++++++ .../users/view-user/view-user.component.html | 162 +++++---- .../users/view-user/view-user.component.scss | 66 +++- .../users/view-user/view-user.component.ts | 191 ++++++++++- src/assets/env.template.js | 8 + src/assets/styles/_content.scss | 14 +- src/assets/styles/_helper.scss | 71 +++- src/assets/translations/en.json | 113 +++++- src/assets/translations/es.json | 297 +++++++++------- src/assets/translations/fr.json | 296 ++++++++++------ src/environments/environment.prod.ts | 10 + src/environments/environment.ts | 10 + src/theme/theme.scss | 10 +- 60 files changed, 3409 insertions(+), 752 deletions(-) create mode 100644 src/app/core/utils/passwords-utility.ts create mode 100644 src/app/shared/success-dialog/success-dialog.component.html create mode 100644 src/app/shared/success-dialog/success-dialog.component.scss create mode 100644 src/app/shared/success-dialog/success-dialog.component.spec.ts create mode 100644 src/app/shared/success-dialog/success-dialog.component.ts create mode 100644 src/app/shared/update-password-dialog/update-password-dialog.component.html create mode 100644 src/app/shared/update-password-dialog/update-password-dialog.component.scss create mode 100644 src/app/shared/update-password-dialog/update-password-dialog.component.spec.ts create mode 100644 src/app/shared/update-password-dialog/update-password-dialog.component.ts create mode 100644 src/app/users/models/jbpm.model.ts create mode 100644 src/app/users/models/user.model.ts create mode 100644 src/app/users/services/users-jbpm.service.ts create mode 100644 src/app/users/services/users-keycloak.service.ts create mode 100644 src/app/users/services/users.service.ts create mode 100644 src/app/users/user-requests/user-requests.component.html create mode 100644 src/app/users/user-requests/user-requests.component.scss create mode 100644 src/app/users/user-requests/user-requests.component.spec.ts create mode 100644 src/app/users/user-requests/user-requests.component.ts create mode 100644 src/app/users/users/users.component.html create mode 100644 src/app/users/users/users.component.scss create mode 100644 src/app/users/users/users.component.spec.ts create mode 100644 src/app/users/users/users.component.ts diff --git a/.gitignore b/.gitignore index 174ed728..643d11aa 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ xcuserdata/ *.sublime-workspace # IDE - VSCode +.vscode .vscode/* !.vscode/settings.json !.vscode/tasks.json diff --git a/env.sample b/env.sample index 132e58cc..26fe4145 100644 --- a/env.sample +++ b/env.sample @@ -27,10 +27,22 @@ export PH_OAUTH_CLIENT_ID=opsapp export PH_OAUTH_CLIENT_SECRET=Y2xpZW50Og= +export PH_OAUTH_CLIENT_UUUID=Y2xpZW50Og= + export PH_OAUTH_BASIC_AUTH=true export PH_OAUTH_BASIC_AUTH_TOKEN=Y2xpZW50Og== +export PH_JBPM_API_URL=http://localhost:8180/kie-server/services/rest/server + +export PH_JBPM_CONTAINER_ID=PaymentHubEE_1.0.0-SNAPSHOT + +export PH_JBPM_CREDENTIALS_ADMIN_MAKER=Y2xpZW50Og== + +export PH_JBPM_CREDENTIALS_ADMIN_CHECKER=Y2xpZW50Og== + +export PH_JBPM_CREDENTIALS_BOTH=Y2xpZW50Og== + export PH_DEFAULT_LANGUAGE=en export PH_SUPPORTED_LANGUAGES=en,fr,es diff --git a/src/app/core/authentication/authentication.service.ts b/src/app/core/authentication/authentication.service.ts index 10792b68..5ce105bb 100644 --- a/src/app/core/authentication/authentication.service.ts +++ b/src/app/core/authentication/authentication.service.ts @@ -164,7 +164,7 @@ export class AuthenticationService { */ private getUserDetails(loginContext: LoginContext, tokenResponse: OAuth2Token) { if (this.isOauthKeyCloak()) { - this.oauthKeycloakService.introspect(tokenResponse).subscribe((userDetails: Introspect) => { + this.oauthKeycloakService.getUserInfo(tokenResponse).subscribe((userDetails: Introspect) => { this.storage.setItem(this.oAuthUserDetailsStorageKey, JSON.stringify(userDetails)); this.onLoginSuccess({ username: loginContext.username, accessToken: tokenResponse.access_token, authenticated: true, tenantId: loginContext.tenant } as any); diff --git a/src/app/core/authentication/keycloak/oauth-keycloak.service.ts b/src/app/core/authentication/keycloak/oauth-keycloak.service.ts index 92af2717..96e90cd7 100644 --- a/src/app/core/authentication/keycloak/oauth-keycloak.service.ts +++ b/src/app/core/authentication/keycloak/oauth-keycloak.service.ts @@ -91,6 +91,18 @@ export class OauthKeycloakService { return this.http.post(url, payload.toString(), httpOptions); } + getUserInfo(token: OAuth2Token): Observable { + + const httpOptions = { + headers: new HttpHeaders({ + Authorization: `Bearer ${token.access_token}`, + 'Content-Type': 'application/json' + }) + }; + const url: string = `${this.url()}/userinfo`; + return this.http.get(url, httpOptions); + } + private url(): string { return `${environment.oauth.serverUrl}/realms/${environment.oauth.realm}/protocol/openid-connect`; } diff --git a/src/app/core/shell/content/content.component.html b/src/app/core/shell/content/content.component.html index 4020fabe..9c0bf3fc 100644 --- a/src/app/core/shell/content/content.component.html +++ b/src/app/core/shell/content/content.component.html @@ -6,7 +6,7 @@ - chevron_right + diff --git a/src/app/core/shell/content/content.component.scss b/src/app/core/shell/content/content.component.scss index efe5f3b9..0271e766 100644 --- a/src/app/core/shell/content/content.component.scss +++ b/src/app/core/shell/content/content.component.scss @@ -1,9 +1,23 @@ -.container { - width: 80%; +@import 'theme/theme'; +.container { + width: 90%; + margin: 0 auto; .breadcrumb { padding-left: 18%; margin: 0; - font-size: x-large; + font-size: 1.6rem; + font-weight: 600; } } + +::ng-deep .xng-breadcrumb-link{ + color: $primary !important; + font-size:1.3rem; + font-weight: 400; + cursor: pointer; +} + +::ng-deep .xng-breadcrumb-link:hover{ + text-decoration: none !important; +} diff --git a/src/app/core/shell/shell.component.html b/src/app/core/shell/shell.component.html index d0a2a802..9926116f 100644 --- a/src/app/core/shell/shell.component.html +++ b/src/app/core/shell/shell.component.html @@ -26,10 +26,8 @@ -
-
diff --git a/src/app/core/shell/shell.component.scss b/src/app/core/shell/shell.component.scss index 5521eed4..97da48f6 100644 --- a/src/app/core/shell/shell.component.scss +++ b/src/app/core/shell/shell.component.scss @@ -9,15 +9,10 @@ } .sidebar-full { - width: 22rem; + width: 18rem; } .sidebar-compact { - width: 8rem; - } - - .vertical-space { - line-height: 40px; - height: 40px; + width: 6rem; } } diff --git a/src/app/core/shell/sidenav/sidenav.component.html b/src/app/core/shell/sidenav/sidenav.component.html index c0111d5f..d9ea5be6 100644 --- a/src/app/core/shell/sidenav/sidenav.component.html +++ b/src/app/core/shell/sidenav/sidenav.component.html @@ -8,10 +8,10 @@
-
-
- - {{ 'APP_NAME' | translate }} +
+
+ + {{ 'APP_NAME' | translate }}
@@ -22,6 +22,48 @@ {{ 'labels.menus.Dashboard' | translate }} + + + + +

{{ "labels.menus.User Management" | translate }}

+ + + + + + + + + +
+ + + +
+ + @@ -32,10 +74,10 @@
diff --git a/src/app/core/shell/sidenav/sidenav.component.scss b/src/app/core/shell/sidenav/sidenav.component.scss index 3545deae..5c8025d1 100644 --- a/src/app/core/shell/sidenav/sidenav.component.scss +++ b/src/app/core/shell/sidenav/sidenav.component.scss @@ -1,18 +1,18 @@ -@import "theme/theme"; +@import 'theme/theme'; .sidenav { - margin-left: 30px; background-color: $primary; color: $white; min-height: 100vh; height: 100vh; - border-top-right-radius: 25px; - border-bottom-right-radius: 25px; } .mat-fab { background-color: $white; color: $dark-grey; + width: 40px; + height: 40px; + box-shadow: none; } .sidebar-full, @@ -20,142 +20,65 @@ .navigation-panel { width: 100%; height: 100%; - margin-top: 20px; .sidenav-collapse { position: absolute; bottom: 20px; right: 20px; } - } - - img { - max-width: 100%; - } - - .app-brand { - display: flex; - align-items: center; - justify-content: center; - text-align: center; - max-width: 15rem; - z-index: 9999; - width: 100%; - margin: auto; - color: $white; - margin-bottom: 60px; - - .app-logo { - width: auto; - height: 42px; - margin-right: 8px; - } - - .app-logo-text { - width: auto; - height: auto; - font-size: 1.3rem; - font-weight: normal; - } - } - - .app-user { - text-align: center; - width: 100%; - padding: 1rem 0 0.4rem; - - .app-user-photo { - width: 72px; - margin: 0 auto 8px; - height: 72px; - border: 1px solid hsla(210, 8%, 51%, 0.13); - padding: 4px; - border-radius: 50%; - } - - img { + .nav-item-sep { width: 100%; - height: 100%; - border-radius: 50%; - } - - .app-user-name { - display: block; - font-size: 0.875rem; - font-weight: 300; - color: rgba(0, 0, 0, 0.96); - margin-left: -2px; } + .app-brand { + text-align: center; + z-index: 9999; + width: 100%; + margin: 3rem 1rem; + color: $white; - .app-user-controls { - .mat-icon-button { - .xs-button { - height: 20px; - width: 20px; - line-height: 20px; - margin: 5px; - } + .app-logo { + width: auto; + height: 100%; + font-size: 2rem; } - .text-muted { - color: rgba(0, 0, 0, 0.54); + .app-logo-text { + width: auto; + height: auto; + font-size: 1.4rem; + font-weight: bold; + // white-space: nowrap; } } } - .nav-item-sep { - span { - padding: 16px 0 0 16px; - display: block; - font-size: 12px; - } - } - .app-sidenav { - .icon-menu { - display: flex; - flex-direction: column; - justify-content: space-evenly; - - .mat-divider { - margin: 0 -24px; - } - - .icon-menu-title { - padding-left: 0; - margin-left: -8px; - } - - .icon-menu-item { - display: inline-block; + .mat-nav-list { + .expanded-user { + padding: 0 1rem; + width: 90%; + gap: 0.5rem; button { - min-width: auto; - margin: 4px; + background-color: $primary; + border: none; + color: $white; + font-size: 1rem; + padding: 0.1rem 1rem; + width: 10rem; + border-radius: 5px; } } - } - - .nav-item-sep { - padding: 0; - margin: 1rem 0; - } - - .mat-nav-list { - margin: 0; - padding: 0; - list-style: none; - color: $white; - .mat-list-item { color: inherit; .mat-list-icon { - height: 30px; - font-size: 22px; + height: 1.8rem; + width: 1.8rem; + font-size: 1.3rem; } } - } + } } } @@ -170,39 +93,29 @@ } } - .app-user { - display: none; - } - .app-sidenav { .nav-item-sep { span { display: none; } } - - .icon-menu { - padding: 8px 0 0; - width: 4rem; - - .nav-item-sep { - display: none; - } - - span { - display: none; - } - } } } -.sidebar-full { +.sidebar-compact { .navigation-panel { - padding-top: 5%; - } - .app-sidenav { - .icon-menu { - flex-direction: row; + .sidenav-collapse { + position: absolute; + bottom: 20px; + right: 25px; } } } + +::ng-deep .mat-list-item-content { + justify-content: center; +} + +::ng-deep .mat-button-wrapper { + padding: 0 !important; +} \ No newline at end of file diff --git a/src/app/core/shell/sidenav/sidenav.component.ts b/src/app/core/shell/sidenav/sidenav.component.ts index d45f9b94..7412bc95 100644 --- a/src/app/core/shell/sidenav/sidenav.component.ts +++ b/src/app/core/shell/sidenav/sidenav.component.ts @@ -15,6 +15,11 @@ import { AuthenticationService } from '../../authentication/authentication.servi }) export class SidenavComponent implements OnInit { + //User Management Expansion + isUserManagementExpanded:boolean = false; + //User Management Active Button + activeButton:string=''; + /** True if sidenav is in collapsed state. */ @Input() sidenavCollapsed: boolean; @Output() sideNavControl: EventEmitter = new EventEmitter; @@ -51,5 +56,12 @@ export class SidenavComponent implements OnInit { sideNavCollapsed(value: boolean): void { this.sideNavControl.emit(value); } + toggleUserManagement(event: Event) { + event.stopPropagation(); + this.isUserManagementExpanded = !this.isUserManagementExpanded; + } + setActiveButton(buttonName: string) { + this.activeButton = buttonName; + } } diff --git a/src/app/core/shell/toolbar/toolbar.component.html b/src/app/core/shell/toolbar/toolbar.component.html index 406334ca..2d83665b 100644 --- a/src/app/core/shell/toolbar/toolbar.component.html +++ b/src/app/core/shell/toolbar/toolbar.component.html @@ -1,20 +1,15 @@ - +
+ -
-
+
+
{{displayUser()}}
- - - -
{{displayUser()}}
- - -
+
- - +
diff --git a/src/app/core/shell/toolbar/toolbar.component.scss b/src/app/core/shell/toolbar/toolbar.component.scss index 68252029..66944dca 100644 --- a/src/app/core/shell/toolbar/toolbar.component.scss +++ b/src/app/core/shell/toolbar/toolbar.component.scss @@ -1,57 +1,17 @@ @import 'theme/theme'; - -#mifosx-toolbar { - position: relative; - background-color: transparent; - - .toolbar { - width: 96%; - border: 0.06rem solid; - border-radius: 15px; - - .content { - margin-left: 2%; - margin-right: 2%; - - .mat-fab { - margin-top: 20px; - background-color: $white; - color: $black; - border: 0.06rem solid; - } - - .username { - vertical-align: middle; - text-align: center; - color: $dark-grey; - margin-right: 40px; - margin-top: 35px; - } - } - } - - .tab-link { - min-width: auto; - padding: 0 1rem; +.content { + display: flex; + justify-content: space-between; + align-items: center; + margin: 1rem 1rem 0 1rem; + padding: 1rem; + border: 1px solid $mid-grey; + border-radius: 4px; + + .mat-fab { + background-color: $white; + color: $black; + border: 1px solid $mid-grey; + box-shadow: none; } - - .search-bar { - .search { - max-width: 400px; - width: 100%; - font-size: 1rem; - } - } - - .username { - text-align: right; - font-size: medium; - } - - .language { - min-width: 120px; - width: 120px; - margin: auto; - } - } diff --git a/src/app/core/utils/passwords-utility.ts b/src/app/core/utils/passwords-utility.ts new file mode 100644 index 00000000..850a300c --- /dev/null +++ b/src/app/core/utils/passwords-utility.ts @@ -0,0 +1,37 @@ +import { Injectable } from '@angular/core'; +import { AbstractControl, ValidationErrors, ValidatorFn, Validators } from '@angular/forms'; +import { Subscription } from 'rxjs'; + + +@Injectable({ + providedIn: 'root' +}) + +export class PasswordsUtility { + // password regex pattern + public static PASSWORD_REGEX = '^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*[#$@$!%*?&])[A-Za-z\d#$@$!%*?&].{8,}$'; + + public getPasswordValidators(): ValidatorFn[] { + return [Validators.required, Validators.pattern(PasswordsUtility.PASSWORD_REGEX), Validators.maxLength(50), Validators.minLength(8)]; + } + + /** + * Confirm Change Password of Users + * @param controlNameToCompare Form Control Name to be compared. + */ + public confirmPassword(controlNameToCompare: string): ValidatorFn { + return (c: AbstractControl): ValidationErrors|null => { + if (c.value == null || c.value.length === 0) { + return null; + } + const controlToCompare = c.root.get(controlNameToCompare); + if (controlToCompare) { + const subscription: Subscription = controlToCompare.valueChanges.subscribe(() => { + c.updateValueAndValidity(); + subscription.unsubscribe(); + }); + } + return controlToCompare && controlToCompare.value !== c.value ? {'notequal': true} : null; + }; + } +} diff --git a/src/app/shared/icons.module.ts b/src/app/shared/icons.module.ts index 1ed2f34b..bffb06b2 100644 --- a/src/app/shared/icons.module.ts +++ b/src/app/shared/icons.module.ts @@ -112,7 +112,13 @@ import { faPause, faFilter, faPaperPlane, - faTicket + faTicket, + faSquareParking, + faCaretDown, + faLeftLong, + faRightLong, + faCaretUp, + faChevronUp } from '@fortawesome/free-solid-svg-icons'; /** @@ -237,7 +243,13 @@ export class IconsModule { faPiggyBank, faBars, faPaperPlane, - faTicket + faTicket, + faSquareParking, + faCaretDown, + faLeftLong, + faRightLong, + faCaretUp, + faChevronUp ); } diff --git a/src/app/shared/language-selector/language-selector.component.scss b/src/app/shared/language-selector/language-selector.component.scss index d95d19f6..b16b890f 100644 --- a/src/app/shared/language-selector/language-selector.component.scss +++ b/src/app/shared/language-selector/language-selector.component.scss @@ -1,4 +1,7 @@ #language-selector, .languageselector { - max-width: 6rem; + max-width: 12rem; } +::ng-deep .mat-form-field-wrapper{ + padding-bottom: 0 !important ; +} \ No newline at end of file diff --git a/src/app/shared/language-selector/language-selector.component.ts b/src/app/shared/language-selector/language-selector.component.ts index 4c37aa76..d405585f 100644 --- a/src/app/shared/language-selector/language-selector.component.ts +++ b/src/app/shared/language-selector/language-selector.component.ts @@ -39,7 +39,7 @@ export class LanguageSelectorComponent implements OnInit { */ setLanguage() { this.translateService.use(this.languageSelector.value); - this.settingsService.setLanguage({ name: '', code: this.languageSelector.value.substring(0, 2) }); + this.settingsService.setLanguage({ name: this.translateService.instant('languages.' + this.languageSelector.value), code: this.languageSelector.value.substring(0, 2) }); } /** diff --git a/src/app/shared/material.module.ts b/src/app/shared/material.module.ts index 9d0e5f89..2f55d182 100644 --- a/src/app/shared/material.module.ts +++ b/src/app/shared/material.module.ts @@ -20,7 +20,7 @@ import { MatIconModule } from '@angular/material/icon'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacyPaginatorModule as MatPaginatorModule } from '@angular/material/legacy-paginator'; +import { MatPaginatorModule } from '@angular/material/paginator'; import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/material/legacy-progress-bar'; import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio'; @@ -93,7 +93,7 @@ import { NgxMatMomentModule, NGX_MAT_MOMENT_FORMATS } from '@angular-material-co providers: [ { provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, - useValue: { appearance: 'standard' } + useValue: { appearance: 'outline' } }, { provide: STEPPER_GLOBAL_OPTIONS, diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 1acd3d94..5cbf4fbe 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -24,6 +24,8 @@ import { BreadcrumbModule, BreadcrumbService } from 'xng-breadcrumb'; import { NgxCsvParserModule } from 'ngx-csv-parser'; import { DragDropFileComponent } from './drag-drop-file/drag-drop-file.component'; import { NgxFileDropModule } from 'ngx-file-drop'; +import { SuccessDialogComponent } from './success-dialog/success-dialog.component'; +import { UpdatePasswordDialogComponent } from './update-password-dialog/update-password-dialog.component'; /** * Shared Module @@ -53,7 +55,9 @@ import { NgxFileDropModule } from 'ngx-file-drop'; ListItemComponent, TenantSelectorComponent, IdentifierComponent, - DragDropFileComponent + DragDropFileComponent, + SuccessDialogComponent, + UpdatePasswordDialogComponent ], exports: [ FileUploadComponent, @@ -72,7 +76,9 @@ import { NgxFileDropModule } from 'ngx-file-drop'; BreadcrumbModule, NgxCsvParserModule, NgxFileDropModule, - DragDropFileComponent + DragDropFileComponent, + SuccessDialogComponent, + UpdatePasswordDialogComponent ], providers: [ BreadcrumbService diff --git a/src/app/shared/success-dialog/success-dialog.component.html b/src/app/shared/success-dialog/success-dialog.component.html new file mode 100644 index 00000000..4e2e2c83 --- /dev/null +++ b/src/app/shared/success-dialog/success-dialog.component.html @@ -0,0 +1,11 @@ +
+
+ +
+ +
+

Congratulations

+

{{ data.key | translate:data.params }}

+
+ +
\ No newline at end of file diff --git a/src/app/shared/success-dialog/success-dialog.component.scss b/src/app/shared/success-dialog/success-dialog.component.scss new file mode 100644 index 00000000..af024614 --- /dev/null +++ b/src/app/shared/success-dialog/success-dialog.component.scss @@ -0,0 +1,21 @@ +@import 'theme/theme'; + +.container{ + height: 100%; + .icon-container{ + background-color: $light-grey; + width: 150px; + height: 100px; + border-radius: 3rem; + margin-bottom: 1rem; + font-size: 1.5rem; + } + + .title{ + font-size: 1.5rem; + font-weight: 500; + margin: 0; + } +} + + diff --git a/src/app/shared/success-dialog/success-dialog.component.spec.ts b/src/app/shared/success-dialog/success-dialog.component.spec.ts new file mode 100644 index 00000000..7fc445ab --- /dev/null +++ b/src/app/shared/success-dialog/success-dialog.component.spec.ts @@ -0,0 +1,21 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SuccessDialogComponent } from './success-dialog.component'; + +describe('SuccessDialogComponent', () => { + let component: SuccessDialogComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [SuccessDialogComponent] + }); + fixture = TestBed.createComponent(SuccessDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/success-dialog/success-dialog.component.ts b/src/app/shared/success-dialog/success-dialog.component.ts new file mode 100644 index 00000000..c93c6168 --- /dev/null +++ b/src/app/shared/success-dialog/success-dialog.component.ts @@ -0,0 +1,18 @@ +import { Component, Inject } from '@angular/core'; +import {MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog' +import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +@Component({ + selector: 'mifosx-success-dialog', + templateUrl: './success-dialog.component.html', + styleUrls: ['./success-dialog.component.scss'] +}) +export class SuccessDialogComponent { + constructor(@Inject(MAT_DIALOG_DATA) public data: any, public dialogRef: MatDialogRef) { + } + + ngOnInit() { + setTimeout(() => { + this.dialogRef.close(); + }, 2000); + } +} diff --git a/src/app/shared/update-password-dialog/update-password-dialog.component.html b/src/app/shared/update-password-dialog/update-password-dialog.component.html new file mode 100644 index 00000000..8926f12e --- /dev/null +++ b/src/app/shared/update-password-dialog/update-password-dialog.component.html @@ -0,0 +1,101 @@ +
+

{{ "labels.heading.Change Password" | translate }}

+ +
+
+
+
+ {{ "labels.inputs.Password" | translate }} + + + + {{ "labels.inputs.Password" | translate }} + {{ "labels.commons.is required" | translate }} + + + {{ "labels.commons.Password should be at least" | translate }} + {{ + "labels.commons.8 characters long" | translate + }} + + + {{ + "labels.commons.Password should not be more than" | translate + }} + {{ + "labels.commons.50 characters long" | translate + }} + + + {{ "labels.commons.Password should include a" | translate }} + {{ "labels.commons.numeral" | translate }} + {{ "labels.commons.and at" | translate }} + {{ + "labels.commons.least one uppercase" | translate + }} + ,{{ + "labels.commons.lowercase and special character" | translate + }} + + +
+ +
+ {{ + "labels.inputs.Repeat Password" | translate + }} + + + + {{ "labels.inputs.Password" | translate }} + {{ "labels.commons.required" | translate }} + + + {{ "labels.inputs.Password" | translate }} + {{ "labels.commons.does not match" | translate }} + + +
+
+
+
+ + + + + +
diff --git a/src/app/shared/update-password-dialog/update-password-dialog.component.scss b/src/app/shared/update-password-dialog/update-password-dialog.component.scss new file mode 100644 index 00000000..863db6db --- /dev/null +++ b/src/app/shared/update-password-dialog/update-password-dialog.component.scss @@ -0,0 +1,38 @@ +@import "theme/theme"; + +.container { + padding: 1rem; + overflow:none !important; + h1 { + color: $primary; + font-size: x-large; + font-weight: 600; + } + + .form-fields{ + margin-bottom: 1rem; + } + + .login-button { + width: 8rem; + border-radius: 5px; + background-color: $green; + padding: 0.3rem 0; + box-shadow: none; + color: $white; + + } + + .login-button:disabled{ + background-color: $mid-grey; + color: $black; + } + .cancel-button { + width: 8rem; + border-radius: 5px; + padding: 0.3rem 0; + border: 1px solid $black; + box-shadow: none; + } + +} diff --git a/src/app/shared/update-password-dialog/update-password-dialog.component.spec.ts b/src/app/shared/update-password-dialog/update-password-dialog.component.spec.ts new file mode 100644 index 00000000..8d1c7560 --- /dev/null +++ b/src/app/shared/update-password-dialog/update-password-dialog.component.spec.ts @@ -0,0 +1,21 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UpdatePasswordDialogComponent } from './update-password-dialog.component'; + +describe('UpdatePasswordDialogComponent', () => { + let component: UpdatePasswordDialogComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [UpdatePasswordDialogComponent] + }); + fixture = TestBed.createComponent(UpdatePasswordDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/update-password-dialog/update-password-dialog.component.ts b/src/app/shared/update-password-dialog/update-password-dialog.component.ts new file mode 100644 index 00000000..998bbb58 --- /dev/null +++ b/src/app/shared/update-password-dialog/update-password-dialog.component.ts @@ -0,0 +1,61 @@ +import { Component, OnInit, Inject } from '@angular/core'; +import { UntypedFormBuilder, Validators, ValidatorFn, AbstractControl, ValidationErrors } from '@angular/forms'; +import { Subscription } from 'rxjs'; + +import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { PasswordsUtility } from 'app/core/utils/passwords-utility'; + + +@Component({ + selector: 'mifosx-update-password-dialog', + templateUrl: './update-password-dialog.component.html', + styleUrls: ['./update-password-dialog.component.scss'] +}) +export class UpdatePasswordDialogComponent implements OnInit { + + /** Change Password Form */ + changePasswordForm: any; + + /** + * @param {MatDialogRef} dialogRef Component reference to dialog. + * @param {any} data Provides any data. + */ + constructor(public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any, + private formBuilder: UntypedFormBuilder, + private passwordsUtility: PasswordsUtility) { } + + ngOnInit() { + this.createChangePasswordForm(); + } + + /** Change Password form */ + createChangePasswordForm() { + this.changePasswordForm = this.formBuilder.group({ + 'password': ['', this.passwordsUtility.getPasswordValidators()], + 'repeatPassword': ['', [Validators.required, this.confirmPassword('password')]] + }); + } + + /** + * Confirm Change Password of Users + * @param controlNameToCompare Form Control Name to be compared. + */ + confirmPassword(controlNameToCompare: string): ValidatorFn { + return (c: AbstractControl): ValidationErrors|null => { + if (c.value == null || c.value.length === 0) { + return null; + } + const controlToCompare = c.root.get(controlNameToCompare); + if (controlToCompare) { + const subscription: Subscription = controlToCompare.valueChanges.subscribe(() => { + c.updateValueAndValidity(); + subscription.unsubscribe(); + }); + } + return controlToCompare && controlToCompare.value !== c.value ? {'notequal': true} : null; + }; + } + +} + diff --git a/src/app/users/create-user/create-user.component.html b/src/app/users/create-user/create-user.component.html index 21fbfb44..091f000b 100644 --- a/src/app/users/create-user/create-user.component.html +++ b/src/app/users/create-user/create-user.component.html @@ -1,3 +1,4 @@ +{{ 'labels.texts.Add a new user to the network' | translate }}
@@ -5,127 +6,146 @@
- -
- - - Username - - - Username is required - - - - - Email - - - Email is invalid - - - Email is required - - - - - First Name - - - First Name cannot begin with a special character or number - - - First Name is required - - - - - Last Name - - - Last Name cannot begin with a special character or number - - - Last Name is required - - - -
- - Override password expiry policy - +

{{ 'labels.heading.Define User' | translate }}

+
+
+ {{'labels.inputs.Type of User'| translate}} * + + + {{ + type.name + }} + + + UserType is required + +
- -
- - Auto generate password - + +
+ {{'labels.inputs.Role'| translate}} * + + + {{ + role.name + }} + + + role is required + +
- - Password - - - Password is required - - - - - Repeat Password - - - Password is required - - - -

- Passwords do not match -

- - - Office - - - {{ office.name }} - - - - Office is required - - - - - Staff - - - {{ staff.displayName }} - - - - - - Roles - - - {{ role.name }} - - - - At least one role must be selected - - - -
- +
+

{{ 'labels.heading.User Information' | translate }}

+
+
+ {{'labels.inputs.First Name'| translate}} * + + + + First Name + cannot contain any special character or numbers + + + First Name is required + + +
+ +
+ {{'labels.inputs.Last Name'| translate}} * + + + + Last Name + cannot contain any special character or numbers + + + Last Name is required + + +
+ +
+ {{'labels.inputs.User Name'| translate}} * + + + + User Name + cannot begin with a special character or number + + + User Name is required + + +
+ +
+ {{'labels.inputs.Email'| translate}} * + + + + Email is invalid + + + Email is required + + +
+ +
+ {{'labels.inputs.Mobile Number'| translate}} * + + + + Mobile Number is invalid + + + Mobile Number is required + + +
+ +
+ {{'labels.inputs.FSP ID'| translate}} * + + + + {{ id }} + + + + FSP ID is required + + +
+ +
+ {{'labels.inputs.Govt ID'| translate}} * + + + + {{ id }} + + + + Govt ID is required + + +
+ +
- - - + + + -
+
\ No newline at end of file diff --git a/src/app/users/create-user/create-user.component.scss b/src/app/users/create-user/create-user.component.scss index 5d44678c..1057eb2a 100644 --- a/src/app/users/create-user/create-user.component.scss +++ b/src/app/users/create-user/create-user.component.scss @@ -1,13 +1,90 @@ -.password-never-expires-wrapper { - padding: 17.5px 0 17.5px 0; +@import 'theme/theme'; + +span { + display: flex; + color: $mid-grey; + width: 90%; + margin: 0 auto; +} + +.container { + max-width: 90%; + height: fit-content; + overflow-y: hidden; + .mat-card { + padding: 2rem 5rem 0 5rem; + margin: 2rem 1rem; + background-color: $light-grey; + box-shadow: none; + + h2 { + color: $primary; + } + .gap { + gap: 1.3rem; + } + + .button { + padding: 0.3rem 4rem; + border-radius: $border-size; + background-color: $white; + color: $primary; + cursor: pointer; + } + + .submit { + background-color: $primary; + color: $white; + } + + .submit:disabled { + background-color: $light-black; + color: $white; + cursor: not-allowed; + } + } +} + +.edit-b { + width: 8rem; + background-color: $primary; } -.send-password-to-email-wrapper { - padding: 17.5px 0 17.5px 0; +.delete-b { + width: 8rem; + background-color: $red; } -.reset-password-error { - color: #f44336; - font-size: 80%; - margin: 0; +.update-b { + width: 12rem; + background-color: $primary; } + +.custom-button { + border-radius: 5px; + padding: 0.2rem 0; + box-shadow: none; + color: $white; +} + +.not-allowed { + cursor: not-allowed; +} + +::ng-deep .custom-form-field.mat-form-field-appearance-outline .mat-form-field-outline { + color: black; + background-color: $white; + border-radius: 5px; +} +::ng-deep .custom-form-field.mat-form-field input:disabled { + color: black; +} +::ng-deep .custom-form-field.mat-form-field select:disabled { + color: black; +} + +::ng-deep .custom-create-user.mat-form-field-appearance-outline .mat-form-field-outline { + color: black; + background-color: $white; + border-radius: 5px; +} \ No newline at end of file diff --git a/src/app/users/create-user/create-user.component.ts b/src/app/users/create-user/create-user.component.ts index 5b7bf595..b407664c 100644 --- a/src/app/users/create-user/create-user.component.ts +++ b/src/app/users/create-user/create-user.component.ts @@ -1,13 +1,16 @@ /** Angular Imports */ import { Component, OnInit } from '@angular/core'; -import { UntypedFormGroup, UntypedFormBuilder, UntypedFormControl, Validators } from '@angular/forms'; +import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms'; import { Router, ActivatedRoute } from '@angular/router'; +import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; /** Custom Services */ -import { UsersService } from '../users.service'; +import { UsersService } from '../services/users.service'; + +/**Components */ +import { SuccessDialogComponent } from 'app/shared/success-dialog/success-dialog.component'; +import { AlertService } from 'app/core/alert/alert.service'; -/** Custom Validators */ -import { confirmPasswordValidator } from '../../login/reset-password/confirm-password.validator'; /** * Create user component. @@ -21,28 +24,40 @@ export class CreateUserComponent implements OnInit { /** User form. */ userForm: UntypedFormGroup; - /** Offices data. */ - officesData: any; /** Roles data. */ rolesData: any; - /** Staff data. */ - staffData: any; + /** Type of User */ + userTypes:any; + /** FSP Ids */ + fspIds: string[]; + /** Govt Ids */ + govtIds: string[]; + /** Show FSP ID Field */ + showFspIdField = false; + /** Show Govt ID Field */ + showGovtIdField = false; /** * Retrieves the offices and roles data from `resolve`. * @param {FormBuilder} formBuilder Form Builder. - * @param {UsersService} UsersService Users Service. + * @param {UsersService} usersService Users Service. + * @param {KeycloakAdminService} keycloakAdminService Keycloak Admin Service. + * @param {JbpmService} jbpmService Jbpm Service. + * @param {AlertService} alertService Alert Service. + * @param {MatDialog} dialog Material Dialog. * @param {ActivatedRoute} route Activated Route. * @param {Router} router Router for navigation. */ constructor(private formBuilder: UntypedFormBuilder, private usersService: UsersService, + private alertService: AlertService, + private dialog: MatDialog, private route: ActivatedRoute, private router: Router) { this.route.data.subscribe((data: { usersTemplate: any }) => { - this.officesData = data.usersTemplate.allowedOffices; + this.userTypes = data.usersTemplate.userTypes; this.rolesData = data.usersTemplate.availableRoles; }); } @@ -52,8 +67,7 @@ export class CreateUserComponent implements OnInit { */ ngOnInit() { this.createUserForm(); - this.setStaffData(); - this.setConditionalControls(); + this.subscribeToFieldChanges(); } /** @@ -61,57 +75,137 @@ export class CreateUserComponent implements OnInit { */ createUserForm() { this.userForm = this.formBuilder.group({ - 'username': ['', Validators.required], - 'email': ['', [Validators.required, Validators.email]], - 'firstname': ['', [Validators.required, Validators.pattern('(^[A-z]).*')]], - 'lastname': ['', [Validators.required, Validators.pattern('(^[A-z]).*')]], - 'sendPasswordToEmail': [true], - 'passwordNeverExpires': [false], - 'officeId': ['', Validators.required], - 'staffId': [''], - 'roles': ['', Validators.required] - }, { validator: confirmPasswordValidator }); + userTypes: ['', Validators.required], + roles: ['', [Validators.required]], + firstName: ['', [Validators.required, Validators.pattern('^[A-Za-z]+$')]], + lastName: ['', [Validators.required, Validators.pattern('^[A-Za-z]+$')]], + email: ['', [Validators.required, Validators.email]], + mobileNo: ['', [Validators.required, Validators.pattern('^[0-9]{10}$')]], + fspID: [''], + govtID: [''], + username: ['', [Validators.required, Validators.pattern('^[A-Za-z][A-Za-z0-9!@#$%^&*()_+-=]*$')]], + }); } /** - * Sets the staff data each time the user selects a new office + * Sets the ID field each time the user selects a new user type */ - setStaffData() { - this.userForm.get('officeId').valueChanges.subscribe((officeId: string) => { - this.staffData = []; - this.usersService.getStaff(officeId).subscribe((staff: any) => { - this.staffData = staff; + onUserTypeChange(selectedUserType: string) { + const selectedUser = this.userTypes.find((user: { name: string }) => user.name === selectedUserType); + if (selectedUser) { + if (selectedUser.name === 'FSP User') { + this.showFspIdField = true; + this.showGovtIdField = false; + this.fspIds = selectedUser.FSPId; + this.userForm.get('fspID'); + this.userForm.get('govtID').clearValidators(); + this.userForm.get('govtID').reset(); + } else if (selectedUser.name === 'Govt. Entity User') { + this.showGovtIdField = true; + this.showFspIdField = false; + this.govtIds = selectedUser.GovtId; + this.userForm.get('govtID'); + this.userForm.get('fspID').clearValidators(); + this.userForm.get('fspID').reset(); + } else { + this.showFspIdField = false; + this.showGovtIdField = false; + this.userForm.get('fspID').clearValidators(); + this.userForm.get('govtID').clearValidators(); + this.userForm.get('fspID').reset(); + this.userForm.get('govtID').reset(); + } + this.userForm.get('fspID').updateValueAndValidity(); + this.userForm.get('govtID').updateValueAndValidity(); + } + } + + /** + * Submits the user form and creates user, + * if successful redirects to users. + */ + submit(): void { + if (this.userForm.valid) { + const user = this.mapFormDataToUserData(this.userForm.value); + this.usersService.startJBPMProcess(user).subscribe( + () => { + this.openSuccessDialog(user.username); + this.userForm.reset(); + this.clearValidationErrors(); + } + ); + } else { + // Mark all fields as touched to trigger validation messages + Object.keys(this.userForm.controls).forEach((field) => { + const control = this.userForm.get(field); + control.markAsTouched({ onlySelf: true }); }); - }); + this.alertService.alert({ type: 'error', message: 'Please fill all required fields correctly.' }); + } } /** - * Sets the conditional controls of the user form + * Remove Validations Error from the form control */ - setConditionalControls() { - this.userForm.get('sendPasswordToEmail').valueChanges.subscribe((sendPasswordToEmail: boolean) => { - if (sendPasswordToEmail) { - this.userForm.removeControl('password'); - this.userForm.removeControl('repeatPassword'); - this.userForm.get('email').setValidators([Validators.required, Validators.email]); - } else { - this.userForm.addControl('password', new UntypedFormControl('', Validators.required)); - this.userForm.addControl('repeatPassword', new UntypedFormControl('', Validators.required)); - this.userForm.get('email').setValidators([Validators.email]); - } - this.userForm.get('email').updateValueAndValidity(); + clearValidationErrors() { + Object.keys(this.userForm.controls).forEach((field) => { + const control = this.userForm.get(field); + control.setErrors(null); + control.markAsUntouched(); + control.markAsPristine(); }); } /** - * Submits the user form and creates user, - * if successful redirects to users. + * Map the form data to user data + * @param formData form data + * @returns User + */ + private mapFormDataToUserData(formData: any): any { + return { + actionType: 'CREATE', + createdAt: new Date().toISOString(), + email: formData.email, + firstName: formData.firstName, + userid: null, + lastName: formData.lastName, + mobileNo: formData.mobileNo, + roles: formData.roles, + status: 'Inactive', + fspId: formData.fspID || null, + govtId: formData.govtID || null, + updatedAt: new Date().toISOString(), + userType: formData.userTypes, + username: formData.username, + }; + } + + + /** + * Subscribe to field changes to show validation errors */ - submit() { - const user = this.userForm.value; - this.usersService.createUser(user).subscribe((response: any) => { - this.router.navigate(['../'], { relativeTo: this.route }); + subscribeToFieldChanges() { + Object.keys(this.userForm.controls).forEach((field) => { + const control = this.userForm.get(field); + control.valueChanges.subscribe(() => { + if (control.errors) { + control.markAsTouched(); + } + }); }); } -} + /** + * Open Success Dialog + */ + openSuccessDialog(username: any): void { + this.dialog.open(SuccessDialogComponent, { + width: '800px', + height: '500px', + data: { + params: { username: username }, + key: 'labels.texts.UserCreated', + }, + }); + } +} \ No newline at end of file diff --git a/src/app/users/models/jbpm.model.ts b/src/app/users/models/jbpm.model.ts new file mode 100644 index 00000000..7043cd00 --- /dev/null +++ b/src/app/users/models/jbpm.model.ts @@ -0,0 +1,44 @@ +export interface ProcessInstance { + 'process-instance-id': number; + 'process-id': string; + 'process-name': string; + 'process-version': string; + 'process-instance-state': number; + 'container-id': string; + initiator: string; + 'start-date': { + 'java.util.Date': number; + }; + 'process-instance-desc': string; + 'correlation-key': string; + 'parent-instance-id': number; + 'sla-compliance': number; + 'sla-due-date': null; + 'active-user-tasks': { + 'task-summary': TaskSummary[]; + }; + 'process-instance-variables': null; + } + +export interface TaskSummary { + 'task-id': number; + 'task-name': string; + 'task-subject': string; + 'task-description': string; + 'task-status': string; + 'task-priority': number; + 'task-is-skipable': null; + 'task-actual-owner': string; + 'task-created-by': string; + 'task-created-on': { + 'java.util.Date': number; + }; + 'task-activation-time': { + 'java.util.Date': number; + }; + 'task-expiration-time': null; + 'task-proc-inst-id': number; + 'task-proc-def-id': string; + 'task-container-id': string; + 'task-parent-id': null; + } \ No newline at end of file diff --git a/src/app/users/models/user.model.ts b/src/app/users/models/user.model.ts new file mode 100644 index 00000000..ab97c79c --- /dev/null +++ b/src/app/users/models/user.model.ts @@ -0,0 +1,27 @@ +export interface User { + actionType: string; + createdAt: string; + email: string; + firstName: string; + userid: string | null; + lastName: string; + mobileNo: string; + roles: string[]; + status: string; + fspId: string | null; + govtId: string | null; + updatedAt: string; + userType: string; + username: string; + } + + export interface UserType { + name: string; + FSPId?: string[]; + GovtId?: string[]; + } + + export interface Role { + id: number; + name: string; + } \ No newline at end of file diff --git a/src/app/users/services/users-jbpm.service.ts b/src/app/users/services/users-jbpm.service.ts new file mode 100644 index 00000000..8a2d3651 --- /dev/null +++ b/src/app/users/services/users-jbpm.service.ts @@ -0,0 +1,162 @@ +/** Angular Imports */ +import { Injectable } from '@angular/core'; +import { HttpClient, HttpHeaders} from '@angular/common/http'; + +/** Rxjs Imports */ +import { Observable } from 'rxjs'; + +/** Environment Configuration */ +import { environment } from 'environments/environment'; + + +/** + * Jbpm Service + */ +@Injectable({ + providedIn: 'root', +}) +export class JbpmService { + + /** Jbpm API URL */ + private jbpmApiUrl = environment.jbpm.jbpmApiUrl; + private containerId = environment.jbpm.containerId; + private credentials = environment.jbpm.credentials; + + /** + * Constructor + * @param {HttpClient} http Http Client. + */ + constructor(private http: HttpClient) {} + + /** + * Get Credentials + * @returns {Object} Credentials + */ + private getCredentials(): { username: string; password: string } { + const userDetails = JSON.parse( + sessionStorage.getItem('pheeOAuthUserDetails') || '{}' + ); + const roles = userDetails?.resource_access?.opsapp?.roles || []; + let encodedCredentials; + if (roles.includes('Admin Maker') && roles.includes('Admin Checker')) { + encodedCredentials = this.credentials.both; + } else if (roles.includes('Admin Maker')) { + encodedCredentials = this.credentials.adminMaker; + } else if (roles.includes('Admin Checker')) { + encodedCredentials = this.credentials.adminChecker; + } else { + throw new Error('Unauthorized'); + } + + const [username, password] = encodedCredentials.split(':'); + return { username, password }; + } + + /** + * Get Headers + * @returns {HttpHeaders} Headers + */ + private getHeaders(): HttpHeaders { + const credentials = this.getCredentials(); + const token = btoa(`${credentials.username}:${credentials.password}`); + return new HttpHeaders({ + Authorization: `Basic ${token}`, + 'Content-Type': 'application/json', + }); + } + + /** + * Get Processes + * @returns {Observable} Processes + */ + startProcess(processId: string, variables: any): Observable { + const url = `${this.jbpmApiUrl}/containers/${this.containerId}/processes/${processId}/instances`; + return this.http.post(url, { variables }, { headers: this.getHeaders() }); + } + + /** + * Get Tasks by Potential Owner + * @returns {Observable} Tasks + */ + getTasks(potentialOwner: string, status: string[]): Observable { + const url = `${this.jbpmApiUrl}/queries/tasks/instances/pot-owners`; + const body = { + 'potential-owner': potentialOwner, + status: status, + }; + return this.http.post(url, body, { headers: this.getHeaders() }); + } + + /** + * Get All Tasks + * @returns {Observable} Tasks + * @description Get all tasks + */ + getAllTasks(): Observable { + const url = `${this.jbpmApiUrl}/queries/tasks/instances/pot-owners`; + return this.http.get(url, { headers: this.getHeaders() }); + } + + /** + * Get Task Content + * @param taskId Task Id + * @returns {Observable} Task Content + */ + getTaskContent(taskId: number): Observable { + const url = `${this.jbpmApiUrl}/containers/${this.containerId}/tasks/${taskId}/contents/input`; + return this.http.get(url, { headers: this.getHeaders() }); + } + + /** + * Complete Task + * @param taskId + * @param variables + * @returns {Observable} + */ + completeAdminTask(taskId: string, variables: any): Observable { + const url = `${this.jbpmApiUrl}/containers/${this.containerId}/tasks/${taskId}/states/completed`; + const body = { approve: variables.approved.toString() }; + return this.http.put(url, body, { headers: this.getHeaders() }); + } + + /** + * Start Task + * @param taskId + * @returns {Observable} + */ + startTask(taskId: string): Observable { + const url = `${this.jbpmApiUrl}/containers/${this.containerId}/tasks/${taskId}/states/started`; + return this.http.put(url, {}, { headers: this.getHeaders() }); + } + + /** + * Complete Task + * @param taskId + * @param variables + * @returns {Observable} + * @description Complete Task + */ + completeTask(taskId: string, variables: any): Observable { + const url = `${this.jbpmApiUrl}/containers/${this.containerId}/tasks/${taskId}/states/completed`; + const body = { + userData: { + 'com.myspace.paymenthubee.UserData': variables, + }, + }; + console.log('Complete Task:', body); + return this.http.put(url, body, { headers: this.getHeaders() }); + } + + + /** + * Get Task by Process Instance Id + * @param ProcessInstanceId + * @returns {Observable} + */ + getTasksByProcessInstanceId(processInstanceId: number): Observable { + const url = `${this.jbpmApiUrl}/containers/${this.containerId}/processes/instances/${processInstanceId}`; + // return this.http.get(`${this.jbpmApiUrl}/queries/tasks/instances/process/${processInstanceId}`); + return this.http.get(url, { headers: this.getHeaders() }); + } + +} \ No newline at end of file diff --git a/src/app/users/services/users-keycloak.service.ts b/src/app/users/services/users-keycloak.service.ts new file mode 100644 index 00000000..fd1fa19f --- /dev/null +++ b/src/app/users/services/users-keycloak.service.ts @@ -0,0 +1,249 @@ +/** Angular Imports */ +import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { Injectable } from '@angular/core'; + +//Rxjs Imports +import { Observable} from 'rxjs'; +import { switchMap } from 'rxjs/operators'; + +//Environment +import { environment } from 'environments/environment'; + +//Custom Models +import { Role } from '../models/user.model'; + +/** + * Keycloak Admin Service + */ +@Injectable({ + providedIn: 'root', +}) +export class KeycloakAdminService { + + /** + * Constructor + * @param {HttpClient} http Http + */ + constructor(private http: HttpClient) { } + + /** + * @description Get url + * @returns {string} url + */ + private url(): string { + return `${environment.oauth.serverUrl}/admin/realms/${environment.oauth.realm}`; + } + + /** + * @description Get token + * @returns {string | null} token + */ + private getToken(): string | null { + const tokenDetails = sessionStorage.getItem('pheeOAuthTokenDetails'); + if (tokenDetails) { + const token = JSON.parse(tokenDetails); + return token.access_token; + } + return null; + } + + + /** + * @description Get httpOptions + * @returns {HttpHeaders} httpOptions + */ + private httpOptions() { + const token = this.getToken(); + if (!token) { + throw new Error('No token available'); + } + return { + headers: new HttpHeaders({ + 'Content-Type': 'application/json', + Authorization: `Bearer ${token}`, + }), + }; + } + + /** + * @description Create user + * @param user + * @returns {Observable} + */ + createUser(user: any): Observable { + const url = `${this.url()}/users`; + return this.http.post(url, user, this.httpOptions()); + } + + /** + * @description Update user + * @param userId + * @param user + * @returns {Observable} + */ + updateUser(userId: string, user: any): Observable { + const url = `${this.url()}/users/${userId}`; + return this.http.put(url, user, this.httpOptions()); + } + + /** + * @description Get all users + * @returns {Observable} + */ + getAllUsers(): Observable { + const url = `${this.url()}/users`; + return this.http.get(url, this.httpOptions()); + } + + // /** + // * @description Get all enabled users + // * @returns {Observable} + // */ + // getAllEnabledUsers(): Observable { + // const url = `${this.url()}/users?enabled=true`; + // return this.http.get(url, this.httpOptions()); + // } + + // /** + // * @description Get all disabled users + // * @returns {Observable} + // */ + // getAllDisabledUsers(): Observable { + // const url = `${this.url()}/users?enabled=false`; + // return this.http.get(url, this.httpOptions()); + // } + + /** + * @description Get user by id + * @param userId + * @returns {Observable} + */ + getUserById(userId: string): Observable { + const url = `${this.url()}/users/${userId}`; + return this.http.get(url, this.httpOptions()); + } + + /** + * @description Delete user + * @param userId + * @returns {Observable} + */ + deleteUser(userId: string): Observable { + const url = `${this.url()}/users/${userId}`; + return this.http.delete(url, this.httpOptions()); + } + + // /** + // * @description Enable user + // * @param userId + // * @returns {Observable} + // */ + // approveUser(userId: string): Observable { + // const updateUserUrl = `${this.url()}/users/${userId}`; + // const userUpdateData = { enabled: true }; + // return this.http.put(updateUserUrl, userUpdateData, this.httpOptions()); + // } + + // /** + // * @description Disable user + // * @param userId + // * @returns {Observable} + // */ + // disableUser(userId: string): Observable { + // const updateUserUrl = `${this.url()}/users/${userId}`; + // const userUpdateData = { enabled: false }; + // return this.http.put(updateUserUrl, userUpdateData, this.httpOptions()); + // } + + /** + * @description Update user status + * @param userId + * @param newStatus + * @returns {Observable} + */ + updateUserStatus(userId: string, newStatus: any): Observable { + return this.getUserById(userId).pipe( + switchMap((user: any) => { + user.attributes.status = newStatus; + return this.updateUser(userId, user); + }) + ); + } + + /** + * @description Get all roles + * @returns {Observable} + */ + getAllRoles(): Observable { + const url = `${this.url()}/clients/${environment.oauth.clientUUID}/roles`; + return this.http.get(url, this.httpOptions()); + } + + /** + * @description Get user by username + * @param username + * @returns {Observable} + */ + getUserByUsername(username: string): Observable { + const url = `${this.url()}/users?username=${encodeURIComponent(username)}`; + return this.http.get(url, this.httpOptions()); + } + + /** + * @description Get role by name + * @param roleName + * @returns {Observable} + */ + getRoleByName(roleName: string): Observable { + const url = `${this.url()}/clients/${environment.oauth.clientUUID}/roles/${roleName}`; + return this.http.get(url, this.httpOptions()); + } + + /** + * @description Get roles by user id + * @param userId + * @returns {Observable} + */ + getRolesByUserId(userId: string): Observable { + const url = `${this.url()}/users/${userId}/role-mappings/clients/${environment.oauth.clientUUID}`; + return this.http.get(url, this.httpOptions()); + } + + /** + * @description Assign role to user + * @param userId + * @param roleName + * @returns {Observable} + */ + assignRoleToUser(userId: string, roleName: any): Observable { + const url = `${this.url()}/users/${userId}/role-mappings/clients/${environment.oauth.clientUUID}`; + + return this.http.post(url, [roleName], this.httpOptions()); + } + + /** + * @description Unassign a role from a user + * @param userId + * @param roleName + * @returns {Observable} + */ + unassignRoleFromUser(userId: string, roleName: any): Observable { + const url = `${this.url()}/users/${userId}/role-mappings/clients/${environment.oauth.clientUUID}`; + const options = { + ...this.httpOptions(), + body: roleName, + }; + return this.http.delete(url, options); + } + + /** + * @description Update user password + * @param userId + * @param password + */ + updatePassword(userId: string, password: string): Observable { + const url = `${this.url()}/users/${userId}/reset-password`; + const data = { type: 'password', value: password, temporary: false }; + return this.http.put(url, data, this.httpOptions()); + } +} \ No newline at end of file diff --git a/src/app/users/services/users.service.ts b/src/app/users/services/users.service.ts new file mode 100644 index 00000000..77156b64 --- /dev/null +++ b/src/app/users/services/users.service.ts @@ -0,0 +1,321 @@ +/** Angular Imports */ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; + +/** rxjs Imports */ +import { catchError, forkJoin, map, Observable, of, switchMap, throwError } from 'rxjs'; + +/**Custom Services */ +import { JbpmService } from './users-jbpm.service'; +import { KeycloakAdminService } from './users-keycloak.service'; + +/**Custom Models */ +import { User } from '../models/user.model'; +import { ProcessInstance } from '../models/jbpm.model'; + +/** + * Users service. + */ +@Injectable({ + providedIn: 'root', +}) +export class UsersService { + private processId = 'PaymentHubEE.UserManagementProcess'; + + /** + * @param {HttpClient} http Http Client to send requests. + * @param {JbpmService} jbpmService Jbpm Service. + */ + constructor(private http: HttpClient, + private keycloakAdminService: KeycloakAdminService, + private jbpmService: JbpmService) { } + /** + * @returns {Observable} User types + */ + getUserTypes(): Observable { + const userTypes = [ + { id: 1, name: 'PayEE User', PayEEId: [''] }, + { id: 2, name: 'Govt. Entity User', GovtId: ['GOVT1', 'GOVT2', 'GOVT3'] }, + { id: 3, name: 'FSP User', FSPId: ['FSP1', 'FSP2', 'FSP3'] }, + ]; + + return new Observable((observer) => { + observer.next(userTypes); + observer.complete(); + }); + } + + /** + * @returns {Observable} User status + */ + userStatus(): Observable { + // Assuming user status are fetched from an API or defined + const userStatus = [ + { id: 1, name: 'Active' }, + { id: 2, name: 'Inactive' }, + { id: 3, name: 'Blocked' }, + { id: 4, name: 'Temporary Disabled' }, + ]; + return new Observable((observer) => { + observer.next(userStatus); + observer.complete(); + }); + } + + /** + * @returns {Observable} Users template data + */ + getUsersTemplate(): Observable { + return forkJoin({ + roles: this.keycloakAdminService.getAllRoles(), + userTypes: this.getUserTypes(), + userStatus: this.userStatus(), + }).pipe( + map((data) => { + return { + availableRoles: data.roles, + userTypes: data.userTypes, + userStatus: data.userStatus, + }; + }) + ); + } + + /** + * Creates a new user using the JBPM process + * @param {User} user User to be created. + * @returns {Observable} + */ + startJBPMProcess(user: User): Observable { + + return this.jbpmService.startProcess(this.processId, user).pipe( + switchMap((processInstance: number) => { + return this.jbpmService.getTasksByProcessInstanceId(processInstance); + }), + switchMap((processData: ProcessInstance) => { + if (processData['active-user-tasks'] && processData['active-user-tasks']['task-summary']) { + const tasks = processData['active-user-tasks']['task-summary']; + const adminMakerTask = Array.isArray(tasks) ? tasks.find((task) => task['task-name'] === 'Admin Maker Task') : tasks['task-name'] === 'Admin Maker Task' ? tasks : null; + + if (!adminMakerTask) { + return throwError(() => new Error('Admin Maker Task not found')); + } + return this.completeAdminMakerTask(adminMakerTask['task-id'], user); + } else { + return throwError(() => new Error('No active user tasks found')); + } + }), + catchError((error) => { + console.error('Error in JBPM process:', error); + return throwError(() => new Error(`Failed to create user: ${error.message}`)); + }) + ); + } + + /** + * Completes the Admin Maker Task in the JBPM process + * @param {number} taskId ID of the Admin Maker Task + * @param {User} userData User data to complete the task + * @returns {Observable} + */ + public completeAdminMakerTask(taskId: number, userData: User): Observable { + return this.jbpmService.startTask(taskId.toString()).pipe( + switchMap(() => { + return this.jbpmService.completeTask(taskId.toString(), userData); + }) + ); + } + + /** + * @description Get all tasks for a user from JBPM. + * @returns {Observable} Processed tasks. + */ + getProcessedTasks() { + return this.jbpmService.getAllTasks().pipe( + switchMap((response: any) => { + if (Array.isArray(response['task-summary']) && response['task-summary'].length > 0) { + const taskObservables = response['task-summary'].map((task: any) => + this.jbpmService.getTaskContent(task['task-id']) + ); + return forkJoin(taskObservables).pipe( + map((taskContents: any[]) => { + return response['task-summary'] + .map((task: any, index: number) => { + const taskContent = taskContents[index]; + const userData = taskContent.userData['com.myspace.paymenthubee.UserData']; + if (!userData) { + console.error('UserData not found for task:', task['task-id']); + return null; + } + return { + taskId: task['task-id'], + taskName: taskContent.TaskName || task['task-name'], + taskStatus: task['task-status'], + nodeName: taskContent.NodeName, + actorId: taskContent.ActorId, + username: userData.username || 'N/A', + email: userData.email || 'N/A', + firstName: userData.firstName || 'N/A', + lastName: userData.lastName || 'N/A', + mobileNo: userData.mobileNo || 'N/A', + userType: userData.userType || 'N/A', + fspId: userData.fspId || null, + govtId: userData.govtId || null, + status: userData.status || 'N/A', + actionType: userData.actionType || 'N/A', + roles: Array.isArray(userData.roles) ? userData.roles.join(', ') : 'N/A', + createdAt: userData.createdAt + ? new Date(userData.createdAt['java.util.Date']).toLocaleString() + : 'N/A', + updatedAt: userData.updatedAt + ? new Date(userData.updatedAt['java.util.Date']).toLocaleString() + : 'N/A', + }; + }) + .filter(Boolean); + }) + ); + } else { + return of([]); + } + }) + ); + } + + + /** + * @description Process user request + * @param user User data + * @param approved Approval status + * @returns {Observable} Processed user request. + */ + processUserRequest(user: any, approved: boolean): Observable { + return this.jbpmService.startTask(user.taskId).pipe( + switchMap(() => this.jbpmService.completeAdminTask(user.taskId, { approved })), + switchMap(() => { + if (!approved) { + return of('Request not approved'); + } + const keycloakUser = this.mapFormDataToUser(user); + switch (user.actionType) { + case 'CREATE': + return this.createUser(keycloakUser); + case 'UPDATE': + return this.updateUser(keycloakUser); + case 'DELETE': + return this.deleteUser(keycloakUser); + default: + return throwError('Unknown action type: ' + user.actionType); + } + }) + ); + } + + /** + * @description Map form data to Keycloak user data + * @param user User data from JBPM form + */ + private mapFormDataToUser(user: any): any { + const roles = Array.isArray(user.roles) ? user.roles : user.roles.split(',').map((role: string) => role.trim()); + return { + username: user.username, + enabled: true, + emailVerified: true, + firstName: user.firstName, + lastName: user.lastName, + email: user.email, + attributes: { + fspId: [user.fspId], + govtId: [user.govtId], + mobileNo: [user.mobileNo], + userType: [user.userType], + roles: roles, + status: [user.status], + }, + credentials: [ + { + type: 'password', + value: user.firstName + '123', //temporary password + temporary: false, + }, + ], + }; + } + + /** + * @description Create user in Keycloak + * @param keycloakUser Keycloak user data + * @returns {Observable} Created user. + */ + private createUser(keycloakUser: any): Observable { + return this.keycloakAdminService.createUser(keycloakUser).pipe( + switchMap(response => this.keycloakAdminService.getUserByUsername(keycloakUser.username)), + switchMap(createdUser => { + if (!createdUser || !createdUser[0]?.id) { + return throwError('Failed to retrieve created user details'); + } + const userId = createdUser[0].id; + return this.assignRolesToUser(userId, keycloakUser.attributes.roles).pipe( + switchMap(() => this.keycloakAdminService.updateUserStatus(userId, ['Active'])) + ); + }) + ); + } + + /** + * @description Update user in Keycloak + * @param keycloakUser Keycloak user data + * @returns {Observable} Updated user. + */ + private updateUser(keycloakUser: any): Observable { + return this.keycloakAdminService.getUserByUsername(keycloakUser.username).pipe( + switchMap(user => { + const userId = user[0].id; + return this.keycloakAdminService.updateUser(userId, keycloakUser).pipe( + switchMap(() => this.keycloakAdminService.getRolesByUserId(userId)), + switchMap(roles => this.keycloakAdminService.unassignRoleFromUser(userId, roles)), + switchMap(() => this.assignRolesToUser(userId, keycloakUser.attributes.roles)), + switchMap(() => this.keycloakAdminService.getUserByUsername(keycloakUser.username)) + ); + }) + ); + } + + /** + * @description Delete user in Keycloak + * @param keycloakUser Keycloak user data + * @returns {Observable} Deleted user. + */ + private deleteUser(keycloakUser: any): Observable { + return this.keycloakAdminService.getUserByUsername(keycloakUser.username).pipe( + switchMap(user => { + const userId = user[0].id; + return this.keycloakAdminService.deleteUser(userId); + }) + ); + } + + /** + * @description Assign roles to user + * @param userId User ID + * @param roles Roles to assign + * @returns {Observable} Assigned roles. + */ + private assignRolesToUser(userId: string, roles: string[]): Observable { + return forkJoin( + roles.map(roleName => + this.keycloakAdminService.getRoleByName(roleName).pipe( + switchMap(role => this.keycloakAdminService.assignRoleToUser(userId, role)) + ) + ) + ); + } + + /** + * @param {string} userId user ID of user. + * @returns {Observable} User. + */ + getUser(userId: string): Observable { + return this.http.get(`/users/${userId}`); + } +} \ No newline at end of file diff --git a/src/app/users/user-requests/user-requests.component.html b/src/app/users/user-requests/user-requests.component.html new file mode 100644 index 00000000..429fe3e6 --- /dev/null +++ b/src/app/users/user-requests/user-requests.component.html @@ -0,0 +1,238 @@ +{{ "labels.texts.Accept and Reject user requests" | translate }} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ {{"labels.inputs.User Name"| translate}} +
+ + + {{"labels.inputs.User Name"| translate}} + + + + + + + 		{{ user.username }} +
+ {{"labels.inputs.Email"| translate}} +
+ + + + {{"labels.inputs.Email"| translate}} + + + + + + + 		{{ user.email }} +
+ {{"labels.inputs.First Name"| translate}} +
+ + + + {{"labels.inputs.First Name"| translate}} + + + + + + + 		{{ user.firstName }} +
+ {{"labels.inputs.Last Name"| translate}} +
+ + + + {{"labels.inputs.Last Name"| translate}} + + + + + + + + 		{{ user.lastName }} +
+ {{"labels.inputs.Mobile Number"| translate}} +
+ + + + {{"labels.inputs.Mobile Number"| translate}} + + + + + + + + 		{{ user.mobileNo }} +
+ {{"labels.inputs.ID"| translate}} +
+ + + + {{"labels.inputs.ID"| translate}} + + + + + + + + + 		+ {{ user.govtId || user.fspId || "N/A" }} + +
+ {{"labels.inputs.User Type"| translate}} +
+ + + + {{"labels.inputs.User Type"| translate}} + + + + + + + + 		{{ user.userType }} +
+ {{"labels.inputs.Status"| translate}} +
+ + + + {{"labels.inputs.Status"| translate}} + + + + + + + + 		{{ user.status }} +
+ {{"labels.inputs.Action Type"| translate}} +
+ + + + {{"labels.inputs.Action Type"| translate}} + + + + + + + + 		{{ user.actionType }} +
+ {{"labels.inputs.Role"| translate}} +
+ + + + {{"labels.inputs.Roles"| translate}} + + + + + + + + + 		{{ user.roles }}Actions +
+ + +
+
+ {{"labels.texts.No data found."| translate}} +
+ + + +
\ No newline at end of file diff --git a/src/app/users/user-requests/user-requests.component.scss b/src/app/users/user-requests/user-requests.component.scss new file mode 100644 index 00000000..b9eca859 --- /dev/null +++ b/src/app/users/user-requests/user-requests.component.scss @@ -0,0 +1,59 @@ +@import 'theme/theme'; + +.container { + height: fit-content; + overflow-y: hidden; + .mat-card { + margin: 2rem 0; + } +} + +.column-label { + width: 3.8rem; +} + +/* Hide the search icon by default */ +.hidden-search-icon { + visibility: hidden; + font-size: 20px; + display: flex; + align-items: center; + justify-content: flex-end; +} + +/* Show the search icon on hover with grey color */ +th:hover .hidden-search-icon, +.hidden-search-icon:hover { + visibility: visible; + color: grey; +} + +span { + display: flex; + color: $mid-grey; + width: 90%; + margin: 0 auto; +} + +.button-box { + gap: 0.3rem; + height: 3rem; + width: 100%; + .button { + height: 40%; + width: 80%; + font-size: 10px !important; + font-weight: 400; + border: none; + border-radius: 4px; + box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1); + background-color: $white; + color: $primary; + cursor: pointer; + } + + .submit { + background-color: $primary; + color: $white; + } +} \ No newline at end of file diff --git a/src/app/users/user-requests/user-requests.component.spec.ts b/src/app/users/user-requests/user-requests.component.spec.ts new file mode 100644 index 00000000..dd321ad1 --- /dev/null +++ b/src/app/users/user-requests/user-requests.component.spec.ts @@ -0,0 +1,21 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UserRequestsComponent } from './user-requests.component'; + +describe('UserRequestsComponent', () => { + let component: UserRequestsComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [UserRequestsComponent] + }); + fixture = TestBed.createComponent(UserRequestsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/users/user-requests/user-requests.component.ts b/src/app/users/user-requests/user-requests.component.ts new file mode 100644 index 00000000..43de6f1c --- /dev/null +++ b/src/app/users/user-requests/user-requests.component.ts @@ -0,0 +1,158 @@ +/** Angular Imports */ +import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; + +/** rxjs Imports */ +import { catchError, finalize } from 'rxjs'; + +/** Custom Services */ +import { AlertService } from 'app/core/alert/alert.service'; +import { UsersService } from '../services/users.service'; + + +/** + * User Requests Component + */ +@Component({ + selector: 'mifosx-user-requests', + templateUrl: './user-requests.component.html', + styleUrls: ['./user-requests.component.scss'], +}) +export class UserRequestsComponent implements OnInit { + /** Loading indicator */ + isLoading = false; + + /** Table data source */ + dataSource = new MatTableDataSource(); + + /** Table paginator and sort */ + @ViewChild(MatPaginator) paginator: MatPaginator; + @ViewChild(MatSort) set matSort(sort: MatSort) { + this.dataSource.sort = sort; + } + + /** table columns */ + displayedColumns: string[] = ['username', 'email', 'firstName', 'lastName', 'mobileNo', 'userType', 'id', 'actionType', 'roles', 'status', 'actions']; + + /** Filters */ + showFilter: { [key: string]: boolean } = { + username: false, + email: false, + firstName: false, + lastName: false, + mobileNo: false, + userType: false, + id: false, + actionType: false, + roles: false, + status: false, + actions: false, + }; + + /** + * @param cdr ChangeDetectorRef + * @param alertService AlertService + * @param usersService UsersService + */ + constructor(private cdr: ChangeDetectorRef, private alertService: AlertService, private usersService: UsersService) { } + + /** + * @description On init + */ + ngOnInit() { + this.getAllTasks(); + } + + + /** + * @description Toggle filter for column + * @param columnName column name to toggle filter + */ + toggleFilter(columnName: string) { + for (let key in this.showFilter) { + if (key !== columnName) { + this.showFilter[key] = false; + } + } + this.showFilter[columnName] = !this.showFilter[columnName]; + if (!this.showFilter[columnName]) { + this.applyFilter('', columnName); + } + } + + + /** + * @description Apply filter to table + * @param filterValue filter value from input + * @param columnName column name to apply filter + */ + applyFilter(filterValue: string, columnName: string) { + filterValue = filterValue.trim().toLowerCase(); + this.dataSource.filterPredicate = (data: any, filter: string) => { + const valueToCheck = String(data[columnName] || '').toLowerCase(); + return valueToCheck.includes(filter); + }; + this.dataSource.filter = filterValue; + } + + + /** + * @description Get all tasks + */ + getAllTasks() { + this.isLoading = true; + this.usersService + .getProcessedTasks() + .pipe( + finalize(() => (this.isLoading = false)), + catchError((error) => { + console.error('Error fetching tasks:', error); + this.alertService.alert({ type: 'error', message: 'Error fetching tasks' }); + return []; + }) + ) + .subscribe((userRequests) => { + this.dataSource.data = userRequests; + this.cdr.detectChanges(); + this.dataSource.paginator = this.paginator; + }); + } + + /** + * @description Approve record + * @param user user object + */ + approveRecord(user: any) { + this.usersService + .processUserRequest(user, true) + .pipe( + finalize(() => this.getAllTasks()), + catchError((error) => { + console.error('Error processing user request:', error); + this.alertService.alert({ type: 'error', message: 'Error processing user request' }); + return []; + }) + ) + .subscribe(); + } + + /** + * @description Reject record + * @param user user object + */ + delRecord(user: any) { + this.usersService + .processUserRequest(user, false) + .pipe( + finalize(() => this.getAllTasks()), + catchError((error) => { + console.error('Error rejecting user request:', error); + this.alertService.alert({ type: 'error', message: 'Error rejecting user request' }); + return []; + }) + ) + .subscribe(); + } +} \ No newline at end of file diff --git a/src/app/users/user.resolver.ts b/src/app/users/user.resolver.ts index 126b126d..14ee1d52 100644 --- a/src/app/users/user.resolver.ts +++ b/src/app/users/user.resolver.ts @@ -6,7 +6,8 @@ import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; /** Custom Services */ -import { UsersService } from './users.service'; +import { UsersService } from './services/users.service'; +import { KeycloakAdminService } from './services/users-keycloak.service'; /** * User data resolver. @@ -17,7 +18,7 @@ export class UserResolver { /** * @param {UsersService} usersService Users service. */ - constructor(private usersService: UsersService) {} + constructor(private keycloakAdminService: KeycloakAdminService) {} /** * Returns the user data. @@ -25,6 +26,5 @@ export class UserResolver { */ resolve(route: ActivatedRouteSnapshot): Observable { const userId = route.paramMap.get('id'); - return this.usersService.getUser(userId); - } + return this.keycloakAdminService.getUserById(userId); } } diff --git a/src/app/users/users-routing.module.ts b/src/app/users/users-routing.module.ts index 7a5f25ba..fbcef888 100644 --- a/src/app/users/users-routing.module.ts +++ b/src/app/users/users-routing.module.ts @@ -6,9 +6,10 @@ import { Routes, RouterModule } from '@angular/router'; import { Route } from '../core/route/route.service'; /** Custom Components */ -import { UsersComponent } from './users.component'; +import { UsersComponent } from './users/users.component'; import { CreateUserComponent } from './create-user/create-user.component'; import { ViewUserComponent } from './view-user/view-user.component'; +import { UserRequestsComponent } from './user-requests/user-requests.component'; /** Custom Resolvers */ import { UsersResolver } from './users.resolver'; @@ -20,7 +21,7 @@ const routes: Routes = [ Route.withShell([ { path: 'users', - data: { title: 'Users', breadcrumb: 'Users' }, + data: { breadcrumb: 'Users', title: 'Users' }, children: [ { path: '', @@ -32,14 +33,19 @@ const routes: Routes = [ { path: 'create', component: CreateUserComponent, - data: { title: 'Create User', breadcrumb: 'Create User' }, + data: { title: 'Create User', breadcrumb: 'Create' }, resolve: { usersTemplate: UsersTemplateResolver } }, + { + path: "user-requests", + component: UserRequestsComponent, + data: { title: "User Requests", breadcrumb: "User Requests" }, + }, { path: ':id', - data: { title: 'View User', routeResolveBreadcrumb: ['user', 'username'] }, + data: { title: 'View User', breadcrumb:'View User' }, resolve: { user: UserResolver }, @@ -66,7 +72,7 @@ const routes: Routes = [ providers: [ UsersResolver, UsersTemplateResolver, - UserResolver + UserResolver ] }) export class UsersRoutingModule { } diff --git a/src/app/users/users-template.resolver.ts b/src/app/users/users-template.resolver.ts index 6478e05e..fd1148a3 100644 --- a/src/app/users/users-template.resolver.ts +++ b/src/app/users/users-template.resolver.ts @@ -6,7 +6,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; /** Custom Services */ -import { UsersService } from './users.service'; +import { UsersService } from './services/users.service'; /** * Users template data resolver. diff --git a/src/app/users/users.module.ts b/src/app/users/users.module.ts index ae34c321..70984f55 100644 --- a/src/app/users/users.module.ts +++ b/src/app/users/users.module.ts @@ -6,9 +6,10 @@ import { SharedModule } from '../shared/shared.module'; import { UsersRoutingModule } from './users-routing.module'; /** Custom Components */ -import { UsersComponent } from './users.component'; +import { UsersComponent } from './users/users.component'; import { CreateUserComponent } from './create-user/create-user.component'; import { ViewUserComponent } from './view-user/view-user.component'; +import { UserRequestsComponent } from './user-requests/user-requests.component'; /** * Users Module @@ -23,7 +24,8 @@ import { ViewUserComponent } from './view-user/view-user.component'; declarations: [ UsersComponent, CreateUserComponent, - ViewUserComponent + ViewUserComponent, + UserRequestsComponent ] }) export class UsersModule { } diff --git a/src/app/users/users.resolver.ts b/src/app/users/users.resolver.ts index 234c99e7..f43bec91 100644 --- a/src/app/users/users.resolver.ts +++ b/src/app/users/users.resolver.ts @@ -6,7 +6,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; /** Custom Services */ -import { UsersService } from './users.service'; +import { KeycloakAdminService } from './services/users-keycloak.service'; /** * Users data resolver. @@ -15,16 +15,16 @@ import { UsersService } from './users.service'; export class UsersResolver { /** - * @param {UsersService} usersService Users service. + * @param {KeycloakAdminService} keycloakAdminService Keycloak Admin Service. */ - constructor(private usersService: UsersService) {} + constructor(private keycloakAdminService: KeycloakAdminService) {} /** * Returns the users data. * @returns {Observable} */ resolve(): Observable { - return this.usersService.getUsers(); + return this.keycloakAdminService.getAllUsers(); } } diff --git a/src/app/users/users/users.component.html b/src/app/users/users/users.component.html new file mode 100644 index 00000000..aa8115a8 --- /dev/null +++ b/src/app/users/users/users.component.html @@ -0,0 +1,100 @@ +{{ 'labels.texts.All Users of the Network' | translate }} +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ {{ 'labels.inputs.Type of User' | translate }} +
+ + + {{ 'labels.inputs.Type of user' | translate }} + + + + + + + 		{{ user.attributes.userType }} +
+ {{ 'labels.inputs.Name' | translate }} +
+ + + {{ 'labels.inputs.Name' | translate }} + + + + + + + 		+ {{ user.firstName + ' ' + user.lastName }} + +
+ {{ 'labels.inputs.Email' | translate }} +
+ + + {{ 'labels.inputs.Email' | translate }} + + + + + + + 		{{ user.email }} +
+ {{ 'labels.inputs.ID' | translate }} +
+ + + {{ 'labels.inputs.ID' | translate }} + + + + + + + 		+ {{ user.attributes.govtId || user.attributes.fspId || 'N/A' }} +
+ {{ 'labels.texts.No data found.' | translate }} +
+
+ + + + + +
diff --git a/src/app/users/users/users.component.scss b/src/app/users/users/users.component.scss new file mode 100644 index 00000000..86bd3758 --- /dev/null +++ b/src/app/users/users/users.component.scss @@ -0,0 +1,49 @@ +@import "theme/theme"; + +table { + width: 100%; + + .select-row:hover { + cursor: pointer; + } +} + +span { + display: flex; + color: $mid-grey; + width: 90%; + margin: 0 auto; + padding-bottom: 1rem; +} + +/* Hide the search icon by default */ +.hidden-search-icon { + visibility: hidden; + font-size: 20px; + display: flex; + align-items: center; + justify-content: flex-end; +} + +/* Show the search icon on hover with grey color */ +th:hover .hidden-search-icon, +.hidden-search-icon:hover { + visibility: visible; + color: grey; +} + +.column-label{ + width: 10rem; +} + + +::ng-deep .custom-form-field.mat-form-field-appearance-outline .mat-form-field-outline { + color: black; + background-color: $white; + border-radius: 5px; +} +::ng-deep .column-label.mat-form-field input:disabled{ + color: black; + border: none; + width: fit-content; +} \ No newline at end of file diff --git a/src/app/users/users/users.component.spec.ts b/src/app/users/users/users.component.spec.ts new file mode 100644 index 00000000..909b5baf --- /dev/null +++ b/src/app/users/users/users.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UsersComponent } from './users.component'; + +describe('UsersComponent', () => { + let component: UsersComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ UsersComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(UsersComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/users/users/users.component.ts b/src/app/users/users/users.component.ts new file mode 100644 index 00000000..c04c275c --- /dev/null +++ b/src/app/users/users/users.component.ts @@ -0,0 +1,123 @@ +/** Angular Imports */ +import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; +import { ActivatedRoute } from '@angular/router'; + + + +/** + * Users component. + */ +@Component({ + selector: 'mifosx-users', + templateUrl: './users.component.html', + styleUrls: ['./users.component.scss'], +}) +export class UsersComponent implements OnInit { + /** Users data. */ + usersData: any; + /** Columns to be displayed in users table. */ + displayedColumns: string[] = ['userType', 'name', 'email', 'id']; + /** Data source for users table. */ + dataSource: MatTableDataSource; + + /** Paginator for users table. */ + @ViewChild(MatPaginator) paginator: MatPaginator; + /** Sorter for users table. */ + @ViewChild(MatSort) sort: MatSort; + + /** + * Retrieves the users data from `resolve`. + * @param {ActivatedRoute} route Activated Route. + */ + + constructor(private route: ActivatedRoute, private cdr: ChangeDetectorRef) { + this.route.data.subscribe((data: { users: any }) => { + this.usersData = data.users; + console.log(this.usersData); + }); + } + + /** + * Filters data in users table based on passed value. + * @param {string} filterValue Value to filter data. + */ + + showFilter: { [key: string]: boolean } = { + userType: false, + name: false, + email: false, + id: false, + }; + + toggleFilter(columnName: string) { + // Turn off all filters + for (let key in this.showFilter) { + if (key !== columnName) { + this.showFilter[key] = false; + } + } + this.showFilter[columnName] = !this.showFilter[columnName]; + if (!this.showFilter[columnName]) { + this.applyFilter('', columnName); // Clear the filter + } + } + + applyFilter(filterValue: string, columnName: string) { + filterValue = filterValue.trim().toLowerCase(); + this.dataSource.filterPredicate = (data, filter) => { + let valueToCheck = ''; + switch (columnName) { + case 'userType': + valueToCheck = String(data.attributes.userType).toLowerCase(); + break; + case 'name': + valueToCheck = (data.firstName + ' ' + data.lastName).toLowerCase(); + break; + case 'email': + valueToCheck = String(data.email).toLowerCase(); + break; + case 'id': + valueToCheck = String(data.attributes.govtId || data.attributes.fspId || 'N/A').toLowerCase(); + break; + } + return valueToCheck.startsWith(filter); + }; + this.dataSource.filter = filterValue; + } + + /** + * Sets the users table. + */ + ngOnInit() { + this.setUsers(); + } + + /** + * Initializes the data source, paginator and sorter for users table. + */ + setUsers() { + this.dataSource = new MatTableDataSource(this.usersData); + this.cdr.detectChanges(); + this.dataSource.paginator = this.paginator; + this.dataSource.sort = this.sort; + console.log(this.dataSource); + console.log(this.dataSource.sort); + + this.dataSource.sortingDataAccessor = (item, property) => { + console.log(item, property); + switch (property) { + case 'name': + return item.firstName + ' ' + item.lastName; + case 'id': + return item.attributes.govtId || item.attributes.fspId || 'N/A'; + case 'userType': + return item.attributes.userType; + default: + return item[property]; + } + }; + } +} diff --git a/src/app/users/view-user/view-user.component.html b/src/app/users/view-user/view-user.component.html index 872135c3..cae14083 100644 --- a/src/app/users/view-user/view-user.component.html +++ b/src/app/users/view-user/view-user.component.html @@ -1,15 +1,14 @@ +user details of the network +
- - -
@@ -18,63 +17,96 @@ - -
- -
- Login Name -
- -
- {{ userData.username }} -
- -
- First Name -
- -
- {{ userData.firstname }} -
- -
- Last Name -
- -
- {{ userData.lastname }} -
- -
- Email +

{{ userData.username }}

+
+
+
+ {{'labels.inputs.Type of User'| translate}} * + + + + + + + {{ + type.name + }} + + + +
+
+ {{'labels.inputs.Role'| translate}} * + + + + + + + {{ + role.name + }} + + + +
+
+ {{'labels.inputs.First Name'| translate}} * + + + +
+
+ {{'labels.inputs.Last Name'| translate}} * + + + +
+ +
+ {{'labels.inputs.Status'| translate}} * + + + + + + + {{ + status.name + }} + + + +
+ +
+ {{'labels.inputs.Email'| translate}} * + + + +
+
+ {{'labels.inputs.Mobile Number'| translate}} * + + + +
+ +
+ {{'labels.inputs.GOVT ID'| translate}} * + {{'labels.inputs.FSP ID'| translate}} * + + + +
-
- {{ userData.email }} -
- -
- Office -
- -
- {{ userData.officeName }} -
- -
- Roles -
- -
- - {{ role.name }} - -
- -
- + + + + + - - -
+
\ No newline at end of file diff --git a/src/app/users/view-user/view-user.component.scss b/src/app/users/view-user/view-user.component.scss index b154f3f2..33ef1cde 100644 --- a/src/app/users/view-user/view-user.component.scss +++ b/src/app/users/view-user/view-user.component.scss @@ -1,14 +1,68 @@ +@import "theme/theme"; + +span { + display: flex; + color: $mid-grey; + width: 90%; + margin: 0 auto; +} + .container { - max-width: 37rem; + max-width: 90%; + .mat-card{ + padding: 2rem 5rem 0 5rem; + background-color: $light-grey; + box-shadow: none; + + h1 { + color: $primary; + } + +} .content { div { margin: 1rem 0; - word-wrap: break-word; - - span { - display: block; - } + word-wrap: break-word; } } } + +.edit-b{ + width: 8rem; + background-color: $primary; +} + +.delete-b{ + width: 8rem; + background-color: $red; +} + +.update-b{ + width: 12rem; + background-color: $primary; + +} + +.custom-button { + border-radius: 5px; + padding: 0.2rem 0; + box-shadow: none; + color: $white; +} + +.not-allowed { + cursor: not-allowed; +} + +::ng-deep .custom-form-field.mat-form-field-appearance-outline .mat-form-field-outline { + color: black; + background-color: $white; + border-radius: 5px; +} +::ng-deep .custom-form-field.mat-form-field input:disabled{ + color: black; +} +::ng-deep .custom-form-field.mat-form-field select:disabled{ + color: black; +} \ No newline at end of file diff --git a/src/app/users/view-user/view-user.component.ts b/src/app/users/view-user/view-user.component.ts index 8a9f2875..35fa11ee 100644 --- a/src/app/users/view-user/view-user.component.ts +++ b/src/app/users/view-user/view-user.component.ts @@ -2,12 +2,16 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; /** Custom Services */ -import { UsersService } from '../users.service'; +import { UsersService } from '../services/users.service'; +import { KeycloakAdminService } from '../services/users-keycloak.service'; +import { AlertService } from 'app/core/alert/alert.service'; /** Custom Components */ import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component'; +import { UpdatePasswordDialogComponent } from 'app/shared/update-password-dialog/update-password-dialog.component'; /** * View user component. @@ -15,12 +19,19 @@ import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.co @Component({ selector: 'mifosx-view-user', templateUrl: './view-user.component.html', - styleUrls: ['./view-user.component.scss'] + styleUrls: ['./view-user.component.scss'], }) export class ViewUserComponent implements OnInit { - /** User Data. */ userData: any; + /** Edit User Form */ + userForm: FormGroup; + /** Return current edit form status */ + isEditing = false; + /** Load User Data */ + userTemplate: any; + /** Current User Data */ + initialFormValues: any; /** * Retrieves the user data from `resolve`. @@ -29,33 +40,179 @@ export class ViewUserComponent implements OnInit { * @param {Router} router Router for navigation. * @param {MatDialog} dialog Dialog reference. */ - constructor(private usersService: UsersService, - private route: ActivatedRoute, - private router: Router, - private dialog: MatDialog) { + constructor( + private usersService: UsersService, + private keycloakAdminService: KeycloakAdminService, + private alertService: AlertService, + private fb: FormBuilder, + private route: ActivatedRoute, + private router: Router, + private dialog: MatDialog + ) { this.route.data.subscribe((data: { user: any }) => { this.userData = data.user; }); } + /** + * @description Initializes the component. + */ ngOnInit() { + this.editUserForm(); + this.getUserTemplate(); + } + + /** + * @description Edit user form. + */ + editUserForm() { + const idValue = this.userData.attributes.fspId || this.userData.attributes.govtId || 'N/A'; + const idType = this.userData.attributes.fspId ? 'fspId' : 'govtId'; + this.userForm = this.fb.group({ + userTypes: [{ value: this.userData.attributes.userType, disabled: true }, Validators.required], + roles: [{ value: this.userData.attributes.roles, disabled: true }, [Validators.required]], + firstName: [{ value: this.userData.firstName, disabled: true }, [Validators.required, Validators.pattern('^[A-Za-z]+$')]], + lastName: [{ value: this.userData.lastName, disabled: true }, [Validators.required, Validators.pattern('^[A-Za-z]+$')]], + email: [{ value: this.userData.email, disabled: true }, [Validators.required, Validators.email]], + mobileNo: [{ value: this.userData.attributes.mobileNo, disabled: true }, [Validators.required, Validators.pattern('^[0-9]{10}$')]], + id: [{ value: idValue, disabled: true }, [Validators.required]], + idType: [idType], + status: [{ value: this.userData.attributes.status, disabled: true }, Validators.required], + }); + + // Store initial form values + this.initialFormValues = this.userForm.getRawValue(); + } + + /** + * @description Get user template data. + */ + getUserTemplate() { + this.usersService.getUsersTemplate().subscribe((response) => { + this.userTemplate = response; + }); + } + + /** + * @description Toggles the edit mode. + */ + toggleEdit() { + this.isEditing = !this.isEditing; + if (this.isEditing) { + Object.keys(this.userForm.controls).forEach((control) => { + if (control !== 'id' && control !== 'userTypes') { + this.userForm.get(control).enable(); + } + }); + } else { + // Reset form to initial values + this.userForm.reset(this.initialFormValues); + this.userForm.disable(); + } + } + + /** + * @description Saves the user data. + */ + async save() { + if (this.userForm.valid) { + const updatedUser = this.mapFormDataToUser(this.userForm.getRawValue()); + updatedUser.actionType = 'UPDATE'; + try { + await this.usersService.startJBPMProcess(updatedUser).toPromise(); + this.alertService.alert({ type: 'success', message: 'User update request submitted for approval' }); + this.toggleEdit(); + this.userForm.disable(); + } catch (error) { + this.alertService.alert({ type: 'error', message: `Failed to submit user update request: ${error.message}` }); + } + } + } + + + /** + * @description Maps form data to user object. + * @param {any} formData Form data. + * @returns {any} User object. + */ + private mapFormDataToUser(formData: any): any { + const idType = this.userForm.get('idType').value; + const user: any = { + actionType: 'UPDATE', + createdAt: this.userData.createdTimestamp + ? new Date(this.userData.createdTimestamp).toISOString() + : new Date().toISOString(), + updatedAt: new Date().toISOString(), + email: formData.email, + firstName: formData.firstName, + userid: this.userData.id, + lastName: formData.lastName, + mobileNo: Array.isArray(formData.mobileNo) ? formData.mobileNo[0] : formData.mobileNo, + roles: formData.roles, + status: formData.status[0], + userType: formData.userTypes[0], + username: this.userData.username, + }; + + if (formData.id !== 'N/A') { + user[idType] = Array.isArray(formData.id) ? formData.id[0] : formData.id; + } + + return user; } + /** - * Deletes the user and redirects to users. + * @returns {string} Returns the label for the ID field based on the ID type. + */ + getIdLabel(): string { + return this.userForm.get('idType').value === 'fspId' ? 'FSP ID *' : 'GOVT ID *'; + } + + + + /** + * @description Opens a dialog to update the user's password. + */ + updatePassword() { + const dialogRef = this.dialog.open(UpdatePasswordDialogComponent, { + width: "400px", + height: "400px", + }); + + dialogRef.afterClosed().subscribe(async (response: any) => { + if (response) { + try { + await this.keycloakAdminService.updatePassword(this.userData.id, response.password).toPromise(); + this.alertService.alert({ type: 'success', message: 'Password updated successfully' }); + this.router.navigate(["/users"]); + } catch (error) { + this.alertService.alert({ type: 'error', message: 'Failed to update password' }); + console.error('Error updating password:', error); + } + } + }); + } + + /** + * @description Deletes the user and redirects to users. */ delete() { - const deleteUserDialogRef = this.dialog.open(DeleteDialogComponent, { - data: { deleteContext: `user ${this.userData.id}` } + const dialogRef = this.dialog.open(DeleteDialogComponent, { + data: { deleteContext: `user ${this.userData.firstName}` } }); - deleteUserDialogRef.afterClosed().subscribe((response: any) => { + + dialogRef.afterClosed().subscribe(async (response: any) => { if (response.delete) { - this.usersService.deleteUser(this.userData.id) - .subscribe(() => { - this.router.navigate(['/users']); - }); + const deleteUserData = this.mapFormDataToUser(this.userForm.getRawValue()); + deleteUserData.actionType = 'DELETE'; + try { + await this.usersService.startJBPMProcess(deleteUserData).toPromise(); + this.alertService.alert({ type: 'success', message: 'User deletion request submitted for approval' }); + } catch (error) { + this.alertService.alert({ type: 'error', message: `Failed to submit user deletion request: ${error.message}` }); + } } }); } - -} +} \ No newline at end of file diff --git a/src/assets/env.template.js b/src/assets/env.template.js index bec2db62..7e4dff11 100644 --- a/src/assets/env.template.js +++ b/src/assets/env.template.js @@ -22,8 +22,16 @@ window["env"]["oauthRealm"] = '$PH_OAUTH_REALM'; window["env"]["oauthClientId"] = '$PH_OAUTH_CLIENT_ID'; window["env"]["oauthClientSecret"] = '$PH_OAUTH_CLIENT_SECRET'; + window["env"]["oauthClientUUID"] = '$PH_OAUTH_CLIENT_UUUID'; window["env"]["oauthBasicAuth"] = '$PH_OAUTH_BASIC_AUTH'; window["env"]["oauthBasicAuthToken"] = '$PH_OAUTH_BASIC_AUTH_TOKEN'; + + //JBPM Environment variables + window["env"]["jbpmApiUrl"] = '$PH_JBPM_API_URL'; + window["env"]["jbpmContainerId"] = '$PH_JBPM_CONTAINER_ID'; + window["env"]["jbpmCredentialsAdminMaker"] = '$PH_JBPM_CREDENTIALS_ADMIN_MAKER'; + window["env"]["jbpmCredentialsAdminChecker"] = '$PH_JBPM_CREDENTIALS_ADMIN_CHECKER'; + window["env"]["jbpmCredentialsBoth"] = '$PH_JBPM_CREDENTIALS_BOTH'; // Language Environment variables window["env"]["defaultLanguage"] = '$PH_DEFAULT_LANGUAGE'; diff --git a/src/assets/styles/_content.scss b/src/assets/styles/_content.scss index 0b56c828..6cdfe450 100644 --- a/src/assets/styles/_content.scss +++ b/src/assets/styles/_content.scss @@ -1,3 +1,5 @@ +@import "theme/theme"; + .center { text-align: center; } @@ -7,7 +9,7 @@ } .green { - color: green; + color: $green; } .red { @@ -22,6 +24,16 @@ color: blue; } +.primary{ + color: $primary; + +} + +.black{ + color: $black; +} + mat-dialog-container { min-width: 600px; + border-radius: 0.8rem !important; } \ No newline at end of file diff --git a/src/assets/styles/_helper.scss b/src/assets/styles/_helper.scss index 7dae1553..6716d238 100644 --- a/src/assets/styles/_helper.scss +++ b/src/assets/styles/_helper.scss @@ -1,8 +1,14 @@ +@import url("https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"); @import "content"; @import "colours"; @import "loader"; @import "width-height"; @import "z-index"; +@import "theme/theme"; + +*{ + font-family: $font-family !important; +} body, html { @@ -29,14 +35,63 @@ body { font-family: Roboto, Helvetica Neue, sans-serif; table { - border: 1px solid rgba($color: #000000, $alpha: 0.12); width: 100%; + border-radius: 8px; + border-radius: $border-size; + th, + td { + font-family: $font-family; + border-bottom-style: none !important; + } tr:nth-child(even) { - background-color: #f2f2f2; + background-color: #f9f9f9; + } + thead { + background-color: #f3f3f3 !important; + } + .mat-sort-header-content{ + color: $black; + font-weight: 500; + font-size: 0.9rem; + } + th:first-child { + border-radius: $border-size 0 0 0; + } + th:last-child { + border-radius: 0 $border-size 0 0; } } } +.mat-mdc-select-panel { + background-color: $white !important; + box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1) !important; +} + +.mat-error { + padding-top: 1rem; +} + + +.table-container { + max-height: calc(100vh - 320px); + overflow: auto; + scrollbar-width:thin; + scrollbar-color: $mid-grey $white; + + ::-webkit-scrollbar { + width: 8px; + } + + ::-webkit-scrollbar-track { + background-color: $white; + } + + ::-webkit-scrollbar-thumb { + background-color: $mid-grey; + } +} + div { box-sizing: border-box; } @@ -47,6 +102,10 @@ div { width: 90%; } +.gap0 { + gap: 0.5rem; +} + .mb-05 { margin-bottom: 0.5rem; } @@ -1642,6 +1701,10 @@ div { border-radius: 5px; } +.radius8 { + border-radius: 8px !important; +} + .radius10 { border-radius: 10px; } @@ -1733,3 +1796,7 @@ textarea.noresize { .amount { text-align: right; } + +.left{ + text-align: left; +} \ No newline at end of file diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json index 2d302968..4744d278 100644 --- a/src/assets/translations/en.json +++ b/src/assets/translations/en.json @@ -1,21 +1,33 @@ { - "APP_NAME": "PHEE - Operations Management", + "APP_NAME": "Enterprise Edition", "languages": { "en": "English", "es": "Spanish", - "fr": "French" + "fr": "French", + "it": "Italian", + "de": "German" }, "labels": { "breadcrumbs": { "home": "Home", "batches": "Batches", - "Payment Hub EE": "Payment Hub EE", + "Payment Hub EE": "Payment Hub", "bulk-import": "Bulk Import", "sub-batches": "Sub Batches", "transfers": "Transfers", "Voucher Management": "Voucher Management", - "voucher-management": "Voucher Management", - "Account Mapper": "Account Mapper" + "Account Mapper": "Account Mapper", + "User Requests": "User Requests", + "Create": "Create", + "View Users": "View Users", + "User Details": "User Details", + "dashboard": "Dashboard", + "Visualizations": "Visualizations", + "Settings": "Settings", + "User Management": "User Management", + "G2P Payment Config": "G2P Payment Config", + "Users":"Users", + "View User":"View User" }, "buttons": { "Login": "Login", @@ -26,13 +38,23 @@ "Clear Data": "Clear Data", "Browse Files": "Browse Files", "Search": "Search", - "Close": "Close" + "Close": "Close", + "Confirm": "Confirm", + "Submit": "Submit", + "Approve": "Approve", + "Reject": "Reject" }, "errors": { "Username or password incorrect.": "Username or password incorrect" }, "heading": { - "View Transfer": "View Transfer" + "View Transfer": "View Transfer", + "Change Password": "Change Password", + "Backoffice Login": "Backoffice Login", + "Define User": "Define User", + "User Information": "User Information", + "Batch Summary":"Batch Summary", + "Sub Batch Summary":"Sub Batch Summary" }, "inputs": { "ID": "ID", @@ -41,6 +63,7 @@ "Tenant": "Tenant", "Username": "Username", "Password": "Password", + "Repeat Password": "Repeat Password", "Language": "Language", "Group Code": "Group Code", "Expiry": "Expiry", @@ -73,23 +96,47 @@ "Start Time": "Start Time", "Completed Time": "Completed Time", "Payer FSP": "Payer FSP", + "Payee FSP": "Payee FSP", "Transaction Type": "Transaction Type", "Source Financial Institution": "Source Financial Institution", "Source Account Number": "Source Account Number", "Destination Account Number": "Destination Account Number", "Destination Financial Institution": "Destination Financial Institution", - "Transaction Reference Number": "Transaction Reference Number", + "Transaction Reference Number": "Transaction ID", "Batch ID": "Batch ID", "Client Correlation ID": "Client Correlation ID", "Direction": "Direction", - "Payee Dfsp": "Payee Dfsp", + "Payee Dfsp": "Payee DFSP", "Payee Fee": "Payee Fee", "Payee Party": "Payee Party", - "Payer Dfsp": "Payer Dfsp", + "Payer Dfsp": "Payer DFSP", "Financial Address": "Financial Address", "Financial Institution": "Financial Institution", "Payment Modality": "Payment Modality", - "Purpose": "Purpose" + "Purpose": "Purpose", + "Bulk Voucher Upload": "Bulk Voucher Upload", + "Registering Institution ID": "Registering Institution ID", + "Type of User": "Type of User", + "Name": "Name", + "Role": "Role", + "First Name": "First Name", + "Last Name": "Last Name", + "Email": "Email", + "User Name": "User Name", + "Mobile Number": "Mobile Number", + "GOVT ID": "Govt ID", + "Govt ID":"Govt ID", + "FSP ID": "FSP ID", + "User Type": "User Type", + "Action Type": "Action Type", + "Number of Instructions": "Number of Instructions", + "Sub-Batch Reference Number": "Sub-Batch Reference Number", + "Date/Time": "Date/Time", + "Total Amount":"Total Amount", + "Program":"Program", + "Payer DFSP":"Payer DFSP", + "Payment Account":"Payment Account", + "Date":"Date" }, "menus": { "Login": "Login", @@ -104,7 +151,19 @@ "Main Batches": "Main Batches", "Create Batch": "Create Batch", "Sub Batches": "Sub Batches", - "Transfers": "Transfers" + "Transfers": "Transfers", + "User Management": "User Management", + "Create User": "Create User", + "User Requests": "User Requests", + "View Users": "View Users", + "Account Mapper": "Account Mapper", + "Visualizations": "Visualizations", + "G2P Payment Config": "G2P Payment Config", + "G2P Payment": "G2P Payment", + "Create":"Create", + "Update":"Update", + "Beneficiaries": "Beneficiaries", + "Create Beneficiaries": "Create Beneficiaries" }, "texts": { "Logged in as": "Logged in as", @@ -112,7 +171,33 @@ "Home": "Home", "Remember me": "Remember me", "Version": "Version", - "Drag and Drop the CSV input file, or": "Drag and Drop the CSV input file, or" + "Select voucher file from your system and make sure it matches the requirement": "Select voucher file from your system and make sure it matches the requirement", + "File must be in CSV or Excel Format": "(File must be in CSV or Excel Format)", + "Username is": "Username", + "Password is": "Password", + "required": "required", + "VoucherCreated": "{{count}} Vouchers have been created successfully", + "UserCreated": "User {{username}} Request has been created successfully", + "BatchesCreated": "{{count}} Batches has been created successfully", + "Enter your login details below": "Enter your login details below", + "Add a new user to the network": "Add a new user to the network", + "No data found.": "No data found.", + "All Users of the Network": "All Users of the Network", + "Accept and Reject user requests": "Accept and Reject user requests", + "No data matching data found": "No data matching data found" + }, + "commons": { + "is required": "is required", + "8 characters long": "8 characters long", + "50 characters long": "50 characters long", + "Password should be at least": "Password should be at least", + "Password should not be more than": "Password should not be more than", + "Password should include a": "Password should include a", + "numeral": "numeral", + "and at": "and at", + "least one uppercase": "least one uppercase", + "lowercase and special character": "lowercase and special character", + "does not match": "does not match" } } -} +} \ No newline at end of file diff --git a/src/assets/translations/es.json b/src/assets/translations/es.json index a5d3d8f0..878c8687 100644 --- a/src/assets/translations/es.json +++ b/src/assets/translations/es.json @@ -1,131 +1,200 @@ { - "APP_NAME": "Payment Hub", - "Logged in as": "Logged in as", - "Remember me": "Remember me", - "not_found_subtitle": "Oops.. Looks like this page doesn't exist.", + "APP_NAME": "Edición Empresarial", "languages": { - "en": "Ingles", + "en": "Inglés", + "es": "Español", "fr": "Francés", - "es": "Español" + "it": "Italiano", + "de": "Alemán" }, "labels": { "breadcrumbs": { - "Home": "Home" + "home": "Inicio", + "batches": "Lotes", + "Payment Hub EE": "Centro de Pagos", + "bulk-import": "Importación Masiva", + "sub-batches": "Sub Lotes", + "transfers": "Transferencias", + "Voucher Management": "Gestión de Vales", + "Account Mapper": "Mapeador de Cuentas", + "User Requests": "Solicitudes de Usuario", + "Create": "Crear", + "View Users": "Ver Usuarios", + "User Details": "Detalles del Usuario", + "dashboard": "Tablero", + "Visualizations": "Visualizaciones", + "Settings": "Configuraciones", + "User Management": "Gestión de Usuarios", + "G2P Payment Config": "Configuración de Pago G2P", + "Users": "Usuarios", + "View User": "Ver Usuario" }, "buttons": { - "Dashboard": "Dashboard", - "Add": "Add", - "Back": "Back", - "Close": "Close", - "Next": "Next", - "Login": "Login", - "Create User": "Create User" + "Login": "Iniciar Sesión", + "Forgot Password?": "¿Olvidaste tu Contraseña?", + "Cancel": "Cancelar", + "Download Template": "Descargar Plantilla", + "Send Data": "Enviar Datos", + "Clear Data": "Borrar Datos", + "Browse Files": "Buscar Archivos", + "Search": "Buscar", + "Close": "Cerrar", + "Confirm": "Confirmar", + "Submit": "Enviar", + "Approve": "Aprobar", + "Reject": "Rechazar" }, - "commons": { - "is required": "is required" + "errors": { + "Username or password incorrect.": "Usuario o contraseña incorrectos." }, - "inputs": { - "Tenant": "Tenant", - "Language": "Lenguaje", - "Server": "Server", - "Url": "Url", - "Login": "Login", - "Logout": "Logout", - "Username": "Username", - "Password": "Password", - "Remember me": "Remember me", - "Filter": "Filter", - "products": { - "loan": { - "Amortization": "Amortization", - "amortizationType": { - "Equal installments": "Equal installments", - "Equal principal payments": "Equal principal payments" - }, - "Is Equal Amortization?": "Is Equal Amortization?" - } - } + "heading": { + "View Transfer": "Ver Transferencia", + "Change Password": "Cambiar Contraseña", + "Backoffice Login": "Inicio de Sesión en Backoffice", + "Define User": "Definir Usuario", + "User Information": "Información del Usuario", + "Batch Summary": "Resumen del Lote", + "Sub Batch Summary": "Resumen del Sub Lote" }, - "links": { - "Contribute": "Contribute", - "Resources": "Resources", - "Community": "Community", - "User Manual": "User Manual", - "Functional Specifications": "Functional Specifications", - "Developer Zone": "Developer Zone", - "User Group": "User Group", - "Developer Group": "Developer Group", - "IRC": "IRC", - "Key Design Principles": "Key Design Principles", - "Working with Code": "Working with Code", - "Donate": "Donate", - "Forgot Password?": "Forgot Password?" + "inputs": { + "ID": "ID", + "Transaction ID": "ID de Transacción", + "Payer Party": "Parte Pagadora", + "Tenant": "Inquilino", + "Username": "Nombre de Usuario", + "Password": "Contraseña", + "Repeat Password": "Repetir Contraseña", + "Language": "Idioma", + "Group Code": "Código de Grupo", + "Expiry": "Expiración", + "Request Id": "ID de Solicitud", + "URL": "URL", + "Functional Id": "ID Funcional", + "Instruction Id": "ID de Instrucción", + "Institution Id": "ID de Institución", + "Program Id": "ID del Programa", + "Description": "Descripción", + "Amount": "Monto", + "Currency": "Moneda", + "Payment Mode": "Modo de Pago", + "SubType": "SubTipo", + "Credit Party": "Parte Acreditada", + "Debit Party": "Parte Debitada", + "Request": "Solicitud", + "Filters": "Filtros", + "Date Voucher": "Fecha del Vale", + "Date Voucher Created": "Fecha de Creación del Vale", + "Serial Number": "Número de Serie", + "Government Entity": "Entidad Gubernamental", + "Functional ID": "ID Funcional", + "Status": "Estado", + "From Date": "Desde la Fecha", + "To Date": "Hasta la Fecha", + "Source Ministry": "Ministerio Fuente", + "Batch Reference Number": "Número de Referencia del Lote", + "Bulk Amount": "Monto Total", + "Start Time": "Hora de Inicio", + "Completed Time": "Hora de Finalización", + "Payer FSP": "FSP del Pagador", + "Payee FSP": "FSP del Beneficiario", + "Transaction Type": "Tipo de Transacción", + "Source Financial Institution": "Institución Financiera Fuente", + "Source Account Number": "Número de Cuenta Fuente", + "Destination Account Number": "Número de Cuenta de Destino", + "Destination Financial Institution": "Institución Financiera de Destino", + "Transaction Reference Number": "Número de Referencia de Transacción", + "Batch ID": "ID del Lote", + "Client Correlation ID": "ID de Correlación del Cliente", + "Direction": "Dirección", + "Payee Dfsp": "DFSP del Beneficiario", + "Payee Fee": "Comisión del Beneficiario", + "Payee Party": "Parte Beneficiaria", + "Payer Dfsp": "DFSP del Pagador", + "Financial Address": "Dirección Financiera", + "Financial Institution": "Institución Financiera", + "Payment Modality": "Modalidad de Pago", + "Purpose": "Propósito", + "Bulk Voucher Upload": "Carga Masiva de Vales", + "Registering Institution ID": "ID de Institución Registrante", + "Type of user": "Tipo de Usuario", + "Name": "Nombre", + "Role": "Rol", + "First Name": "Nombre", + "Last Name": "Apellido", + "Email": "Correo Electrónico", + "User Name": "Nombre de Usuario", + "Mobile Number": "Número de Teléfono Móvil", + "Govt ID": "ID Gubernamental", + "FSP ID": "ID del FSP", + "User Type": "Tipo de Usuario", + "Action Type": "Tipo de Acción", + "Number of Instructions": "Número de Instrucciones", + "Sub-Batch Reference Number": "Número de Referencia del Sub Lote", + "Date/Time": "Fecha/Hora", + "Total Amount": "Monto Total", + "Program": "Programa", + "Payer DFSP": "DFSP del Pagador", + "Payment Account": "Cuenta de Pago" }, "menus": { - "Institution": "Institution", - "Accounting": "Accounting", - "Breadcrumbs": "Breadcrumbs", - "Reports": "Reports", - "Admin": "Admin", - "Self Service": "Self Service", - "Configuration Wizard": "Configuration Wizard", - "Clients": "Clients", - "Groups": "Groups", - "Centers": "Centers", - "All": "All", - "Loans": "Loans", - "Savings": "Savings", - "Funds": "Funds", - "XBRL": "XBRL", - "Users": "Users", - "Organization": "Organization", - "System": "System", - "Products": "Products", - "Templates": "Templates", - "User Management": "User Management", - "App Configuration": "App Configuration", - "Task Management": "Task Management", - "Help": "Help", - "Profile": "Profile", - "Settings": "Settings", - "Sign Out": "Sign Out", - "Global Search": "Global Search", - "Language Selector": "Language Selector", - "Theme Picker": "Theme Picker", - "Application Menu": "Application Menu", - "User Panel": "User Panel", - "Frequently Accessed": "Frequently Accessed", - "Dashboard": "Dashboard", - "Navigation": "Navigation", - "Frequent Postings": "Frequent Postings", - "Create Journal Entry": "Create Journal Entry", - "Chart of Accounts": "Chart of Accounts", - "Notifications": "Notifications", - "Main Items": "Main Items", - "Checker Inbox and Tasks": "Checker Inbox and Tasks", - "Individual Collection Sheet": "Individual Collection Sheet", - "Keyboard Shortcuts": "Keyboard Shortcuts" - }, - "placeholders": { - "Add new server": "Add new server", - "Search Activity": "Search Activity" + "Login": "Iniciar Sesión", + "Logout": "Cerrar Sesión", + "Settings": "Configuraciones", + "Sign Out": "Desconectar", + "Dashboard": "Tablero", + "Vouchers": "Vales", + "Create Vouchers": "Crear Vales", + "Payment Hub": "Centro de Pagos", + "Account Management": "Gestión de Cuentas", + "Main Batches": "Lotes Principales", + "Create Batch": "Crear Lote", + "Sub Batches": "Sub Lotes", + "Transfers": "Transferencias", + "User Management": "Gestión de Usuarios", + "Create User": "Crear Usuario", + "User Requests": "Solicitudes de Usuario", + "View Users": "Ver Usuarios", + "Account Mapper": "Mapeador de Cuentas", + "Visualizations": "Visualizaciones", + "G2P Payment Config": "Configuración de Pago G2P", + "G2P Payment": "Pago G2P", + "Create":"Crear", + "Update":"Actualizar", + "Beneficiaries": "Beneficiarios", + "Create Beneficiaries": "Crear Beneficiarios" }, "texts": { - "Welcome": "Welcome", - "Version": "Version", - "by": "by", - "Login into Tenant": "Login into Tenant" - } - }, - "errors": { - "inputs": { - "Password is required": "Password is required", - "Username is required": "Username is required", - "Username or password incorrect.": "Username or password incorrect" + "Logged in as": "Conectado como", + "About": "Acerca de", + "Home": "Inicio", + "Remember me": "Recuérdame", + "Version": "Versión", + "Select voucher file from your system and make sure it matches the requirement": "Seleccione el archivo de vale de su sistema y asegúrese de que cumpla con los requisitos", + "File must be in CSV or Excel Format": "El archivo debe estar en formato CSV o Excel", + "Username is": "El nombre de usuario es", + "Password is": "La contraseña es", + "required": "requerido", + "VoucherCreated": "Se han creado {{count}} vales exitosamente", + "UserCreated": "La solicitud del usuario {{username}} se ha creado exitosamente", + "BatchesCreated": "Se han creado {{count}} lotes exitosamente", + "Enter your login details below": "Ingrese sus datos de inicio de sesión a continuación", + "Add a new user to the network": "Agregar un nuevo usuario a la red", + "No data found.": "No se encontraron datos.", + "All Users of the Network": "Todos los Usuarios de la Red", + "Accept and Reject user requests": "Aceptar y Rechazar solicitudes de usuario" + }, + "commons": { + "is required": "es requerido", + "8 characters long": "de 8 caracteres", + "50 characters long": "de 50 caracteres", + "Password should be at least": "La contraseña debe tener al menos", + "Password should not be more than": "La contraseña no debe tener más de", + "Password should include a": "La contraseña debe incluir un", + "numeral": "número", + "and at": "y al", + "least one uppercase": "menos una mayúscula", + "lowercase and special character": "minúscula y un carácter especial", + "does not match": "no coincide" } - }, - "tooltips": { - "Settings": "Settings", - "Sign Out": "Sign Out" } -} +} \ No newline at end of file diff --git a/src/assets/translations/fr.json b/src/assets/translations/fr.json index 8e0a59a5..57a0d503 100644 --- a/src/assets/translations/fr.json +++ b/src/assets/translations/fr.json @@ -1,131 +1,201 @@ { - "APP_NAME": "Payment Hub", - "Logged in as": "Logged in as", - "Remember me": "Remember me", - "not_found_subtitle": "Oups.. Il semble que cette page n'existe pas.", + "APP_NAME": "Édition Entreprise", "languages": { - "en-US": "Anglaise", - "fr-FR": "Français", - "es-MX": "Espagnole" + "en": "Anglais", + "es": "Espagnol", + "fr": "Français", + "it": "Italien", + "de": "Allemand" }, "labels": { "breadcrumbs": { - "Home": "Home" + "home": "Accueil", + "batches": "Lots", + "Payment Hub EE": "Centre de Paiements", + "bulk-import": "Importation en Masse", + "sub-batches": "Sous-Lots", + "transfers": "Transferts", + "Voucher Management": "Gestion des Bons", + "Account Mapper": "Cartographie des Comptes", + "User Requests": "Demandes d'Utilisateur", + "Create": "Créer", + "View Users": "Voir les Utilisateurs", + "User Details": "Détails de l'Utilisateur", + "dashboard": "Tableau de Bord", + "Visualizations": "Visualisations", + "Settings": "Paramètres", + "User Management": "Gestion des Utilisateurs", + "G2P Payment Config": "Config du Paiement G2P", + "Users":"Utilisateurs", + "View User":"Voir l'Utilisateur" }, "buttons": { - "Dashboard": "Dashboard", - "Add": "Add", - "Back": "Back", - "Close": "Close", - "Next": "Next", - "Login": "Login", - "Create User": "Create User" + "Login": "Se Connecter", + "Forgot Password?": "Mot de Passe Oublié ?", + "Cancel": "Annuler", + "Download Template": "Télécharger le Modèle", + "Send Data": "Envoyer les Données", + "Clear Data": "Effacer les Données", + "Browse Files": "Parcourir les Fichiers", + "Search": "Rechercher", + "Close": "Fermer", + "Confirm": "Confirmer", + "Submit": "Soumettre", + "Approve": "Approuver", + "Reject": "Rejeter" }, - "commons": { - "is required": "is required" + "errors": { + "Username or password incorrect.": "Nom d'utilisateur ou mot de passe incorrect." + }, + "heading": { + "View Transfer": "Voir le Transfert", + "Change Password": "Changer le Mot de Passe", + "Backoffice Login": "Connexion Backoffice", + "Define User": "Définir l'Utilisateur", + "User Information": "Informations sur l'Utilisateur", + "Batch Summary": "Résumé du Lot", + "Sub Batch Summary": "Résumé du Sous-Lot" }, "inputs": { - "Tenant": "Tenant", + "ID": "ID", + "Transaction ID": "ID de Transaction", + "Payer Party": "Partie Payeur", + "Tenant": "Locataire", + "Username": "Nom d'Utilisateur", + "Password": "Mot de Passe", + "Repeat Password": "Répéter le Mot de Passe", "Language": "Langue", - "Server": "Server", - "Url": "Url", - "Login": "Login", - "Logout": "Logout", - "Username": "Username", - "Password": "Password", - "Remember me": "Remember me", - "Filter": "Filter", - "products": { - "loan": { - "Amortization": "Amortization", - "amortizationType": { - "Equal installments": "Equal installments", - "Equal principal payments": "Equal principal payments" - }, - "Is Equal Amortization?": "Is Equal Amortization?" - } - } - }, - "links": { - "Contribute": "Contribute", - "Resources": "Resources", - "Community": "Community", - "User Manual": "User Manual", - "Functional Specifications": "Functional Specifications", - "Developer Zone": "Developer Zone", - "User Group": "User Group", - "Developer Group": "Developer Group", - "IRC": "IRC", - "Key Design Principles": "Key Design Principles", - "Working with Code": "Working with Code", - "Donate": "Donate", - "Forgot Password?": "Forgot Password?" + "Group Code": "Code de Groupe", + "Expiry": "Expiration", + "Request Id": "ID de Demande", + "URL": "URL", + "Functional Id": "ID Fonctionnel", + "Instruction Id": "ID d'Instruction", + "Institution Id": "ID d'Institution", + "Program Id": "ID de Programme", + "Description": "Description", + "Amount": "Montant", + "Currency": "Devise", + "Payment Mode": "Mode de Paiement", + "SubType": "Sous-Type", + "Credit Party": "Partie Créditrice", + "Debit Party": "Partie Débitrice", + "Request": "Demande", + "Filters": "Filtres", + "Date Voucher": "Date du Bon", + "Date Voucher Created": "Date de Création du Bon", + "Serial Number": "Numéro de Série", + "Government Entity": "Entité Gouvernementale", + "Functional ID": "ID Fonctionnel", + "Status": "Statut", + "From Date": "À Partir de la Date", + "To Date": "Jusqu'à la Date", + "Source Ministry": "Ministère Source", + "Batch Reference Number": "Numéro de Référence du Lot", + "Bulk Amount": "Montant Total", + "Start Time": "Heure de Début", + "Completed Time": "Heure de Fin", + "Payer FSP": "FSP du Payeur", + "Payee FSP": "FSP du Bénéficiaire", + "Transaction Type": "Type de Transaction", + "Source Financial Institution": "Institution Financière Source", + "Source Account Number": "Numéro de Compte Source", + "Destination Account Number": "Numéro de Compte de Destination", + "Destination Financial Institution": "Institution Financière de Destination", + "Transaction Reference Number": "Numéro de Référence de Transaction", + "Batch ID": "ID du Lot", + "Client Correlation ID": "ID de Corrélation Client", + "Direction": "Direction", + "Payee Dfsp": "DFSP du Bénéficiaire", + "Payee Fee": "Frais du Bénéficiaire", + "Payee Party": "Partie Bénéficiaire", + "Payer Dfsp": "DFSP du Payeur", + "Financial Address": "Adresse Financière", + "Financial Institution": "Institution Financière", + "Payment Modality": "Modalité de Paiement", + "Purpose": "But", + "Bulk Voucher Upload": "Téléchargement en Masse de Bons", + "Registering Institution ID": "ID de l'Institution Enregistrante", + "Type of User": "Type d'utilisateur", + "Name": "Nom", + "Role": "Rôle", + "First Name": "Prénom", + "Last Name": "Nom de Famille", + "Email": "Email", + "User Name": "Nom d'Utilisateur", + "Mobile Number": "Numéro de Téléphone Portable", + "Govt ID": "ID Gouvernemental", + "FSP ID": "ID de FSP", + "User Type": "Type d'Utilisateur", + "Action Type": "Type d'Action", + "Number of Instructions": "Nombre d'Instructions", + "Sub-Batch Reference Number": "Numéro de Référence du Sous-Lot", + "Date/Time": "Date/Heure", + "Total Amount": "Montant Total", + "Program": "Programme", + "Payer DFSP": "DFSP du Payeur", + "Payment Account": "Compte de Paiement", + "Date": "Date" }, "menus": { - "Institution": "Institution", - "Accounting": "Accounting", - "Breadcrumbs": "Breadcrumbs", - "Reports": "Reports", - "Admin": "Admin", - "Self Service": "Self Service", - "Configuration Wizard": "Configuration Wizard", - "Clients": "Clients", - "Groups": "Groups", - "Centers": "Centers", - "All": "All", - "Loans": "Loans", - "Savings": "Savings", - "Funds": "Funds", - "XBRL": "XBRL", - "Users": "Users", - "Organization": "Organization", - "System": "System", - "Products": "Products", - "Templates": "Templates", - "User Management": "User Management", - "App Configuration": "App Configuration", - "Task Management": "Task Management", - "Help": "Help", - "Profile": "Profile", - "Settings": "Settings", - "Sign Out": "Sign Out", - "Global Search": "Global Search", - "Language Selector": "Language Selector", - "Theme Picker": "Theme Picker", - "Application Menu": "Application Menu", - "User Panel": "User Panel", - "Frequently Accessed": "Frequently Accessed", - "Dashboard": "Dashboard", - "Navigation": "Navigation", - "Frequent Postings": "Frequent Postings", - "Create Journal Entry": "Create Journal Entry", - "Chart of Accounts": "Chart of Accounts", - "Notifications": "Notifications", - "Main Items": "Main Items", - "Checker Inbox and Tasks": "Checker Inbox and Tasks", - "Individual Collection Sheet": "Individual Collection Sheet", - "Keyboard Shortcuts": "Keyboard Shortcuts" - }, - "placeholders": { - "Add new server": "Add new server", - "Search Activity": "Search Activity" + "Login": "Se Connecter", + "Logout": "Se Déconnecter", + "Settings": "Paramètres", + "Sign Out": "Déconnexion", + "Dashboard": "Tableau de Bord", + "Vouchers": "Bons", + "Create Vouchers": "Créer des Bons", + "Payment Hub": "Centre de Paiements", + "Account Management": "Gestion des Comptes", + "Main Batches": "Lots Principaux", + "Create Batch": "Créer un Lot", + "Sub Batches": "Sous-Lots", + "Transfers": "Transferts", + "User Management": "Gestion des Utilisateurs", + "Create User": "Créer un Utilisateur", + "User Requests": "Demandes d'Utilisateur", + "View Users": "Voir les Utilisateurs", + "Account Mapper": "Cartographie des Comptes", + "Visualizations": "Visualisations", + "G2P Payment Config": "Config du Paiement G2P", + "G2P Payment": "Paiement G2P", + "Create":"Créer", + "Update":"Mettre à Jour", + "Beneficiaries": "Bénéficiaires", + "Create Beneficiaries": "Créer des Bénéficiaires" }, "texts": { - "Welcome": "Welcome", + "Logged in as": "Connecté en tant que", + "About": "À propos", + "Home": "Accueil", + "Remember me": "Se souvenir de moi", "Version": "Version", - "by": "by", - "Login into Tenant": "Login into Tenant" - } - }, - "errors": { - "inputs": { - "Password is required": "Password is required", - "Username is required": "Username is required", - "Username or password incorrect.": "Username or password incorrect" + "Select voucher file from your system and make sure it matches the requirement": "Sélectionnez le fichier de bon de votre système et assurez-vous qu'il répond aux exigences", + "File must be in CSV or Excel Format": "Le fichier doit être au format CSV ou Excel", + "Username is": "Le nom d'utilisateur est", + "Password is": "Le mot de passe est", + "required": "requis", + "VoucherCreated": "{{count}} Bons ont été créés avec succès", + "UserCreated": "La demande de l'utilisateur {{username}} a été créée avec succès", + "BatchesCreated": "{{count}} Lots ont été créés avec succès", + "Enter your login details below": "Entrez vos informations de connexion ci-dessous", + "Add a new user to the network": "Ajouter un nouvel utilisateur au réseau", + "No data found.": "Aucune donnée trouvée.", + "All Users of the Network": "Tous les Utilisateurs du Réseau", + "Accept and Reject user requests": "Accepter et Rejeter les demandes des utilisateurs" + }, + "commons": { + "is required": "est requis", + "8 characters long": "de 8 caractères", + "50 characters long": "de 50 caractères", + "Password should be at least": "Le mot de passe doit comporter au moins", + "Password should not be more than": "Le mot de passe ne doit pas dépasser", + "Password should include a": "Le mot de passe doit inclure un", + "numeral": "chiffre", + "and at": "et au", + "least one uppercase": "moins une majuscule", + "lowercase and special character": "minuscule et un caractère spécial", + "does not match": "ne correspond pas" } - }, - "tooltips": { - "Settings": "Settings", - "Sign Out": "Sign Out" } -} +} \ No newline at end of file diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index e20c2049..203a8df8 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -27,9 +27,19 @@ export let environment = { realm: window['env']['oauthRealm'] || 'paymenthub', clientId: window['env']['oauthClientId'] || 'opsapp', clientSecret: window['env']['oauthClientSecret'] || '', + clientUUID: window['env']['oauthClientUUID'] || '', basicAuth: window['env']['oauthBasicAuth'] || true, basicAuthToken: window['env']['oauthBasicAuthToken'] || 'Y2xpZW50Og==' }, + jbpm:{ + jbpmApiUrl: window['env']['jbpmApiUrl'] || '', + containerId: window['env']['jbpmContainerId'] || '', + credentials: { + adminMaker: window['env']['jbpmCredentialsAdminMaker'] || '', + adminChecker: window['env']['jbpmCredentialsAdminChecker'] || '', + both: window['env']['jbpmCredentialsBoth'] || '' + } + }, auth: { enabled: window['env']['authEnabled'] || false, }, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index a2dc7e8b..31d29ba0 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -27,9 +27,19 @@ export let environment = { realm: window['env']['oauthRealm'] || 'paymenthub', clientId: window['env']['oauthClientId'] || 'opsapp', clientSecret: window['env']['oauthClientSecret'] || '', + clientUUID: window['env']['oauthClientUUID'] || '', basicAuth: window['env']['oauthBasicAuth'] || true, basicAuthToken: window['env']['oauthBasicAuthToken'] || 'Y2xpZW50Og==' }, + jbpm:{ + jbpmApiUrl: window['env']['jbpmApiUrl'] || '', + containerId: window['env']['jbpmContainerId'] || '', + credentials: { + adminMaker: window['env']['jbpmCredentialsAdminMaker'] || '', + adminChecker: window['env']['jbpmCredentialsAdminChecker'] || '', + both: window['env']['jbpmCredentialsBoth'] || '' + } + }, auth: { enabled: window['env']['authEnabled'] || false, }, diff --git a/src/theme/theme.scss b/src/theme/theme.scss index 0e9a7d09..69a606c8 100644 --- a/src/theme/theme.scss +++ b/src/theme/theme.scss @@ -2,17 +2,21 @@ * Global application theme. * Framework overrides and customization goes here. */ - $primary: #004989; + $primary: #1658BD; $accent: #b4d575; + $green:#00A94F; + $red:#FF4B5B; // Endpoints $white: #fff; $black: #000; +$light-black:#cccccca9; // Greys $light-grey: #f5f5f5; -$mid-grey: #d7dada; +$mid-grey: #bac1c1; $dark-grey: #353b3b; -$border-size: 0.08rem; +$border-size: 0.50rem; +$font-family: Poppins, Helvetica Neue, sans-serif;