Merge pull request #4155 from NativeScript/kddimitrov/add-test-ga-project

feat: add ga dev id and change to live on grunt pack

Author: KristianDD

Gruntfile.js

@@ -1,6 +1,24 @@
 const childProcess = require("child_process");
+const EOL = require("os").EOL;
 const now = new Date().toISOString();
 
+const CONFIG_JSON_PATH = "config/config.json";
+
+const ENVIRONMENTS = {
+	live: "live",
+	dev: "dev"
+};
+
+const GA_TRACKING_IDS = {
+	[ENVIRONMENTS.dev]: "UA-111455-51",
+	[ENVIRONMENTS.live]: "UA-111455-44"
+};
+
+const CONFIG_DATA = {
+	filePath: "config/config.json",
+	gaKey: "GA_TRACKING_ID"
+}
+
 function shallowCopy(obj) {
 	var result = {};
 	Object.keys(obj).forEach(function (key) {
@@ -101,17 +119,6 @@ module.exports = function (grunt) {
 
 		},
 
-		copy: {
-			package_to_drop_folder: {
-				src: "*.tgz",
-				dest: "<%= copyPackageTo %>/<%= jobName %>/<%= dateString %> #<%= buildNumber %>/"
-			},
-			package_to_qa_drop_folder: {
-				src: "*.tgz",
-				dest: "<%= copyPackageTo %>/<%= jobName %>/nativescript.tgz"
-			}
-		},
-
 		clean: {
 			src: ["test/**/*.js*",
 				"lib/**/*.js*",
@@ -191,17 +198,41 @@ module.exports = function (grunt) {
 		grunt.file.write("package.json", JSON.stringify(packageJson, null, "  "));
 	});
 
+	const setConfig = (key, value) => {
+		const configJson = grunt.file.readJSON(CONFIG_DATA.filePath);
+		configJson[key] = value;
+		const stringConfigContent = JSON.stringify(configJson, null, "	") + EOL;
+		grunt.file.write(CONFIG_DATA.filePath, stringConfigContent);
+	}
+
+	grunt.registerTask("set_live_ga_id", function() {
+		setConfig(CONFIG_DATA.gaKey, GA_TRACKING_IDS[ENVIRONMENTS.live]);
+	});
+
+	grunt.registerTask("set_dev_ga_id", function() {
+		setConfig(CONFIG_DATA.gaKey, GA_TRACKING_IDS[ENVIRONMENTS.dev]);
+	});
+
+	grunt.registerTask("verify_live_ga_id", function() {
+		var configJson = grunt.file.readJSON(CONFIG_DATA.filePath);
+
+		if(configJson[CONFIG_DATA.gaKey] !== GA_TRACKING_IDS[ENVIRONMENTS.live]) {
+			throw new Error("Google Analytics id is not configured correctly.");
+		}
+	});
+
 	grunt.registerTask("test", ["ts:devall", "shell:npm_test"]);
-	grunt.registerTask("pack", [
+	grunt.registerTask("prepare", [
 		"clean",
 		"ts:release_build",
 		"shell:npm_test",
 
+		"set_live_ga_id",
+		"verify_live_ga_id"
+	]);
+	grunt.registerTask("pack", [
 		"set_package_version",
-		"shell:build_package",
-
-		"copy:package_to_drop_folder",
-		"copy:package_to_qa_drop_folder"
+		"shell:build_package"
 	]);
 	grunt.registerTask("lint", ["tslint:build"]);
 	grunt.registerTask("all", ["clean", "test", "lint"]);

config/config.json

@@ -7,5 +7,6 @@
 	"DISABLE_HOOKS": false,
 	"UPLOAD_PLAYGROUND_FILES_ENDPOINT": "https://play.nativescript.org/api/files",
 	"SHORTEN_URL_ENDPOINT": "https://play.nativescript.org/api/shortenurl?longUrl=%s",
-	"PREVIEW_APP_ENVIRONMENT": "live"
+	"PREVIEW_APP_ENVIRONMENT": "live",
+	"GA_TRACKING_ID": "UA-111455-51"
 }

lib/config.ts

@@ -11,6 +11,7 @@ export class Configuration extends ConfigBase implements IConfiguration { // Use
 	UPLOAD_PLAYGROUND_FILES_ENDPOINT: string = null;
 	SHORTEN_URL_ENDPOINT: string = null;
 	PREVIEW_APP_ENVIRONMENT: string = null;
+	GA_TRACKING_ID: string = null;
 
 	/*don't require logger and everything that has logger as dependency in config.js due to cyclic dependency*/
 	constructor(protected $fs: IFileSystem) {

lib/declarations.d.ts

@@ -412,6 +412,7 @@ interface IConfiguration extends Config.IConfig {
 	UPLOAD_PLAYGROUND_FILES_ENDPOINT: string;
 	SHORTEN_URL_ENDPOINT: string;
 	PREVIEW_APP_ENVIRONMENT: string;
+	GA_TRACKING_ID: string;
 }
 
 interface IApplicationPackage {

lib/services/analytics/google-analytics-provider.ts

@@ -3,21 +3,21 @@ import * as ua from "universal-analytics";
 import { AnalyticsClients } from "../../common/constants";
 
 export class GoogleAnalyticsProvider implements IGoogleAnalyticsProvider {
-	private static GA_TRACKING_ID = "UA-111455-44";
 	private currentPage: string;
 
 	constructor(private clientId: string,
 		private $staticConfig: IStaticConfig,
 		private $analyticsSettingsService: IAnalyticsSettingsService,
 		private $logger: ILogger,
-		private $proxyService: IProxyService) {
+		private $proxyService: IProxyService,
+		private $config: IConfiguration) {
 	}
 
 	public async trackHit(trackInfo: IGoogleAnalyticsData): Promise<void> {
 		const sessionId = uuid.v4();
 
 		try {
-			await this.track(GoogleAnalyticsProvider.GA_TRACKING_ID, trackInfo, sessionId);
+			await this.track(this.$config.GA_TRACKING_ID, trackInfo, sessionId);
 		} catch (e) {
 			this.$logger.trace("Analytics exception: ", e);
 		}

package.json

@@ -14,6 +14,8 @@
     "test": "node test-scripts/istanbul.js",
     "postinstall": "node postinstall.js",
     "preuninstall": "node preuninstall.js",
+    "prepack": "grunt prepare",
+    "postpack": "grunt set_dev_ga_id",
     "mocha": "node test-scripts/mocha.js",
     "tsc": "tsc",
     "tslint": "tslint -p tsconfig.json --type-check",