Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 9858eee2 authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

Fix error messages

parent dbb79ce9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 72 additions and 57 deletions
smp-angular/src/_smp-all-themes.scss
+ 5
− 0
View file @ 9858eee2
......@@ -39,6 +39,11 @@
text-align: center;
}
.smp-field-error{
color: smp.get-theme-color($theme, warn, 500) !important;
font-size: 70%;
}
}
smp-angular/src/app/app.module.ts
+ 2
− 0
View file @ 9858eee2
......@@ -140,6 +140,7 @@ import {
} from "./common/panels/user-settings-panel/user-profile-panel.component";
import {EditDomainComponent} from "./edit/edit-domain/edit-domain.component";
import {EditDomainService} from "./edit/edit-domain/edit-domain.service";
import {SmpFieldErrorComponent} from "./common/components/smp-field-error/smp-field-error.component";
@NgModule({
......@@ -203,6 +204,7 @@ import {EditDomainService} from "./edit/edit-domain/edit-domain.service";
ServiceGroupSearchComponent,
ServiceMetadataWizardDialogComponent,
SidenavComponent,
SmpFieldErrorComponent,
SpacerComponent,
SpinnerComponent,
ToolbarComponent,
......
smp-angular/src/app/common/components/smp-field-error/smp-field-error.component.ts 0 → 100644
+ 8
− 0
View file @ 9858eee2
import { Component, Input } from '@angular/core';
@Component({
selector: 'smp-field-error',
template: '<div class="smp-field-error" ><ng-content></ng-content></div>'
})
export class SmpFieldErrorComponent {
}
smp-angular/src/app/common/dialogs/access-token-generation-dialog/access-token-generation-dialog.component.html
+ 1
− 1
View file @ 9858eee2
......@@ -25,7 +25,7 @@
formControlName="current-password" required id="cp_id">
<mat-icon matSuffix
(click)="hideCurrPwdFiled = !hideCurrPwdFiled">{{hideCurrPwdFiled ? 'visibility_off' : 'visibility'}}</mat-icon>
<mat-error *ngIf="passwordError('current-password', 'required')">Password is required</mat-error>
<smp-field-error *ngIf="passwordError('current-password', 'required')">Password is required</smp-field-error >
</mat-form-field>
<mat-card-actions>
......
smp-angular/src/app/common/dialogs/credential-dialog/credential-dialog.component.html
+ 8
− 8
View file @ 9858eee2
......@@ -27,11 +27,11 @@
</mat-date-range-input>
<mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>
<mat-date-range-picker #picker></mat-date-range-picker>
<mat-error *ngIf="credentialForm.controls.activeFrom.hasError('matStartDateInvalid')">Invalid active from
<smp-field-error *ngIf="credentialForm.controls.activeFrom.hasError('matStartDateInvalid')">Invalid active from
date
</mat-error>
<mat-error *ngIf="credentialForm.controls.expireOn.hasError('matEndDateInvalid')">Invalid expire on date
</mat-error>
</smp-field-error >
<smp-field-error *ngIf="credentialForm.controls.expireOn.hasError('matEndDateInvalid')">Invalid expire on date
</smp-field-error >
</mat-form-field>
</div>
</div>
......@@ -57,10 +57,10 @@
<input matEndDate formControlName="validTo" placeholder="Expire On" readonly="true">
</mat-date-range-input>
<mat-error *ngIf="credentialForm.controls.activeFrom.hasError('matStartDateInvalid')">Invalid active from date
</mat-error>
<mat-error *ngIf="credentialForm.controls.expireOn.hasError('matEndDateInvalid')">Invalid expire on date
</mat-error>
<smp-field-error *ngIf="credentialForm.controls.activeFrom.hasError('matStartDateInvalid')">Invalid active from date
</smp-field-error >
<smp-field-error *ngIf="credentialForm.controls.expireOn.hasError('matEndDateInvalid')">Invalid expire on date
</smp-field-error >
</mat-form-field>
<mat-form-field class="certificate-issuer" style="width:100%">
<mat-label>Issuer Name</mat-label>
......
smp-angular/src/app/common/dialogs/password-change-dialog/password-change-dialog.component.html
+ 42
− 42
View file @ 9858eee2
......@@ -8,51 +8,51 @@
{{message}}
</div>
<form [formGroup]="dialogForm">
<mat-card>
<mat-card-content fxLayout="column">
<mat-form-field style="width:100%">
<input matInput placeholder="Username" formControlName="username" id="un_id" readonly="true">
</mat-form-field>
<mat-form-field style="width:100%">
<input matInput placeholder="User email" formControlName="email" id="em_id"
[ngClass]="{ 'empty-field-label': isEmptyEmailAddress }" readonly="true">
</mat-form-field>
<div style="display:flex;flex-direction: column">
</mat-card-content>
</mat-card>
<mat-card class="password-panel">
<mat-card-content>
<mat-form-field *ngIf="showCurrentPasswordField" style="width:100%">
<input matInput [placeholder]="getPasswordTitle" [type]="hideCurrPwdFiled ? 'password' : 'text'"
formControlName="current-password" required id="cp_id">
<mat-icon matSuffix
(click)="hideCurrPwdFiled = !hideCurrPwdFiled">{{hideCurrPwdFiled ? 'visibility_off' : 'visibility'}}</mat-icon>
</mat-form-field>
<mat-form-field style="width:100%">
<mat-label>Change password for Username</mat-label>
<input matInput placeholder="Username" formControlName="username" id="un_id" readonly="true">
</mat-form-field>
<mat-form-field style="width:100%">
<input matInput placeholder="New Password" [type]="hideNewPwdFiled ? 'password' : 'text'"
formControlName="new-password" required id="np_id" auto-focus-directive>
<mat-icon matSuffix
(click)="hideNewPwdFiled = !hideNewPwdFiled">{{hideNewPwdFiled ? 'visibility_off' : 'visibility'}}</mat-icon>
<mat-error *ngIf="passwordError('new-password', 'required')">New password is required</mat-error>
<mat-error *ngIf="passwordError('new-password', 'error')">New password must not be equal than old current
password!
</mat-error>
<mat-error *ngIf="passwordError('new-password', 'pattern')">{{passwordValidationMessage}}</mat-error>
</mat-form-field>
<div class="password-panel" style="display: flex;flex-direction: column">
<mat-form-field style="width:100%">
<input matInput placeholder="Confirm New Password" [type]="hideConfPwdFiled ? 'password' : 'text'"
formControlName="confirm-new-password" required id="cnp_id">
<mat-icon matSuffix
(click)="hideConfPwdFiled = !hideConfPwdFiled">{{hideConfPwdFiled ? 'visibility_off' : 'visibility'}}</mat-icon>
<mat-error *ngIf="passwordError('confirm-new-password', 'error')">Confirm valued does not match new password!
</mat-error>
<mat-error *ngIf="passwordError('confirm-new-password', 'required')">Confirm New password is required
</mat-error>
</mat-form-field>
</mat-card-content>
</mat-card>
<mat-form-field *ngIf="showCurrentPasswordField" style="width:100%">
<mat-label>{{getPasswordTitle}}</mat-label>
<input matInput [placeholder]="getPasswordTitle" [type]="hideCurrPwdFiled ? 'password' : 'text'"
formControlName="current-password" required id="cp_id">
<mat-icon matSuffix
(click)="hideCurrPwdFiled = !hideCurrPwdFiled">{{hideCurrPwdFiled ? 'visibility_off' : 'visibility'}}</mat-icon>
</mat-form-field>
<mat-form-field style="width:100%">
<mat-label>New Password</mat-label>
<input matInput placeholder="New Password" [type]="hideNewPwdFiled ? 'password' : 'text'"
formControlName="new-password" required id="np_id" auto-focus-directive>
<mat-icon matSuffix
(click)="hideNewPwdFiled = !hideNewPwdFiled">{{hideNewPwdFiled ? 'visibility_off' : 'visibility'}}</mat-icon>
<smp-field-error *ngIf="passwordError('new-password', 'required')">New password is required</smp-field-error >
<smp-field-error *ngIf="passwordError('new-password', 'error')">New password must not be equal than old current
password!
</smp-field-error >
<smp-field-error *ngIf="passwordError('new-password', 'pattern')">{{passwordValidationMessage}}</smp-field-error>
</mat-form-field>
<mat-form-field style="width:100%">
<mat-label>Confirm New Password</mat-label>
<input matInput placeholder="Confirm New Password" [type]="hideConfPwdFiled ? 'password' : 'text'"
formControlName="confirm-new-password" required id="cnp_id">
<mat-icon matSuffix
(click)="hideConfPwdFiled = !hideConfPwdFiled">{{hideConfPwdFiled ? 'visibility_off' : 'visibility'}}</mat-icon>
<smp-field-error *ngIf="passwordError('confirm-new-password', 'error')">Confirm valued does not match new
password!
</smp-field-error >
<smp-field-error *ngIf="passwordError('confirm-new-password', 'required')">Confirm New password is required
</smp-field-error >
</mat-form-field>
</div>
</div>
</form>
</mat-dialog-content>
......
smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.html
+ 2
− 2
View file @ 9858eee2
......@@ -40,8 +40,8 @@
</mat-date-range-input>
<mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>
<mat-date-range-picker #picker></mat-date-range-picker>
<mat-error *ngIf="credentialForm.controls.activeFrom.hasError('matStartDateInvalid')">Invalid active from date</mat-error>
<mat-error *ngIf="credentialForm.controls.expireOn.hasError('matEndDateInvalid')">Invalid expire on date</mat-error>
<smp-field-error *ngIf="credentialForm.controls.activeFrom.hasError('matStartDateInvalid')">Invalid active from date</smp-field-error >
<smp-field-error *ngIf="credentialForm.controls.expireOn.hasError('matEndDateInvalid')">Invalid expire on date</smp-field-error >
</mat-form-field>
</div>
<div style="display: flex;flex-flow: row wrap;">
......
smp-angular/src/app/user-settings/user-certificates/user-certificate-panel/user-certificate-panel.component.html
+ 2
− 2
View file @ 9858eee2
......@@ -47,8 +47,8 @@
</mat-date-range-input>
<mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>
<mat-date-range-picker #picker></mat-date-range-picker>
<mat-error *ngIf="credentialForm.controls.activeFrom.hasError('matStartDateInvalid')">Invalid active from date</mat-error>
<mat-error *ngIf="credentialForm.controls.expireOn.hasError('matEndDateInvalid')">Invalid expire on date</mat-error>
<smp-field-error *ngIf="credentialForm.controls.activeFrom.hasError('matStartDateInvalid')">Invalid active from date</smp-field-error >
<smp-field-error *ngIf="credentialForm.controls.expireOn.hasError('matEndDateInvalid')">Invalid expire on date</smp-field-error >
</mat-form-field>
</div>
</div>
smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationService.java
+ 1
− 1
View file @ 9858eee2
......@@ -35,7 +35,7 @@ import static eu.europa.ec.edelivery.smp.data.ui.auth.SMPAuthority.S_AUTHORITY_T
*/
@Service("smpAuthorizationService")
public class SMPAuthorizationService {
private static final String ERR_INVALID_OR_NULL = "Invalid or null authentication for the session!";
private static final String ERR_INVALID_OR_NULL = "Invalid or Expired session! Please login again.";
private static final SMPLogger LOG = SMPLoggerFactory.getLogger(SMPAuthorizationService.class);
DomainMemberDao domainMemberDao;
......
smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationServiceTest.java
+ 1
− 1
View file @ 9858eee2
......@@ -93,7 +93,7 @@ public class SMPAuthorizationServiceTest {
// given
SecurityContextHolder.setContext(mockSecurityContextSystemAdmin);
testInstance.isCurrentlyLoggedIn("Invalid or null authentication for the session!");
testInstance.isCurrentlyLoggedIn("Invalid or Expired session! Please login again.");
}
@Test
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about