From 1f5a1056b52cdb4a89ffb2af662fca22c541abef Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Thu, 30 Apr 2020 11:55:14 -0300 Subject: [PATCH 1/7] Revert "Notifications Analytics" --- __tests__/__snapshots__/index.js.snap | 6 ---- config/default.json | 3 +- config/development.json | 3 +- config/production.json | 3 +- config/webpack/default.js | 1 - package.json | 3 +- src/index.js | 2 +- src/utils/index.js | 2 -- src/utils/tracking.js | 47 --------------------------- 9 files changed, 5 insertions(+), 65 deletions(-) delete mode 100644 src/utils/tracking.js diff --git a/__tests__/__snapshots__/index.js.snap b/__tests__/__snapshots__/index.js.snap index 416655e0..18663275 100644 --- 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 index e7c3a7bf..38d4e982 100644 --- 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 index 95eeb428..b1519a01 100644 --- 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 index 92031113..d2b1223d 100644 --- 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 index 3ef26273..4872dd72 100644 --- 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 index 74bc2abe..b5a3500b 100644 --- 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": "0.17.0", + "version": "0.15.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 index b8c4c79f..78103660 100644 --- 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 index d0212e21..6a6387a4 100644 --- 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 deleted file mode 100644 index 4b764615..00000000 --- a/src/utils/tracking.js +++ /dev/null @@ -1,47 +0,0 @@ -/* global window */ -/* global CONFIG */ - -import ReactGA from 'react-ga'; - -const { GOOGLE_ANALYTICS_ID } = CONFIG; -const TRACKING_NAME = 'tracking'; - -/** - * init - Init Google Analytics tracking - * @param {string} userId - */ -export const init = (userId) => { - ReactGA.initialize([{ - trackingId: GOOGLE_ANALYTICS_ID, - gaOptions: { - name: TRACKING_NAME, - userId, - }, - }], { - alwaysSendToDefaultTracker: false, - }); -}; - -/** - * pageView - Track page view - */ -export const pageView = () => { - ReactGA.pageview(window.location.pathname - + window.location.search, [TRACKING_NAME]); -}; - -/** - * event - Add custom tracking event. - * @param {string} category - * @param {string} action - * @param {string} label - */ -export const event = (category, action, label) => { - ReactGA.event({ - category, - action, - label, - }, [TRACKING_NAME]); -}; - -export default undefined; From 6f98f739433f62be60e7486f7a621397186f6d7f Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Fri, 8 May 2020 19:58:06 -0300 Subject: [PATCH 2/7] Added NODE_ENV to build scripts --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 74bc2abe..447b38df 100644 --- a/package.json +++ b/package.json @@ -22,9 +22,9 @@ }, "scripts": { "build": "npm run clean && npm run build:dev && npm run build:prod", - "build:dev": "./node_modules/.bin/webpack --env=development --progress --profile --colors --display-optimization-bailout", + "build:dev": "NODE_ENV=development ./node_modules/.bin/webpack --env=development --progress --profile --colors --display-optimization-bailout", "build:dev:watch": "npm run clean && ./node_modules/.bin/webpack --env=development --progress --profile --colors --watch --display-optimization-bailout", - "build:prod": "./node_modules/.bin/webpack --env=production --progress --profile --colors --display-optimization-bailout", + "build:prod": "NODE_ENV=production ./node_modules/.bin/webpack --env=production --progress --profile --colors --display-optimization-bailout", "clean": "rimraf dist", "jest": "jest --no-cache --maxWorkers=4 --config config/jest/default.js", "lint": "npm run lint:js", From 54c823a11e205211f1cee63052569fa2c730db91 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Fri, 8 May 2020 20:14:33 -0300 Subject: [PATCH 3/7] Test release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 447b38df..d306f514 100644 --- 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": "0.17.0", + "version": "1000.15.4", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From ce9827278fd9937c416e7c68142d434114f50843 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Sat, 9 May 2020 00:41:56 -0300 Subject: [PATCH 4/7] Npm ver bump up for production release to v0.17.1 https://github.com/topcoder-platform/community-app/issues/4309 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b5a3500b..4881ed61 100644 --- 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": "0.15.0", + "version": "0.17.1", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From f48803c9374eeff77ce82c767bdc5501a9aa5e1a Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Tue, 12 May 2020 09:12:25 +0530 Subject: [PATCH 5/7] Adding dist tags --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e161844..e8eac28e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: - attach_workspace: at: . - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc - - run: npm publish + - run: npm publish --tag test-release # dont change anything workflows: version: 2 From 6c8eb5bb0197af8b393bf32eab110eedce8e7ae5 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 13 May 2020 12:56:11 +0530 Subject: [PATCH 6/7] Removing dist tag --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e8eac28e..0e161844 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: - attach_workspace: at: . - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc - - run: npm publish --tag test-release + - run: npm publish # dont change anything workflows: version: 2 From b7816e5e9b45c493cc24547d643bedec3c613965 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 13 May 2020 12:57:42 +0530 Subject: [PATCH 7/7] npm bump up v0.17.2 for prod release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ef5e43f..177e7aca 100644 --- 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.16.0", + "version": "0.17.2", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0",