build:Merge remote-tracking branch 'origin/develop' into feature-details-page-suggestion-cards

Author: sushilshinde

.circleci/config.yml

@@ -176,21 +176,23 @@ workflows:
               only:
                 - develop                
                 - feature-details-page-suggestion-cards
+                - hot-fix-past-challenge-search
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
               only:
                 - develop
+                - hot-fixes-leaderboard
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
                 - develop
-                - feature-member-profiles
+                - feature-contentful
       # Production builds are exectuted only on tagged commits to the
       # master branch.
       - "build-prod":

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

@@ -29,6 +29,7 @@ exports[`Matches shallow shapshot 1`] = `
         isCopilot={false}
         isTopGear={false}
         onUsernameClick={null}
+        themeName="Default"
       />
     </div>
     <div
@@ -48,6 +49,7 @@ exports[`Matches shallow shapshot 1`] = `
         isCopilot={false}
         isTopGear={false}
         onUsernameClick={null}
+        themeName="Default"
       />
     </div>
     <div
@@ -67,6 +69,7 @@ exports[`Matches shallow shapshot 1`] = `
         isCopilot={false}
         isTopGear={false}
         onUsernameClick={null}
+        themeName="Default"
       />
     </div>
     <div
@@ -86,6 +89,7 @@ exports[`Matches shallow shapshot 1`] = `
         isCopilot={false}
         isTopGear={false}
         onUsernameClick={null}
+        themeName="Default"
       />
     </div>
   </div>

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

@@ -28,7 +28,7 @@ exports[`Matches shallow shapshot 1`] = `
       className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
     >
       <a
-        href="https://help.topcoder-dev.com"
+        href="https://www.topcoder.com/thrive/tracks?track=Topcoder"
       >
         HELP CENTER
       </a>

__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap

@@ -37,6 +37,7 @@ exports[`Matches shallow shapshot shapshot 1 1`] = `
       "users": Object {},
     }
   }
+  domRef={null}
   expandTag={null}
   expandedTags={Array []}
   newChallengeDetails={false}
@@ -74,6 +75,7 @@ exports[`Matches shallow shapshot shapshot 2 1`] = `
       "users": Object {},
     }
   }
+  domRef={null}
   expandTag={null}
   expandedTags={Array []}
   newChallengeDetails={false}
@@ -109,6 +111,7 @@ exports[`Matches shallow shapshot shapshot 3 1`] = `
       "users": Object {},
     }
   }
+  domRef={null}
   expandTag={null}
   expandedTags={Array []}
   newChallengeDetails={false}

__tests__/shared/components/challenge-listing/Listing/__snapshots__/Bucket.jsx.snap

@@ -77,6 +77,7 @@ exports[`Matches shallow shapshot 1`] = `
     loading={false}
     newChallengeDetails={false}
     openChallengesInNewTabs={false}
+    searchTimestamp={0}
     setFilterState={[MockFunction]}
     setSort={[MockFunction]}
     sort=""
@@ -226,6 +227,7 @@ exports[`Matches shallow shapshot 2`] = `
     loading={true}
     newChallengeDetails={false}
     openChallengesInNewTabs={false}
+    searchTimestamp={0}
     setFilterState={[MockFunction]}
     setSort={[MockFunction]}
     sort=""
