Creating different Observables for models inside store
Change-Id: Ic2b190cddf04dde25a9ca7ae9445e0e9d8da42f1
diff --git a/src/app/datasources/stores/model.store.ts b/src/app/datasources/stores/model.store.ts
index 0839cc7..903bd46 100644
--- a/src/app/datasources/stores/model.store.ts
+++ b/src/app/datasources/stores/model.store.ts
@@ -11,27 +11,33 @@
export class ModelStore {
static $inject = ['WebSocket', 'StoreHelpers', 'ModelRest'];
- private _collection: BehaviorSubject<any[]> = new BehaviorSubject([]);
+ private _collections: any; // NOTE contains a map of {model: BehaviourSubject}
constructor(
private webSocket: IWSEventService,
private storeHelpers: IStoreHelpersService,
private ModelRest: IXosResourceService
) {
+ this._collections = {};
}
- // FIXME if called multiple time (for different collection),
- // it return the same observable while it should return different ones
query(model: string) {
- this.loadInitialData(model);
+
+ // if there isn't already an observable for that item
+ if (!this._collections[model]) {
+ this._collections[model] = new BehaviorSubject([]); // NOTE maybe this can be created when we get response from the resource
+ this.loadInitialData(model);
+ }
+
this.webSocket.list()
.filter((e: IWSEvent) => e.model === model)
.subscribe(
(event: IWSEvent) => {
- this.storeHelpers.updateCollection(event, this._collection);
+ this.storeHelpers.updateCollection(event, this._collections[model]);
},
err => console.error
);
- return this._collection.asObservable();
+
+ return this._collections[model].asObservable();
}
private loadInitialData(model: string) {
@@ -40,7 +46,7 @@
this.ModelRest.getResource(endpoint).query().$promise
.then(
res => {
- this._collection.next(res);
+ this._collections[model].next(res);
},
err => console.log(`Error retrieving ${model}`, err)
);