Skip to content
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

Jump to bottom

Add ability to go back to lead motion after amendment create #2859

Merged
merged 2 commits into from
Oct 17, 2023
Merged

Add ability to go back to lead motion after amendment create #2859

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b22d87
Add ability to go back to lead motion after amendment create
bastianjoel Oct 6, 2023
1250cbc
Cleanup
bastianjoel Oct 6, 2023
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
2 changes: 1 addition & 1 deletion ...ges/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ export class AmendmentCreateWizardComponent extends BaseMeetingComponent impleme
};

const { sequential_number } = await this.repo.createParagraphBased(motionCreate);
this.router.navigate([this.activeMeetingId, `motions`, sequential_number]);
this.router.navigate([this.activeMeetingId, `motions`, sequential_number], { replaceUrl: true, state: { canGoBack: true } });
}

/**
Expand Down
4 changes: 3 additions & 1 deletion client/src/app/ui/modules/head-bar/services/routing-state.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { filter, pairwise, startWith } from 'rxjs';
providedIn: `root`
})
export class RoutingStateService {
private skipUnsafeRouteCheck = false;
/**
* Hold the previous URL
*/
Expand All @@ -32,7 +33,7 @@ export class RoutingStateService {
* If this fails, the open nav button should be shown
*/
public get isSafePrevUrl(): boolean {
if (this._previousUrl) {
if (this._previousUrl && !this.skipUnsafeRouteCheck) {
return !this.unsafeUrls.some(unsafeUrl => this._previousUrl?.includes(unsafeUrl));
} else {
return true;
Expand Down Expand Up @@ -62,6 +63,7 @@ export class RoutingStateService {
pairwise()
)
.subscribe((event: any[]) => {
this.skipUnsafeRouteCheck = router.getCurrentNavigation()?.extras?.state[`canGoBack`] ?? false;
this._previousUrl = event[0]?.urlAfterRedirects ?? this._currentUrl;
const currentNavigationExtras = router.getCurrentNavigation()?.extras;
if (currentNavigationExtras && currentNavigationExtras.state && currentNavigationExtras.state[`back`]) {
Expand Down
Loading