diff --git a/claims/claim-utils/displayClaims/displayClaims.component.ts b/claims/claim-utils/displayClaims/displayClaims.component.ts
index 8ab5380d..58ccde80 100644
--- a/claims/claim-utils/displayClaims/displayClaims.component.ts
+++ b/claims/claim-utils/displayClaims/displayClaims.component.ts
@@ -8,6 +8,7 @@ import {ModalLoading} from '../../../utils/modal/loading.component';
import {AlertModal} from '../../../utils/modal/alert';
import {Session} from '../../../login/utils/helper.class';
import{EnvProperties} from '../../../utils/properties/env-properties';
+import {LoginErrorCodes} from '../../../login/utils/guardHelper.class';
@Component({
@@ -122,7 +123,7 @@ export class DisplayClaimsComponent {
getClaims () {
if(!Session.isLoggedIn()){
this.userValidMessage = "User session has expired. Please login again.";
-
+ this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} });
}else{
this.selected=[];
var types = '';
@@ -463,6 +464,7 @@ handleErrors(err){
deleteById(id:string){
if(!Session.isLoggedIn()){
this.userValidMessage = "User session has expired. Please login again.";
+ this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} });
}else{
console.log("Deleting claim with id:"+id);
@@ -495,7 +497,7 @@ handleErrors(err){
batchDeleteById(ids:string[]){
if(!Session.isLoggedIn()){
this.userValidMessage = "User session has expired. Please login again.";
-
+ this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} });
}else{
console.warn("Deleting claim with ids:"+ids);
this._claimService.deleteBulk(ids,this.properties.claimsAPIURL).subscribe(
diff --git a/login/user.component.html b/login/user.component.html
index 51bb8390..27553940 100644
--- a/login/user.component.html
+++ b/login/user.component.html
@@ -33,27 +33,23 @@
- You are not authorized to use the requested page
+ You are not authorized to use the requested page.
- You are not authorized to use the requested page
+ You are not authorized to use the requested page.
- There is no community selected
+ There is no research community selected.
- For this action you have to subscribe to community first
+ For this action you have to subscribe to research community first.
{{errorMessage}}
diff --git a/sharedComponents/bottom.component.html b/sharedComponents/bottom.component.html
index 2bda8168..a1e00718 100644
--- a/sharedComponents/bottom.component.html
+++ b/sharedComponents/bottom.component.html
@@ -35,21 +35,21 @@