Merge pull request #158 from wwelling/master

Removed unused modules

package.json

@@ -92,7 +92,7 @@
     "compression": "1.7.1",
     "cookie-parser": "1.4.3",
     "core-js": "2.5.1",
-    "express": "4.16.0",
+    "express": "4.16.1",
     "express-session": "1.15.6",
     "font-awesome": "4.7.0",
     "http-server": "0.10.0",
@@ -133,7 +133,7 @@
     "awesome-typescript-loader": "3.2.3",
     "caniuse-lite": "1.0.30000697",
     "codelyzer": "3.2.0",
-    "compression-webpack-plugin": "1.0.0",
+    "compression-webpack-plugin": "1.0.1",
     "copy-webpack-plugin": "4.1.0",
     "coveralls": "3.0.0",
     "css-loader": "0.28.7",
@@ -182,7 +182,7 @@
     "rollup-plugin-uglify": "2.0.1",
     "sass-loader": "6.0.6",
     "script-ext-html-webpack-plugin": "1.8.5",
-    "source-map-loader": "0.2.1",
+    "source-map-loader": "0.2.2",
     "string-replace-loader": "1.3.0",
     "to-string-loader": "1.1.5",
     "ts-helpers": "1.1.2",

resources/data/en/test.json

-{
-  "test": {
-    "message": "Hello, DSpace!"
-  }
-}

src/app/app.component.spec.ts

@@ -25,8 +25,6 @@ import { HostWindowState } from './shared/host-window.reducer';
 import { HostWindowResizeAction } from './shared/host-window.actions';
 import { MockTranslateLoader } from './shared/testing/mock-translate-loader';
 
-import { BrowserCookiesModule } from '../modules/cookies/browser-cookies.module';
-import { BrowserDataLoaderModule } from '../modules/data-loader/browser-data-loader.module';
 import { BrowserTransferStateModule } from '../modules/transfer-state/browser-transfer-state.module';
 import { BrowserTransferStoreModule } from '../modules/transfer-store/browser-transfer-store.module';
 
@@ -52,8 +50,6 @@ describe('App component', () => {
             useClass: MockTranslateLoader
           }
         }),
-        BrowserCookiesModule,
-        BrowserDataLoaderModule,
         BrowserTransferStateModule,
         BrowserTransferStoreModule
       ],

src/app/app.module.ts

@@ -21,7 +21,6 @@ import { appMetaReducers, debugMetaReducers } from './app.metareducers';
 
 import { CoreModule } from './core/core.module';
 import { AppRoutingModule } from './app-routing.module';
-import { TransferHttpModule } from '../modules/transfer-http/transfer-http.module';
 
 import { AppComponent } from './app.component';
 import { HeaderComponent } from './header/header.component';
@@ -66,7 +65,6 @@ if (!ENV_CONFIG.production) {
     EffectsModule.forRoot(appEffects),
     StoreModule.forRoot(appReducers),
     StoreRouterConnectingModule,
-    TransferHttpModule,
     ...DEV_MODULES
   ],
   providers: [

src/app/browser-app.module.ts

@@ -11,8 +11,6 @@ import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { EffectsModule } from '@ngrx/effects';
 
 import { TransferState } from '../modules/transfer-state/transfer-state';
-import { BrowserCookiesModule } from '../modules/cookies/browser-cookies.module';
-import { BrowserDataLoaderModule } from '../modules/data-loader/browser-data-loader.module';
 import { BrowserTransferStateModule } from '../modules/transfer-state/browser-transfer-state.module';
 import { BrowserTransferStoreEffects } from '../modules/transfer-store/browser-transfer-store.effects';
 import { BrowserTransferStoreModule } from '../modules/transfer-store/browser-transfer-store.module';
@@ -39,10 +37,13 @@ export function createTranslateLoader(http: HttpClient) {
       appId: 'ds-app-id'
     }),
     HttpClientModule,
