Vihko Open Form [Closes #708] #798
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Blodir
requested changes
Jun 13, 2025
| @@ -0,0 +1,14 @@ | |||
| <ng-container *ngIf="thankYouData$ | async as data"> | |||
| <div class="m-6"> | |||
There was a problem hiding this comment.
this should probably be a my-6, unless you want the horizontal padding?
| }) | ||
| export class ThankYouComponent implements OnInit, OnDestroy { | ||
|
|
||
| Rights = Rights; // eslint-disable-line @typescript-eslint/naming-convention |
| @@ -8,4 +9,16 @@ import { Form } from '../../shared/model/Form'; | |||
| }) | |||
| export class SurveyBoxComponent { | |||
| @Input() form!: Form.List; | |||
|
|
|||
| formLink(): string[] { | |||
| @@ -1,5 +1,6 @@ | |||
| import { Component, Input } from '@angular/core'; | |||
| import { Form } from '../../shared/model/Form'; | |||
| import { Global } from '../../../environments/global'; | |||
|
|
|||
| @Component({ | |||
There was a problem hiding this comment.
could make this ChangeDetectionStrategy.OnPush while you're at it.
| @@ -24,7 +24,7 @@ | |||
| </div> | |||
| </div> | |||
| <div id="navbar" class="collapse navbar-collapse" [class.in]="openMenu"> | |||
| <ul class="nav navbar-nav"> | |||
| <ul class="nav navbar-nav" *ngIf="navbarService.navbarVisible"> | |||
There was a problem hiding this comment.
use navbarService.navbarVisible$ | async here directly and get rid of the cdr.markForCheck()
| @@ -70,6 +72,10 @@ export class NavbarComponent implements AfterViewInit, OnInit, OnDestroy { | |||
| if (this.platformService.isServer) { | |||
| return; | |||
| } | |||
| this.navbarService.navbarVisible$.subscribe(() => { | |||
| @@ -102,7 +102,16 @@ export class FormService { | |||
| return `/project/${formId}/form`; | |||
| } | |||
|
|
|||
| getFormAlias(formId: string) { | |||
| import { Subject } from 'rxjs'; | ||
|
|
||
| @Injectable({providedIn: 'root'}) | ||
| export class NavbarService { |
There was a problem hiding this comment.
use a BehaviorSubject
navbarVisible$ = new BehaviorSubject(true);
set navbarVisible(v) {
this.navbarVisible$.next(v)
}
get navbarVisible() {
return this.navbarVisible$.value
}| @@ -36,6 +37,12 @@ export interface ExcelFormOptions { | |||
| allowGenerate: boolean; | |||
| } | |||
|
|
|||
| export interface RegistrationContact { | |||
| preferredName: string | undefined; | |||
There was a problem hiding this comment.
optional syntax would be nicer eg.
preferredName?: string;
| const params: string[] = [ | ||
| `next=${this.location.path(true)}`, | ||
| 'redirectMethod=POST', | ||
| 'locale=%lang%', |
There was a problem hiding this comment.
why not
`locale=${this.translate.currentLang}`
Blodir
reviewed
Jun 13, 2025
| @@ -255,7 +255,7 @@ export class UserService implements OnDestroy { | |||
| const params: string[] = [ | |||
| `next=${this.location.path(true)}`, | |||
| 'redirectMethod=POST', | |||
| 'locale=%lang%', | |||
| `locale=${this.translate.currentLang}`, | |||
There was a problem hiding this comment.
you need to remove the .replace('%lang%'... below
Blodir
approved these changes
Jun 16, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains the new Vihko open form changes. Open forms have /about, /form and /thank-you pages. The specs included that the address must include "/pyoriaiset" instead of the formId, like https://708.dev.laji.fi/en/project/pyoriaiset/form and this required some work-arounds.
Open form can be used without logging in. If user submits the form without login, and emailHasAccount returns a matching user from the API, the user is asked to login to their account. The formState is saved to localStorage while the user is logging in on laji-auth, and ngOnInit checks if there's formState (which is, user returning from laji-auth).
If the email doesn't have an account, registrationContacts are saved to project-form.service and thank-you page has a link to register, which takes registrationContacts as params to prefill the sign up form.
Even when user doesn't log in or sign up, email is mandatory. In this case it is stored to document in format:
'vihko:' + email, so that all of the anonymous user's observations can be linked to their new account later with a backend process, if they ever create one.The open form hides some of the navbar content with the new NavbarService.