Skip to content

Commit 7705fc1

Browse files
committed
Merge branch 'OBS-1996-fix-store' into 'enterprise'
fix(journeys): forward component patterns when creating journey See merge request dkinternal/observability/dataops-observability!70
2 parents 4cc51c3 + 1daedbd commit 7705fc1

2 files changed

Lines changed: 20 additions & 2 deletions

File tree

observability_ui/apps/shell/src/app/projects/journeys/journeys.store.spec.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,24 @@ describe('journeys.store', () => {
105105
});
106106
});
107107

108+
it('should forward component pattern fields to service.create', (done) => {
109+
jest.spyOn(service, 'create');
110+
store.createOne({
111+
name: 'test',
112+
description: 'test',
113+
component_include_patterns: 'p*',
114+
component_exclude_patterns: 'prod*',
115+
instance_rules: [],
116+
project_id: 'testProject',
117+
}).subscribe(() => {
118+
expect(service.create).toHaveBeenCalledWith(
119+
expect.objectContaining({ component_include_patterns: 'p*', component_exclude_patterns: 'prod*' }),
120+
'testProject',
121+
);
122+
done();
123+
});
124+
});
125+
108126
it('should add components if there are components', (done) => {
109127
store.createOne({
110128
components: [ 'test1', 'test2' ],

observability_ui/apps/shell/src/app/projects/journeys/journeys.store.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ export class JourneysStore extends EntityStore<JourneyState, JourneysActions> im
5151
}
5252

5353
@Effect()
54-
createOne({ name, description, instance_rules, project_id, components }: JourneyCreateRequest): Observable<Journey> {
55-
return this.service.create({ name, description }, project_id).pipe(
54+
createOne({ name, description, component_include_patterns, component_exclude_patterns, instance_rules, project_id, components }: JourneyCreateRequest): Observable<Journey> {
55+
return this.service.create({ name, description, component_include_patterns, component_exclude_patterns }, project_id).pipe(
5656
switchMap((journey) => {
5757
if (instance_rules && instance_rules.length > 0) {
5858
return forkJoin(

0 commit comments

Comments
 (0)