Skip to content

Commit 8b1de38

Browse files
authored
Merge pull request #2427 from rushi-tekdi/release-1.13.0-prod-register
Release 1.13.0 prod register to new issues fixed
2 parents 9f18404 + b118f73 commit 8b1de38

File tree

5 files changed

+41
-2
lines changed

5 files changed

+41
-2
lines changed

apps/learner-web-app/src/app/registration/RegisterationFlow.tsx

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import DynamicForm from '@shared-lib-v2/DynamicForm/components/DynamicForm';
2424
import { fetchForm } from '@shared-lib-v2/DynamicForm/components/DynamicFormCallback';
2525
import { FormContext } from '@shared-lib-v2/DynamicForm/components/DynamicFormConstant';
2626
import { useRouter } from 'next/navigation';
27-
import { createUser } from '@shared-lib-v2/DynamicForm/services/CreateUserService';
27+
import { createUser, sendMessage } from '@shared-lib-v2/DynamicForm/services/CreateUserService';
2828
import { RoleId } from '@shared-lib-v2/DynamicForm/utils/app.constant';
2929
import { getUserId, login } from '@learner/utils/API/LoginService';
3030
import SignupSuccess from '@learner/components/SignupSuccess /SignupSuccess ';
@@ -314,6 +314,19 @@ const RegisterationFlow = () => {
314314
localStorage.removeItem('localPayload');
315315
localStorage.removeItem('formData');
316316

317+
//sent username and password
318+
sendMessage({
319+
"sms": {
320+
"to": [updated_payload.mobile],
321+
"body":"Hey",
322+
"templateId": "6948f41681326042a2454bb2",
323+
"replacements": {
324+
"var1": username,
325+
"var2": password
326+
}
327+
}
328+
});
329+
317330
setSignupSuccessModal(true);
318331
} else {
319332
showToastMessage(t('LEARNER_APP.REGISTRATION_FLOW.USERNAME_ALREADY_EXIST'), 'error');

apps/learner-web-app/src/components/EnrollProgramCarousel/EnrollProgramCarousel.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ const EnrollProgramCarousel = ({
8989
//below code show pragyanpath program in explore programs tab
9090
// || program?.params?.uiConfig?.sso?.length > 0
9191
);
92+
localStorage.setItem('programsDataLogin', JSON.stringify(programsData));
93+
localStorage.setItem('visibleProgramsLogin', JSON.stringify(visiblePrograms));
9294
// console.log('visiblePrograms', visiblePrograms);
9395

9496
// If it's Explore Programs tab, exclude enrolled programs

apps/learner-web-app/src/components/ProgramSwitchModal/ProgramSwitchModal.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const ProgramSwitchModal: React.FC<ProgramSwitchModalProps> = ({
5252
const [enrolledPrograms, setEnrolledPrograms] = useState<TenantData[]>([]);
5353
const [currentProgram, setCurrentProgram] = useState<TenantData | null>(null);
5454
const [loading, setLoading] = useState(true);
55+
const [isAllProgramRegistred, setIsAllProgramRegistred] = useState<string | null>(null);
5556

5657
useEffect(() => {
5758
const fetchEnrolledPrograms = async () => {
@@ -69,6 +70,15 @@ const ProgramSwitchModal: React.FC<ProgramSwitchModalProps> = ({
6970
const userResponse = await getUserDetails(userId, true);
7071
const tenantData = userResponse?.result?.userData?.tenantData || [];
7172

73+
//set isAllProgramRegistred
74+
const programsData = JSON.parse(localStorage.getItem('programsDataLogin') || '[]');
75+
const visiblePrograms = JSON.parse(localStorage.getItem('visibleProgramsLogin') || '[]');
76+
const filterIds = tenantData.map((item: any) => item.tenantId);
77+
const filteredPrograms = programsData?.filter((program: any) =>
78+
filterIds.includes(program.tenantId)
79+
);
80+
setIsAllProgramRegistred(visiblePrograms.length <= filteredPrograms.length ? 'yes' : 'no');
81+
7282
// Find current program
7383
const current =
7484
tenantData.find(
@@ -393,6 +403,7 @@ const ProgramSwitchModal: React.FC<ProgramSwitchModalProps> = ({
393403
>
394404
Home
395405
</Button>
406+
{isAllProgramRegistred !== 'yes' && (
396407
<Button
397408
variant="outlined"
398409
fullWidth
@@ -412,6 +423,7 @@ const ProgramSwitchModal: React.FC<ProgramSwitchModalProps> = ({
412423
>
413424
Show All Programs
414425
</Button>
426+
)}
415427
<Button
416428
variant="outlined"
417429
fullWidth

libs/shared-lib-v2/src/DynamicForm/services/CreateUserService.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,17 @@ export const userNameExist = async (userData: any): Promise<any> => {
4040
}
4141
};
4242

43+
export const sendMessage = async (messageData: any): Promise<any> => {
44+
const apiUrl: string = API_ENDPOINTS.sendMessage;
45+
try {
46+
const response = await post(apiUrl, messageData);
47+
return response?.data?.result;
48+
} catch (error) {
49+
console.error('error in sending message', error);
50+
throw error;
51+
}
52+
};
53+
4354
export const createCohort = async (userData: any): Promise<any> => {
4455
const apiUrl: string = API_ENDPOINTS.cohortCreate;
4556
try {

libs/shared-lib-v2/src/DynamicForm/utils/API/APIEndpoints.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ const API_ENDPOINTS = {
5353
userReadWithField: (userId: string | string[]) => `${baseurl}/user/read/${userId}?fieldvalue=false`,
5454
contentSearchStatus: `${baseurl}/tracking/content/search/status`,
5555
contentCreate: `${baseurl}/tracking/content/create`,
56-
updateCohortUser: (userId: string | string[])=>`${baseurl}/user/v1/cohort/update/${userId}`
56+
updateCohortUser: (userId: string | string[])=>`${baseurl}/user/v1/cohort/update/${userId}`,
57+
sendMessage: `${baseurl}/notification/send-raw`,
5758
};
5859

5960
export default API_ENDPOINTS;

0 commit comments

Comments
 (0)