Merge branch 'develop' into reskin

* develop: (38 commits)
  fix(reskin-profile): test update
  improvement(reskin-profile): verified badge
  fix: test snapshots
  fix: topgear page not loading
  fix not loading fonts on tco due CSP on staging
  tables and headings fixes
  ci: remove develop branch from Dev env
  fix indexOf on null image
  ci: deploy develop branch on Dev env
  ci: on test
  catch unhandled exceptions
  Fix CMS-related error for NotFound entries
  JSON.stringify all objects for error dump
  JSON.stringify CMS errors
  ci: on test
  dump action for inspection
  improvement(reskin-profile): fix lint error on css
  improvement(reskin-profile): copilot activity f2f
  fix test fail
  add opacity
  ...

Author: dedywahyudi

.circleci/config.yml

@@ -349,15 +349,14 @@ workflows:
           filters:
             branches:
               only:
-                - develop
                 - reskin-profile
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global
           filters:
             branches:
               only:
-                - circleci-fix
+                - tco23
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global
@@ -380,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

__tests__/shared/components/ProfilePage/__snapshots__/index.jsx.snap

@@ -5,7 +5,7 @@ exports[`renders a full Profile correctly 1`] = `
   className="src-shared-components-ProfilePage-___styles__outer-container___3in3p"
 >
   <div>
-    <ProfileHeader
+    <Connect(ProfileHeader)
       info={
         Object {
           "competitionCountryCode": "USA",
@@ -717,7 +717,7 @@ exports[`renders an empty Profile correctly 1`] = `
   className="src-shared-components-ProfilePage-___styles__outer-container___3in3p"
 >
   <div>
