Merge pull request #425 from Rushikesh-Sonawane99/release-1.0.0

Issue #PS-000 chore: Added hyphen on UI when no subjects present for teacher profile and replaced content/v1 search api with /action/composite/v3/search
tekdi · Nov 25, 2024 · 0d5a995 · 0d5a995
2 parents 3a8021b + 46e0b99
commit 0d5a995
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/pages/user-profile/[userId].tsx b/src/pages/user-profile/[userId].tsx
@@ -543,8 +543,7 @@ const TeacherProfile: React.FC<TeacherProfileProp> = ({
                             flexWrap: 'wrap',
                           }}
                         >
-                          {orderedSubjects &&
-                            orderedSubjects.length > 0 &&
+                          {orderedSubjects && orderedSubjects.length > 0 ? (
                             orderedSubjects.map((subject: any) => {
                               const isMutualSubject =
                                 mutualSubjects?.includes(subject);
@@ -570,7 +569,18 @@ const TeacherProfile: React.FC<TeacherProfileProp> = ({
                                   {getLabelForSubject(subject)}
                                 </Button>
                               );
-                            })}
+                            })
+                          ) : (
+                            <Typography
+                              sx={{
+                                fontSize: '14px',
+                                fontWeight: '500',
+                                color: theme.palette.warning.A200,
+                              }}
+                            >
+                             -
+                            </Typography>
+                          )}
                         </Box>
                       </Grid>
                     );

diff --git a/src/services/AssesmentService.ts b/src/services/AssesmentService.ts
@@ -5,6 +5,7 @@ import {
   ISearchAssessment,
 } from '@/utils/Interfaces';
 import { post } from './RestClient';
+import { URL_CONFIG } from '@/utils/url.config';
 
 export const getAssessmentList = async ({
   sort,
@@ -25,9 +26,9 @@ export const getAssessmentList = async ({
 export const getDoIdForAssessmentDetails = async ({
   filters,
 }: GetDoIdServiceParam): Promise<any> => {
+  // const apiUrl: string = `${URL_CONFIG.API.COMPOSITE_SEARCH}`;
   const apiUrl: string =
     'https://sunbirdsaas.com/api/content/v1/search?orgdetails=orgName%2Cemail&licenseDetails=name%2Cdescription%2Curl';
-
   const data = {
     request: {
       filters: {