Merge pull request #5560 from topcoder-platform/develop

Release v1.9.5

Author: luizrrodrigues

.circleci/config.yml

@@ -47,7 +47,7 @@ build_docker_image: &build_docker_image
             ./build.sh
 jobs:
   # Build & Deploy against development backend
-  deployDev:
+  "build-dev":
     <<: *defaults
     steps:
       # Initialization.
@@ -73,8 +73,9 @@ jobs:
             source awsenvconf
             source buildenvvar
             ./master_deploy.sh -d ECS -e DEV -t latest -s dev_communityapp_taskvar -i communityapp
+
   # Build & Deploy against testing backend
-  deployTest:
+  "build-test":
     <<: *defaults
     steps:
       # Initialization.
@@ -100,8 +101,9 @@ jobs:
             source awsenvconf
             source buildenvvar
             ./master_deploy.sh -d ECS -e DEV -t latest -s test_communityapp_taskvar -i communityapp
+
   # Build & Deploy against testing backend
-  deployQA:
+  "build-qa":
     <<: *defaults
     steps:
       # Initialization.
@@ -127,8 +129,9 @@ jobs:
             source awsenvconf
             source buildenvvar
             ./master_deploy.sh -d ECS -e DEV -t latest -s qa_communityapp_taskvar -i communityapp
+
   # Build & Deploy against prod api backend
-  deployBeta:
+  "build-prod-beta":
     <<: *defaults
     steps:
       # Initialization.
@@ -156,7 +159,7 @@ jobs:
             ./master_deploy.sh -d ECS -e PROD -t latest -s beta_communityapp_taskvar, -i communityapp
   
   # Build & Deploy against prod api backend
-  deployStag:
+  "build-prod-staging":
     <<: *defaults
     steps:
       # Initialization.
@@ -189,7 +192,7 @@ jobs:
             --data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_smoketesting":true , "run_performancetesting":false, "run_basedeployment": false}}'
     
   # Build & Deploy against production backend
-  deployProd:
+  "build-prod":
     <<: *defaults
     steps:
       # Initialization.
@@ -220,6 +223,8 @@ jobs:
             --header "Circle-Token: ${CIRCLE_TOKEN}" \
             --header 'content-type: application/json' \
             --data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_smoketesting":true , "run_performancetesting":false, "run_basedeployment": false}}'
+   
+  # Automated Smoke Testing against Staging
   Smoke-Testing-On-Staging:
     <<: *defaults
     steps: 
@@ -244,6 +249,8 @@ jobs:
             ./automated-smoke-test/smoketest.sh automation-config-staging.json prod
       - store_artifacts:
           path: /automated-smoke-test/test-results
+  
+   # Automated Smoke Testing against Production
   Smoke-Testing-On-Production:
     <<: *defaults
     steps: 
@@ -266,6 +273,7 @@ jobs:
             source awsenvconf
             source buildenvvar
             ./automated-smoke-test/smoketest.sh automation-config-prod.json prod
+
   # Test job for the cases when we do not need deployment. It just rapidly
   # installs (updates) app dependencies, and runs tests (ESLint, Stylelint,
   # Jest unit-tests).
@@ -327,37 +335,37 @@ workflows:
     when: << pipeline.parameters.run_basedeployment >>
     jobs:
       # Development builds are executed on "new-develop" branch only.
-      - deployDev:
+      - "build-dev":
           context : org-global
           filters:
             branches:
               only:
                 - develop
       # This is alternate dev env for parallel testing
-      - deployTest:
+      - "build-test":
           context : org-global      
           filters:
             branches:
               only:                
                 - free
       # This is alternate dev env for parallel testing
-      - deployQA:
+      - "build-qa":
           context : org-global      
           filters:
             branches:
               only:
                 - free
       # This is beta env for production soft releases
-      - deployBeta:
+      - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
-                - free
+                - thrive-bug-fixes
       # This is stage env for production QA releases
-      - deployStag:
+      - "build-prod-staging":
           context : org-global         
