Merge pull request #175 from GSA/fix-userlogin-timeout

Fix UserLogin timeout rendering and ArtModal export

Author: collinschreyer-dev

src/app/auth/userlogin/userlogin.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ChangeDetectorRef, AfterViewInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
 import { User } from '../../shared/user';
@@ -16,7 +16,7 @@ import { Title } from '@angular/platform-browser';
   templateUrl: './userlogin.component.html',
   styleUrls: ['./userlogin.component.scss']
 })
-export class UserloginComponent extends BaseComponent implements OnInit {
+export class UserloginComponent extends BaseComponent implements OnInit, AfterViewInit {
 
   myForm: FormGroup;
   errorMessage = false;
@@ -30,7 +30,8 @@ export class UserloginComponent extends BaseComponent implements OnInit {
     private authService: AuthService,
     private router: Router,
     private user: UserService,
-    private ts: Title
+    private ts: Title,
+    private cdr: ChangeDetectorRef
   ) {
     super(ts);
     this.pageName = 'Solicitation Review Tool';
@@ -43,6 +44,26 @@ export class UserloginComponent extends BaseComponent implements OnInit {
       email: new FormControl('', [Validators.required]),
       password: new FormControl('', [Validators.required])
     });
+    
+    // Force change detection cycle
+    setTimeout(() => {
+      this.cdr.detectChanges();
+    }, 0);
+  }
+  
+  ngAfterViewInit() {
+    // Check if we got here from a session timeout (token missing but other session data exists)
+    const hasToken = localStorage.getItem('token');
+    const hasUserInfo = localStorage.getItem('email') || localStorage.getItem('id');
+    
+    if (!hasToken && hasUserInfo) {
+      // Likely a timeout situation, clear remaining data
+      localStorage.clear();
+      
+      // Force rendering
+      this.cdr.detectChanges();
+      
+    }
   }
 
   onSubmit() {

src/app/solicitation/solicitation.module.ts

@@ -81,7 +81,8 @@ import { ArtCategoryComponent } from './summary/results-detail/art-modal/art-cat
   ],
     exports: [
         SolicitationComponent,
-        FeedbackReportComponent
+        FeedbackReportComponent,
+        ArtIframeDialogComponent
     ]
 })
 export class SolicitationModule { }