Merge branch 'develop' into config-hotfix

sushilshinde · web-flow · commit 95749c497db3 · 2020-05-12T09:05:58.000+05:30
diff --git a/__tests__/__snapshots__/index.js.snap b/__tests__/__snapshots__/index.js.snap
@@ -387,11 +387,5 @@ Object {
     "delay": [Function],
     "formatDuration": [Function],
   },
-  "tracking": Object {
-    "default": undefined,
-    "event": [Function],
-    "init": [Function],
-    "pageView": [Function],
-  },
 }
 `;
diff --git a/config/default.json b/config/default.json
@@ -2,6 +2,5 @@
   "AV_SCAN_SCORER_REVIEW_TYPE_ID": "",
   "PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "",
   "PAGE_SIZE": 50,
-  "REVIEW_OPPORTUNITY_PAGE_SIZE": 1000,
-  "GOOGLE_ANALYTICS_ID": ""
+  "REVIEW_OPPORTUNITY_PAGE_SIZE": 1000
 }
diff --git a/config/development.json b/config/development.json
@@ -1,5 +1,4 @@
 {
   "AV_SCAN_SCORER_REVIEW_TYPE_ID": "68c5a381-c8ab-48af-92a7-7a869a4ee6c3",
-  "PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "52c91e85-745f-4e62-b592-9879a2dfe9fd",
-  "GOOGLE_ANALYTICS_ID": "UA-161803421-1"
+  "PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "52c91e85-745f-4e62-b592-9879a2dfe9fd"
 }
diff --git a/config/production.json b/config/production.json
@@ -1,5 +1,4 @@
 {
   "AV_SCAN_SCORER_REVIEW_TYPE_ID": "55bbb17d-aac2-45a6-89c3-a8d102863d05",
-  "PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "df51ca7d-fb0a-4147-9569-992fcf5aae48",
-  "GOOGLE_ANALYTICS_ID": "UA-6340959-1"
+  "PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "df51ca7d-fb0a-4147-9569-992fcf5aae48"
 }
diff --git a/config/webpack/default.js b/config/webpack/default.js
@@ -19,7 +19,6 @@ module.exports = {
     'moment-duration-format',
     'react',
     'react-dom',
-    'react-ga',
     'redux',
     'redux-actions',
     'isomorphic-fetch',
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .",
     "test": "npm run lint && npm run jest"
   },
-  "version": "1000.15.4",
+  "version": "1000.16.0",
   "dependencies": {
     "auth0-js": "^6.8.4",
     "config": "^3.2.0",
@@ -44,7 +44,6 @@
     "qs": "^6.5.2",
     "react": "^16.4.1",
     "react-dom": "^16.4.1",
-    "react-ga": "^2.7.0",
     "react-redux": "^6.0.1",
     "redux": "^3.7.2",
     "redux-actions": "^2.4.0",
diff --git a/src/index.js b/src/index.js
@@ -12,5 +12,5 @@ export { actions } from './actions';
 export { services } from './services';
 
 export {
-  challenge, logger, errors, tc, time, mock, submission, tracking,
+  challenge, logger, errors, tc, time, mock, submission,
 } from './utils';
diff --git a/src/utils/index.js b/src/utils/index.js
@@ -8,7 +8,6 @@ import * as mock from './mock';
 import * as errors from './errors';
 import * as filter from './challenge/filter';
 import * as submission from './submission';
-import * as tracking from './tracking';
 
 const challenge = {
   filter,
@@ -22,5 +21,4 @@ export {
   mock,
   errors,
   submission,
-  tracking,
 };
diff --git a/src/utils/tracking.js b/src/utils/tracking.js

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,5 @@`
`2`	`2`	`"AV_SCAN_SCORER_REVIEW_TYPE_ID": "",`
`3`	`3`	`"PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "",`
`4`	`4`	`"PAGE_SIZE": 50,`
`5`		`- "REVIEW_OPPORTUNITY_PAGE_SIZE": 1000,`
`6`		`- "GOOGLE_ANALYTICS_ID": ""`
	`5`	`+ "REVIEW_OPPORTUNITY_PAGE_SIZE": 1000`
`7`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"AV_SCAN_SCORER_REVIEW_TYPE_ID": "68c5a381-c8ab-48af-92a7-7a869a4ee6c3",`
`3`		`- "PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "52c91e85-745f-4e62-b592-9879a2dfe9fd",`
`4`		`- "GOOGLE_ANALYTICS_ID": "UA-161803421-1"`
	`3`	`+ "PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "52c91e85-745f-4e62-b592-9879a2dfe9fd"`
`5`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"AV_SCAN_SCORER_REVIEW_TYPE_ID": "55bbb17d-aac2-45a6-89c3-a8d102863d05",`
`3`		`- "PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "df51ca7d-fb0a-4147-9569-992fcf5aae48",`
`4`		`- "GOOGLE_ANALYTICS_ID": "UA-6340959-1"`
	`3`	`+ "PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "df51ca7d-fb0a-4147-9569-992fcf5aae48"`
`5`	`4`	`}`