FarmMaps/FarmMapsLib
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix AW-1056, AW-1080
All checks were successful
FarmMaps.Develop/FarmMapsLib/develop This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma
2020-03-26 14:29:18 +01:00
parent 8db1edb262
commit bc17f80050
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/common-map/src/fm-map/components/map/map.component.ts
View File

@@ -192,7 +192,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
newQueryState = this.serializeService.deserialize(queryState); newQueryState = this.serializeService.deserialize(queryState);
queryState = this.serializeService.serialize(newQueryState); queryState = this.serializeService.serialize(newQueryState);
} }
queryStateChanged = this.serializeService.serialize(lastQueryState) != queryState; queryStateChanged = this.serializeService.serialize(lastQueryState) != queryState || setStateCount==0;
} }
let t =0; let t =0;
if(setStateCount==0) t=600; if(setStateCount==0) t=600;

5
projects/common-map/src/fm-map/effects/map.effects.ts
View File

@@ -149,10 +149,11 @@ export class MapEffects {
selectItem$: Observable<Action> = this.actions$.pipe( selectItem$: Observable<Action> = this.actions$.pipe(
ofType(mapActions.SELECTITEM), ofType(mapActions.SELECTITEM),
withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)), withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)),
switchMap(([action, selectedItem]) => { withLatestFrom(this.store$.select(mapReducers.getSetStateCount)),
switchMap(([[action, selectedItem],setStateCount]) => {
let a = action as mapActions.SelectItem; let a = action as mapActions.SelectItem;
let itemCode = selectedItem ? selectedItem.code : ""; let itemCode = selectedItem ? selectedItem.code : "";
if (a.itemCode != itemCode) { if (a.itemCode != itemCode || setStateCount == 1) {
return this.itemService$.getItem(a.itemCode).pipe( return this.itemService$.getItem(a.itemCode).pipe(
map((item: IItem) => new mapActions.SelectItemSuccess(item)), map((item: IItem) => new mapActions.SelectItemSuccess(item)),
catchError(error => of(new commonActions.Fail(error)))) catchError(error => of(new commonActions.Fail(error))))