Add data and analytics authorizations (#302)

* Add data and analytics authorizations

* Add some missing ending newlines

* Increment minor version to 1.5.0

* Upgrade stomp, update home component, and add data and analytics admin component

README.md

@@ -25,8 +25,9 @@ In addition to having [Docker](https://docs.docker.com/) installed, a running [S
   -e HOST=localhost \
   -e PORT=4200 \
   -e BASE_HREF=/ \
-  -e SSR_SERVICE_URL="http://127.0.0.1:9000" \
+  -e BROKER_URL="ws://localhost:9000" \
   -e SERVICE_URL="http://localhost:9000" \
+  -e SSR_SERVICE_URL="http://127.0.0.1:9000" \
   -e EMBED_URL="http://localhost:4201" \
   -e UI_URL="http://localhost:4200" \
   -e VIVO_URL="http://localhost:8080/vivo" \

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scholars-angular",
-  "version": "1.4.3",
+  "version": "1.5.0",
   "description": "Angular Universal client for Scholars Discovery",
   "license": "MIT",
   "contributors": [],
@@ -51,6 +51,7 @@
     "@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

@@ -11,6 +11,7 @@ import { join } from 'path';
 import { APP_BASE_HREF } from '@angular/common';
 
 import { ngExpressEngine } from '@nguniversal/express-engine';
+import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
 
 import * as express from 'express';
 import * as expressStaticGzip from 'express-static-gzip';
@@ -22,10 +23,12 @@ const HOST = process.env.HOST || 'localhost';
 const PORT = Number(process.env.PORT) || 4200;
 const BASE_HREF = process.env.BASE_HREF || '/';
 
-const SSR_SERVICE_URL = process.env.SSR_SERVICE_URL || 'http://127.0.0.1:9000';
+const BROKER_URL = process.env.BROKER_URL || 'ws://localhost:9000';
 const SERVICE_URL = process.env.SERVICE_URL || 'http://localhost:9000';
-const EMBED_URL = process.env.EMBED_URL || 'http://localhost:4201';
+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';
 const VIVO_URL = process.env.VIVO_URL || 'http://localhost:8080/vivo';
 const VIVO_EDITOR_URL = process.env.VIVO_EDITOR_URL || 'http://localhost:8080/vivo_editor';
 
@@ -81,10 +84,11 @@ export const app = (appConfig: AppConfig) => {
   router.get('*', (req, res) => {
     res.render(indexHtml, {
       req,
-      providers: [{
-        provide: APP_BASE_HREF,
-        useValue: req.baseUrl
-      }]
+      providers: [
+        { provide: APP_BASE_HREF, useValue: req.baseUrl },
+        { provide: REQUEST, useValue: req },
+        { provide: RESPONSE, useValue: res },
+      ]
     });
   });
 
@@ -98,9 +102,10 @@ function run() {
     host: HOST,
     port: PORT,
     baseHref: BASE_HREF,
+    brokerUrl: BROKER_URL,
     serviceUrl: SERVICE_URL,
-    embedUrl: EMBED_URL,
     uiUrl: UI_URL,
+    embedUrl: EMBED_URL,
     vivoUrl: VIVO_URL,
     vivoEditorUrl: VIVO_EDITOR_URL,
     collectSearchStats: COLLECT_SEARCH_STATS

src/app/+admin/admin.component.ts

@@ -41,6 +41,10 @@ export class AdminComponent implements OnInit {
         route: ['/admin/DisplayViews'],
         translateKey: 'ADMIN.DISPLAY_VIEWS.TITLE',
       },
+      {
+        route: ['/admin/DataAndAnalyticsViews'],
+        translateKey: 'ADMIN.DATA_AND_ANALYTICS_VIEWS.TITLE',
+      },
       {
         route: ['/admin/Themes'],
         translateKey: 'ADMIN.THEMES.TITLE',

src/app/+admin/admin.module.ts

@@ -7,6 +7,7 @@ import { CustomMissingTranslationHandler } from '../core/handler/custom-missing-
 import { SharedModule } from '../shared/shared.module';
 import { AdminComponent } from './admin.component';
 import { routes } from './admin.routes';
+import { DataAndAnalyticsViewsComponent } from './data-and-analytics-views/data-and-analytics-views.component';
 import { DirectoryViewsComponent } from './directory-views/directory-views.component';
 import { DiscoveryViewsComponent } from './discovery-views/discovery-views.component';
 import { DisplayViewsComponent } from './display-views/display-views.component';
@@ -16,6 +17,7 @@ import { UsersComponent } from './users/users.component';
 @NgModule({
   declarations: [
     AdminComponent,
+    DataAndAnalyticsViewsComponent,
     DirectoryViewsComponent,
     DiscoveryViewsComponent,
     DisplayViewsComponent,

src/app/+admin/admin.routes.ts

@@ -6,6 +6,7 @@ import { DiscoveryViewsComponent } from './discovery-views/discovery-views.compo
 import { DisplayViewsComponent } from './display-views/display-views.component';
 import { ThemesComponent } from './themes/themes.component';
 import { UsersComponent } from './users/users.component';
+import { DataAndAnalyticsViewsComponent } from './data-and-analytics-views/data-and-analytics-views.component';
 
 export const routes: Routes = [
   {
@@ -51,6 +52,19 @@ export const routes: Routes = [
           ],
         },
       },
+      {
+        path: 'DataAndAnalyticsViews',
+        component: DataAndAnalyticsViewsComponent,
+        data: {
+          collection: 'dataAndAnalyticsViews',
+          tags: [
+            {
+              name: 'view',
+              content: 'Scholars Administration - Data and Analytics Views',
+            },
+          ],
+        },
+      },
       {
         path: 'Themes',
         component: ThemesComponent,

src/app/+admin/data-and-analytics-views/data-and-analytics-views.component.html

@@ -0,0 +1,16 @@
+<scholars-pagination [page]="page">
+  <table class="table table-striped table-hover">
+    <thead>
+      <tr>
+        <th scope="col">{{ 'ADMIN.DATA_AND_ANALYTICS_VIEWS.NAME' | translate }}</th>
+        <th scope="col">{{ 'ADMIN.DATA_AND_ANALYTICS_VIEWS.LAYOUT' | translate }}</th>
+      </tr>
+    </thead>
+    <tbody *ngIf="dataAndAnalyticsViews | async; let dataAndAnalyticsViews">
+      <tr *ngFor="let dataAndAnalyticsView of dataAndAnalyticsViews">
+        <td scope="row">{{dataAndAnalyticsView.name}}</td>
+        <td scope="row">{{dataAndAnalyticsView.layout}}</td>
+      </tr>
+    </tbody>
+  </table>
+</scholars-pagination>

src/app/+admin/data-and-analytics-views/data-and-analytics-views.component.spec.ts

@@ -0,0 +1,55 @@
+import { APP_BASE_HREF } from '@angular/common';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { testAppConfig } from '../../../test.config';
+import { DialogService } from '../../core/service/dialog.service';
+import { metaReducers, reducers } from '../../core/store';
+import { SharedModule } from '../../shared/shared.module';
+import { DataAndAnalyticsViewsComponent } from './data-and-analytics-views.component';
+
+describe('DataAndAnalyticsViewsComponent', () => {
+  let component: DataAndAnalyticsViewsComponent;
+  let fixture: ComponentFixture<DataAndAnalyticsViewsComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [DataAndAnalyticsViewsComponent],
+      providers: [
+        DialogService,
+        {
+          provide: APP_BASE_HREF,
+          useValue: '/',
+        },
+      ],
+      imports: [
+        NoopAnimationsModule,
+        SharedModule,
+        StoreModule.forRoot(reducers(testAppConfig), {
+          metaReducers,
+          runtimeChecks: {
+            strictStateImmutability: false,
+            strictActionImmutability: false,
+            strictStateSerializability: false,
+            strictActionSerializability: false,
+          },
+        }),
+        TranslateModule.forRoot(),
+        RouterTestingModule.withRoutes([]),
+      ],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DataAndAnalyticsViewsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/+admin/data-and-analytics-views/data-and-analytics-views.component.ts

@@ -0,0 +1,29 @@
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { Store, select } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { SdrPage } from '../../core/model/sdr';
+import { DataAndAnalyticsView } from '../../core/model/view';
+import { AppState } from '../../core/store';
+import { selectAllResources, selectResourcesPage } from '../../core/store/sdr';
+
+@Component({
+  selector: 'scholars-data-and-analytics-views',
+  templateUrl: './data-and-analytics-views.component.html',
+  styleUrls: ['./data-and-analytics-views.component.scss'],
+  encapsulation: ViewEncapsulation.None,
+})
+export class DataAndAnalyticsViewsComponent implements OnInit {
+
+  public dataAndAnalyticsViews: Observable<DataAndAnalyticsView[]>;
+
+  public page: Observable<SdrPage>;
+
+  constructor(private store: Store<AppState>) { }
+
+  ngOnInit() {
+    this.dataAndAnalyticsViews = this.store.pipe(select(selectAllResources<DataAndAnalyticsView>('dataAndAnalyticsViews')));
+    this.page = this.store.pipe(select(selectResourcesPage<DataAndAnalyticsView>('dataAndAnalyticsViews')));
+  }
+
+}

src/app/+admin/directory-views/directory-views.component.html

@@ -13,4 +13,4 @@
       </tr>
     </tbody>
   </table>
-</scholars-pagination>
+</scholars-pagination>

src/app/+admin/discovery-views/discovery-views.component.html

@@ -13,4 +13,4 @@
       </tr>
     </tbody>
   </table>
-</scholars-pagination>
+</scholars-pagination>

src/app/+admin/display-views/display-views.component.html

@@ -17,4 +17,4 @@
       </tr>
     </tbody>
   </table>
-</scholars-pagination>
+</scholars-pagination>

src/app/+admin/themes/themes.component.html

@@ -15,4 +15,4 @@
       </tr>
     </tbody>
   </table>
-</scholars-pagination>
+</scholars-pagination>

src/app/+admin/users/users.component.html

@@ -21,4 +21,4 @@
       </tr>
     </tbody>
   </table>
-</scholars-pagination>
+</scholars-pagination>

src/app/+dashboard/home/home.component.ts

@@ -1,10 +1,11 @@
-import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
+import { isPlatformBrowser } from '@angular/common';
+import { Component, Inject, OnInit, PLATFORM_ID, ViewEncapsulation } from '@angular/core';
 import { DomSanitizer, SafeStyle } from '@angular/platform-browser';
 import { ActivatedRoute, Params } from '@angular/router';
 import { NgbCarouselConfig } from '@ng-bootstrap/ng-bootstrap';
 import { Store, select } from '@ngrx/store';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { Observable, Subject } from 'rxjs';
+import { filter, take } from 'rxjs/operators';
 
 import { Hero, Home } from '../../core/model/theme';
 import { DiscoveryView } from '../../core/model/view';
@@ -21,49 +22,46 @@ import * as fromAuth from '../../core/store/auth/auth.actions';
   styleUrls: ['home.component.scss'],
   encapsulation: ViewEncapsulation.None,
 })
-export class HomeComponent implements OnInit, OnDestroy {
+export class HomeComponent implements OnInit {
 
   public discoveryView: Observable<DiscoveryView>;
 
   public home: Observable<Home>;
 
   public organization: Observable<string>;
 
-  public searchStyles: BehaviorSubject<SearchBoxStyles>;
+  public searchStyles: Subject<SearchBoxStyles>;
 
-  private subscriptions: Subscription[];
-
-  constructor(public config: NgbCarouselConfig, private sanitizer: DomSanitizer, private route: ActivatedRoute, private store: Store<AppState>) {
-    this.subscriptions = [];
-  }
+  constructor(
+    public config: NgbCarouselConfig,
+    @Inject(PLATFORM_ID) private platformId: string,
+    private sanitizer: DomSanitizer,
+    private route: ActivatedRoute,
+    private store: Store<AppState>
+  ) { }
 
   ngOnInit() {
     this.discoveryView = this.store.pipe(
       select(selectDiscoveryViewByClass('People')),
-      filter((view: DiscoveryView) => view !== undefined)
+      filter((view: DiscoveryView) => !!view)
     );
     this.home = this.store.pipe(
       select(selectActiveThemeHome),
-      filter((home: Home) => home !== undefined)
+      filter((home: Home) => !!home)
     );
     this.organization = this.store.pipe(
       select(selectActiveThemeOrganization),
-      filter((organization: string) => organization !== undefined)
-    );
-    this.subscriptions.push(
-      this.route.queryParams.subscribe((params: Params) => {
-        if (params.key !== undefined) {
-          this.store.dispatch(new fromAuth.ConfirmRegistrationAction({ key: params.key }));
-        }
-      })
+      filter((organization: string) => !!organization)
     );
-    this.searchStyles = new BehaviorSubject<SearchBoxStyles>(undefined);
-  }
-
-  ngOnDestroy() {
-    this.subscriptions.forEach((subscription: Subscription) => {
-      subscription.unsubscribe();
-    });
+    if (isPlatformBrowser(this.platformId)) {
+      this.route.queryParams.pipe(take(1))
+        .subscribe((params: Params) => {
+          if (!!params.key) {
+            this.store.dispatch(new fromAuth.ConfirmRegistrationAction({ key: params.key }));
+          }
+        });
+    }
+    this.searchStyles = new Subject<SearchBoxStyles>();
   }
 
   public showCarousel(home: Home): boolean {

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

@@ -1,3 +1,3 @@
 <div class="container mb-1" *ngIf="getSelectedExportView() | async; let selected">
-  <a class="btn btn-primary pull-right" [href]="getDownloadLink(organization, selected)">{{ 'DATA_AND_ANALYTICS.DOWNLOAD' | translate }}</a>
+  <button class="btn btn-primary pull-right" (click)="download(organization, selected)">{{ 'DATA_AND_ANALYTICS.DOWNLOAD' | translate }}</button>
 </div>

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

@@ -1,12 +1,16 @@
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
+import { REQUEST } from '@nguniversal/express-engine/tokens';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { testAppConfig } from '../../../test.config';
+import { getRequest } from '../../app.browser.module';
 import { Layout } from '../../core/model/view';
 import { ContainerType } from '../../core/model/view/data-and-analytics-view';
 import { Side } from '../../core/model/view/display-view';
+import { RestService } from '../../core/service/rest.service';
 import { metaReducers, reducers } from '../../core/store';
 import { SharedModule } from '../../shared/shared.module';
 import { ProfileSummariesExportComponent } from './profile-summaries-export.component';
@@ -20,6 +24,7 @@ describe('ProfileSummariesExportComponent', () => {
       declarations: [ProfileSummariesExportComponent],
       imports: [
         SharedModule,
+        HttpClientTestingModule,
         StoreModule.forRoot(reducers(testAppConfig), {
           metaReducers,
           runtimeChecks: {
@@ -31,6 +36,10 @@ describe('ProfileSummariesExportComponent', () => {
         }),
         RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot(),
+      ],
+      providers: [
+        { provide: REQUEST, useFactory: getRequest },
+        RestService
       ]
     }).compileComponents();
   }));