Skip to content

ISSUE #ED-1136 fix: back button issue in project details page #3312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2023
Merged

ISSUE #ED-1136 fix: back button issue in project details page #3312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/app/manage-learn/project/project-listing/project-listing.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,10 @@ export class ProjectListingComponent {
programId: project.programId,
solutionId: project.solutionId,
type: selectedFilter,
listing: true
},
replaceUrl:true
skipLocationChange: true,
replaceUrl: true,
});
} else {
this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], {
Expand Down
17 changes: 15 additions & 2 deletions src/app/manage-learn/project/project-templateview/project-templateview.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export class ProjectTemplateviewPage implements OnInit {
certificateCriteria:any =[];
userId;
clickedOnProfile :boolean = false;
listing:boolean = false;
public backButtonFunc: Subscription;

constructor(
Expand Down Expand Up @@ -97,6 +98,7 @@ export class ProjectTemplateviewPage implements OnInit {
this.solutionId = parameters.solutionId;
this.isATargetedSolution = (parameters.isATargetedSolution === 'true');
this.isAssignedProject = parameters.type == 'assignedToMe' ? true : false
this.listing = (parameters.listing == "true");
});
this.stateData = this.router.getCurrentNavigation().extras.state;
this.templateDetailsPayload = this.router.getCurrentNavigation().extras.state;
Expand Down Expand Up @@ -260,7 +262,16 @@ export class ProjectTemplateviewPage implements OnInit {
}

async start() {
await this.router.navigate([`/${RouterLinks.HOME}`]);
await this.router.navigate([`/${RouterLinks.HOME}`]);
if(this.listing){
await this.router
.navigate([`/${RouterLinks.PROJECT}`], {
queryParams: {
selectedFilter: this.isAssignedProject? 'assignedToMe' : 'discoveredByMe',
}
})
}
setTimeout(() => {
if (this.stateData?.referenceFrom === 'link') {
this.startProjectsFromLink();
} else if (this.project.projectId) {
Expand All @@ -285,6 +296,7 @@ export class ProjectTemplateviewPage implements OnInit {
}
this.projectService.getProjectDetails(payload);
}
},500)
}

startProjectsFromLink() {
Expand Down Expand Up @@ -362,7 +374,8 @@ export class ProjectTemplateviewPage implements OnInit {
programId: this.programId,
solutionId :this.solutionId,
isATargetedSolution :this.isATargetedSolution ,
type :this.isAssignedProject ? 'assignedToMe' : 'createdByMe'
type :this.isAssignedProject ? 'assignedToMe' : 'createdByMe',
listing : this.listing
}
this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.PROJECT_TEMPLATE}`, this.solutionId], {
queryParams: params,
Expand Down