merge from ecomp a88f0072 - Modern UI

[vid.git] / vid-webpack-master / src / app / shared / services / configuration.service.ts

diff --git a/vid-webpack-master/src/app/services/configuration.service.ts b/vid-webpack-master/src/app/shared/services/configuration.service.ts
similarity index 82%
rename from vid-webpack-master/src/app/services/configuration.service.ts
rename to vid-webpack-master/src/app/shared/services/configuration.service.ts
index 4edd8ff..6c618b5 100644 (file)
--- a/vid-webpack-master/src/app/services/configuration.service.ts
+++ b/vid-webpack-master/src/app/shared/services/configuration.service.ts
@@ -1,10 +1,11 @@
 import {Injectable} from '@angular/core';
 import {HttpClient} from "@angular/common/http";
-import {Constants} from "../shared/utils/constants";
-import {Observable} from 'rxjs/Observable';
-import {updateFlags} from "../global.actions";
+import {Constants} from "../utils/constants";
+import {Observable} from 'rxjs';
 import {NgRedux} from "@angular-redux/store";
 import {AppState} from "../store/reducers";
+import {updateFlags} from "../storeUtil/utils/global/global.actions";
+import {of} from "rxjs";
 
 @Injectable()
 export class ConfigurationService {
@@ -23,7 +24,7 @@ export class ConfigurationService {
   getFlags(): Observable<{[key: string] : boolean}> {
     let flags = this.store.getState().global.flags;
     if (flags) {
-      return Observable.of(flags);
+      return of(flags);
     }
     let pathQuery = Constants.Path.FEATURES_FLAG_PATH;
     return this._http.get<{[key: string] : boolean}>(pathQuery).map(response => {