-    <ProfileHeader
+    <Connect(ProfileHeader)
       info={
         Object {
           "competitionCountryCode": "USA",

__tests__/shared/components/__snapshots__/Content.jsx.snap

@@ -491,7 +491,7 @@ exports[`Matches shallow shapshot 1`] = `
     <li>
       <Link
         replace={false}
-        to="/__community__/wipro"
+        to="/__community__/wipro/challenges"
       >
         TopGear (Wipro) community
       </Link>

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){
@@ -135,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'
@@ -182,11 +185,13 @@ async function onExpressJsSetup(server) {
           + ` ${config.CDN.PUBLIC}`
           + ' https://d1of0acg2orgco.cloudfront.net'
           + ' https://d24oibycet9bsb.cloudfront.net'
+          + ' https://d1mwkvp2xbqfs9.cloudfront.net'
           + ' https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com;'
         + " frame-src 'self'"
           + ` ${config.URL.AUTH}`
           + ' https://www.youtube.com;'
         + " img-src 'self'"
+          + ' data:'
           + ` ${config.CDN.PUBLIC}`
           + ' https://cdn.segment.com'
           + ' https://d1of0acg2orgco.cloudfront.net'
@@ -196,11 +201,14 @@ 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;'
+          + ' https://i.ytimg.com'
+          + ' https://images.contentful.com'
+          + ' https://d0.awsstatic.com/logos/;'
         + " manifest-src 'self';"
         + " media-src 'self';"
         + ' report-uri https://623d4c23f90d055298b24042.endpoint.csper.io/?v=0;'

src/server/services/communities.js

@@ -116,6 +116,17 @@ export async function getMetadata(communityId) {
   if (metadata.groupIds) {
     metadata.groupIds = await extendByChildGroups(metadata.groupIds);
   }
+
+  // FIXME: This is a tempory patch to resolve "Backstage Error" that's showing up on Topgear
+  // app due to missing "Wipro All" authorized group
+  // Roll this back as soon as the root cause is fixed
+  // which is likely either in topcoder-react-lib that handles merging groups (https://github.com/topcoder-platform/topcoder-react-lib/blob/c637525211550bea283390e52490fce7f6dd44a8/src/services/groups.js#L107)
+  // or Groups Api
+  if (communityId === 'wipro') {
+    logger.info('Getting metadata for Topgear. Existing Authorized Groups', JSON.stringify(metadata.authorizedGroupIds));
+    metadata.authorizedGroupIds = _.uniq(metadata.authorizedGroupIds.concat('b7f7c0f8-8ee8-409e-9e5c-33404983b635'));
+    logger.info('After adding "Wipro All" group', JSON.stringify(metadata.authorizedGroupIds));
+  }
   getMetadata.cache[communityId] = { data: metadata, timestamp: now };
   return _.cloneDeep(metadata);
 }

src/server/tc-communities/tco23/metadata.json

@@ -0,0 +1,20 @@
+{
+  "challengeFilter": {
+    "events": ["tco23"]
+  },
+  "communityId": "tco23",
+  "communityName": "TCO23",
+  "groupIds": [],
+  "hideSearch": true,
+  "logos": [{
+    "img": "/community-app-assets/themes/tco/TCO23.svg",
+    "url": "https://tco23.topcoder.com"
+  }],
+  "menuItems": [{
+    "navigationMenu": "6SsceF3R5YuKxsf8XnCM5I"
+  }],
+  "newsFeed": "http://www.topcoder.com/feed",
+  "subdomains": ["tco23"],
+  "description": "2023 Topcoder Open. The Ultimate Programming & Design Tournament",
+  "image": "tco23.jpg"
+}

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 {

src/shared/components/Content/index.jsx

@@ -413,7 +413,7 @@ export default function Content() {
           </Link>
         </li>
         <li>
-          <Link to="/__community__/wipro">
+          <Link to="/__community__/wipro/challenges">
             TopGear (Wipro) community
           </Link>
         </li>

src/shared/components/Contentful/ContentBlock/index.jsx

@@ -19,6 +19,7 @@ import generalTheme from './themes/general.scss';
 import blobCard from './themes/blobCard.scss';
 import TCO20Theme from './themes/TCO20.scss';
 import largeCard from './themes/largeCard.scss';
+import bracketsTheme from './themes/brackets.scss';
 
 const THEMES = {
   Default: defaultTheme,
@@ -31,6 +32,7 @@ const THEMES = {
   'Blob Card': blobCard,
   TCO20: TCO20Theme,
   'Large Card': largeCard,
+  Brackets: bracketsTheme,
 };
 
 /* Loads content block background asset. */

src/shared/components/Contentful/ContentBlock/themes/brackets.scss

@@ -0,0 +1,64 @@
+@import "~styles/mixins";
+@import "~components/Contentful/brackets";
+
+.contentWrapper {
+  display: flex;
+  margin: 0 auto;
+  max-width: $screen-lg;
+  padding: 15px 0;
+  color: $tc-black;
+
+  @include xs-to-sm {
+    flex-direction: column;
+  }
+}
+
+.container {
+  align-content: center;
+  background: white;
+  padding: 10px 0;
+
+  &:nth-child(even) .contentWrapper {
+    flex-direction: row-reverse;
+
+    @include xs-to-sm {
+      flex-direction: column;
+    }
+  }
+}
+
+strong a {
+  font-weight: 600 !important;
+}
+
+.content {
+  flex: 1;
+  padding: 0;
+
+  @include xs-to-md {
+    padding: 15px;
+  }
+
+  @include roboto-regular;
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    color: $tco-black;
+  }
+
+  @include brackets-headers;
+  @include brackets-content;
+}
+
+.image {
+  flex: 1;
+  margin: 15px;
+
+  img {
+    width: 100%;
+  }
+}

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}

src/shared/components/Contentful/Tabs/Tabs.jsx

@@ -27,6 +27,7 @@ import underlineDarkTheme from './themes/underline-dark.scss';
 import verticalTheme from './themes/vertical.scss';
 import pillsTheme from './themes/pills.scss';
 import underlineBoxTheme from './themes/underline-box.scss';
+import bracketsTheme from './themes/brackets.scss';
 
 export const TAB_THEMES = {
   Default: defaultTheme,
@@ -38,6 +39,7 @@ export const TAB_THEMES = {
   Vertical: verticalTheme,
   Pills: pillsTheme,
   'Underline box': underlineBoxTheme,
+  Brackets: bracketsTheme,
 };
 
 export default class TabsItemsLoader extends Component {