From 1d3c7c789440adce773659f414307cea703cc147 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiri4a@gmail.com>
Date: Tue, 24 May 2022 16:23:04 +0300
Subject: [PATCH 01/20] fix social share for Contentful routes

---
 src/shared/components/Contentful/Route.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/Contentful/Route.jsx b/src/shared/components/Contentful/Route.jsx
index 6a7dd02e41..4b88d43585 100644
--- a/src/shared/components/Contentful/Route.jsx
+++ b/src/shared/components/Contentful/Route.jsx
@@ -47,7 +47,7 @@ function ChildRoutesLoader(props) {
               <React.Fragment>
                 <MetaTags
                   description={fields.description}
-                  image={fields.thumbnail}
+                  image={fields.socialThumbnail}
                   siteName={fields.socialSiteName}
                   socialDescription={fields.socialDescription}
                   socialTitle={fields.socialTitle}

From fc9782fd7270551c9808eae646314bfe3662dccf Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiri4a@gmail.com>
Date: Tue, 24 May 2022 16:23:59 +0300
Subject: [PATCH 02/20] ci: on beta

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0b075aa900..faf4b3370a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -370,7 +370,7 @@ workflows:
           filters:
             branches:
               only:
-                - footer-update
+                - social-share-thumb
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         

From b068d1342830ad9a9f973a4c9401e24c0ff8f9a3 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiri4a@gmail.com>
Date: Wed, 25 May 2022 12:46:39 +0300
Subject: [PATCH 03/20] domain fix for social thumb

---
 src/shared/components/MetaTags.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/shared/components/MetaTags.jsx b/src/shared/components/MetaTags.jsx
index 343d8a684d..4b192752df 100644
--- a/src/shared/components/MetaTags.jsx
+++ b/src/shared/components/MetaTags.jsx
@@ -24,7 +24,10 @@ function MetaTags({
   feed,
   feedTitle,
 }) {
-  const img = `${domain}${image}`;
+  let img = `${domain}${image}`;
+  if (image.indexOf('http://') === 0 || image.indexOf('https://') === 0) {
+    img = `${image}`;
+  }
   const socTitle = socialTitle || title;
   const socDesc = socialDescription || description;
   return (

From 807f6faa7216c2097ab8dcd0f71e904f643706b0 Mon Sep 17 00:00:00 2001
From: eisbilir <emre.isbilir@gmail.com>
Date: Thu, 26 May 2022 00:03:45 +0300
Subject: [PATCH 04/20] add csp header for tco

---
 src/server/index.js | 62 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/src/server/index.js b/src/server/index.js
index 0eee1228fd..9d1c10ecee 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -50,6 +50,8 @@ ts = moment(ts.timestamp).valueOf();
 const sw = `sw.js${process.env.NODE_ENV === 'production' ? '' : '?debug'}`;
 const swScope = '/challenges'; // we are currently only interested in improving challenges pages
 
+const tcoPattern = new RegExp(/^tco\d{2}\.topcoder(?:-dev)?\.com$/i);
+
 const EXTRA_SCRIPTS = [
   `<script type="application/javascript">
   if('serviceWorker' in navigator){
@@ -206,6 +208,66 @@ async function onExpressJsSetup(server) {
         + ' report-uri https://623d4c23f90d055298b24042.endpoint.csper.io/?v=0;'
         + " worker-src 'self';",
       );
+    } else if (req.url.startsWith('/__community__/tco') || tcoPattern.test(req.hostname)) {
+      res.header(
+        'Content-Security-Policy',
+        "default-src 'self';"
+        + " script-src 'self' 'unsafe-inline' 'unsafe-eval'"
+          + ` ${config.CDN.PUBLIC}`
+          + ' https://cdn.segment.com'
+          + ' https://www.google-analytics.com'
+          + ' https://assets.zendesk.com'
+          + ' https://static.zdassets.com'
+          + ' https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com'
+          + ' https://fast.trychameleon.com'
+          + ' https://browser.sentry-cdn.com'
+          + ' https://cdn.heapanalytics.com'
+          + ' https://www.googletagmanager.com'
+          + ' https://assets.ubembed.com'
+          + ' https://connect.facebook.net;'
+        + " style-src 'self' 'unsafe-inline'"
+          + ` ${config.CDN.PUBLIC};`
+        + " object-src 'none';"
+        + " base-uri 'self';"
+        + " connect-src 'self'"
+          + ` ${config.API.V2}/`
+          + ` ${config.API.V3}/`
+          + ` ${config.API.V4}/`
+          + ` ${config.API.V5}/`
+          + ` ${config.CDN.PUBLIC}`
+          + ` ${config.URL.COMMUNITY_APP}`
+          + ' https://www.google-analytics.com'
+          + ' https://api.segment.io'
+          + ' https://ekr.zdassets.com'
+          + ' https://stats.g.doubleclick.net'
+          + ' https://topcoder.zendesk.com'
+          + ' https://fast.trychameleon.com;'
+        + " font-src 'self'"
+          + ' data:'
+          + ` ${config.CDN.PUBLIC};`
+        + " frame-src 'self'"
+          + ` ${config.URL.AUTH}`
+          + ' https://www.youtube.com;'
+        + " img-src 'self'"
+          + ` ${config.CDN.PUBLIC}`
+          + ' https://images.ctfassets.net'
+          + ' https://q.quora.com'
+          + ' https://heapanalytics.com'
+          + ' https://www.google-analytics.com'
+          + ' https://www.facebook.com'
+          + ' https://www.google.com'
+          + ' https://topcoder-prod-media.s3.amazonaws.com'
+          + ' https://topcoder-dev-media.s3.amazonaws.com'
+          + ' https://www.facebook.com'
+          + ' https://d0.awsstatic.com/logos/'
+          + ' https://i.ytimg.com'
+          + ' https://images.contentful.com'
+          + ' https://www.googletagmanager.com'
+          + ' data:;'
+        + " manifest-src 'self';"
+        + " media-src 'self';"
+        + " worker-src 'self';",
+      );
     }
 
     next();

From d46f467822af6b95908182acc10de1268aa01f75 Mon Sep 17 00:00:00 2001
From: Emre <emre.isbilir@gmail.com>
Date: Thu, 26 May 2022 10:51:28 +0300
Subject: [PATCH 05/20] combine tco headers with veterans

---
 src/server/index.js | 67 ++++-----------------------------------------
 1 file changed, 6 insertions(+), 61 deletions(-)

diff --git a/src/server/index.js b/src/server/index.js
index 9d1c10ecee..9996ce180f 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -137,13 +137,14 @@ async function onExpressJsSetup(server) {
     res.header('Referrer-Policy', 'strict-origin-when-cross-origin');
     res.header('Permissions-Policy', 'geolocation=(), microphone=(), camera=()');
 
-    if (req.url.startsWith('/__community__/veterans') || req.hostname === 'veterans.topcoder.com') {
+    if (req.url.startsWith('/__community__/veterans') || req.hostname === 'veterans.topcoder.com' || req.url.startsWith('/__community__/tco') || tcoPattern.test(req.hostname)) {
       res.header(
         'Content-Security-Policy',
         "default-src 'self';"
         + " script-src 'report-sample' 'self' 'unsafe-inline' 'unsafe-eval'"
           + ` ${config.CDN.PUBLIC}`
           + ' http://www.google-analytics.com'
+          + ' https://www.google-analytics.com'
           + ' https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com'
           + ' https://assets.ubembed.com'
           + ' https://assets.zendesk.com'
@@ -189,6 +190,7 @@ async function onExpressJsSetup(server) {
           + ` ${config.URL.AUTH}`
           + ' https://www.youtube.com;'
         + " img-src 'self'"
+          + ' data:'
           + ` ${config.CDN.PUBLIC}`
           + ' https://cdn.segment.com'
           + ' https://d1of0acg2orgco.cloudfront.net'
@@ -198,74 +200,17 @@ async function onExpressJsSetup(server) {
           + ' https://heapanalytics.com'
           + ' https://q.quora.com'
           + ' https://topcoder-prod-media.s3.amazonaws.com'
+          + ' https://topcoder-dev-media.s3.amazonaws.com'
           + ' https://www.facebook.com'
           + ' https://www.google-analytics.com'
           + ' https://www.google.com'
           + ' https://www.googletagmanager.com'
-          + ' https://i.ytimg.com;'
-        + " manifest-src 'self';"
-        + " media-src 'self';"
-        + ' report-uri https://623d4c23f90d055298b24042.endpoint.csper.io/?v=0;'
-        + " worker-src 'self';",
-      );
-    } else if (req.url.startsWith('/__community__/tco') || tcoPattern.test(req.hostname)) {
-      res.header(
-        'Content-Security-Policy',
-        "default-src 'self';"
-        + " script-src 'self' 'unsafe-inline' 'unsafe-eval'"
-          + ` ${config.CDN.PUBLIC}`
-          + ' https://cdn.segment.com'
-          + ' https://www.google-analytics.com'
-          + ' https://assets.zendesk.com'
-          + ' https://static.zdassets.com'
-          + ' https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com'
-          + ' https://fast.trychameleon.com'
-          + ' https://browser.sentry-cdn.com'
-          + ' https://cdn.heapanalytics.com'
-          + ' https://www.googletagmanager.com'
-          + ' https://assets.ubembed.com'
-          + ' https://connect.facebook.net;'
-        + " style-src 'self' 'unsafe-inline'"
-          + ` ${config.CDN.PUBLIC};`
-        + " object-src 'none';"
-        + " base-uri 'self';"
-        + " connect-src 'self'"
-          + ` ${config.API.V2}/`
-          + ` ${config.API.V3}/`
-          + ` ${config.API.V4}/`
-          + ` ${config.API.V5}/`
-          + ` ${config.CDN.PUBLIC}`
-          + ` ${config.URL.COMMUNITY_APP}`
-          + ' https://www.google-analytics.com'
-          + ' https://api.segment.io'
-          + ' https://ekr.zdassets.com'
-          + ' https://stats.g.doubleclick.net'
-          + ' https://topcoder.zendesk.com'
-          + ' https://fast.trychameleon.com;'
-        + " font-src 'self'"
-          + ' data:'
-          + ` ${config.CDN.PUBLIC};`
-        + " frame-src 'self'"
-          + ` ${config.URL.AUTH}`
-          + ' https://www.youtube.com;'
-        + " img-src 'self'"
-          + ` ${config.CDN.PUBLIC}`
-          + ' https://images.ctfassets.net'
-          + ' https://q.quora.com'
-          + ' https://heapanalytics.com'
-          + ' https://www.google-analytics.com'
-          + ' https://www.facebook.com'
-          + ' https://www.google.com'
-          + ' https://topcoder-prod-media.s3.amazonaws.com'
-          + ' https://topcoder-dev-media.s3.amazonaws.com'
-          + ' https://www.facebook.com'
-          + ' https://d0.awsstatic.com/logos/'
           + ' https://i.ytimg.com'
           + ' https://images.contentful.com'
-          + ' https://www.googletagmanager.com'
-          + ' data:;'
+          + ' https://d0.awsstatic.com/logos/;'
         + " manifest-src 'self';"
         + " media-src 'self';"
+        + ' report-uri https://623d4c23f90d055298b24042.endpoint.csper.io/?v=0;'
         + " worker-src 'self';",
       );
     }

From 927025635b1451822ddd23d6199a7110c503987d Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Thu, 26 May 2022 20:42:17 -0300
Subject: [PATCH 06/20] ci: deploy fix-security-headers to Stag env

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 37fe8b4d60..db65705116 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -379,7 +379,7 @@ workflows:
             branches:
               only:
                 - develop
-                - stat_marathon_match_link
+                - fix-security-headers
       # Production builds are exectuted
       # when PR is merged to the master
       # Don't change anything in this configuration

From 0cda9c0b6c0eb8248ceaa8c36957b1f5f159fc29 Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Mon, 6 Jun 2022 01:04:17 -0300
Subject: [PATCH 07/20] ci: deploy develop branch to QA env

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cd359cdd0f..024fd38194 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -363,7 +363,7 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - develop
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global

From 4af74151aa888ecbee72e6fc5494e0bf74d29add Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kkartunov@users.noreply.github.com>
Date: Wed, 8 Jun 2022 18:39:38 +0300
Subject: [PATCH 08/20] Add error and res for logging more details

---
 src/shared/reducers/contentful/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/reducers/contentful/index.js b/src/shared/reducers/contentful/index.js
index 9c0a27b45d..331eadb1e3 100644
--- a/src/shared/reducers/contentful/index.js
+++ b/src/shared/reducers/contentful/index.js
@@ -61,7 +61,7 @@ function create(init) {
     const environment = _.get(payload, 'environment') || config.CONTENTFUL.DEFAULT_ENVIRONMENT;
     const res = _.get(newState, `${spaceName}.${environment}`);
     if (error || !res) {
-      logger.log('CMS-related error');
+      logger.log('CMS-related error', error, res);
       return state;
     }
     const st = state[spaceName][environment];

From 09f481a40779ae4fbb4de20aeca13916b96b3baf Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kkartunov@users.noreply.github.com>
Date: Thu, 9 Jun 2022 18:49:58 +0300
Subject: [PATCH 09/20] add more infos for debug

---
 src/shared/reducers/contentful/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/reducers/contentful/index.js b/src/shared/reducers/contentful/index.js
index 331eadb1e3..6619d21d55 100644
--- a/src/shared/reducers/contentful/index.js
+++ b/src/shared/reducers/contentful/index.js
@@ -61,7 +61,7 @@ function create(init) {
     const environment = _.get(payload, 'environment') || config.CONTENTFUL.DEFAULT_ENVIRONMENT;
     const res = _.get(newState, `${spaceName}.${environment}`);
     if (error || !res) {
-      logger.log('CMS-related error', error, res);
+      logger.log('CMS-related error', error, res, `${spaceName}.${environment}`, newState, payload, config.CONTENTFUL.DEFAULT_SPACE_NAME, config.CONTENTFUL.DEFAULT_ENVIRONMENT);
       return state;
     }
     const st = state[spaceName][environment];

From 87ba361044cc0612c11fa1868188c002a5678308 Mon Sep 17 00:00:00 2001
From: Nursoltan Saipolda <nursoltan.saipolda@chemantics.com>
Date: Fri, 10 Jun 2022 00:16:40 +0800
Subject: [PATCH 10/20] enhance mm dashboard

---
 .../MMDashboard/Graph/index.jsx               | 76 +++++++++++++------
 src/shared/utils/tc.js                        | 45 +++++++++++
 2 files changed, 98 insertions(+), 23 deletions(-)

diff --git a/src/shared/components/challenge-detail/MMDashboard/Graph/index.jsx b/src/shared/components/challenge-detail/MMDashboard/Graph/index.jsx
index 2139ef782a..263c90073a 100644
--- a/src/shared/components/challenge-detail/MMDashboard/Graph/index.jsx
+++ b/src/shared/components/challenge-detail/MMDashboard/Graph/index.jsx
@@ -1,16 +1,18 @@
 /* eslint-disable react/no-this-in-sfc */
-import React from 'react';
+import React, { useState } from 'react';
 import Highcharts from 'highcharts';
 import HighchartsReact from 'highcharts-react-official';
 import PT from 'prop-types';
 import moment from 'moment';
-import { getRatingColor } from 'utils/tc';
+import { getHighlightedColor, getRatingColor, getUnSelectedColors } from 'utils/tc';
 import DefaultUserImage from 'assets/images/ico-user-default.png';
 
 import './styles.scss';
 import _ from 'lodash';
 
 export default function Graph({ statisticsData, baseline, awardLine }) {
+  const [point, setPoint] = useState(null);
+
   const flatData = [];
   const dates = [];
   _.each(statisticsData, (entry) => {
@@ -28,24 +30,48 @@ export default function Graph({ statisticsData, baseline, awardLine }) {
     chart: {
       type: 'scatter',
       backgroundColor: '#fff',
+      events: {
+        click: () => {
+          setPoint(null);
+        },
+      },
     },
     title: {
       text: '',
     },
     series: [
       {
-        data: _.map(flatData, data => ({
-          x: moment(data.created).valueOf(),
-          y: _.max([0, data.score ? (parseFloat(data.score)) : 0]),
-          name: data.handle,
-          color: data.ratingColor
-            || getRatingColor(data.rating
-            || 0),
-          customData: data,
-        })),
+        data: _.map(flatData, (data) => {
+          let color;
+          if (point) {
+            if (point.customData.handle === data.handle) {
+              color = getHighlightedColor(data.rating || 0);
+            } else {
+              color = getUnSelectedColors(data.rating || 0);
+            }
+          } else {
+            color = data.ratingColor || getRatingColor(data.rating || 0);
+          }
+          return {
+            x: moment(data.created).valueOf(),
+            y: _.max([0, data.score ? (parseFloat(data.score)) : 0]),
+            name: data.handle,
+            color,
+            customData: data,
+          };
+        }),
         pointStart: moment(_.min(dates)).valueOf(),
         pointInterval: 24 * 3600 * 1000,
         backgroundColor: 'rgb(51,51,51)',
+        point: {
+          events: {
+            click: (e) => {
+              if (e && e.point) {
+                setPoint(e.point);
+              }
+            },
+          },
+        },
       },
     ],
     legend: {
@@ -106,23 +132,27 @@ export default function Graph({ statisticsData, baseline, awardLine }) {
     },
     tooltip: {
       formatter() {
-        const str = `
-          <div style="border-radius:4px; padding-top: 15px; padding-left: 10px;">
-            <img height="30" width="30" src="${this.point.customData.photoUrl || DefaultUserImage}" style="position: absolute; border-radius: 50%;" />
-            <p style="margin-left: 50px">${this.point.customData.handle}</p>
-            <br />
-            <p style="margin-left: 50px;">${this.point.customData.submissionCount} submissions</p>
-            <p style="margin-left: 50px;">Score: ${this.y}</p>
-            <p style="margin-left: 50px;">Submitted: ${moment(this.point.customData.created).format('MM/DD/YYYY')} </p>
-          </div>
-        `;
-        return str;
+        const currentPointer = this.point || point;
+        if (currentPointer) {
+          const str = `
+            <div style="border-radius:4px; padding-top: 15px; padding-left: 10px;">
+              <img height="30" width="30" src="${currentPointer.customData.photoUrl || DefaultUserImage}" style="position: absolute; border-radius: 50%;" />
+              <p style="margin-left: 50px">${currentPointer.customData.handle}</p>
+              <br />
+              <p style="margin-left: 50px;">${currentPointer.customData.submissionCount} submissions</p>
+              <p style="margin-left: 50px;">Score: ${this.y}</p>
+              <p style="margin-left: 50px;">Submitted: ${moment(currentPointer.customData.created).format('MM/DD/YYYY')} </p>
+            </div>
+          `;
+          return str;
+        }
+        return false;
       },
       useHTML: true,
       style: {
         color: '#fff',
       },
-      backgroundColor: 'rgb(51,51,51)',
+      backgroundColor: point ? '#2e2e2e' : 'rgb(51,51,51)',
       shared: true,
     },
   };
diff --git a/src/shared/utils/tc.js b/src/shared/utils/tc.js
index 6edfd72a1c..e9ab88addd 100644
--- a/src/shared/utils/tc.js
+++ b/src/shared/utils/tc.js
@@ -122,12 +122,57 @@ export const RATING_COLORS = [{
   color: '#EF3A3A' /* Red */,
   limit: Infinity,
 }];
+
 export function getRatingColor(rating) {
   let i = 0; const r = Number(rating);
   while (RATING_COLORS[i].limit <= r) i += 1;
   return RATING_COLORS[i].color || 'black';
 }
 
+export const HIGHLIGHTED_RATING_COLORS = [{
+  color: '#464646' /* Grey */,
+  limit: 900,
+}, {
+  color: '#00ab00' /* Green */,
+  limit: 1200,
+}, {
+  color: '#3748ff' /* Blue */,
+  limit: 1500,
+}, {
+  color: '#ffe879' /* Yellow */,
+  limit: 2200,
+}, {
+  color: '#ff2a2a' /* Red */,
+  limit: Infinity,
+}];
+export function getHighlightedColor(rating) {
+  let i = 0; const r = Number(rating);
+  while (HIGHLIGHTED_RATING_COLORS[i].limit <= r) i += 1;
+  return HIGHLIGHTED_RATING_COLORS[i].color || 'black';
+}
+
+export const UNSELECTED_RATING_COLORS = [{
+  color: '#f3f3f3' /* Grey */,
+  limit: 900,
+}, {
+  color: '#e6f6e6' /* Green */,
+  limit: 1200,
+}, {
+  color: '#c5c8ef' /* Blue */,
+  limit: 1500,
+}, {
+  color: '#fff5c4' /* Yellow */,
+  limit: 2200,
+}, {
+  color: '#f47d7d' /* Red */,
+  limit: Infinity,
+}];
+export function getUnSelectedColors(rating) {
+  let i = 0; const r = Number(rating);
+  while (UNSELECTED_RATING_COLORS[i].limit <= r) i += 1;
+  return UNSELECTED_RATING_COLORS[i].color || 'black';
+}
+
 /**
  * Given ExpressJS HTTP request it extracts Topcoder auth tokens from cookies,
  * if they are present there and are not expired.

From 4387367c91623a356b38535d73c05aae2edaacf1 Mon Sep 17 00:00:00 2001
From: Nursoltan Saipolda <nursoltan.saipolda@chemantics.com>
Date: Sun, 12 Jun 2022 22:59:11 +0800
Subject: [PATCH 11/20] add opacity

---
 .../MMDashboard/Graph/index.jsx               | 59 ++++++++++++-------
 .../MMDashboard/Graph/styles.scss             |  5 ++
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/shared/components/challenge-detail/MMDashboard/Graph/index.jsx b/src/shared/components/challenge-detail/MMDashboard/Graph/index.jsx
index 263c90073a..62bad0f281 100644
--- a/src/shared/components/challenge-detail/MMDashboard/Graph/index.jsx
+++ b/src/shared/components/challenge-detail/MMDashboard/Graph/index.jsx
@@ -7,8 +7,8 @@ import moment from 'moment';
 import { getHighlightedColor, getRatingColor, getUnSelectedColors } from 'utils/tc';
 import DefaultUserImage from 'assets/images/ico-user-default.png';
 
-import './styles.scss';
 import _ from 'lodash';
+import styles from './styles.scss';
 
 export default function Graph({ statisticsData, baseline, awardLine }) {
   const [point, setPoint] = useState(null);
@@ -26,7 +26,44 @@ export default function Graph({ statisticsData, baseline, awardLine }) {
     });
   });
 
+  const pointDatas = _.map(flatData, (data) => {
+    let color;
+    let isSelected = false;
+    if (point) {
+      isSelected = point.customData.handle === data.handle;
+      if (isSelected) {
+        color = getHighlightedColor(data.rating || 0);
+      } else {
+        color = getUnSelectedColors(data.rating || 0);
+      }
+    } else {
+      color = data.ratingColor || getRatingColor(data.rating || 0);
+    }
+    return {
+      x: moment(data.created).valueOf(),
+      y: _.max([0, data.score ? (parseFloat(data.score)) : 0]),
+      name: data.handle,
+      color,
+      customData: data,
+      marker: {
+        enabled: true,
+        width: 'circle',
+        radius: isSelected ? 6 : 4,
+      },
+      className: !isSelected && point ? styles.selectedPoint : '',
+    };
+  });
+
   const options = {
+    plotOptions: {
+      line: {
+        events: {
+          click() {
+            this.group.toFront();
+          },
+        },
+      },
+    },
     chart: {
       type: 'scatter',
       backgroundColor: '#fff',
@@ -41,25 +78,7 @@ export default function Graph({ statisticsData, baseline, awardLine }) {
     },
     series: [
       {
-        data: _.map(flatData, (data) => {
-          let color;
-          if (point) {
-            if (point.customData.handle === data.handle) {
-              color = getHighlightedColor(data.rating || 0);
-            } else {
-              color = getUnSelectedColors(data.rating || 0);
-            }
-          } else {
-            color = data.ratingColor || getRatingColor(data.rating || 0);
-          }
-          return {
-            x: moment(data.created).valueOf(),
-            y: _.max([0, data.score ? (parseFloat(data.score)) : 0]),
-            name: data.handle,
-            color,
-            customData: data,
-          };
-        }),
+        data: pointDatas,
         pointStart: moment(_.min(dates)).valueOf(),
         pointInterval: 24 * 3600 * 1000,
         backgroundColor: 'rgb(51,51,51)',
diff --git a/src/shared/components/challenge-detail/MMDashboard/Graph/styles.scss b/src/shared/components/challenge-detail/MMDashboard/Graph/styles.scss
index 8e0652361b..611e6085c8 100644
--- a/src/shared/components/challenge-detail/MMDashboard/Graph/styles.scss
+++ b/src/shared/components/challenge-detail/MMDashboard/Graph/styles.scss
@@ -21,3 +21,8 @@
     padding-right: 16px;
   }
 }
+
+.selectedPoint {
+  z-index: 1000 !important;
+  opacity: 0.9;
+}
\ No newline at end of file

From 2bd8e340cb673d68d4bced75d683e04431a0a5e0 Mon Sep 17 00:00:00 2001
From: Nursoltan Saipolda <nursoltan.saipolda@chemantics.com>
Date: Sun, 12 Jun 2022 23:04:08 +0800
Subject: [PATCH 12/20] fix test fail

---
 .../components/challenge-detail/MMDashboard/Graph/styles.scss   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-detail/MMDashboard/Graph/styles.scss b/src/shared/components/challenge-detail/MMDashboard/Graph/styles.scss
index 611e6085c8..539c9f9efd 100644
--- a/src/shared/components/challenge-detail/MMDashboard/Graph/styles.scss
+++ b/src/shared/components/challenge-detail/MMDashboard/Graph/styles.scss
@@ -25,4 +25,4 @@
 .selectedPoint {
   z-index: 1000 !important;
   opacity: 0.9;
-}
\ No newline at end of file
+}

From 73ddb5fa61252732a45514c399c2d38df428c37d Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiri4a@gmail.com>
Date: Mon, 13 Jun 2022 12:32:24 +0300
Subject: [PATCH 13/20] dump action for inspection

---
 src/shared/reducers/contentful/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/reducers/contentful/index.js b/src/shared/reducers/contentful/index.js
index 6619d21d55..3d1cceb266 100644
--- a/src/shared/reducers/contentful/index.js
+++ b/src/shared/reducers/contentful/index.js
@@ -61,7 +61,7 @@ function create(init) {
     const environment = _.get(payload, 'environment') || config.CONTENTFUL.DEFAULT_ENVIRONMENT;
     const res = _.get(newState, `${spaceName}.${environment}`);
     if (error || !res) {
-      logger.log('CMS-related error', error, res, `${spaceName}.${environment}`, newState, payload, config.CONTENTFUL.DEFAULT_SPACE_NAME, config.CONTENTFUL.DEFAULT_ENVIRONMENT);
+      logger.log('CMS-related error', error, action, config.CONTENTFUL.DEFAULT_SPACE_NAME, config.CONTENTFUL.DEFAULT_ENVIRONMENT, res, newState);
       return state;
     }
     const st = state[spaceName][environment];

From 38c0dc887bbec1334f06fab21b404bcea8c3a633 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiri4a@gmail.com>
Date: Mon, 13 Jun 2022 12:32:31 +0300
Subject: [PATCH 14/20] ci: on test

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 024fd38194..5b8c04d12e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -356,7 +356,7 @@ workflows:
           filters:
             branches:
               only:
-                - circleci-fix
+                - debug-CMS-error
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global

From e03855e6a7aab2ab54481870439661b3f4b29f82 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiri4a@gmail.com>
Date: Mon, 13 Jun 2022 12:59:57 +0300
Subject: [PATCH 15/20] JSON.stringify CMS errors

---
 src/shared/reducers/contentful/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/reducers/contentful/index.js b/src/shared/reducers/contentful/index.js
index 3d1cceb266..860bd972bb 100644
--- a/src/shared/reducers/contentful/index.js
+++ b/src/shared/reducers/contentful/index.js
@@ -61,7 +61,7 @@ function create(init) {
     const environment = _.get(payload, 'environment') || config.CONTENTFUL.DEFAULT_ENVIRONMENT;
     const res = _.get(newState, `${spaceName}.${environment}`);
     if (error || !res) {
-      logger.log('CMS-related error', error, action, config.CONTENTFUL.DEFAULT_SPACE_NAME, config.CONTENTFUL.DEFAULT_ENVIRONMENT, res, newState);
+      logger.log('CMS-related error', error, JSON.stringify(action), config.CONTENTFUL.DEFAULT_SPACE_NAME, config.CONTENTFUL.DEFAULT_ENVIRONMENT, res, newState);
       return state;
     }
     const st = state[spaceName][environment];

From 081bfa6d69919c4456ddb185d3ead0c38273add2 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiri4a@gmail.com>
Date: Mon, 13 Jun 2022 13:02:50 +0300
Subject: [PATCH 16/20] JSON.stringify all objects for error dump

---
 src/shared/reducers/contentful/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/reducers/contentful/index.js b/src/shared/reducers/contentful/index.js
index 860bd972bb..6e212ba353 100644
--- a/src/shared/reducers/contentful/index.js
+++ b/src/shared/reducers/contentful/index.js
@@ -61,7 +61,7 @@ function create(init) {
     const environment = _.get(payload, 'environment') || config.CONTENTFUL.DEFAULT_ENVIRONMENT;
     const res = _.get(newState, `${spaceName}.${environment}`);
     if (error || !res) {
-      logger.log('CMS-related error', error, JSON.stringify(action), config.CONTENTFUL.DEFAULT_SPACE_NAME, config.CONTENTFUL.DEFAULT_ENVIRONMENT, res, newState);
+      logger.log('CMS-related error', error, JSON.stringify(action), config.CONTENTFUL.DEFAULT_SPACE_NAME, config.CONTENTFUL.DEFAULT_ENVIRONMENT, JSON.stringify(res), JSON.stringify(newState));
       return state;
     }
     const st = state[spaceName][environment];

From 342a01fd0e0afc4649e85979b051e84de94b817f Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiri4a@gmail.com>
Date: Mon, 13 Jun 2022 13:35:12 +0300
Subject: [PATCH 17/20] Fix CMS-related error for NotFound entries

---
 src/shared/reducers/contentful/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/shared/reducers/contentful/index.js b/src/shared/reducers/contentful/index.js
index 6e212ba353..ced719ba4b 100644
--- a/src/shared/reducers/contentful/index.js
+++ b/src/shared/reducers/contentful/index.js
@@ -60,8 +60,8 @@ function create(init) {
     const spaceName = _.get(payload, 'spaceName') || config.CONTENTFUL.DEFAULT_SPACE_NAME;
     const environment = _.get(payload, 'environment') || config.CONTENTFUL.DEFAULT_ENVIRONMENT;
     const res = _.get(newState, `${spaceName}.${environment}`);
-    if (error || !res) {
-      logger.log('CMS-related error', error, JSON.stringify(action), config.CONTENTFUL.DEFAULT_SPACE_NAME, config.CONTENTFUL.DEFAULT_ENVIRONMENT, JSON.stringify(res), JSON.stringify(newState));
+    if ((error && payload && payload.sys && payload.sys.id !== 'NotFound') || !res) {
+      logger.log('CMS-related error', JSON.stringify(action), config.CONTENTFUL.DEFAULT_SPACE_NAME, config.CONTENTFUL.DEFAULT_ENVIRONMENT, JSON.stringify(res), JSON.stringify(newState));
       return state;
     }
     const st = state[spaceName][environment];

From 9c93b21713680ff72fe3697392096cf157c32ff3 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiri4a@gmail.com>
Date: Mon, 13 Jun 2022 15:51:44 +0300
Subject: [PATCH 18/20] catch unhandled exceptions

---
 src/shared/actions/contentful.js | 46 +++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/shared/actions/contentful.js b/src/shared/actions/contentful.js
index f89b81e5a7..28dd6c0f3e 100644
--- a/src/shared/actions/contentful.js
+++ b/src/shared/actions/contentful.js
@@ -3,7 +3,7 @@ import { getService } from 'services/contentful';
 import { config, redux } from 'topcoder-react-utils';
 import { removeTrailingSlash } from 'utils/url';
 import { menuItemBuilder, target as urlTarget } from 'utils/contentful';
-import { services } from 'topcoder-react-lib';
+import { services, logger } from 'topcoder-react-lib';
 
 const ERRMSG_UNKNOWN_TARGET = 'Unknown action target';
 
@@ -91,15 +91,19 @@ async function getContentDone(operationId, contentId, target, preview, spaceName
     environment,
   });
   let content;
-  switch (target) {
-    case TARGETS.ASSETS:
-      content = await service.getAsset(contentId);
-      break;
-    case TARGETS.ENTRIES:
-      content = await service.getEntry(contentId);
-      break;
-    default:
-      throw new Error(ERRMSG_UNKNOWN_TARGET);
+  try {
+    switch (target) {
+      case TARGETS.ASSETS:
+        content = await service.getAsset(contentId);
+        break;
+      case TARGETS.ENTRIES:
+        content = await service.getEntry(contentId);
+        break;
+      default:
+        throw new Error(ERRMSG_UNKNOWN_TARGET);
+    }
+  } catch (e) {
+    logger.error('getContentDone error', e);
   }
 
   return {
@@ -141,15 +145,19 @@ async function queryContentDone(operationId, queryId, target,
     environment,
   });
   let data;
-  switch (target) {
-    case TARGETS.ASSETS:
-      data = await service.queryAssets(query);
-      break;
-    case TARGETS.ENTRIES:
-      data = await service.queryEntries(query);
-      break;
-    default:
-      throw new Error(ERRMSG_UNKNOWN_TARGET);
+  try {
+    switch (target) {
+      case TARGETS.ASSETS:
+        data = await service.queryAssets(query);
+        break;
+      case TARGETS.ENTRIES:
+        data = await service.queryEntries(query);
+        break;
+      default:
+        throw new Error(ERRMSG_UNKNOWN_TARGET);
+    }
+  } catch (e) {
+    logger.error('queryContentDone error', e);
   }
 
   return {

From f36f059414e45f114e79dc196172a5f2d99fb80c Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Tue, 14 Jun 2022 09:08:01 -0300
Subject: [PATCH 19/20] ci: deploy develop branch on Dev env

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index da2363b72b..114ab17160 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -349,7 +349,7 @@ workflows:
           filters:
             branches:
               only:
-                - reskin
+                - develop
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global
@@ -363,7 +363,7 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - free
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global

From 785ebfb0012cc28596a27c82bd540bdbf8f8cfbd Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiri4a@gmail.com>
Date: Tue, 14 Jun 2022 18:00:02 +0300
Subject: [PATCH 20/20] fix indexOf on null image

---
 src/shared/components/MetaTags.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/MetaTags.jsx b/src/shared/components/MetaTags.jsx
index 4b192752df..cc0067393c 100644
--- a/src/shared/components/MetaTags.jsx
+++ b/src/shared/components/MetaTags.jsx
@@ -25,7 +25,7 @@ function MetaTags({
   feedTitle,
 }) {
   let img = `${domain}${image}`;
-  if (image.indexOf('http://') === 0 || image.indexOf('https://') === 0) {
+  if (image && (image.indexOf('http://') === 0 || image.indexOf('https://') === 0)) {
     img = `${image}`;
   }
   const socTitle = socialTitle || title;