Merge pull request #172 from USEPA/add_new_home_dialog

Add new home dialog

AGOLAccountRequestor/settings.py

@@ -59,6 +59,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'AGOLAccountRequestor.views.redirect_middleware'
 ]
 
 ROOT_URLCONF = 'AGOLAccountRequestor.urls'

AGOLAccountRequestor/views.py

@@ -9,6 +9,8 @@
 from rest_framework.response import Response
 from django.conf import settings
 from django.views.decorators.csrf import ensure_csrf_cookie
+from django.contrib import messages
+from django.shortcuts import redirect
 
 logger = logging.getLogger('django')
 
@@ -81,3 +83,28 @@ def email_field_coordinator_request(request):
 
 def error_test(request):
     raise Exception("this should log")
+
+
+
+def redirect_middleware(get_response):
+    # One-time configuration and initialization.
+
+    def middleware(request):
+        # Code to be executed for each request before
+        # the view (and later middleware) are called.
+        if 'redirect' in request.GET:
+            query_string = request.GET.copy()
+            del query_string['redirect']
+
+            messages.add_message(request, messages.WARNING, "The Account Request Tool has a new home. Please update your bookmarks to https://gpdashboard.epa.gov/request/")
+            path = f'{request.path}?{query_string.urlencode()}' if query_string else request.path
+            response = redirect(path)
+        else:
+            response = get_response(request)
+
+        # Code to be executed for each request/response after
+        # the view is called.
+
+        return response
+
+    return middleware

ui/src/app/app.component.spec.ts

@@ -6,6 +6,7 @@ import {LoginService} from './auth/login.service';
 import {HttpClientTestingModule} from '@angular/common/http/testing';
 import {MatToolbarModule} from '@angular/material/toolbar';
 import {MatIconModule} from '@angular/material/icon';
+import {MatLegacySnackBarModule} from '@angular/material/legacy-snack-bar';
 
 describe('AppComponent', () => {
   beforeEach(async(() => {
@@ -14,7 +15,8 @@ describe('AppComponent', () => {
         RouterTestingModule,
         HttpClientTestingModule,
         MatToolbarModule,
-        MatIconModule
+        MatIconModule,
+        MatLegacySnackBarModule
       ],
       declarations: [
         AppComponent

ui/src/app/app.component.ts

@@ -4,7 +4,8 @@ import {BehaviorSubject, Observable, ReplaySubject, Subject} from 'rxjs';
 import {NavigationEnd, Router, ActivatedRoute} from '@angular/router';
 import {UserConfig, UserConfigService} from './auth/user-config.service';
 import {environment} from '../environments/environment';
-import {filter} from 'rxjs/operators';
+import {filter, tap} from 'rxjs/operators';
+import {MatLegacySnackBar as MatSnackBar} from '@angular/material/legacy-snack-bar';
 
 declare var gtag;
 
@@ -21,7 +22,8 @@ export class AppComponent implements OnInit {
     public loginService: LoginService,
     public router: Router,
     public route: ActivatedRoute,
-    public userConfig: UserConfigService
+    public userConfig: UserConfigService,
+    public snackBar: MatSnackBar
   ) {
     const navEndEvent$ = router.events.pipe(
       filter(e => e instanceof NavigationEnd)
@@ -37,6 +39,10 @@ export class AppComponent implements OnInit {
   ngOnInit(): void {
     this.admin_url = `${environment.local_service_endpoint}/admin/`;
     this.config = this.userConfig.config;
+    this.route.queryParams.pipe(
+      filter(q => 'redirect' in q),
+      tap(() => this.open_redirect_message())
+    ).subscribe()
   }
 
   logout() {
@@ -49,4 +55,12 @@ export class AppComponent implements OnInit {
   close_warning() {
     this.router.navigate([]);
   }
+
+  open_redirect_message() {
+    this.router.navigate([], {queryParams: {redirect: null}, queryParamsHandling: 'merge'})
+    this.snackBar.open(
+      'The Account Request Tool has a new home. Please update your bookmarks to https://gpdashboard.epa.gov/request/',
+      'Dismiss',
+      {verticalPosition: 'top', panelClass: ['snackbar-error']})
+  }
 }

ui/src/styles.css

@@ -114,6 +114,9 @@ mat-list-item.filter-btn div {
 .snackbar-error {
   background-color: darkorange !important;
   color: black !important;
+  .mat-simple-snackbar-action {
+    color: black;
+  }
 }
 
 div.mat-dialog-actions {