Merge branch 'develop' into contentful-tabs-mobile

luizrrodrigues · web-flow · commit 08a86ec00528 · 2021-11-18T06:23:09.000-03:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -342,7 +342,7 @@ workflows:
           filters:
             branches:
               only:
-                - gigs-apply-integration
+                - free
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -363,7 +363,7 @@ workflows:
           filters:
             branches:
               only:
-                - contentful-tabs-mobile
+                - free
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         
diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
@@ -82,19 +82,19 @@ exports[`Default render 1`] = `
                   "title": "Competitive Programming",
                 },
                 Object {
-                  "href": "/thrive/tracks?track=Data%20Science&tax=",
+                  "href": "/thrive/tracks?track=Data%20Science",
                   "title": "Data Science",
                 },
                 Object {
-                  "href": "/thrive/tracks?track=Design&tax=",
+                  "href": "/thrive/tracks?track=Design",
                   "title": "Design",
                 },
                 Object {
-                  "href": "/thrive/tracks?track=Development&tax=",
+                  "href": "/thrive/tracks?track=Development",
                   "title": "Development",
                 },
                 Object {
-                  "href": "/thrive/tracks?track=QA&tax=",
+                  "href": "/thrive/tracks?track=QA",
                   "title": "QA",
                 },
               ],
diff --git a/config/default.js b/config/default.js
@@ -358,19 +358,19 @@ module.exports = {
             },
             {
               title: 'Data Science',
-              href: '/thrive/tracks?track=Data%20Science&tax=',
+              href: '/thrive/tracks?track=Data%20Science',
             },
             {
               title: 'Design',
-              href: '/thrive/tracks?track=Design&tax=',
+              href: '/thrive/tracks?track=Design',
             },
             {
               title: 'Development',
-              href: '/thrive/tracks?track=Development&tax=',
+              href: '/thrive/tracks?track=Development',
             },
             {
               title: 'QA',
-              href: '/thrive/tracks?track=QA&tax=',
+              href: '/thrive/tracks?track=QA',
             },
           ],
         },
diff --git a/config/production.js b/config/production.js
@@ -139,19 +139,19 @@ module.exports = {
             },
             {
               title: 'Data Science',
-              href: '/thrive/tracks?track=Data%20Science&tax=',
+              href: '/thrive/tracks?track=Data%20Science',
             },
             {
               title: 'Design',
-              href: '/thrive/tracks?track=Design&tax=',
+              href: '/thrive/tracks?track=Design',
             },
             {
               title: 'Development',
-              href: '/thrive/tracks?track=Development&tax=',
+              href: '/thrive/tracks?track=Development',
             },
             {
               title: 'QA',
-              href: '/thrive/tracks?track=QA&tax=',
+              href: '/thrive/tracks?track=QA',
             },
           ],
         },
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -122,6 +122,13 @@ components:
           description: "The availability of the user"
           default: true
           example: true
+        skill:
+          type: string
+          description: "The candidate's skills separated via ,"
+          example: "Java,Angular,SQL Server,JavaScript"
+        salaryExpectation:
+          type: integer
+          description: "The candidate expected salary"
         hasProfile:
           type: boolean
           description: "Whether has profile for the user"
diff --git a/src/server/routes/recruitCRM.js b/src/server/routes/recruitCRM.js
@@ -24,19 +24,42 @@ const routes = express.Router();
 
 // Enables CORS on those routes according config above
 // ToDo configure CORS for set of our trusted domains
-routes.use(cors());
-routes.options('*', cors());
-
-routes.get('/jobs', (req, res, next) => new RecruitCRMService().getAllJobs(req, res, next));
-routes.get('/jobs/cache', (req, res, next) => new RecruitCRMService().getJobsCacheStats(req, res, next));
-routes.get('/jobs/cache/flush', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), (req, res, next) => new RecruitCRMService().getJobsCacheFlush(req, res, next));
-routes.get('/jobs/search', (req, res, next) => new RecruitCRMService().getJobs(req, res, next));
-routes.get('/jobs/:id', (req, res, next) => new RecruitCRMService().getJob(req, res, next));
-routes.post('/jobs/:id/apply', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), upload.single('resume'), (req, res, next) => new RecruitCRMService().applyForJob(req, res, next));
-routes.get('/candidates/search', (req, res, next) => new RecruitCRMService().searchCandidates(req, res, next));
+// routes.use(cors());
+// routes.options('*', cors());
+
+routes.options('/jobs', cors());
+routes.get('/jobs', cors(), (req, res, next) => new RecruitCRMService().getAllJobs(req, res, next));
+
+routes.options('/jobs/cache', cors());
+routes.get('/jobs/cache', cors(), (req, res, next) => new RecruitCRMService().getJobsCacheStats(req, res, next));
+
+routes.options('/jobs/cache/flush', cors());
+routes.get('/jobs/cache/flush', cors(), (req, res, next) => authenticator(authenticatorOptions)(req, res, next), (req, res, next) => new RecruitCRMService().getJobsCacheFlush(req, res, next));
+
+routes.options('/jobs/search', cors());
+routes.get('/jobs/search', cors(), (req, res, next) => new RecruitCRMService().getJobs(req, res, next));
+
+routes.options('/jobs/:id', cors());
+routes.get('/jobs/:id', cors(), (req, res, next) => new RecruitCRMService().getJob(req, res, next));
+
+const applyOptions = {
+  origin: true,
+  methods: ['POST'],
+  credentials: true,
+  maxAge: 3600,
+  allowedHeaders: ['Content-Type', 'Authorization'],
+};
+routes.options('/jobs/:id/apply', cors(applyOptions));
+routes.post('/jobs/:id/apply', cors(applyOptions), (req, res, next) => authenticator(authenticatorOptions)(req, res, next), upload.single('resume'), (req, res, next) => new RecruitCRMService().applyForJob(req, res, next));
+
+routes.options('/candidates/search', cors());
+routes.get('/candidates/search', cors(), (req, res, next) => new RecruitCRMService().searchCandidates(req, res, next));
 // new router added
-routes.get('/profile', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), (req, res, next) => new RecruitCRMService().getProfile(req, res, next));
-routes.post('/profile', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), upload.single('resume'), (req, res, next) => new RecruitCRMService().updateProfile(req, res, next));
-routes.get('/taasjobs', (req, res, next) => new RecruitCRMService().getJobsFromTaas(req, res, next));
+routes.options('/profile', cors());
+routes.get('/profile', cors(), (req, res, next) => authenticator(authenticatorOptions)(req, res, next), (req, res, next) => new RecruitCRMService().getProfile(req, res, next));
+routes.post('/profile', cors(), (req, res, next) => authenticator(authenticatorOptions)(req, res, next), upload.single('resume'), (req, res, next) => new RecruitCRMService().updateProfile(req, res, next));
+
+routes.options('/taasjobs', cors());
+routes.get('/taasjobs', cors(), (req, res, next) => new RecruitCRMService().getJobsFromTaas(req, res, next));
 
 export default routes;
diff --git a/src/server/services/contentful.js b/src/server/services/contentful.js
@@ -134,7 +134,9 @@ class ApiService {
    * @return {Promise}
    */
   async queryEntries(query) {
-    const res = await this.client.getEntries(query);
+    const decode = o => _.mapValues(o, prop => (typeof prop === 'object' ? decode(prop) : decodeURIComponent(prop)));
+    const decoded = decode(query);
+    const res = await this.client.getEntries(decoded);
     return res.stringifySafe ? JSON.parse(res.stringifySafe()) : res;
   }
 }
diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js
@@ -635,6 +635,8 @@ export default class RecruitCRMService {
       const responseMapping = {
         hasProfile: true,
         phone: candidate.contact_number,
+        salaryExpectation: candidate.salary_expectation,
+        skill: candidate.skill,
         resume: candidate.resume,
         availability: _.isNil(candidate.available_from) ? true
           : new Date(candidate.available_from) <= new Date(),
diff --git a/src/shared/components/Contentful/Article/themes/default.scss b/src/shared/components/Contentful/Article/themes/default.scss
@@ -139,9 +139,8 @@
 
     .catsContainer {
       display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      flex-wrap: wrap;
+      flex-direction: column;
+      align-items: flex-start;
       border-left: 3px solid #e9e9e9;
       padding-left: 7px;
       margin-bottom: 5px;
diff --git a/src/shared/components/Contentful/ArticleCard/themes/video.scss b/src/shared/components/Contentful/ArticleCard/themes/video.scss
@@ -9,6 +9,7 @@
   min-height: 217px;
   display: flex;
   flex-direction: column;
+  cursor: pointer;
 
   @include xs-to-sm {
     margin: auto;
diff --git a/src/shared/components/Contentful/SearchPageFilter/FilterAuthor/themes/default.scss b/src/shared/components/Contentful/SearchPageFilter/FilterAuthor/themes/default.scss
@@ -87,6 +87,10 @@ $text-black: #2a2a2a;
     align-items: center;
     width: 100%;
     justify-content: flex-start;
+
+    &:last-child {
+      height: auto;
+    }
   }
 
   span {
diff --git a/src/shared/containers/EDU/Search.jsx b/src/shared/containers/EDU/Search.jsx
@@ -13,6 +13,7 @@ import { updateQuery } from 'utils/url';
 import qs from 'qs';
 import LoadingIndicator from 'components/LoadingIndicator';
 import SearchPageFilter from 'components/Contentful/SearchPageFilter/SearchPageFilter';
+import moment from 'moment';
 // Partials
 import ResultTabs from './partials/ResultTabs';
 // CSS
@@ -66,8 +67,8 @@ export default class EDUSearch extends React.Component {
     const queryUpdate = {
       author: filterState.selectedAuthor,
       tags: filterState.tags,
-      startDate: filterState.startDate.format('YYYY-MM-DD'),
-      endDate: filterState.endDate.format('YYYY-MM-DD'),
+      startDate: filterState.startDate instanceof moment ? filterState.startDate.format('YYYY-MM-DD') : moment(filterState.startDate).format('YYYY-MM-DD'),
+      endDate: filterState.endDate instanceof moment ? filterState.endDate.format('YYYY-MM-DD') : moment(filterState.endDate).format('YYYY-MM-DD'),
       track: filterState.selectedCategory ? filterState.selectedCategory.title : null,
       tax: filterState.selectedCategory ? _.map(
         _.filter(filterState.selectedCategory.items, item => item.selected),
@@ -88,6 +89,8 @@ export default class EDUSearch extends React.Component {
     } = this.state;
     const title = 'Tutorials And Workshops That Matter | Thrive | Topcoder';
     const description = 'Thrive is our vault of content that we have been gathering over the years. It is full of tutorials and workshops that matter. Grow with us!';
+    let inputSelectedFilter = '0';
+    if (query.phrase) inputSelectedFilter = '1';
 
     const metaTags = (
       <MetaTags
@@ -111,7 +114,10 @@ export default class EDUSearch extends React.Component {
         {/* Banner */}
         <div className={searchTheme.bannerContainer}>
           <div className={searchTheme.searchBarWrapp}>
-            <SearchBar inputlVal={query.phrase || query.title} selectedFilter={query.phrase ? '1' : '0'} />
+            <SearchBar
+              inputlVal={query.phrase || query.title}
+              inputSelectedFilter={inputSelectedFilter}
+            />
           </div>
         </div>
         <div className={searchTheme.shapeBanner} />
diff --git a/src/shared/services/contentful.js b/src/shared/services/contentful.js
@@ -316,7 +316,7 @@ class Service {
       // thus we need to find it first
       await this.queryEntries({
         content_type: 'person',
-        query: encodeURIComponent(author),
+        query: author,
       })
         .then((result) => {
           query['fields.contentAuthor.sys.id'] = result.total ? result.items[0].sys.id : 'NO_SUCH_ID';
@@ -340,12 +340,12 @@ class Service {
     }
     if (track) query['fields.trackCategory'] = track;
     if (!_.isEmpty(tags)) {
-      query['fields.tags[all]'] = tags.map(t => encodeURIComponent(t)).join(',');
+      query['fields.tags[all]'] = tags.map(t => t).join(',');
     }
     if (startDate) query['fields.creationDate[gte]'] = startDate;
     if (endDate) query['fields.creationDate[lte]'] = endDate;
-    if (phrase) query.query = encodeURIComponent(phrase);
-    if (title) query['fields.title[match]'] = encodeURIComponent(title);
+    if (phrase) query.query = phrase;
+    if (title) query['fields.title[match]'] = title;
     if (sortBy) {
       switch (sortBy) {
         case 'Likes': query.order = '-fields.upvotes,-fields.creationDate'; break;

Original file line number	Diff line number	Diff line change
`@@ -358,19 +358,19 @@ module.exports = {`
`358`	`358`	`},`
`359`	`359`	`{`
`360`	`360`	`title: 'Data Science',`
`361`		`- href: '/thrive/tracks?track=Data%20Science&tax=',`
	`361`	`+ href: '/thrive/tracks?track=Data%20Science',`
`362`	`362`	`},`
`363`	`363`	`{`
`364`	`364`	`title: 'Design',`
`365`		`- href: '/thrive/tracks?track=Design&tax=',`
	`365`	`+ href: '/thrive/tracks?track=Design',`
`366`	`366`	`},`
`367`	`367`	`{`
`368`	`368`	`title: 'Development',`
`369`		`- href: '/thrive/tracks?track=Development&tax=',`
	`369`	`+ href: '/thrive/tracks?track=Development',`
`370`	`370`	`},`
`371`	`371`	`{`
`372`	`372`	`title: 'QA',`
`373`		`- href: '/thrive/tracks?track=QA&tax=',`
	`373`	`+ href: '/thrive/tracks?track=QA',`
`374`	`374`	`},`
`375`	`375`	`],`
`376`	`376`	`},`
Original file line number	Diff line number	Diff line change
`@@ -139,19 +139,19 @@ module.exports = {`
`139`	`139`	`},`
`140`	`140`	`{`
`141`	`141`	`title: 'Data Science',`
`142`		`- href: '/thrive/tracks?track=Data%20Science&tax=',`
	`142`	`+ href: '/thrive/tracks?track=Data%20Science',`
`143`	`143`	`},`
`144`	`144`	`{`
`145`	`145`	`title: 'Design',`
`146`		`- href: '/thrive/tracks?track=Design&tax=',`
	`146`	`+ href: '/thrive/tracks?track=Design',`
`147`	`147`	`},`
`148`	`148`	`{`
`149`	`149`	`title: 'Development',`
`150`		`- href: '/thrive/tracks?track=Development&tax=',`
	`150`	`+ href: '/thrive/tracks?track=Development',`
`151`	`151`	`},`
`152`	`152`	`{`
`153`	`153`	`title: 'QA',`
`154`		`- href: '/thrive/tracks?track=QA&tax=',`
	`154`	`+ href: '/thrive/tracks?track=QA',`
`155`	`155`	`},`
`156`	`156`	`],`
`157`	`157`	`},`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,9 @@ class ApiService {`
`134`	`134`	`* @return {Promise}`
`135`	`135`	`*/`
`136`	`136`	`async queryEntries(query) {`
`137`		`- const res = await this.client.getEntries(query);`
	`137`	`+ const decode = o => _.mapValues(o, prop => (typeof prop === 'object' ? decode(prop) : decodeURIComponent(prop)));`
	`138`	`+ const decoded = decode(query);`
	`139`	`+ const res = await this.client.getEntries(decoded);`
`138`	`140`	`return res.stringifySafe ? JSON.parse(res.stringifySafe()) : res;`
`139`	`141`	`}`
`140`	`142`	`}`