Skip to content

Commit

Permalink
Merge pull request #66 from rajnishdargan/release-7.0.0
Browse files Browse the repository at this point in the history
Issue #IQ-567 fix: Error Event is generated on Telemetry while preview the Question set
  • Loading branch information
sajeshkayyath authored Dec 18, 2023
2 parents 7ad0466 + 4683936 commit 87607a1
Show file tree
Hide file tree
Showing 9 changed files with 151 additions and 100 deletions.
8 changes: 4 additions & 4 deletions projects/quml-library/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions projects/quml-library/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@project-sunbird/sunbird-quml-player",
"version": "7.0.0",
"version": "7.0.1",
"schematics": "./schematics/collection.json",
"ng-add": {
"save": "dependencies"
Expand All @@ -18,7 +18,7 @@
"@project-sunbird/client-services": "4.9.1"
},
"dependencies": {
"@project-sunbird/sunbird-player-sdk-v9": "5.1.0"
"@project-sunbird/sunbird-player-sdk-v9": "6.0.0"
},
"devDependencies": {
"copyfiles": "2.4.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { TransformationService } from '../services/transformation-service/transf
import { fakeMainProgressBar, fakeSections, playerConfig, singleContent } from './main-player.component.spec.data';
import { UtilService } from '../util-service';
import { of } from 'rxjs';
import { PLAYER_COMPATABILITY_CONFIG } from '../player-constants';

describe('MainPlayerComponent', () => {
let component: MainPlayerComponent;
Expand All @@ -24,7 +25,7 @@ describe('MainPlayerComponent', () => {
TestBed.configureTestingModule({
declarations: [MainPlayerComponent],
imports: [
SunbirdPlayerSdkModule,
SunbirdPlayerSdkModule.forRoot(PLAYER_COMPATABILITY_CONFIG),
CommonModule
],
providers: [QumlLibraryService, QuestionCursor],
Expand Down
4 changes: 4 additions & 0 deletions projects/quml-library/src/lib/player-constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@ export const DEFAULT_SCORE: number = 1;
export const WARNING_TIME_CONFIG = {
DEFAULT_TIME : 75,
SHOW_TIMER: true
}

export const PLAYER_COMPATABILITY_CONFIG = {
contentCompatibilityLevel: 6
}
4 changes: 2 additions & 2 deletions projects/quml-library/src/lib/quml-library.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import { SafeHtmlPipe } from './pipes/safe-html/safe-html.pipe';
import { MainPlayerComponent } from './main-player/main-player.component';
import { SectionPlayerComponent } from './section-player/section-player.component';
import { ProgressIndicatorsComponent } from './progress-indicators/progress-indicators.component'

import { PLAYER_COMPATABILITY_CONFIG } from './player-constants';
@NgModule({
declarations: [
QumlLibraryComponent,
Expand Down Expand Up @@ -80,7 +80,7 @@ import { ProgressIndicatorsComponent } from './progress-indicators/progress-indi
imports: [
CommonModule,
CarouselModule,
SunbirdPlayerSdkModule
SunbirdPlayerSdkModule.forRoot(PLAYER_COMPATABILITY_CONFIG)
],
providers: [
QumlLibraryService
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { CommonModule } from '@angular/common';
import { ElementRef, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
import { waitForAsync, ComponentFixture, fakeAsync, flush, TestBed, tick } from '@angular/core/testing';
import { ErrorService } from '@project-sunbird/sunbird-player-sdk-v9';
import { ErrorService, SunbirdPlayerSdkModule } from '@project-sunbird/sunbird-player-sdk-v9';
import { CarouselComponent } from 'ngx-bootstrap/carousel';
import { of, Subject } from 'rxjs';
import { fakeMainProgressBar } from '../main-player/main-player.component.spec.data';
Expand All @@ -11,6 +11,7 @@ import { UtilService } from '../util-service';
import { QuestionCursor } from './../quml-question-cursor.service';
import { SectionPlayerComponent } from './section-player.component';
import { mockSectionPlayerConfig } from './section-player.component.spec.data';
import { PLAYER_COMPATABILITY_CONFIG } from '../player-constants';


describe('SectionPlayerComponent', () => {
Expand Down Expand Up @@ -51,13 +52,14 @@ describe('SectionPlayerComponent', () => {
TestBed.configureTestingModule({
declarations: [SectionPlayerComponent, CarouselComponent],
imports: [
CommonModule
CommonModule,
SunbirdPlayerSdkModule.forRoot(PLAYER_COMPATABILITY_CONFIG)
],
providers: [
QumlLibraryService,
QuestionCursor,
{ provide: ViewerService, useClass: ViewerServiceMock },
{ provide: ElementRef, useClass: ElementRefMock },
{ provide: ElementRef, useClass: ElementRefMock }
],
schemas: [NO_ERRORS_SCHEMA]
})
Expand Down
2 changes: 1 addition & 1 deletion projects/quml-player-wc/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ import { ProgressIndicatorsComponent } from '../../../quml-library/src/lib/progr
BrowserModule,
CommonModule,
CarouselModule.forRoot(),
SunbirdPlayerSdkModule,
SunbirdPlayerSdkModule.forRoot({ contentCompatibilityLevel: 6 }),
HttpClientModule
],
providers: [{ provide: QuestionCursor, useClass: QuestionCursorImplementationService }]
Expand Down
2 changes: 1 addition & 1 deletion web-component/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@project-sunbird/sunbird-quml-player-web-component",
"version": "3.0.0",
"version": "3.0.1",
"description": "The web component package for the sunbird QuML player",
"main": "sunbird-quml-player.js",
"scripts": {
Expand Down
Loading

0 comments on commit 87607a1

Please sign in to comment.