Issue #SB-000 merge: Merge pull request #112 from project-sunbird/release-2.4.0

Merge release-2.4.0 to master

Author: Kartheek Palla

app/scripts/contenteditor/manager/stage-manager.js

@@ -9,6 +9,7 @@ org.ekstep.contenteditor.stageManager = new (Class.extend({
 	contentLoading: false,
 	summary: [],
 	assets: [],
+	plugins_used: [],
 	init: function () {
 		var instance = this
 		fabric.Object.prototype.transparentCorners = false
@@ -239,6 +240,7 @@ org.ekstep.contenteditor.stageManager = new (Class.extend({
 		var content = { theme: { id: 'theme', version: '1.0', startStage: this.stages[0].id, stage: [], manifest: { media: [] }, 'plugin-manifest': { plugin: [] } } }
 		this.setNavigationalParams()
 		var mediaMap = {}
+		var plugin_arr = []
 		instance.summary = []
 		instance.assets = []
 		instance.pragma = null
@@ -247,8 +249,10 @@ org.ekstep.contenteditor.stageManager = new (Class.extend({
 			var stageBody = stage.toECML()
 			stageBody.manifest = { media: [] }
 			var stageAssets = []
+			plugin_arr.push({ identifier: stage.manifest.id, semanticVersion: stage.manifest.ver})
 			_.forEach(stage.children, function (plugin) {
 				var id = plugin.getManifestId()
+				plugin_arr.push({ identifier: plugin.manifest.id, semanticVersion: plugin.manifest.ver});
 				if (_.isUndefined(stageBody[id])) stageBody[id] = []
 				stageBody[id].push(plugin.toECML())
 				var summaryObj = plugin.getSummary()
@@ -267,8 +271,13 @@ org.ekstep.contenteditor.stageManager = new (Class.extend({
 			})
 			content.theme.stage.push(stageBody)
 		})
-
+		
 		instance.manifestGenerator(content)
+		ecEditor._.each(content.theme['plugin-manifest'].plugin, function (p){
+			plugin_arr.push({ identifier: p.id, semanticVersion: p.ver})
+        })
+        instance.plugins_used = ecEditor._.uniqBy(plugin_arr, 'identifier');
+		
 
 		if (!_.isEmpty(org.ekstep.contenteditor.mediaManager.migratedMediaMap)) {
 			instance.mergeMediaMap(mediaMap)

app/scripts/contenteditor/service/telemetry-service.js

@@ -193,7 +193,7 @@ org.ekstep.services.telemetryService = new (org.ekstep.services.iService.extend(
      * @memberof org.ekstep.services.telemetryService
      *
      */
-	interact: function (data) {
+	interact: function (data, options) {
 		if (!(data.hasOwnProperty('type') && (data.hasOwnProperty('objectid') || data.hasOwnProperty('id')))) {
 			console.error('Invalid interact data')
 			return
@@ -226,7 +226,7 @@ org.ekstep.services.telemetryService = new (org.ekstep.services.iService.extend(
 			eventData.duration = (data.duration * 0.001).toFixed(2)
 		}
 		ecEditor.dispatchEvent('org.ekstep.editor:keepalive')
-		EkTelemetry.interact(eventData)
+		EkTelemetry.interact(eventData, this.generateOptionsData(options))
 	},
 	/**
      *
@@ -235,7 +235,7 @@ org.ekstep.services.telemetryService = new (org.ekstep.services.iService.extend(
      * @memberof org.ekstep.services.telemetryService
      *
      */
-	impression: function (data) {
+	impression: function (data, options) {
 		if (!(data.hasOwnProperty('type') && data.hasOwnProperty('pageid') && data.hasOwnProperty('uri'))) {
 			console.error('Invalid impression data')
 			return
@@ -249,7 +249,25 @@ org.ekstep.services.telemetryService = new (org.ekstep.services.iService.extend(
 		if (data.subtype) { eventData.subtype = data.subtype }
 		if (data.visits) { eventData.visits = data.visits }
 		ecEditor.dispatchEvent('org.ekstep.editor:keepalive')
-		EkTelemetry.impression(eventData)
+		EkTelemetry.impression(eventData, this.generateOptionsData(options))
+	},
+	/**
+	* generates options data envelope
+	* @param options {object} Telemetry Options data
+	* @memberof org.ekstep.services.telemetryService
+	*/
+	generateOptionsData: function (options) {
+		var optionsData = {
+			context:{}
+		}
+		var globalCdata = ecEditor.getContext('cdata') ? ecEditor.getContext('cdata') : [];
+		Object.assign(optionsData, options)
+		if (options && options.context && options.context.cdata) {
+			optionsData.context.cdata = optionsData.context.cdata.concat(globalCdata)
+		}else{
+			optionsData.context.cdata = globalCdata;
+		}
+		return optionsData;
 	},
 	/**
      *
@@ -426,7 +444,7 @@ org.ekstep.services.telemetryService = new (org.ekstep.services.iService.extend(
      * @memberof org.ekstep.services.telemetryService
      *
      */
-	log: function (data) {
+	log: function (data, options) {
 		if (!this.hasRequiredData(data, ['type', 'level', 'message'])) {
 			console.error('Invalid log data')
 			return
@@ -440,7 +458,7 @@ org.ekstep.services.telemetryService = new (org.ekstep.services.iService.extend(
 		if (data.pageid || data.stage) { eventData.pageid = data.stage || data.pageid }
 		if (data.params) { eventData.params = data.params }
 		ecEditor.dispatchEvent('org.ekstep.editor:keepalive')
-		EkTelemetry.log(eventData)
+		EkTelemetry.log(eventData, this.generateOptionsData(options))
 	},
 	/**
      *

app/scripts/framework/service/content-service.js

@@ -20,7 +20,7 @@ org.ekstep.services.contentService = new (org.ekstep.services.iService.extend({
      *
      * @memberof org.ekstep.services.contentService
      */
-	contentFields: 'body,collaborators,editorState,stageIcons,templateId,languageCode,template,gradeLevel,status,concepts,versionKey,name,appIcon,contentType,owner,domain,code,visibility,createdBy,description,language,mediaType,mimeType,osId,languageCode,createdOn,lastUpdatedOn,audience,ageGroup,attributions,artifactUrl,board,subject,keywords,config,resourceType,medium,publisher,year,pkgVersion,framework,rejectReasons,rejectComment,topic,ownedBy,ownershipType,creators,contributors,reservedDialcodes,qrCodeProcessId,channel,purpose,assets,assetsMap',
+	contentFields: 'body,collaborators,editorState,stageIcons,templateId,languageCode,template,gradeLevel,status,concepts,versionKey,name,appIcon,contentType,owner,domain,code,visibility,createdBy,description,language,mediaType,mimeType,osId,languageCode,createdOn,lastUpdatedOn,audience,ageGroup,attributions,artifactUrl,board,subject,keywords,config,resourceType,medium,publisher,year,pkgVersion,framework,rejectReasons,rejectComment,topic,ownedBy,ownershipType,creators,contributors,reservedDialcodes,qrCodeProcessId,channel,purpose,assets,assetsMap,copyright,author',
 	/**
      *
      * sets content meta for the given content id

app/scripts/framework/service/iservice.js

@@ -111,4 +111,4 @@ org.ekstep.services.iService = Class.extend({
 		})
 	}
 
-})
+})

deploy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "content-editor",
-    "version": "2.0.0",
+    "version": "2.4.0",
     "description": "It is used to update files in deployment job",
     "main": "gulpfile.js",
     "scripts": {

package.json

@@ -13,6 +13,7 @@
     "body-parser": "*",
     "express": "^4.14.0",
     "express-http-proxy": "*",
+    "global": "^4.4.0",
     "lodash": "^4.16.6",
     "promise": "^8.0.2",
     "request": "*",
@@ -102,7 +103,7 @@
     "postcss-cli": "*",
     "purify-css": "*",
     "purifycss-webpack": "*",
-    "sass-loader": "*",
+    "sass-loader": "7.1.0",
     "string-replace-loader": "2.1",
     "svg-inline-loader": "*",
     "uglify-es": "*",

webpack.plugin.config.js

@@ -41,7 +41,7 @@ var corePlugins = [
 	'org.ekstep.richtext-1.0',
 	'org.ekstep.iterator-1.0',
 	'org.ekstep.navigation-1.0',
-	'org.ekstep.reviewercomments-1.0',
+	'org.ekstep.reviewercomments-1.0'
 ]
 
 let entryFiles = []
@@ -78,7 +78,7 @@ function packagePlugins () {
 			})
 			var count = 0
 			var len = (pluginContent.replace(/\b(loadNgModules)\b.*\)/g) || []).length
-			
+
 			pluginContent = uglifyjs.minify(pluginContent.replace(/\b(loadNgModules)\b.*\)/g, function ($0) {
 				if (count === len) count = 0
 				var dash
@@ -101,7 +101,7 @@ function packagePlugins () {
 		fs.appendFile('plugins/' + plugin + '/editor/plugin.dist.js', [...dependenciesArr].join('\n'))
 		pluginPackageArr.push('./plugins/' + plugin + '/editor/plugin.dist.js')
 	})
-	
+
 	return pluginPackageArr
 }
 
@@ -136,7 +136,9 @@ module.exports = {
 			'E2EConverter': path.resolve('./plugins/org.ekstep.viewecml-1.0/editor/libs/src/converter.js'),
 			'xmlbuilder': path.resolve('./node_modules/xmlbuilder/lib/index.js'),
 			'X2JS': path.resolve('./plugins/org.ekstep.assessmentbrowser-1.1/editor/libs/xml2json.js'),
-			'video.js': path.resolve('./plugins/org.ekstep.video-1.5/editor/libs/video.js')
+			'video.js': path.resolve('./plugins/org.ekstep.video-1.5/editor/libs/video.js'),
+			'global/document': path.resolve('./node_modules/global/document.js'),
+			'global/window': path.resolve('./node_modules/global/window.js')
 		}
 	},
 	module: {
@@ -225,7 +227,7 @@ module.exports = {
 					passes: 1
 				},
 				ecma: 5,
-				mangle: true				
+				mangle: true
 			},
 			sourceMap: true
 		})
@@ -241,4 +243,4 @@ module.exports = {
 			automaticNameDelimiter: '~'
 		}
 	}
-}
+}