Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
TT-52 feat: consider global toggle state
  • Loading branch information
Angeluz-07 committed Dec 11, 2020
commit 13967e63a5508f61df9fabb4d5aed1c5c30c5597
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ describe('FeatureToggleManager', () => {
);
getFeatureToggleSpy = spyOn(fakeFeatureToggleProvider, 'getFeatureToggle').and.returnValue(of(aToggleWithFilters));
service = new FeatureManagerService(fakeFeatureToggleProvider);
spyOn(service, 'isToggleEnabled').and.returnValue(of(true));
});

it('manager uses feature provider to build feature toggle model', async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { Observable, zip } from 'rxjs';
import { map } from 'rxjs/operators';
import { FeatureToggleProvider } from './feature-toggle-provider.service';

Expand All @@ -18,10 +18,21 @@ export class FeatureManagerService {
}

public isToggleEnabledForUser(toggleName: string, toggleLabel?: string): Observable<boolean> {
return this.featureToggleProvider.getFeatureToggle(toggleName, toggleLabel).pipe(
const matchesFilters$: Observable<boolean> = this.featureToggleProvider
.getFeatureToggle(toggleName, toggleLabel)
.pipe(
map(featureToggle => featureToggle.filters),
map(filters => filters.map(filter => filter.evaluate())),
map(filterEvaluations => filterEvaluations.includes(true))
);

const result$: Observable<boolean> = zip(
this.isToggleEnabled(toggleName, toggleLabel),
matchesFilters$
).pipe(
map(([enabled, enabledForUser]) => enabled && enabledForUser)
);

return result$;
}
}