@@ -262,6 +264,7 @@ exports[`Matches shallow shapshot 3`] = `
     loading={true}
     newChallengeDetails={false}
     openChallengesInNewTabs={false}
+    searchTimestamp={0}
     setFilterState={[MockFunction]}
     setSort={[MockFunction]}
     sort=""

__tests__/shared/utils/__snapshots__/markdown.js.snap

@@ -796,9 +796,6 @@ Array [
       >
         >
       </span>
-      <span
-        className="bash"
-      />
     </code>
      characters for blockquoting. If you’re
     <br />
@@ -813,9 +810,6 @@ Array [
       >
         &gt;
       </span>
-      <span
-        className="bash"
-      />
     </code>
      before every line:
   </p>,
@@ -841,9 +835,6 @@ Array [
       >
         &gt;
       </span>
-      <span
-        className="bash"
-      />
     </code>
      before the first
     <br />
@@ -875,9 +866,6 @@ Array [
       >
         &gt;
       </span>
-      <span
-        className="bash"
-      />
     </code>
     :
   </p>,
@@ -1182,9 +1170,6 @@ Array [
       >
         &gt;
       </span>
-      <span
-        className="bash"
-      />
     </code>
     <br />
     delimiters need to be indented:
@@ -1297,9 +1282,6 @@ end tell
       >
         &gt;
       </span>
-      <span
-        className="bash"
-      />
     </code>
     )
     <br />
@@ -1429,7 +1411,7 @@ end tell
     ) and underscores (
     <code>
       <span
-        className="hljs-keyword"
+        className="hljs-literal"
       >
         _
       </span>
@@ -1447,7 +1429,7 @@ end tell
      or 
     <code>
       <span
-        className="hljs-keyword"
+        className="hljs-literal"
       >
         _
       </span>
@@ -1473,7 +1455,7 @@ end tell
     's or 
     <code>
       <span
-        className="hljs-keyword"
+        className="hljs-literal"
       >
         _
       </span>
@@ -2198,39 +2180,42 @@ Array [
     Ad amet irure est magna id mollit Lorem in do duis enim. Excepteur velit nisi magna ea pariatur pariatur ullamco fugiat deserunt sint non sint. Duis duis est 
     <code>
       <span
-        className="hljs-selector-tag"
+        className="hljs-built_in"
       >
         code
       </span>
-       
+       in 
       <span
-        className="hljs-keyword"
+        className="hljs-built_in"
       >
-        in
+        text
       </span>
-       text
     </code>
      velit velit aute culpa ex quis pariatur pariatur laborum aute pariatur duis tempor sunt ad. Irure magna voluptate dolore consectetur consectetur irure esse. Anim magna 
     <code>
-      &lt;
-      <span
-        className="hljs-keyword"
-      >
-        strong
-      </span>
-      &gt;
       <span
-        className="hljs-keyword"
+        className="hljs-tag"
       >
-        in
+        &lt;
+        <span
+          className="hljs-name"
+        >
+          strong
+        </span>
+        &gt;
       </span>
-       culpa qui officia&lt;/
+      in culpa qui officia
       <span
-        className="hljs-keyword"
+        className="hljs-tag"
       >
-        strong
+        &lt;/
+        <span
+          className="hljs-name"
+        >
+          strong
+        </span>
+        &gt;
       </span>
-      &gt;
     </code>
      dolor eiusmod esse amet aute cupidatat aliqua do id voluptate cupidatat reprehenderit amet labore deserunt.
   </p>,

config/default.js

@@ -116,7 +116,7 @@ module.exports = {
     BLOG_FEED: 'https://www.topcoder.com/blog/feed/',
     COMMUNITY: 'https://community.topcoder-dev.com',
     FORUMS: 'https://apps.topcoder-dev.com/forums',
-    HELP: 'https://help.topcoder-dev.com',
+    HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder',
 
     THRIVE: 'https://www.topcoder.com/thrive',
 
@@ -163,6 +163,12 @@ module.exports = {
    * object should be considered outdated, and updated as soon as possible. */
   USER_GROUP_MAXAGE: 24 * 60 * 60 * 1000,
 
+  /* Maximum time to wait before timeout on searching past challenges (seconds)
+   * when no result at all.
+   * Default: 30 seconds.
+   */
+  SEARCH_TIMEOUT: 30 * 1000,
+
   /* Filestack configuration for uploading Submissions
    * These are for the development back end */
   FILESTACK: {

config/production.js

@@ -29,7 +29,7 @@ module.exports = {
     BASE: 'https://www.topcoder.com',
     COMMUNITY: 'https://community.topcoder.com',
     FORUMS: 'https://apps.topcoder.com/forums',
-    HELP: 'https://help.topcoder.com',
+    HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder',
     MEMBER: 'https://member.topcoder.com',
     ONLINE_REVIEW: 'https://software.topcoder.com',
     PAYMENT_TOOL: 'https://payment.topcoder.com',

docs/TCX-process.md

@@ -0,0 +1,56 @@
+
+This document describes the Topcoder issue/feature release process using TCX. This is a guide for co-pilots, QA, architects and community members. Co-pilot is the driver of the whole process from opening a ticket to the deployment.
+
+## Code Phase
+
+1. Create a branch from the `master` and name it as `hot-fix-fixtitle` or `feature-featuretitle`
+2. Co-pilot will prepare and launch a ticket    
+
+    a.  Add Prize in the issue title [$SOMEAMOUT]
+    
+    b.  Mention PR branch, this branch should be always in sync with master or newly created as mentioned in 1
+    
+    c. Add this to instruction that all the PR should pass `npm test`
+    
+    d.  Change label to `tcx_OpenForPickup`
+    
+    e. Tag the community @topcoder-platform/tcxcommunity @topcoder-platform/topcodercompetitors     
+3. A competitor assings a ticket to self (`tcx_Assigned`), writes the code for the fix
+4. Competitor, PR to the branch (submission) and they should change the label to `tcx_ReadyForReview`
+
+## Review Phase
+
+ 4. Co-pilot will review the code, based on review change the label to
+ 
+     a. `tcx_Feedback` - Feedback should be mentioned in the comments section, this may lead to asking for patch PR
+     
+     b. `Code Review Passed` and `tcx_FixAccepted`- This goes to QA Deployment Phase
+     
+     c. `Code Review Failed` - This goes to 1
+    
+## QA Deployment Phase
+    
+5. Based on the label `Code Review Passed`, co-pilot should request deployment to the architect. Based on whatever testing deployment environment is available to code will be deployed.  
+
+6. Once deployed on the environment co-pilot will change the label to `Ready for QA` and will inform the QA team on #community-app slack channel.
+
+7. Based on QA feedback label should be `QA Pass` or `QA Fail`
+
+8. `QA Fail` label will go to **Review Phase** again
+
+9. `QA Pass` label is a candidate for production deployment 
+
+10. Co-pilot will create PR to `fix-branch > develop` branch
+
+11. An architect will merge PR and ask for smoke testing to the QA team 
+
+12. If smoke testing goes well, co-pilot create PR to `develop > master` 
+
+13. It takes around 20 mins for deployment on any deployment.
+
+14. QA team will verify the post-production issue fix.
+
+15. If post-production test passes QA team will change the label to `Prod QA Pass`, Co-pilot will close this ticket
+
+17. If post-production test fails QA team will change the label to `Prod QA Failed`
+