Merge pull request #392 from TAMULib/sprint-7-staging

Sprint 7 Staging

package.json

@@ -51,7 +51,6 @@
     "@nguniversal/express-engine": "16.2.0",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
-    "@stomp/stompjs": "7.0.0",
     "bootstrap": "~4.6.2",
     "d3": "7.8.5",
     "express": "4.18.2",

server.ts

@@ -25,7 +25,6 @@ const BASE_HREF = process.env.BASE_HREF || '/';
 
 const BROKER_URL = process.env.BROKER_URL || 'ws://localhost:9000';
 const SERVICE_URL = process.env.SERVICE_URL || 'http://localhost:9000';
-const SSR_SERVICE_URL = process.env.SSR_SERVICE_URL || 'http://127.0.0.1:9000';
 
 const UI_URL = process.env.UI_URL || 'http://localhost:4200';
 const EMBED_URL = process.env.EMBED_URL || 'http://localhost:4201';
@@ -37,7 +36,6 @@ const COLLECT_SEARCH_STATS = process.env.COLLECT_SEARCH_STATS === 'true';
 const serverAppConfig = (appConfig: AppConfig): AppConfig => {
   return {
     ...appConfig,
-    serviceUrl: SSR_SERVICE_URL
   };
 }
 

src/app/+data-and-analytics/profile-summaries-export/profile-summaries-export.component.spec.ts

@@ -7,6 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { testAppConfig } from '../../../test.config';
 import { getRequest } from '../../app.browser.module';
+import { APP_CONFIG } from '../../app.config';
 import { Layout } from '../../core/model/view';
 import { ContainerType } from '../../core/model/view/data-and-analytics-view';
 import { Side } from '../../core/model/view/display-view';
@@ -39,6 +40,7 @@ describe('ProfileSummariesExportComponent', () => {
       ],
       providers: [
         { provide: REQUEST, useFactory: getRequest },
+        { provide: APP_CONFIG, useValue: testAppConfig },
         RestService
       ]
     }).compileComponents();

src/app/+directory/directory.component.ts

