Skip to content

History service improvements [Closes #908] #910

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

Open
rpulkka wants to merge 1 commit into
base: development
Choose a base branch
from
Open

History service improvements [Closes #908] #910

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
12 changes: 4 additions & 8 deletions projects/laji/src/app/shared-modules/document-viewer/document/document.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { TemplateForm } from '../../own-submissions/models/template-form';
import { Router } from '@angular/router';
import { LocalizeRouterService } from '../../../locale/localize-router.service';
import { DeleteOwnDocumentService } from '../../../shared/service/delete-own-document.service';
import { HistoryService } from '../../../shared/service/history.service';
import { BrowserService } from '../../../shared/service/browser.service';
import { DocumentPermissionService } from '../service/document-permission.service';
import { FormService } from '../../../shared/service/form.service';
import { Form } from '../../../shared/model/Form';
Expand Down Expand Up @@ -101,7 +101,7 @@ export class DocumentComponent implements AfterViewInit, OnChanges, OnInit, OnDe
private router: Router,
private localizeRouterService: LocalizeRouterService,
private deleteDocumentService: DeleteOwnDocumentService,
private historyService: HistoryService,
private browserService: BrowserService,
private documentPermissionService: DocumentPermissionService,
private formService: FormService
) { }
Expand Down Expand Up @@ -343,15 +343,11 @@ export class DocumentComponent implements AfterViewInit, OnChanges, OnInit, OnDe
return;
}

if(this.historyService.isFirstLoad()) {
this.browserService.goBack(() => {
this.router.navigate(
this.localizeRouterService.translateRoute(['/vihko/home/'])
);
} else {
this.router.navigate(
this.localizeRouterService.translateRoute([this.historyService.getPrevious()])
);
}
});
}
}

Expand Down
27 changes: 18 additions & 9 deletions projects/laji/src/app/shared/service/history.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ const MAX_HISTORY = 30;
@Injectable({providedIn: 'root'})
export class HistoryService implements OnDestroy {
private history: string[] = [];
private hasBack = false;
private anyPageLoaded = false;
private isInitialLoad = false;
private routeSub?: Subscription;

constructor(
Expand All @@ -23,13 +24,25 @@ export class HistoryService implements OnDestroy {
this.routeSub = this.router.events.pipe(
filter(Util.eventIsNavigationEnd)
).subscribe(({urlAfterRedirects}: NavigationEnd) => {
if (this.router.getCurrentNavigation()?.extras.replaceUrl
|| urlAfterRedirects.match(/\/user\/(login|logout)/)
if (!this.anyPageLoaded) {
this.anyPageLoaded = true;
this.isInitialLoad = true;
} else {
this.isInitialLoad = false;
}

if (urlAfterRedirects.match(/\/user\/(login|logout)/)
|| this.history[this.history.length - 1] === urlAfterRedirects) {
return;
}

if (this.router.currentNavigation()?.extras.replaceUrl) {
this.history.pop();
this.history = [...this.history, urlAfterRedirects];
return;
}

if (this.history[this.history.length - 2] === urlAfterRedirects) {
this.hasBack = true;
this.history.pop();
} else {
this.history = [...this.history, urlAfterRedirects];
Expand All @@ -54,11 +67,7 @@ export class HistoryService implements OnDestroy {
return this.history.length > 1;
}

public getPrevious(): string {
return this.history[this.history.length - 2] || '';
}

public isFirstLoad() {
return !(this.hasPrevious() || this.hasBack);
return this.isInitialLoad;
}
}