Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,10 @@ describe('DetailsFieldsComponent', () => {
component.ngOnChanges();
expect(component.shouldRestartEntry).toBeFalse();
expect(component.entryForm.value).toEqual(initialData);
expect(component.activities$).toBe(undefined);
component.activities$.subscribe(item => {
expect(item.length).not.toBe(null);
expect(item.length).toBe(3);
});
});

it('should emit ngOnChange with new data', () => {
Expand Down Expand Up @@ -237,6 +240,15 @@ describe('DetailsFieldsComponent', () => {
});
});

it('selectActiveActivities should return 3 active activities', () => {
const activeActivities = component.selectActiveActivities();

activeActivities.subscribe(item => {
expect(item.length).not.toBe(null);
expect(item.length).toBe(3);
});
});

it('should call createError ', () => {
const childComponent = jasmine.createSpyObj('ChildComponent', ['closeModal']);
component.closeModal = childComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
});

this.store.dispatch(new LoadActivities());
this.activities$ = this.selectActiveActivities();

const updateError$ = this.store.pipe(select(getUpdateError));
updateError$.subscribe((updateError) => {
Expand Down Expand Up @@ -171,6 +172,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
);
} else {
this.cleanForm();
this.activities$ = this.selectActiveActivities();
}
}

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

selectActiveActivities() {
return this.store.pipe(select(allActiveActivities));
}

findInactiveActivity(activities) {
return activities.find(activity => activity.status === 'inactive' &&
activity.id === this.entryToEdit.activity_id
Expand Down