Skip to content

Commit ebebd4f

Browse files
fix: TT-235 bug on details-fields (#677)
1 parent 34a6e9e commit ebebd4f

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

src/app/modules/shared/components/details-fields/details-fields.component.spec.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,10 @@ describe('DetailsFieldsComponent', () => {
196196
component.ngOnChanges();
197197
expect(component.shouldRestartEntry).toBeFalse();
198198
expect(component.entryForm.value).toEqual(initialData);
199-
expect(component.activities$).toBe(undefined);
199+
component.activities$.subscribe(item => {
200+
expect(item.length).not.toBe(null);
201+
expect(item.length).toBe(3);
202+
});
200203
});
201204

202205
it('should emit ngOnChange with new data', () => {
@@ -237,6 +240,15 @@ describe('DetailsFieldsComponent', () => {
237240
});
238241
});
239242

243+
it('selectActiveActivities should return 3 active activities', () => {
244+
const activeActivities = component.selectActiveActivities();
245+
246+
activeActivities.subscribe(item => {
247+
expect(item.length).not.toBe(null);
248+
expect(item.length).toBe(3);
249+
});
250+
});
251+
240252
it('should call createError ', () => {
241253
const childComponent = jasmine.createSpyObj('ChildComponent', ['closeModal']);
242254
component.closeModal = childComponent;

src/app/modules/shared/components/details-fields/details-fields.component.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
8080
});
8181

8282
this.store.dispatch(new LoadActivities());
83+
this.activities$ = this.selectActiveActivities();
8384

8485
const updateError$ = this.store.pipe(select(getUpdateError));
8586
updateError$.subscribe((updateError) => {
@@ -171,6 +172,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
171172
);
172173
} else {
173174
this.cleanForm();
175+
this.activities$ = this.selectActiveActivities();
174176
}
175177
}
176178

@@ -197,6 +199,10 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
197199
this.cleanForm(true);
198200
}
199201

202+
selectActiveActivities() {
203+
return this.store.pipe(select(allActiveActivities));
204+
}
205+
200206
findInactiveActivity(activities) {
201207
return activities.find(activity => activity.status === 'inactive' &&
202208
activity.id === this.entryToEdit.activity_id

0 commit comments

Comments
 (0)