Merge pull request #4101 from beckn/bugfix/kundan/3685/dsep-scholarship-flow

fix(DSEP): fixed dsep scholarship flow

Author: aniketceminds

apps/dsep/components/jobSearch/JobSearch.tsx

@@ -1,18 +1,31 @@
-import React from 'react'
+import React, { useState } from 'react'
 import SearchBar from '../header/SearchBar'
 import { Box } from '@chakra-ui/react'
 import { JobsSearchPropsModel } from './JobsSearch.types'
 import { ProductCard } from '@beckn-ui/becknified-components'
 import JobCardRenderer from './job-card-renderer'
+import { useRouter } from 'next/router'
 
 const JobSearch: React.FC<JobsSearchPropsModel> = props => {
+  const router = useRouter()
   const { jobs, handleChange, searchvalue } = props
+  const [searchKeyword, setSearchKeyword] = useState(router.query?.searchTerm || '')
 
   return (
     <div>
       <Box className="job-search-bar">
         <SearchBar
-          handleChange={() => {}}
+          handleChange={(text: string) => {
+            setSearchKeyword(text)
+            localStorage.removeItem('optionTags')
+            localStorage.setItem(
+              'optionTags',
+              JSON.stringify({
+                name: text
+              })
+            )
+            window.dispatchEvent(new Event('storage-optiontags'))
+          }}
           searchString={searchvalue}
         />
       </Box>

apps/dsep/components/landingPage/LandingPage.tsx

@@ -32,14 +32,26 @@ const LandingPage: React.FC = () => {
     localStorage.setItem('optionTags', JSON.stringify({ name: searchTerm }))
     Router.push(`/search?searchTerm=${searchTerm}`)
   }
+  const navigateToScholarship = () => {
+    localStorage.setItem('optionTags', JSON.stringify({ name: searchTerm }))
+    Router.push(`/scholarshipSearchPage?searchTerm=${searchTerm}`)
+  }
+  const navigateToJob = () => {
+    localStorage.setItem('optionTags', JSON.stringify({ name: searchTerm }))
+    Router.push(`/jobSearch?searchTerm=${searchTerm}`)
+  }
 
   const handleClick = (type: string) => {
     setActiveCard(type)
   }
 
   const searchIconClickHandler = (e: any) => {
     if (searchTerm) {
-      navigateToSearchResults()
+      activeCard === 'course'
+        ? navigateToSearchResults()
+        : activeCard === 'jobs'
+          ? navigateToJob()
+          : navigateToScholarship()
     }
     e.preventDefault()
   }

apps/dsep/components/scholarship/scholarshipCard/ScholarshipCard.tsx

@@ -14,6 +14,7 @@ interface ScholarshipCardProps {
 }
 
 const ScholarshipCard: FC<ScholarshipCardProps> = props => {
+  console.log(props)
   const { t } = useLanguage()
   return (
     <DetailCard>
@@ -62,7 +63,7 @@ const ScholarshipCard: FC<ScholarshipCardProps> = props => {
           <Typography text={props.scholarshipStatus} />
         </Flex>
       </Flex>
-      {props.scholarshipStatus === 'Approved' ? (
+      {props.scholarshipStatus === 'Approved' || props.scholarshipStatus === null ? (
         <>
           <Divider
             mt={'15px'}

apps/dsep/pages/jobSearch.tsx

@@ -1,6 +1,7 @@
 import LoaderWithMessage from '@beckn-ui/molecules/src/components/LoaderWithMessage/loader-with-message'
 import { Box } from '@chakra-ui/react'
 import Cookies from 'js-cookie'
+import { useRouter } from 'next/router'
 import React, { useEffect, useState } from 'react'
 import JobSearch from '../components/jobSearch/JobSearch'
 import { useLanguage } from '../hooks/useLanguage'
@@ -9,17 +10,18 @@ import { ParsedItemModel, SearchResponseModel } from '../types/search.types'
 import { getParsedSearchlist } from '../utilities/search-utils'
 
 const jobSearch = () => {
+  const router = useRouter()
   const [jobs, setJobs] = useState<ParsedItemModel[]>([])
   const [isLoading, setIsLoading] = useState<boolean>(true)
-
+  const [searchKeyword, setSearchKeyword] = useState(router.query?.searchTerm || '')
   const apiUrl = process.env.NEXT_PUBLIC_API_URL
   const { t } = useLanguage()
 
   const searchPayload = {
     context: {
       domain: 'dsep:jobs'
     },
-    searchString: ''
+    searchString: searchKeyword
   }
 
   const fetchJobs = () => {

apps/dsep/pages/scholarshipSearchPage.tsx

@@ -8,12 +8,15 @@ import { ParsedItemModel } from '../types/search.types'
 import { getParsedSearchlist } from '../utilities/search-utils'
 import axios from '../services/axios'
 import { testIds } from '@shared/dataTestIds'
+import { useRouter } from 'next/router'
 
 const ScholarshipCard = () => {
+  const router = useRouter()
   const [isLoading, setIsLoading] = useState(true)
   const [scholarShips, setScholarships] = useState<ParsedItemModel[]>([])
   const [isError, setIsError] = useState(false)
   const dsepScholarshipUrl = process.env.NEXT_PUBLIC_API_URL
+  const [searchKeyword, setSearchKeyword] = useState(router.query?.searchTerm || '')
 
   const { t } = useLanguage()
 
@@ -23,7 +26,7 @@ const ScholarshipCard = () => {
         context: {
           domain: 'dsep:scholarships'
         },
-        searchString: ''
+        searchString: searchKeyword
       })
       const searchData = getParsedSearchlist(scholarshipSearchResponse.data.data)
       setScholarships(searchData)