From 96ef61c54154d241dae28c47ca296490e1526e10 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 12 Nov 2021 13:27:18 +0100
Subject: [PATCH] fix default values for creation validation

---
 src/app/core/services/poll.service.ts         | 34 +++++++++++--------
 .../steps/step-four/step-four.component.html  |  4 ---
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index d3f24333..0a11859a 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -112,22 +112,23 @@ export class PollService implements Resolve<Poll> {
 	}
 
 	public createFormGroup() {
+		let minlengthValidation = environment.production ? 12 : 0;
 		let form = this.fb.group({
-			title: ['', [Validators.required, Validators.minLength(12)]],
+			title: ['', [Validators.required, Validators.minLength(minlengthValidation)]],
 			creatorPseudo: ['', [Validators.required]],
 			created_at: [new Date(), [Validators.required]],
 			creatorEmail: ['', [Validators.required]],
 			custom_url: [this.uuidService.getUUID(), [Validators.required]],
 			description: ['', [Validators.required]],
-			password: ['', [Validators.required]],
+			password: ['', []],
 			choices: new FormArray([]),
 			whoModifiesAnswers: ['', [Validators.required]],
 			whoCanChangeAnswers: ['', [Validators.required]],
 			isAboutDate: [true, [Validators.required]],
-			startDateInterval: ['', [Validators.required]],
-			endDateInterval: ['', [Validators.required]],
-			expiresDaysDelay: ['', [Validators.required]],
-			maxCountOfAnswers: ['', [Validators.required]],
+			// startDateInterval: ['', [Validators.required]],
+			// endDateInterval: ['', [Validators.required]],
+			expiresDaysDelay: [60, []],
+			maxCountOfAnswers: [300, []],
 			isZeroKnoledge: [false, [Validators.required]],
 			isProtectedByPassword: [false, [Validators.required]],
 			isOwnerNotifiedByEmailOnNewVote: [true, [Validators.required]],
@@ -140,7 +141,7 @@ export class PollService implements Resolve<Poll> {
 			allowComments: [true, [Validators.required]],
 			hasMaxCountOfAnswers: [300, [Validators.required]],
 			useVoterUniqueLink: [false, [Validators.required]],
-			voterEmailList: ['', [Validators.required]],
+			voterEmailList: ['', []],
 			allowNewDateTime: [60, [Validators.required, Validators.min(0)]],
 		});
 		this.form = form;
@@ -160,11 +161,12 @@ export class PollService implements Resolve<Poll> {
 			isProtectedByPassword: false,
 			richTextMode: false,
 			areResultsPublic: true,
-			expiracyNumberOfDays: 60,
+			expiresDayDelay: 60,
 			maxCountOfAnswers: 300,
 			voterEmailList: '',
 			password: '',
 		});
+		this.setDefaultDatesForInterval();
 	}
 
 	public updateSlug(): void {
@@ -376,15 +378,19 @@ export class PollService implements Resolve<Poll> {
 		}
 	}
 
-	public createPoll(): void {
+	public createPoll(): Promise<any> {
 		this.toastService.display('sending...');
 		console.log('this.form', this.form);
 		const newpoll = this.newPollFromForm();
-		this.apiService.createPoll(newpoll).then((resp) => {
-			console.log('poll created resp', resp);
-			console.log('TODO fill admin_key');
-			// this.admin_key = resp.data.admin_key;
-		});
+		return this.apiService.createPoll(newpoll).then(
+			(resp: any) => {
+				console.log('poll created resp', resp);
+				console.log('TODO fill admin_key');
+				console.log('resp', resp);
+				this.admin_key = resp.data.poll.admin_key;
+			},
+			(error) => this.apiService.ousideHandleError(error)
+		);
 	}
 
 	/**
diff --git a/src/app/features/administration/form/steps/step-four/step-four.component.html b/src/app/features/administration/form/steps/step-four/step-four.component.html
index a6f649f3..6fd7d762 100644
--- a/src/app/features/administration/form/steps/step-four/step-four.component.html
+++ b/src/app/features/administration/form/steps/step-four/step-four.component.html
@@ -54,10 +54,6 @@
 			</button>
 		</div>
 		<div class="column">
-			<button class="btn is-primary" (click)="createPoll()">
-				<i class="fa fa-save"></i>
-				Enregistrer le sondage
-			</button>
 			<button class="btn is-primary" (click)="createPoll()" [disabled]="!pollService.form.valid">
 				<i class="fa fa-save"></i>
 				Enregistrer le sondage