-    IdlePreloadModule.forRoot(), // forRoot ensures the providers are only created once
-    RouterModule.forRoot([], { useHash: false, preloadingStrategy: IdlePreload }),
-    BrowserCookiesModule,
-    BrowserDataLoaderModule,
+    // forRoot ensures the providers are only created once
+    IdlePreloadModule.forRoot(),
+    RouterModule.forRoot([], {
+      useHash: false,
+      preloadingStrategy:
+      IdlePreload
+    }),
     BrowserTransferStateModule,
     BrowserTransferStoreModule,
     TranslateModule.forRoot({

src/app/server-app.module.ts

@@ -23,10 +23,6 @@ import { TransferState } from '../modules/transfer-state/transfer-state';
 import { ServerTransferStoreEffects } from '../modules/transfer-store/server-transfer-store.effects';
 import { ServerTransferStoreModule } from '../modules/transfer-store/server-transfer-store.module';
 
-import { ServerCookiesModule } from '../modules/cookies/server-cookies.module';
-
-import { ServerDataLoaderModule } from '../modules/data-loader/server-data-loader.module';
-
 import { AppState } from './app.reducer';
 
 import { AppModule } from './app.module';
@@ -54,9 +50,9 @@ export function createTranslateLoader() {
     BrowserModule.withServerTransition({
       appId: 'ds-app-id'
     }),
-    RouterModule.forRoot([], { useHash: false }),
-    ServerCookiesModule,
-    ServerDataLoaderModule,
+    RouterModule.forRoot([], {
+      useHash: false
+    }),
     ServerTransferStateModule,
     ServerTransferStoreModule,
     TranslateModule.forRoot({

src/modules/cookies/browser-cookies.module.ts

-import { NgModule } from '@angular/core';
-
-import { Cookies } from './cookies';
-import { BrowserCookies } from './browser-cookies';
-
-@NgModule({
-  providers: [
-    { provide: Cookies, useClass: BrowserCookies }
-  ]
-})
-export class BrowserCookiesModule {
-
-}

src/modules/cookies/browser-cookies.ts

-import { Injectable } from '@angular/core';
-
-import { Cookies } from './cookies';
-
-@Injectable()
-export class BrowserCookies implements Cookies {
-
-  // TODO: improve - set domain from configuration value or ui baseUrl
-  set(name: string, value: string, days: number, path?: string): void {
-    const date: Date = new Date();
-    date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
-    const expires: string = 'expires=' + date.toUTCString();
-    window.document.cookie = [name, '=', value, '; ', expires, path ? '; path=' + path : ''].join('');
-  }
-
-  get(name: string): string {
-    const cookies: string[] = window.document.cookie.split(';');
-    let cookie: string;
-    for (const cc of cookies) {
-      const c: string = cc.replace(/^\s\+/g, '');
-      if (c.indexOf(name + '=') === 0) {
-        cookie = c.substring(name.length + 1, c.length);
-        break;
-      }
-    }
-    return cookie;
-  }
-
-  // TODO: set path from environment configuration
-  remove(name: string): void {
-    this.set(name, '', 0, '/');
-  }
-
-}

src/modules/cookies/cookies.ts

-export abstract class Cookies {
-
-  abstract set(name: string, value: string, days: number, path?: string): void;
-
-  abstract get(name: string): string;
-
-  abstract remove(name: string): void;
-
-}

src/modules/cookies/server-cookies.module.ts

-import { NgModule } from '@angular/core';
-
-import { Cookies } from './cookies';
-import { ServerCookies } from './server-cookies';
-
-@NgModule({
-  providers: [
-    { provide: Cookies, useClass: ServerCookies }
-  ]
-})
-export class ServerCookiesModule {
-
-}

src/modules/cookies/server-cookies.ts

-import { Injectable } from '@angular/core';
-
-import { Cookies } from './cookies';
-
-@Injectable()
-export class ServerCookies implements Cookies {
-
-  // tslint:disable:no-empty
-  set(name: string, value: string, days: number, path?: string): void {
-
-  }
-  // tslint:enable:no-empty
-
-  get(name: string): string {
-    return undefined;
-  }
-
-  // tslint:disable:no-empty
-  remove(name: string): void {
-
-  }
-  // tslint:enable:no-empty
-
-}

src/modules/data-loader/browser-data-loader.module.ts

-import { NgModule } from '@angular/core';
-
-import { DataLoader } from './data-loader';
-import { BrowserDataLoader } from './browser-data-loader';
-
-@NgModule({
-  providers: [
-    { provide: DataLoader, useClass: BrowserDataLoader }
-  ]
-})
-export class BrowserDataLoaderModule {
-
-}

src/modules/data-loader/browser-data-loader.ts

-import { Injectable } from '@angular/core';
-
-import { Http, Response } from '@angular/http';
-import { Observable } from 'rxjs/Observable';
-
-import { DataLoader } from './data-loader';
-
-@Injectable()
-export class BrowserDataLoader extends DataLoader {
-
-  protected prefix: string;
-
-  protected suffix: string;
-
-  constructor(private http: Http) {
-    super();
-    this.prefix = 'assets/data';
-    this.suffix = '.json';
-  }
-
-  public getData(name: string): Observable<any> {
-    return this.http.get(`${this.prefix}/${this.language}/${name}${this.suffix}`, {}).map((response: Response) => {
-      return response.json();
-    });
-  }
-
-}

src/modules/data-loader/data-loader.ts

-import { Observable } from 'rxjs/Observable';
-
-export abstract class DataLoader {
-
-  protected language: string;
-
-  protected abstract prefix: string;
-
-  protected abstract suffix: string;
-
-  constructor() {
-    this.language = 'en';
-  }
-
-  public setLanguage(language: string): void {
-    this.language = language;
-  }
-
-  abstract getData(name: string): Observable<any>;
-
-}

src/modules/data-loader/server-data-loader.module.ts

-import { NgModule } from '@angular/core';
-
-import { DataLoader } from './data-loader';
-import { ServerDataLoader } from './server-data-loader';
-
-@NgModule({
-  providers: [
-    { provide: DataLoader, useClass: ServerDataLoader }
-  ]
-})
-export class ServerDataLoaderModule {
-
-}

src/modules/data-loader/server-data-loader.ts

-import { Injectable } from '@angular/core';
-
-import { Observable } from 'rxjs/Observable';
-import * as fs from 'fs';
-
-import { DataLoader } from './data-loader';
-
-@Injectable()
-export class ServerDataLoader extends DataLoader {
-
-  protected prefix: string;
-
-  protected suffix: string;
-
-  constructor() {
-    super();
-    this.prefix = 'dist/assets/data';
-    this.suffix = '.json';
-  }
-
-  public getData(name: string): Observable<any> {
-    return Observable.create((observer: any) => {
-      observer.next(JSON.parse(fs.readFileSync(`${this.prefix}/${this.language}/${name}${this.suffix}`, 'utf8')));
-      observer.complete();
-    });
-  }
-
-}

src/modules/transfer-http/transfer-http.module.ts

-import { NgModule } from '@angular/core';
-
-import { TransferHttp } from './transfer-http';
-
-@NgModule({
-  providers: [
-    TransferHttp
-  ]
-})
-export class TransferHttpModule {
-
-}

src/modules/transfer-http/transfer-http.ts

-import { Injectable } from '@angular/core';
-import { ConnectionBackend, Http, Request, RequestOptions, RequestOptionsArgs, Response } from '@angular/http';
-
-import { Observable } from 'rxjs/Observable';
-
-import { TransferState } from '../transfer-state/transfer-state';
-
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/do';
-import 'rxjs/add/observable/of';
-
-@Injectable()
-export class TransferHttp {
-
-  constructor(private http: Http, protected transferState: TransferState) { }
-
-  request(uri: string | Request, options?: RequestOptionsArgs): Observable<any> {
-    // tslint:disable-next-line:no-shadowed-variable
-    return this.getData(uri, options, (url: string, options: RequestOptionsArgs) => {
-      return this.http.request(url, options);
-    });
-  }
-
-  get(url: string, options?: RequestOptionsArgs): Observable<any> {
-    // tslint:disable-next-line:no-shadowed-variable
-    return this.getData(url, options, (url: string, options: RequestOptionsArgs) => {
-      return this.http.get(url, options);
-    });
-  }
-
-  post(url: string, body: any, options?: RequestOptionsArgs): Observable<any> {
-    // tslint:disable-next-line:no-shadowed-variable
-    return this.getPostData(url, body, options, (url: string, body: any, options: RequestOptionsArgs) => {
-      return this.http.post(url, body, options);
-    });
-  }
-
-  put(url: string, body: any, options?: RequestOptionsArgs): Observable<any> {
-    // tslint:disable-next-line:no-shadowed-variable
-    return this.getData(url, options, (url: string, options: RequestOptionsArgs) => {
-      return this.http.put(url, options);
-    });
-  }
-
-  delete(url: string, options?: RequestOptionsArgs): Observable<any> {
-    // tslint:disable-next-line:no-shadowed-variable
-    return this.getData(url, options, (url: string, options: RequestOptionsArgs) => {
-      return this.http.delete(url, options);
-    });
-  }
-
-  patch(url: string, body: any, options?: RequestOptionsArgs): Observable<any> {
-    // tslint:disable-next-line:no-shadowed-variable
-    return this.getPostData(url, body, options, (url: string, body: any, options: RequestOptionsArgs) => {
-      return this.http.patch(url, body, options);
-    });
-  }
-
-  head(url: string, options?: RequestOptionsArgs): Observable<any> {
-    // tslint:disable-next-line:no-shadowed-variable
-    return this.getData(url, options, (url: string, options: RequestOptionsArgs) => {
-      return this.http.head(url, options);
-    });
-  }
-
-  options(url: string, options?: RequestOptionsArgs): Observable<any> {
-    // tslint:disable-next-line:no-shadowed-variable
-    return this.getData(url, options, (url: string, options: RequestOptionsArgs) => {
-      return this.http.options(url, options);
-    });
-  }
-
-  // tslint:disable-next-line:max-line-length
-  private getData(uri: string | Request, options: RequestOptionsArgs, callback: (uri: string | Request, options?: RequestOptionsArgs) => Observable<Response>) {
-
-    let url = uri;
-
-    if (typeof uri !== 'string') {
-      url = uri.url;
-    }
-
-    const key = url + JSON.stringify(options);
-
-    try {
-      return this.resolveData(key);
-    } catch (e) {
-      return callback(uri, options)
-        .map((res: Response) => res.json())
-        .do((data: any) => {
-          this.setCache(key, data);
-        });
-    }
-  }
-
-  private getPostData(uri: string | Request, body: any, options: RequestOptionsArgs, callback: (uri: string | Request, body: any, options?: RequestOptionsArgs) => Observable<Response>) {
-
-    let url = uri;
-
-    if (typeof uri !== 'string') {
-      url = uri.url;
-    }
-
-    const key = url + JSON.stringify(body) + JSON.stringify(options);
-
-    try {
-      return this.resolveData(key);
-    } catch (e) {
-      return callback(uri, body, options)
-        .map((res: Response) => res.json())
-        .do((data: any) => {
-          this.setCache(key, data);
-        });
-    }
-  }
-
-  private resolveData(key: string) {
-    const data = this.getFromCache(key);
-    if (!data) {
-      throw new Error();
-    }
-    return Observable.of(data);
-  }
-
-  private setCache(key, data) {
-    return this.transferState.set(key, data);
-  }
-
-  private getFromCache(key): any {
-    return this.transferState.get(key);
-  }
-
-}