Issue ED-1099 merge: Merge pull request #3307 from shikshalokam/release-5.1.0-mlcert

Issue ED-1099 fix: back button issue in project details page

Author: swayangjit

src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.spec.ts

@@ -86,7 +86,7 @@ describe('ProfileNameConfirmationPopoverComponent', () => {
     });
 
     describe('onProfilePageClick  test-suites', () => {
-        it('should generate telemetry and navigate to district mapping if network is available', () => {
+        it('should generate telemetry and navigate to district mapping if network is available,  if no project content', () => {
             // arrange
             // act
             profileNameConfirmationPopoverComponent.projectContent = "Project content";
@@ -99,5 +99,18 @@ describe('ProfileNameConfirmationPopoverComponent', () => {
             );
             expect(mockPopoverCtrl.dismiss).toHaveBeenCalledWith({ editProfileClicked: true });
         });
+        it('should generate telemetry and navigate to district mapping if network is available, if no project content', () => {
+            // arrange
+            // act
+            profileNameConfirmationPopoverComponent.projectContent = "";
+            profileNameConfirmationPopoverComponent.onProfilePageClick();
+            // assert
+            expect(mockNavService.navigateToEditPersonalDetails).toHaveBeenCalledWith(
+                mockProfileData,
+                PageId.PROFILE_NAME_CONFIRMATION_POPUP,
+                ''
+            );
+            expect(mockPopoverCtrl.dismiss).toHaveBeenCalledWith({ editProfileClicked: true });
+        });
     });
-});
+});

src/app/manage-learn/project/project-templateview/project-templateview.page.ts

@@ -260,6 +260,7 @@ export class ProjectTemplateviewPage implements OnInit {
   }
 
   async start() {
+    await this.router.navigate([`/${RouterLinks.HOME}`]);
     if (this.stateData?.referenceFrom === 'link') {
       this.startProjectsFromLink();
     } else if (this.project.projectId) {
@@ -356,6 +357,21 @@ export class ProjectTemplateviewPage implements OnInit {
     })
    }
    private async showProfileNameConfirmationPopup() {
+    let params ={
+      isTargeted :this.isTargeted,
+       programId: this.programId,
+       solutionId :this.solutionId,
+       isATargetedSolution :this.isATargetedSolution ,
+       type  :this.isAssignedProject ? 'assignedToMe' : 'createdByMe'
+     }
+   this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.PROJECT_TEMPLATE}`, this.solutionId], {
+     queryParams: params,
+     skipLocationChange: false,
+     replaceUrl: true,
+     state: {
+       "referenceFrom": "link",
+   }})
+  
     this.clickedOnProfile = true;
     const popUp = await this.popoverController.create({
       component: ProfileNameConfirmationPopoverComponent,
@@ -368,20 +384,6 @@ export class ProjectTemplateviewPage implements OnInit {
     const { data } = await popUp.onDidDismiss();
     if (data !== undefined) {
       if (data.buttonClicked) {
-        let params ={
-          isTargeted :this.isTargeted,
-           programId: this.programId,
-           solutionId :this.solutionId,
-           isATargetedSolution :this.isATargetedSolution ,
-           type  :this.isAssignedProject ? 'assignedToMe' : 'createdByMe'
-         }
-       this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.PROJECT_TEMPLATE}`, this.solutionId], {
-         queryParams: params,
-         skipLocationChange: false,
-         replaceUrl: true,
-         state: {
-           "referenceFrom": "link",
-       }})
         this.isStarted = true;
         this.clickedOnProfile = false;
         this.doAction();