From 00a8e041033b6e02b37b7ce68866cbf22e587247 Mon Sep 17 00:00:00 2001
From: dengjun <dengjun@huobi.com>
Date: Mon, 5 Jul 2021 21:20:11 +0800
Subject: [PATCH 1/2] ci:community-app update

---
 .circleci/config.yml                          | 2 +-
 config/default.js                             | 1 +
 src/shared/components/Gigs/GigApply/index.jsx | 2 +-
 src/shared/containers/Gigs/RecruitCRMJobs.jsx | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 832d6f80cd..9caead340a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -340,7 +340,7 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - gigs-optimize
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
diff --git a/config/default.js b/config/default.js
index bbb7731670..bbf8b30a55 100644
--- a/config/default.js
+++ b/config/default.js
@@ -256,6 +256,7 @@ module.exports = {
       AUTH_SECRET: 'mysecret',
       VALID_ISSUERS: '["https://api.topcoder-dev.com", "https://api.topcoder.com", "https://topcoder-dev.auth0.com/", "https://auth.topcoder-dev.com/","https://topcoder.auth0.com/","https://auth.topcoder.com/"]',
     },
+    CHAMELEON_VERIFICATION_SECRET: 'mysecret',
   },
   GROWSURF_CAMPAIGN_ID: '',
   GROWSURF_COOKIE: '_tc_gigs_ref',
diff --git a/src/shared/components/Gigs/GigApply/index.jsx b/src/shared/components/Gigs/GigApply/index.jsx
index 3c801ae2d2..bcd84a6782 100644
--- a/src/shared/components/Gigs/GigApply/index.jsx
+++ b/src/shared/components/Gigs/GigApply/index.jsx
@@ -110,7 +110,7 @@ export default function GigApply(props) {
                       ) : (
                         <React.Fragment>
                           <a href={`${config.GIGS_PAGES_PATH}`} styleName="gig-list-btn">GO TO GIGS LIST</a>
-                          <a href={`${config.PLATFORM_SITE_URL}/earn/my-gigs`} styleName="primaryBtn">CHECK GIG APPLICATION STATUS</a>
+                          <a href={`${config.PLATFORM_SITE_URL}/earn/my-gigs?externalId=${job.slug}`} styleName="primaryBtn">CHECK GIG APPLICATION STATUS</a>
                         </React.Fragment>
                       )
                     }
diff --git a/src/shared/containers/Gigs/RecruitCRMJobs.jsx b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
index 14afad81dc..53ca6460cf 100644
--- a/src/shared/containers/Gigs/RecruitCRMJobs.jsx
+++ b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
@@ -179,7 +179,7 @@ class RecruitCRMJobsContainer extends React.Component {
     // build current locations dropdown based on all data
     // and filter by selected location
     jobsToDisplay = _.filter(jobs, (job) => {
-      const country = job.country === 'Anywhere' || job.country === 'Any' ? 'All' : job.country;
+      const country = !job.country || job.country === 'Anywhere' || job.country === 'Any' ? 'All' : job.country;
       // build dropdown
       const found = _.findIndex(locations, { label: country });
       if (found === -1) {
@@ -202,7 +202,7 @@ class RecruitCRMJobsContainer extends React.Component {
         // eslint-disable-next-line no-underscore-dangle
         const _term = term.toLowerCase();
         // name search
-        if (job.name.toLowerCase().includes(_term)) return true;
+        if (job && job.name && job.name.toLowerCase().includes(_term)) return true;
         // skills search
         const skills = _.find(job.custom_fields, ['field_name', 'Technologies Required']);
         if (skills && skills.value && skills.value.toLowerCase().includes(_term)) return true;

From 657d4d0e76dbf0c7e65664d935f1e72680ec1a33 Mon Sep 17 00:00:00 2001
From: dengjun <dengjun@huobi.com>
Date: Wed, 7 Jul 2021 13:16:58 +0800
Subject: [PATCH 2/2] restore ci

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3f76a6d600..a2e1c3acba 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -342,7 +342,7 @@ workflows:
           filters:
             branches:
               only:
-                - gigs-optimize
+                - develop
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global