@@ -82,7 +82,7 @@ export class DirectoryComponent implements OnDestroy, OnInit {
   }
 
   public isActive(directoryView: DirectoryView, params: Params, option: string): boolean {
-    const queryParams: Params = Object.assign({}, params);
+    const queryParams: Params = { ...params };
     if (hasFilter(queryParams.filters, directoryView.index.field)) {
       return queryParams[`${directoryView.index.field}.filter`] === option;
     }
@@ -114,7 +114,7 @@ export class DirectoryComponent implements OnDestroy, OnInit {
   }
 
   public getDirectoryExportUrl(params: Params, directoryView: DirectoryView): string {
-    const queryParams: Params = Object.assign({}, params);
+    const queryParams: Params = { ...params };
     queryParams.facets = null;
     queryParams.collection = null;
     addExportToQueryParams(queryParams, directoryView);
@@ -124,13 +124,13 @@ export class DirectoryComponent implements OnDestroy, OnInit {
   }
 
   public getDirectoryQueryParamsRemovingFilter(params: Params, filterToRemove: Filter): Params {
-    const queryParams: Params = Object.assign({}, params);
+    const queryParams: Params = { ...params };
     removeFilterFromQueryParams(queryParams, filterToRemove);
     return queryParams;
   }
 
   public getDirectoryQueryParamsResetting(params: Params, directoryView: DirectoryView): Params {
-    const queryParams: Params = Object.assign({}, params);
+    const queryParams: Params = { ...params };
     if (hasFilter(queryParams.filters, directoryView.index.field)) {
       const filters = queryParams.filters.split(',')
         .map((field) => field.trim())
@@ -147,13 +147,13 @@ export class DirectoryComponent implements OnDestroy, OnInit {
   }
 
   public getDirectoryQueryParamsClearingFilters(params: Params, discoveryView: DiscoveryView): Params {
-    const queryParams: Params = Object.assign({}, params);
+    const queryParams: Params = { ...params };
     resetFiltersInQueryParams(queryParams, discoveryView);
     return queryParams;
   }
 
   public getDirectoryQueryParamsWithOption(params: Params, directoryView: DirectoryView, option: string): Params {
-    const queryParams: Params = Object.assign({}, params);
+    const queryParams: Params = { ...params };
     queryParams.page = 1;
     if (option) {
       queryParams[`${directoryView.index.field}.filter`] = option;

src/app/+discovery/discovery.component.ts

@@ -118,7 +118,7 @@ export class DiscoveryComponent implements OnDestroy, OnInit {
   }
 
   public getDiscoveryExportUrl(params: Params, discoveryView: DiscoveryView): string {
-    const queryParams: Params = Object.assign({}, params);
+    const queryParams: Params = { ...params };
     queryParams.facets = null;
     queryParams.collection = null;
     addExportToQueryParams(queryParams, discoveryView);
@@ -128,13 +128,13 @@ export class DiscoveryComponent implements OnDestroy, OnInit {
   }
 
   public getDiscoveryQueryParamsRemovingFilter(params: Params, filterToRemove: Filter): Params {
-    const queryParams: Params = Object.assign({}, params);
+    const queryParams: Params = { ...params };
     removeFilterFromQueryParams(queryParams, filterToRemove);
     return queryParams;
   }
 
   public getDiscoveryQueryParamsClearingFilters(params: Params, discoveryView: DiscoveryView): Params {
-    const queryParams: Params = Object.assign({}, params);
+    const queryParams: Params = { ...params };
     resetFiltersInQueryParams(queryParams, discoveryView);
     return queryParams;
   }

src/app/app.component.ts

@@ -29,7 +29,10 @@ export class AppComponent implements OnInit {
 
   private isPlatformBrowser: boolean;
 
-  constructor(@Inject(PLATFORM_ID) platformId: string, private store: Store<AppState>) {
+  constructor(
+    @Inject(PLATFORM_ID) platformId: string,
+    private store: Store<AppState>
+  ) {
     initializeTemplateHelpers(environment.formalize);
     this.isPlatformBrowser = isPlatformBrowser(platformId);
   }

src/app/app.module.ts

@@ -24,6 +24,7 @@ export class I18nTranslateState {
 }
 
 export const I18N_TRANSLATE_STATE = makeStateKey<I18nTranslateState>('I18N_TRANSLATE_STATE');
+export const STORE_TRANSLATE_STATE = makeStateKey<string>('STORE_TRANSLATE_STATE');
 
 const getBaseHref = (document: Document, appConfig: AppConfig): string => {
   const baseTag = document.querySelector('head > base');
@@ -47,10 +48,10 @@ const createWithCredentialsInterceptor = (): HttpInterceptor => {
   ],
   imports: [
     BrowserModule,
-    TransferHttpCacheModule,
     BrowserAnimationsModule,
     AppRoutingModule,
     HttpClientModule,
+    TransferHttpCacheModule,
     TranslateModule.forRoot(),
     CoreModule.forRoot(),
     NgbModule,

src/app/app.server.module.ts

@@ -1,13 +1,14 @@
 import { APP_BASE_HREF, DOCUMENT } from '@angular/common';
-import { NgModule, TransferState } from '@angular/core';
+import { APP_BOOTSTRAP_LISTENER, NgModule, TransferState } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ServerModule } from '@angular/platform-server';
 import { MissingTranslationHandler, TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { readFileSync } from 'fs';
-import { Observable, of } from 'rxjs';
+import { Observable, of, take } from 'rxjs';
 
+import { Store } from '@ngrx/store';
 import { AppComponent } from './app.component';
-import { AppModule, I18N_TRANSLATE_STATE, I18nTranslateState } from './app.module';
+import { AppModule, I18N_TRANSLATE_STATE, I18nTranslateState, STORE_TRANSLATE_STATE } from './app.module';
 import { ComputedStyleLoader } from './core/computed-style-loader';
 import { CustomMissingTranslationHandler } from './core/handler/custom-missing-translation.handler';
 
@@ -72,6 +73,18 @@ const createUniversalStyleLoader = (document: Document, baseHref: string): Compu
       useFactory: createUniversalStyleLoader,
       deps: [DOCUMENT, APP_BASE_HREF],
     },
+    {
+      provide: APP_BOOTSTRAP_LISTENER,
+      useFactory: (store: Store, transferState: TransferState) => {
+        return () => {
+          store.pipe(take(1)).subscribe(state => {
+            transferState.set<string>(STORE_TRANSLATE_STATE, JSON.stringify(state));
+          });
+        };
+      },
+      deps: [Store, TransferState],
+      multi: true,
+    }
   ],
 })
 export class AppServerModule { }

src/app/core/core.module.ts

@@ -10,7 +10,6 @@ import { DialogService } from './service/dialog.service';
 import { MetadataService } from './service/metadata.service';
 import { RestService } from './service/rest.service';
 import { StatsService } from './service/stats.service';
-import { StompService } from './service/stomp.service';
 import { ThemeService } from './service/theme.service';
 
 const MODULES = [
@@ -27,7 +26,6 @@ const PROVIDERS = [
   MetadataService,
   RestService,
   StatsService,
-  StompService,
   ThemeService,
   ThemeRepo,
   UserRepo

src/app/core/guard/auth.guard.ts

@@ -30,9 +30,9 @@ export class AuthGuard {
   public canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
     const roles = route.data.roles;
     return this.requiresAuthorization(roles).pipe(
-      switchMap((authorize: boolean) => {
-        return authorize ? this.isAuthorized(state.url, roles) : this.isAuthenticated(state.url);
-      })
+      switchMap((authorize: boolean) => authorize
+        ? this.isAuthorized(state.url, roles)
+        : this.isAuthenticated(state.url))
     );
   }
 
@@ -48,10 +48,7 @@ export class AuthGuard {
         map((user: User) => {
           const authorized = user ? roles.indexOf(Role[user.role]) >= 0 : false;
           if (!authorized) {
-            this.store.dispatch(new fromRouter.Go({ path: ['/'] }));
-            if (isPlatformBrowser(this.platformId)) {
-              this.store.dispatch(this.alert.unsubscribeFailureAlert());
-            }
+            this.store.dispatch(new fromRouter.Link({ url: '/' }));
           }
           return authorized;
         })) : scheduled([false], asapScheduler)));
@@ -62,11 +59,9 @@ export class AuthGuard {
       select(selectIsAuthenticated),
       map((authenticated: boolean) => {
         if (!authenticated) {
-          this.store.dispatch(new fromRouter.Go({ path: ['/'] }));
+          this.store.dispatch(new fromRouter.Link({ url: '/' }));
+          this.store.dispatch(new fromAuth.SetLoginRedirectAction({ url }));
           if (isPlatformBrowser(this.platformId)) {
-            this.store.dispatch(new fromAuth.SetLoginRedirectAction({
-              navigation: { path: [url] },
-            }));
             this.store.dispatch(this.dialog.loginDialog());
             this.store.dispatch(this.alert.forbiddenAlert());
           }