diff --git a/angular.json b/angular.json index 3d6ce8205..86dccde65 100644 --- a/angular.json +++ b/angular.json @@ -33,24 +33,23 @@ }, { "glob": "**/*", - "input": "node_modules/@project-sunbird/sunbird-quml-player/lib/assets/", + "input": "node_modules/@project-sunbird/sunbird-quml-player-web-component/assets/", "output": "/assets/" } ], "styles": [ - "src/assets/quml-styles/quml-carousel.css", + "node_modules/@project-sunbird/sunbird-quml-player-web-component/styles.css", "node_modules/@project-sunbird/sb-styles/assets/_styles.scss", "src/styles.scss", "src/assets/lib/semantic/semantic.min.css", "src/assets/styles/styles.scss", - "node_modules/font-awesome/css/font-awesome.css", - "node_modules/katex/dist/katex.min.css" + "node_modules/font-awesome/css/font-awesome.css" ], "scripts": [ + "node_modules/@project-sunbird/sunbird-quml-player-web-component/sunbird-quml-player.js", "src/assets/libs/iziToast/iziToast.min.js", "node_modules/jquery/dist/jquery.min.js", "node_modules/jquery.fancytree/dist/jquery.fancytree-all-deps.min.js", - "node_modules/katex/dist/katex.min.js", "node_modules/@project-sunbird/sunbird-file-upload-library/sunbird-file-upload-library.js", "src/assets/lib/dimmer.min.js", "src/assets/lib/transition.min.js", @@ -226,24 +225,24 @@ }, { "glob": "**/*", - "input": "node_modules/@project-sunbird/sunbird-quml-player/lib/assets/", + "input": "node_modules/@project-sunbird/sunbird-quml-player-web-component/assets/", "output": "/assets/" } ], "styles": [ + "node_modules/@project-sunbird/sunbird-quml-player-web-component/styles.css", "projects/questionset-editor-library-wc/src/styles.scss", "src/assets/quml-styles/quml-carousel.css", "node_modules/@project-sunbird/sb-styles/assets/_styles.scss", "src/assets/lib/semantic/semantic.min.css", "src/assets/styles/styles.scss", - "node_modules/font-awesome/css/font-awesome.css", - "node_modules/katex/dist/katex.min.css" + "node_modules/font-awesome/css/font-awesome.css" ], "scripts": [ + "node_modules/@project-sunbird/sunbird-quml-player-web-component/sunbird-quml-player.js", "src/assets/libs/iziToast/iziToast.min.js", "node_modules/jquery/dist/jquery.min.js", "node_modules/jquery.fancytree/dist/jquery.fancytree-all-deps.min.js", - "node_modules/katex/dist/katex.min.js", "node_modules/@project-sunbird/sunbird-file-upload-library/sunbird-file-upload-library.js", "src/assets/lib/dimmer.min.js", "src/assets/lib/transition.min.js", diff --git a/package-lock.json b/package-lock.json index 4777082a4..e0e252ab4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2813,33 +2813,12 @@ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", "dev": true }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, "string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", @@ -2851,40 +2830,6 @@ "strip-ansi": "^7.0.1" } }, - "string-width-cjs": { - "version": "npm:string-width@4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - } - } - }, "strip-ansi": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", @@ -2894,23 +2839,6 @@ "ansi-regex": "^6.0.1" } }, - "strip-ansi-cjs": { - "version": "npm:strip-ansi@6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - } - } - }, "wrap-ansi": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", @@ -2921,60 +2849,6 @@ "string-width": "^5.0.1", "strip-ansi": "^7.0.1" } - }, - "wrap-ansi-cjs": { - "version": "npm:wrap-ansi@7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - } - } } } }, @@ -4216,27 +4090,15 @@ "axios": "^1.4.0" } }, - "@project-sunbird/sunbird-player-sdk-v9": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-player-sdk-v9/-/sunbird-player-sdk-v9-6.0.0.tgz", - "integrity": "sha512-E8ybY5ulxZ7NyBq3Suljz1LsyXHeFsmdJ2NbNZLHKY5WpBF6qtOQDtpjINPTMAPOqlOpR7xAcVMoPxCuP82RGw==", - "requires": { - "ally.js": "1.4.1" - } - }, - "@project-sunbird/sunbird-quml-player": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-quml-player/-/sunbird-quml-player-7.0.2.tgz", - "integrity": "sha512-mjnVY1DySBCGtm59IqPVkaTWpG0qXHIXNI8O2PAXhdPVjyUQVe4pnCjm8WyU20f0j1nDmQkL+Rn3m4aVQbHm8g==", - "requires": { - "@project-sunbird/sunbird-player-sdk-v9": "6.0.0", - "tslib": "^2.3.0" - } + "@project-sunbird/sunbird-quml-player-web-component": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-quml-player-web-component/-/sunbird-quml-player-web-component-3.0.4.tgz", + "integrity": "sha512-ZiPln6XpG9MLcDumgm0/ELvERGpP50l+vxNTr+etHthvtVvTCHpHF55qIXV2lP7Ve0S4MqINePDcKdFeIWS/tA==" }, "@project-sunbird/sunbird-resource-library": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-resource-library/-/sunbird-resource-library-7.0.3.tgz", - "integrity": "sha512-Q1MhBNQIVrFAqGMBHQHq+uqVAbSUAbnaPo1zqy5l1vgvVOj32tm9Xz2kVLNU8vzOnEkRlh95+qsnw/icins5wQ==", + "version": "8.0.0-alpha.1", + "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-resource-library/-/sunbird-resource-library-8.0.0-alpha.1.tgz", + "integrity": "sha512-jzGM0cbqhK8PmjCG2G6aly7HgRvyhWZ7KJyUtb1Gmk8aZaaiMmVaCIPOFm7/2Lcq3S6HlG0NOiZYZGi9iP30yw==", "requires": { "tslib": "^2.0.0" } @@ -4994,15 +4856,6 @@ "fast-deep-equal": "^3.1.3" } }, - "ally.js": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/ally.js/-/ally.js-1.4.1.tgz", - "integrity": "sha512-ZewdfuwP6VewtMN36QY0gmiyvBfMnmEaNwbVu2nTS6zRt069viTgkYgaDiqu6vRJ1VJCriNqV0jGMu44R8zNbA==", - "requires": { - "css.escape": "^1.5.0", - "platform": "1.3.3" - } - }, "alphanum-sort": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", @@ -6921,11 +6774,6 @@ "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==" }, - "css.escape": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", - "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==" - }, "cssauron": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", @@ -13290,11 +13138,6 @@ } } }, - "platform": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz", - "integrity": "sha512-VJK1SRmXBpjwsB4YOHYSturx48rLKMzHgCqDH2ZDa6ZbMS/N5huoNqyQdK5Fj/xayu3fqbXckn5SeCS1EbMDZg==" - }, "plugin-error": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", @@ -15552,6 +15395,40 @@ "strip-ansi": "^3.0.0" } }, + "string-width-cjs": { + "version": "npm:string-width@4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + } + } + }, "string.prototype.trim": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", @@ -15605,6 +15482,23 @@ "ansi-regex": "^2.0.0" } }, + "strip-ansi-cjs": { + "version": "npm:strip-ansi@6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + } + } + }, "strip-bom": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", @@ -16921,6 +16815,75 @@ "strip-ansi": "^3.0.1" } }, + "wrap-ansi-cjs": { + "version": "npm:wrap-ansi@7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + } + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", diff --git a/package.json b/package.json index af544d1a4..81c207555 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,8 @@ "@project-sunbird/common-form-elements-full": "^6.0.3", "@project-sunbird/sb-styles": "0.0.9", "@project-sunbird/sunbird-file-upload-library": "1.0.2", - "@project-sunbird/sunbird-quml-player": "7.0.2", - "@project-sunbird/sunbird-resource-library": "7.0.3", + "@project-sunbird/sunbird-quml-player-web-component": "3.0.4", + "@project-sunbird/sunbird-resource-library": "8.0.0-alpha.1", "@project-sunbird/telemetry-sdk": "0.0.29", "@types/jquery": "^3.5.5", "alphanum-sort": "^1.0.2", diff --git a/projects/questionset-editor-library-wc/src/app/app.module.ts b/projects/questionset-editor-library-wc/src/app/app.module.ts index bde278767..78651f3be 100644 --- a/projects/questionset-editor-library-wc/src/app/app.module.ts +++ b/projects/questionset-editor-library-wc/src/app/app.module.ts @@ -4,7 +4,6 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterModule } from '@angular/router'; import { createCustomElement } from '@angular/elements'; import { QuestionsetEditorLibraryModule, EditorComponent, EditorCursor} from 'questionset-editor-library'; -import { QuestionCursor } from '@project-sunbird/sunbird-quml-player'; import { EditorCursorImplementationService } from '../../../../src/app/editor-cursor-implementation.service'; @NgModule({ declarations: [ @@ -16,7 +15,6 @@ import { EditorCursorImplementationService } from '../../../../src/app/editor-cu BrowserAnimationsModule ], providers: [ - { provide: QuestionCursor, useExisting: EditorCursorImplementationService }, { provide: EditorCursor, useExisting: EditorCursorImplementationService } ] }) diff --git a/projects/questionset-editor-library/package.json b/projects/questionset-editor-library/package.json index e764ff661..6db101ce6 100644 --- a/projects/questionset-editor-library/package.json +++ b/projects/questionset-editor-library/package.json @@ -1,6 +1,6 @@ { "name": "@project-sunbird/sunbird-questionset-editor", - "version": "8.0.0-beta.2", + "version": "8.0.0-alpha.1", "dependencies": { "tslib": "^2.0.0" }, diff --git a/projects/questionset-editor-library/src/lib/components/question/question.component.ts b/projects/questionset-editor-library/src/lib/components/question/question.component.ts index 57bba4d95..70d34f84d 100644 --- a/projects/questionset-editor-library/src/lib/components/question/question.component.ts +++ b/projects/questionset-editor-library/src/lib/components/question/question.component.ts @@ -1508,6 +1508,7 @@ export class QuestionComponent implements OnInit, AfterViewInit, OnDestroy { this.onComponentDestroy$.next(); this.onComponentDestroy$.complete(); this.editorCursor.clearQuestionMap(); + this.editorCursor.removeQuestionMap(this.questionId || this.tempQuestionId); } sliderData($event) { diff --git a/projects/questionset-editor-library/src/lib/components/quml-player/quml-player.component.html b/projects/questionset-editor-library/src/lib/components/quml-player/quml-player.component.html index 282cb71b3..2ee6373c8 100644 --- a/projects/questionset-editor-library/src/lib/components/quml-player/quml-player.component.html +++ b/projects/questionset-editor-library/src/lib/components/quml-player/quml-player.component.html @@ -2,8 +2,7 @@
- +
Click on View details to view the question details.
diff --git a/projects/questionset-editor-library/src/lib/components/quml-player/quml-player.component.ts b/projects/questionset-editor-library/src/lib/components/quml-player/quml-player.component.ts index d146e3a31..1b55d06a1 100644 --- a/projects/questionset-editor-library/src/lib/components/quml-player/quml-player.component.ts +++ b/projects/questionset-editor-library/src/lib/components/quml-player/quml-player.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnInit , Output, ViewEncapsulation} from '@angular/core'; +import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnInit , Output, ViewChild, ViewEncapsulation} from '@angular/core'; import * as _ from 'lodash-es'; import { ConfigService } from '../../services/config/config.service'; import { PlayerService } from '../../services/player/player.service'; @@ -9,13 +9,13 @@ import { EditorService } from '../../services/editor/editor.service'; styleUrls: ['./quml-player.component.scss'], encapsulation: ViewEncapsulation.None, }) -export class QumlPlayerComponent implements OnInit { +export class QumlPlayerComponent implements OnInit, AfterViewInit { qumlPlayerConfig: any; @Input() questionSetHierarchy: any; @Input() isSingleQuestionPreview = false; - showPreview = false; showViewButton = false; @Output() public toolbarEmitter: EventEmitter = new EventEmitter(); + @ViewChild('inQuiryQuMLPlayer') inQuiryQuMLPlayer: ElementRef; constructor(private configService: ConfigService, private playerService: PlayerService, public editorService: EditorService ) { } @@ -26,9 +26,14 @@ export class QumlPlayerComponent implements OnInit { } } + ngAfterViewInit() { + console.log('load player called...'); + this.loadPlayer(); + } + + initialize() { this.setQumlPlayerData(); - this.showPreview = true; } setQumlPlayerData() { @@ -54,6 +59,19 @@ export class QumlPlayerComponent implements OnInit { console.log('qumlPlayerConfig:: ', this.qumlPlayerConfig); } + loadPlayer() { + console.log('loadQuMLPlayer with config:: ', this.qumlPlayerConfig); + (window as any).questionListUrl = `/api/${_.get(this.configService, 'urlConFig.URLS.Question.LIST')}`; + const qumlElement = document.createElement('sunbird-quml-player'); + qumlElement.setAttribute('player-config', JSON.stringify(this.qumlPlayerConfig)); + + qumlElement.addEventListener('playerEvent', this.getPlayerEvents); + + qumlElement.addEventListener('telemetryEvent', this.getTelemetryEvents); + this.inQuiryQuMLPlayer.nativeElement.append(qumlElement); + console.log('load player called ended'); + } + getPlayerEvents(event) { console.log('get player events', JSON.stringify(event)); } diff --git a/projects/questionset-editor-library/src/lib/questionset-editor-cursor.service.ts b/projects/questionset-editor-library/src/lib/questionset-editor-cursor.service.ts index e3b29aa91..f4d36a739 100644 --- a/projects/questionset-editor-library/src/lib/questionset-editor-cursor.service.ts +++ b/projects/questionset-editor-library/src/lib/questionset-editor-cursor.service.ts @@ -2,4 +2,5 @@ export abstract class EditorCursor { abstract setQuestionMap(key: string, value: any): void; abstract clearQuestionMap(): void; + abstract removeQuestionMap(key: string): void; } diff --git a/projects/questionset-editor-library/src/lib/questionset-editor-library.module.ts b/projects/questionset-editor-library/src/lib/questionset-editor-library.module.ts index a989f0cf4..6904d8ccb 100644 --- a/projects/questionset-editor-library/src/lib/questionset-editor-library.module.ts +++ b/projects/questionset-editor-library/src/lib/questionset-editor-library.module.ts @@ -19,8 +19,6 @@ import { OptionsComponent } from './components/options/options.component'; import { AnswerComponent } from './components/answer/answer.component'; import { CkeditorToolComponent } from './components/ckeditor-tool/ckeditor-tool.component'; import { QuestionComponent } from './components/question/question.component'; -import { QumlLibraryModule } from '@project-sunbird/sunbird-quml-player'; -import { CarouselModule } from 'ngx-bootstrap/carousel'; import { TelemetryInteractDirective } from './directives/telemetry-interact/telemetry-interact.directive'; import { CollectionIconComponent } from './components/collection-icon/collection-icon.component'; import { QumlPlayerComponent } from './components/quml-player/quml-player.component'; @@ -73,7 +71,7 @@ import { AssetSegmentComponent } from './components/asset-segment/asset-segment. AssetSegmentComponent, ], imports: [CommonModule, FormsModule, ReactiveFormsModule.withConfig({callSetDisabledState: 'whenDisabledForLegacyCode'}), RouterModule.forChild([]), SuiModule, - CommonFormElementsModule, InfiniteScrollModule, HttpClientModule, ResourceLibraryModule, A11yModule, QumlLibraryModule, CarouselModule,], + CommonFormElementsModule, InfiniteScrollModule, HttpClientModule, ResourceLibraryModule, A11yModule], providers: [ ], exports: [EditorComponent], diff --git a/src/app/editor-cursor-implementation.service.ts b/src/app/editor-cursor-implementation.service.ts index b5960d48f..81bf18327 100644 --- a/src/app/editor-cursor-implementation.service.ts +++ b/src/app/editor-cursor-implementation.service.ts @@ -1,8 +1,6 @@ -import { Inject, Injectable } from '@angular/core'; -import { Observable, of, throwError} from 'rxjs'; + +import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { map, mergeMap } from 'rxjs/operators'; -import { QuestionCursor } from '@project-sunbird/sunbird-quml-player'; import { EditorCursor } from 'questionset-editor-library'; import * as _ from 'lodash-es'; @@ -10,68 +8,24 @@ import * as _ from 'lodash-es'; providedIn: 'root' }) -export class EditorCursorImplementationService implements QuestionCursor, EditorCursor { +export class EditorCursorImplementationService implements EditorCursor { public questionMap = new Map(); constructor(private http: HttpClient) {} // @Inject(HttpClient) - getQuestion(questionId: string): Observable { - if (_.isEmpty(questionId)) { return of({}); } - const question = this.getQuestionData(questionId); - if (question) { - return of({questions : _.castArray(question)}); - } else { - return this.post(_.castArray(questionId)).pipe(map((data) => { - return data.result; - })); - } - } - - getQuestions(questionIds: string[]): Observable { - return this.post(questionIds).pipe(map((data) => { - return data.result; - })); - } - - getQuestionSet(identifier: string): Observable { - return of({}); - } - getQuestionData(questionId) { return this.questionMap.get(_.first(_.castArray(questionId))) || undefined; } setQuestionMap(key, value) { - this.questionMap.set(key, value); + sessionStorage.setItem(key, JSON.stringify(value)); } - clearQuestionMap() { - this.questionMap.clear(); + removeQuestionMap(key) { + sessionStorage.removeItem(key); } - getAllQuestionSet(identifiers: string[]): Observable { - return of({}); + clearQuestionMap() { + this.questionMap.clear(); } - private post(questionIds): Observable { - const httpOptions = { - headers: { 'Content-Type': 'application/json' } - }; - const requestParam = { - url: 'api/question/v2/list', - data: { - request: { - search: { - identifier: questionIds - } - } - } - }; - return this.http.post(requestParam.url, requestParam.data, httpOptions).pipe( - mergeMap((data: any) => { - if (data.responseCode !== 'OK') { - return throwError(data); - } - return of(data); - })); - } -} +} \ No newline at end of file