-          filters:
+          filters: &filters-staging
             branches:
               only:
                 - develop
@@ -367,9 +375,9 @@ workflows:
       # That might trigger wrong branch to be 
       # deployed on the production
       # master branch.
-      - deployProd:
+      - "build-prod":
           context : org-global      
-          filters:
+          filters: &filters-prod
             branches:
               only:
                 - master
@@ -382,7 +390,9 @@ workflows:
                 - develop
 
   Smoke Testing:
-    when: << pipeline.parameters.run_smoketesting >>
+    when: 
+      and:
+        - << pipeline.parameters.run_smoketesting >>
     jobs:
       - Hold [Smoke-Testing]:
           type: approval
@@ -391,17 +401,13 @@ workflows:
           requires:
             - Hold [Smoke-Testing]
           filters:
-            branches:
-              only:
-                - develop
+            <<: *filters-staging
       - Smoke-Testing-On-Production:
           context : org-global
           requires:
             - Hold [Smoke-Testing]
           filters:
-            branches:
-              only:
-                - master
+            <<: *filters-prod
 
   Performance Testing:
     when: << pipeline.parameters.run_performancetesting >>

src/assets/images/icon-gesture.svg

@@ -110,7 +110,7 @@ export class SearchPageFilterInner extends Component {
             <div className={theme.section}>
               <button
                 type="button"
-                className={`${theme['section-header']} ${isShowSubCategory ? theme.expanded : ''}`}
+                className={`${theme['section-header']} ${!isShowSubCategory ? theme.expanded : ''}`}
                 onClick={() => { this.setState({ isShowSubCategory: !isShowSubCategory }); }}
               >
                 <span className={theme['section-title']}>sub category</span>

src/assets/images/tc-logo-pride.svg

@@ -102,6 +102,8 @@ $green-color: #137d60;
 }
 
 .expanded {
+  margin-bottom: 0 !important;
+
   svg {
     -moz-transform: scale(-1, -1);
     -o-transform: scale(-1, -1);

src/shared/components/Contentful/SearchPageFilter/SearchPageFilter.jsx

@@ -77,7 +77,7 @@ $text-gray: #7f7f7f;
   flex-direction: column;
   margin-left: 22px;
   color: $text-black;
-  cursor: pointer;
+  align-items: flex-start;
 
   > div {
     position: relative;

src/shared/components/Contentful/SearchPageFilter/themes/default.scss

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import React, { useState, useEffect } from 'react';
 import PT from 'prop-types';
 import { config } from 'topcoder-react-utils';
-import Logo from 'assets/images/tc-logo.svg';
+import Logo from 'assets/images/tc-logo-pride.svg';
 import { tracking } from '../../actions';
 
 import './style.scss';

src/shared/components/Contentful/TracksTree/ChildListRow/themes/default.scss

@@ -146,7 +146,7 @@
           align-items: center;
           background-image: url(assets/images/data-back.svg);
           width: 78px;
-          height: 69px;
+          height: 71px;
         }
 
         .trackIconDesign {
@@ -207,6 +207,7 @@
 
           @include xs-to-sm {
             margin: 32px 0 0 0;
+            text-align: center;
           }
 
           .trackTitle {
@@ -219,7 +220,7 @@
             text-align: left;
             text-transform: uppercase;
             margin-bottom: 13px;
-            display: block;
+            display: inline-block;
 
             @include xs-to-sm {
               text-align: center;

src/shared/components/Header/index.jsx

@@ -363,8 +363,12 @@ class ChallengeDetailPageContainer extends React.Component {
       metadata,
     } = challenge;
 
-    const { track } = legacy || {};
+    let { track } = legacy || {};
 
+    if (!track) {
+      /* eslint-disable prefer-destructuring */
+      track = challenge.track || '';
+    }
     const submissionsViewable = _.find(metadata, { type: 'submissionsViewable' });
 
     const isLoggedIn = !_.isEmpty(auth.tokenV3);