I v5 develop 17 aug

.circleci/config.yml

@@ -231,6 +231,7 @@ workflows:
             branches:
               only:
                 - hot-fix
+                - integration-v5-develop
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -252,6 +253,7 @@ workflows:
             branches:
               only:
                 - hot-fix
+                - integration-v5-develop
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global

.eslintrc

@@ -2,7 +2,8 @@
   "extends": "./node_modules/topcoder-react-utils/config/eslint/default.json",
   "rules": {
     "jsx-a11y/anchor-is-valid": false,
-    "import/no-cycle": [2, { "maxDepth": 1 }]
+    "import/no-cycle": [2, { "maxDepth": 1 }],
+    "react/forbid-prop-types": false
   },
   "env": {
     "browser": true

__tests__/shared/components/ChallengeTile/__mocks__/design.json

@@ -15,10 +15,11 @@
 	"technologies": "",
 	"status": "COMPLETED",
 	"legacy": {
-		"track": "DESIGN",
 		"forumId": 599349
 	},
-	"subTrack": "LOGO_DESIGN",
+	"track": "Design",
+	"type": "Challenge",
+	"tags": "Logo Design",
 	"name": "Sunshot - MapMySolar - SunGiver  - Brand Concept Logo Design Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30051608,
@@ -320,10 +321,11 @@
 	"technologies": "",
 	"status": "COMPLETED",
 	"legacy": {
-		"track": "DESIGN",
 		"forumId": 598066
 	},
-	"subTrack": "LOGO_DESIGN",
+	"track": "Design",
+	"type": "Challenge",
+	"tags": ["Logo Design"],
 	"name": "2016 Topcoder Open Logo Design Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30051059,
@@ -532,10 +534,11 @@
 	"technologies": "",
 	"status": "COMPLETED",
 	"legacy": {
-		"track": "DESIGN",
 		"forumId": 596557
 	},
-	"subTrack": "LOGO_DESIGN",
+	"track": "Design",
+	"type": "Challenge",
+	"tags": "Logo Design",
 	"name": "ACME Logos Design Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30050375,

__tests__/shared/components/ChallengeTile/__mocks__/develop.json

@@ -22,10 +22,10 @@
 	"technologies": "CSS, HTML, JavaScript",
 	"status": "COMPLETED",
 	"legacy": {
-		"track": "DEVELOP",
 		"forumId": 39153
 	},
-	"subTrack": "FIRST_2_FINISH",
+	"track": "Development",
+	"type": "First2Finish",
 	"name": "$100 Eaton PX 2.0 Petting Zoo - MDC Web Enhancement F2F Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30060905,
@@ -165,10 +165,10 @@
 	"technologies": "ReactJS",
 	"status": "COMPLETED",
 	"legacy": {
-		"track": "DEVELOP",
 		"forumId": 39151
 	},
-	"subTrack": "FIRST_2_FINISH",
+	"track": "Development",
+	"type": "First2Finish",
 	"name": "$100 Eaton PX 2.0 Petting Zoo - ReactJS Enhancement F2F Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30060903,
@@ -323,10 +323,10 @@
 	"technologies": "Angular 2+, Express, JSON, Node.js",
 	"status": "COMPLETED",
 	"legacy": {
-		"track": "DEVELOP",
 		"forumId": 38951
 	},
-	"subTrack": "FIRST_2_FINISH",
+	"track": "Development",
+	"type": "First2Finish",
 	"name": "$500 BG800 Online Course Mock Rest API F2F Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30060687,
@@ -630,11 +630,11 @@
 	"updatedBy": "22841596",
 	"technologies": "JavaScript, ReactJS",
 	"status": "COMPLETED",
-	"legacy": {
-		"track": "DEVELOP",
+	"legacy": {		
 		"forumId": 38702
 	},
-	"subTrack": "FIRST_2_FINISH",
+	"track": "Development",
+	"type": "First2Finish",
 	"name": "John Hancock - Giving Tuesday - General image handling",
 	"reviewType": "INTERNAL",
 	"id": 30060425,

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

@@ -12,7 +12,7 @@ exports[`renders design 1`] = `
   }
 >
   <div
-    className="src-shared-components-ChallengeTile-___style__challenge___1vlh0 src-shared-components-ChallengeTile-___style__tile-view___1stZU src-shared-components-ChallengeTile-___style__DESIGN___Qvjqd"
+    className="src-shared-components-ChallengeTile-___style__challenge___1vlh0 src-shared-components-ChallengeTile-___style__tile-view___1stZU src-shared-components-ChallengeTile-___style__design___1wk2u"
   >
     <div
       className="src-shared-components-ChallengeTile-___style__completed-challenge___3w5tT"
@@ -30,7 +30,7 @@ exports[`renders design 1`] = `
         <p
           className="src-shared-components-ChallengeTile-___style__subtrack-color___2AJaw"
         >
-          LOGO DESIGN
+          Challenge
         </p>
         <p
           className="src-shared-components-ChallengeTile-___style__date-completed___22F18"
@@ -42,7 +42,7 @@ exports[`renders design 1`] = `
         className="src-shared-components-ChallengeTile-___style__challenge-card__bottom___CYUWj"
       >
         <div
-          className="src-shared-components-ChallengeTile-___style__challenge-details___3xZDW src-shared-components-ChallengeTile-___style__DATA_SCIENCE___1b8GD"
+          className="src-shared-components-ChallengeTile-___style__challenge-details___3xZDW src-shared-components-ChallengeTile-___style__data-science___2SGr7"
         >
           <div
             className="src-shared-components-ChallengeTile-___style__design-challenge-user-place___3v-1O"
@@ -91,7 +91,7 @@ exports[`renders develop 1`] = `
   }
 >
   <div
-    className="src-shared-components-ChallengeTile-___style__challenge___1vlh0 src-shared-components-ChallengeTile-___style__tile-view___1stZU src-shared-components-ChallengeTile-___style__DEVELOP___GgzgV"
+    className="src-shared-components-ChallengeTile-___style__challenge___1vlh0 src-shared-components-ChallengeTile-___style__tile-view___1stZU src-shared-components-ChallengeTile-___style__development___19vlt"
   >
     <div
       className="src-shared-components-ChallengeTile-___style__completed-challenge___3w5tT"
@@ -109,7 +109,7 @@ exports[`renders develop 1`] = `
         <p
           className="src-shared-components-ChallengeTile-___style__subtrack-color___2AJaw"
         >
-          FIRST 2 FINISH
+          First2Finish
         </p>
         <p
           className="src-shared-components-ChallengeTile-___style__date-completed___22F18"
@@ -131,7 +131,7 @@ exports[`renders develop 1`] = `
         className="src-shared-components-ChallengeTile-___style__challenge-card__bottom___CYUWj"
       >
         <div
-          className="src-shared-components-ChallengeTile-___style__challenge-details___3xZDW src-shared-components-ChallengeTile-___style__DATA_SCIENCE___1b8GD"
+          className="src-shared-components-ChallengeTile-___style__challenge-details___3xZDW src-shared-components-ChallengeTile-___style__data-science___2SGr7"
         >
           <div
             className="src-shared-components-ChallengeTile-___style__dev-challenge-user-place___2tS8j"
@@ -196,7 +196,7 @@ exports[`renders marathon 1`] = `
   }
 >
   <div
-    className="src-shared-components-ChallengeTile-___style__challenge___1vlh0 src-shared-components-ChallengeTile-___style__tile-view___1stZU src-shared-components-ChallengeTile-___style__DATA_SCIENCE___1b8GD"
+    className="src-shared-components-ChallengeTile-___style__challenge___1vlh0 src-shared-components-ChallengeTile-___style__tile-view___1stZU src-shared-components-ChallengeTile-___style__data-science___2SGr7"
   >
     <div
       className="src-shared-components-ChallengeTile-___style__completed-challenge___3w5tT"
@@ -211,7 +211,7 @@ exports[`renders marathon 1`] = `
         <p
           className="src-shared-components-ChallengeTile-___style__subtrack-color___2AJaw"
         >
-          MARATHON MATCH
+          Challenge
         </p>
         <p
           className="src-shared-components-ChallengeTile-___style__date-completed___22F18"
@@ -223,7 +223,7 @@ exports[`renders marathon 1`] = `
         className="src-shared-components-ChallengeTile-___style__challenge-card__bottom___CYUWj"
       >
         <div
-          className="src-shared-components-ChallengeTile-___style__challenge-details___3xZDW src-shared-components-ChallengeTile-___style__DATA_SCIENCE___1b8GD"
+          className="src-shared-components-ChallengeTile-___style__challenge-details___3xZDW src-shared-components-ChallengeTile-___style__data-science___2SGr7"
         >
           <div
             className="src-shared-components-ChallengeTile-___style__marathon-score___V-afd"

__tests__/shared/components/Contentful/Image/__snapshots__/Image.jsx.snap

@@ -3,6 +3,7 @@
 exports[`Matches shallow shapshot 1`] = `
 <div
   id="image-1"
+  style={Object {}}
 >
   <InlineSVG
     baseURL=""

__tests__/shared/components/Contentful/MemberCard/__snapshots__/MemberCard.jsx.snap

@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Matches shallow shapshot 1`] = `
-<a>
+<a
+  style={Object {}}
+>
   <div>
     <div
       style={

__tests__/shared/components/Contentful/TracksTree/__snapshots__/TracksTree.jsx.snap

@@ -4,10 +4,10 @@ exports[`Matches shallow shapshot 1`] = `
 <div
   className="undefined "
 >
-  <a
-    href="/thrive"
+  <Link
+    to="/thrive"
   >
     THRIVE
-  </a>
+  </Link>
 </div>
 `;

__tests__/shared/components/Leaderboard/__snapshots__/LeaderboardTable.jsx.snap

@@ -44,16 +44,10 @@ exports[`Matches shallow shapshot 1`] = `
         <span
           className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__leaderboard-avatar___21pJ3"
         >
-          <ThemedAvatar
-            composeAdhocTheme="deeply"
-            composeContextTheme="softly"
-            mapThemrProps={[Function]}
-            theme={
-              Object {
-                "avatar": "src-shared-components-Leaderboard-avatarStyles___default___1bHTzy",
-              }
-            }
-            themePriority="adhoc-context-default"
+          <DefaultAvatar
+            data-name="Layer 1"
+            viewBox="0 0 33 33.00137"
+            xmlns="http://www.w3.org/2000/svg"
           />
         </span>
       </td>
@@ -97,16 +91,10 @@ exports[`Matches shallow shapshot 1`] = `
         <span
           className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__leaderboard-avatar___21pJ3"
         >
-          <ThemedAvatar
-            composeAdhocTheme="deeply"
-            composeContextTheme="softly"
-            mapThemrProps={[Function]}
-            theme={
-              Object {
-                "avatar": "src-shared-components-Leaderboard-avatarStyles___default___1bHTzy",
-              }
-            }
-            themePriority="adhoc-context-default"
+          <DefaultAvatar
+            data-name="Layer 1"
+            viewBox="0 0 33 33.00137"
+            xmlns="http://www.w3.org/2000/svg"
           />
         </span>
       </td>
@@ -150,16 +138,10 @@ exports[`Matches shallow shapshot 1`] = `
         <span
           className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__leaderboard-avatar___21pJ3"
         >
-          <ThemedAvatar
-            composeAdhocTheme="deeply"
-            composeContextTheme="softly"
-            mapThemrProps={[Function]}
-            theme={
-              Object {
-                "avatar": "src-shared-components-Leaderboard-avatarStyles___default___1bHTzy",
-              }
-            }
-            themePriority="adhoc-context-default"
+          <DefaultAvatar
+            data-name="Layer 1"
+            viewBox="0 0 33 33.00137"
+            xmlns="http://www.w3.org/2000/svg"
           />
         </span>
       </td>
@@ -203,16 +185,10 @@ exports[`Matches shallow shapshot 1`] = `
         <span
           className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__leaderboard-avatar___21pJ3"
         >
-          <ThemedAvatar
-            composeAdhocTheme="deeply"
-            composeContextTheme="softly"
-            mapThemrProps={[Function]}
-            theme={
-              Object {
-                "avatar": "src-shared-components-Leaderboard-avatarStyles___default___1bHTzy",
-              }
-            }
-            themePriority="adhoc-context-default"
+          <DefaultAvatar
+            data-name="Layer 1"
+            viewBox="0 0 33 33.00137"
+            xmlns="http://www.w3.org/2000/svg"
           />
         </span>
       </td>

__tests__/shared/components/Leaderboard/__snapshots__/PodiumSpot.jsx.snap

@@ -7,16 +7,10 @@ exports[`Matches shallow shapshot 1`] = `
   <span
     className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__leaderboard-avatar___JjdZ_"
   >
-    <ThemedAvatar
-      composeAdhocTheme="deeply"
-      composeContextTheme="softly"
-      mapThemrProps={[Function]}
-      theme={
-        Object {
-          "avatar": "src-shared-components-Leaderboard-avatarStyles___gold___1KUGNq",
-        }
-      }
-      themePriority="adhoc-context-default"
+    <DefaultAvatar
+      data-name="Layer 1"
+      viewBox="0 0 33 33.00137"
+      xmlns="http://www.w3.org/2000/svg"
     />
     <div
       className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__ranking___3eGBy"
@@ -72,16 +66,10 @@ exports[`Matches shallow shapshot 2`] = `
   <span
     className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__leaderboard-avatar___JjdZ_"
   >
-    <ThemedAvatar
-      composeAdhocTheme="deeply"
-      composeContextTheme="softly"
-      mapThemrProps={[Function]}
-      theme={
-        Object {
-          "avatar": "src-shared-components-Leaderboard-avatarStyles___gold___1KUGNq",
-        }
-      }
-      themePriority="adhoc-context-default"
+    <DefaultAvatar
+      data-name="Layer 1"
+      viewBox="0 0 33 33.00137"
+      xmlns="http://www.w3.org/2000/svg"
     />
     <div
       className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__ranking___3eGBy"

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

@@ -348,15 +348,6 @@ exports[`Matches shallow shapshot 1`] = `
               Talk to Sales
             </a>
           </li>
-          <li
-            className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
-          >
-            <a
-              href="https://www.topcoder-dev.com/community/terms"
-            >
-              Terms
-            </a>
-          </li>
         </ul>
       </div>
       <div
@@ -613,7 +604,7 @@ exports[`Matches shallow shapshot 1`] = `
         © 2020 Topcoder
         <a
           className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
-          href="https://www.topcoder.com/privacy-policy/"
+          href="https://www.topcoder-dev.com/policy"
         >
           Policies
         </a>

__tests__/shared/containers/__snapshots__/TopcoderHeader.jsx.snap

@@ -11,6 +11,7 @@ exports[`Matches shallow snapshot 1`] = `
   closeMobileMenu={[Function]}
   closeSearch={[Function]}
   dismissChallengeNotifications={[Function]}
+  headerMenu={null}
   loadNotifications={[Function]}
   markAllNotificationAsRead={[Function]}
   markAllNotificationAsSeen={[Function]}