Merge pull request #240 from OmicsDI/dev

Dev

Author: glmanhtu

src/app/modules/dataset/components/dataset/dataset.component.ts

@@ -84,14 +84,17 @@ export class DatasetComponent implements OnInit {
     }
 
     ngOnInit() {
+        const self = this;
         this.databaseListService.getDatabaseList().subscribe(databases => {
             this.route.params.subscribe(params => {
                 this.slimLoadingBarService.start();
                 this.acc = params['acc'];
                 this.repository = params['domain'];
                 this.databases = databases;
                 this.dataSetService.getDataSetDetail(this.acc, this.repository).subscribe(result => {
-                    this.reanalysisOf = this.reanalysedBy = this.relatedOmics = [];
+                    self.reanalysisOf = [];
+                    self.reanalysedBy = [];
+                    self.relatedOmics = [];
                     this.d = result;
                     this.acc = result.id;
                     this.repository = result.source;
@@ -111,17 +114,17 @@ export class DatasetComponent implements OnInit {
                     if (result.similars != null) {
                         result.similars.filter(s => s.relationType === 'Reanalysis of').map(reanalysis => {
                             const reanalyDb = this.databaseListService.getDatabaseByDatabaseName(reanalysis.database, databases);
-                            this.reanalysisOf.push({reanalysis: reanalysis, db: reanalyDb});
+                            self.reanalysisOf.push({reanalysis: reanalysis, db: reanalyDb});
                         });
 
                         result.similars.filter(s => s.relationType === 'Reanalyzed by').map(reanalysedBy => {
                             const reanalyDb = this.databaseListService.getDatabaseByDatabaseName(reanalysedBy.database, databases);
-                            this.reanalysedBy.push({reanalysis: reanalysedBy, db: reanalyDb});
+                            self.reanalysedBy.push({reanalysis: reanalysedBy, db: reanalyDb});
                         });
 
                         result.similars.filter(s => s.relationType !== 'Reanalyzed by' && s.relationType !== 'Reanalysis of').map(omics => {
                             const reanalyDb = this.databaseListService.getDatabaseByDatabaseName(omics.database, databases);
-                            this.relatedOmics.push({reanalysis: omics, db: reanalyDb});
+                            self.relatedOmics.push({reanalysis: omics, db: reanalyDb});
                         });
                     }
 

src/app/shared/services/auth.service.ts

@@ -17,11 +17,11 @@ export class AuthService implements CanActivate {
             const expired = this.helper.decodeToken(token).expires;
             const isNotExpired = new Date().getMilliseconds() < expired;
             let profile = this.profileService.getProfileFromLocal();
-            if (isNotExpired && profile != null && profile.userId == null) {
-                return false;
-            } else if (isNotExpired && profile == null) {
-                profile = await this.profileService.getProfile().toPromise();
-                this.profileService.setProfile(profile);
+            if (isNotExpired) {
+                if (profile == null || (profile != null && profile.userId == null)) {
+                    profile = await this.profileService.getProfile().toPromise();
+                    this.profileService.setProfile(profile);
+                }
             }
             return isNotExpired;
         }