diff --git a/src/app/client/src/app/modules/groups/components/activity/activity-list/activity-list.component.spec.ts b/src/app/client/src/app/modules/groups/components/activity/activity-list/activity-list.component.spec.ts index 66b062da928331ae3b56a97a3a3de2beec8e9431..4f3f91cfead7f3676311ce6263999cc536c80609 100644 --- a/src/app/client/src/app/modules/groups/components/activity/activity-list/activity-list.component.spec.ts +++ b/src/app/client/src/app/modules/groups/components/activity/activity-list/activity-list.component.spec.ts @@ -99,6 +99,7 @@ describe('ActivityListComponent', () => { it('should call openActivity for Admin', () => { spyOn(component, 'addTelemetry'); + spyOn(component['playerService'], 'playContent'); const event = { data: { name: 'Class 5 English', @@ -109,7 +110,7 @@ describe('ActivityListComponent', () => { contentType: 'Course' }}; component.openActivity(event, 'ACTIVITY_COURSE_TITLE'); - expect(router.navigate).toHaveBeenCalledWith(['/learn/course', 'do_123523212190']); + expect(component['playerService'].playContent).toHaveBeenCalledWith(event.data); expect(component.addTelemetry).toHaveBeenCalled(); }); diff --git a/src/app/client/src/app/modules/groups/components/activity/activity-list/activity-list.component.ts b/src/app/client/src/app/modules/groups/components/activity/activity-list/activity-list.component.ts index cff61624d155dffd1163b21ba3e2a8ff73074964..06cfe2cf84eef83ad7a9e09ac3b8ebff94875bac 100644 --- a/src/app/client/src/app/modules/groups/components/activity/activity-list/activity-list.component.ts +++ b/src/app/client/src/app/modules/groups/components/activity/activity-list/activity-list.component.ts @@ -1,13 +1,12 @@ +import { PlayerService } from '@sunbird/core'; import { Component, Input, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import * as _ from 'lodash-es'; import { fromEvent, Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { ConfigService } from '../../../../shared/services/config/config.service'; -import { ResourceService } from '../../../../shared/services/resource/resource.service'; import { GroupsService } from '../../../services/groups/groups.service'; import { ACTIVITY_DETAILS } from './../../../interfaces'; -import { ToasterService } from '@sunbird/shared'; +import { ToasterService, ConfigService, ResourceService } from '@sunbird/shared'; export interface IActivity { name: string; @@ -46,6 +45,7 @@ export class ActivityListComponent implements OnInit, OnDestroy { public resourceService: ResourceService, private groupService: GroupsService, private toasterService: ToasterService, + private playerService: PlayerService ) { this.config = this.configService.appConfig; } @@ -74,7 +74,7 @@ export class ActivityListComponent implements OnInit, OnDestroy { if (_.get(this.groupData, 'isAdmin')) { this.router.navigate([`${ACTIVITY_DETAILS}`, _.get(event, 'data.identifier')], options); } else { - this.router.navigate(['/learn/course', _.get(event, 'data.identifier')]); + this.playerService.playContent(_.get(event, 'data')); } }