Feat: add checkbox to accept conditions on create bot ✨

fabnumdef · Jan 14, 2021 · 9b9ac20 · 9b9ac20
1 parent 397e140
commit 9b9ac20
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 3 deletions.
diff --git a/back/package.json b/back/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabrique-chatbot-back",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "",
   "author": "",
   "license": "MIT",

diff --git a/back/src/chatbot/chatbot.service.ts b/back/src/chatbot/chatbot.service.ts
@@ -44,7 +44,7 @@ export class ChatbotService {
   }
 
   async create(chatbot: ChatbotModel, file?: FileModel, icon?: FileModel): Promise<ChatbotModel> {
-    let chatbotSaved: Chatbot = await this._chatbotsRepository.save(chatbot);
+    const chatbotSaved: Chatbot = await this._chatbotsRepository.save(chatbot);
     if (!file || !icon) {
       return chatbotSaved;
     }

diff --git a/back/src/core/dto/create-chatbot.dto.ts b/back/src/core/dto/create-chatbot.dto.ts
@@ -40,6 +40,10 @@ export class CreateChatbotDto {
   @MaxLength(50)
   domainName: string;
 
+  @IsString()
+  @IsNotEmpty()
+  acceptConditions: boolean = false;
+
   @IsString()
   @IsNotEmpty()
   @MaxLength(200)

diff --git a/back/src/core/entities/chatbot.entity.ts b/back/src/core/entities/chatbot.entity.ts
@@ -41,6 +41,9 @@ export class Chatbot {
   @Column( { default: false })
   intra_def: boolean;
 
+  @Column( { default: false })
+  accept_conditions: boolean;
+
   @Column('enum', { name: 'status', enum: ChatbotStatus, default: ChatbotStatus.pending, nullable: false})
   status: ChatbotStatus;
 

diff --git a/back/src/core/models/chatbot.model.ts b/back/src/core/models/chatbot.model.ts
@@ -40,6 +40,10 @@ export class ChatbotModel {
   @IsNotEmpty()
   intra_def: boolean = false;
 
+  @IsString()
+  @IsNotEmpty()
+  accept_conditions: boolean = false;
+
   @IsString()
   @IsOptional()
   status: ChatbotStatus;

diff --git a/front/package.json b/front/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabrique-chatbot-front",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/front/src/app/core/models/chatbot-configuration.model.ts b/front/src/app/core/models/chatbot-configuration.model.ts
@@ -12,4 +12,5 @@ export class ChatbotConfiguration {
   primaryColor: string;
   secondaryColor: string;
   domainName: string;
+  acceptConditions: boolean;
 }
diff --git a/front/src/app/core/services/chatbot.service.ts b/front/src/app/core/services/chatbot.service.ts
@@ -34,6 +34,7 @@ export class ChatbotService {
     formData.append('audience', botConfig.audience);
     formData.append('domainName', botConfig.domainName);
     formData.append('intraDef', botConfig.intraDef.toString());
+    formData.append('acceptConditions', botConfig.acceptConditions.toString());
     formData.append('users', JSON.stringify(botConfig.users));
 
     const headers = new HttpHeaders();

diff --git a/front/src/app/modules/create-bot-form/create-bot-form/create-bot-form.component.ts b/front/src/app/modules/create-bot-form/create-bot-form/create-bot-form.component.ts
@@ -63,6 +63,9 @@ export class CreateBotFormComponent implements OnInit {
           primaryColor: ['#6e91f0', [Validators.required, Validators.maxLength(20)]],
           secondaryColor: ['#eef2fd', [Validators.required, Validators.maxLength(20)]],
         }),
+        this._fb.group({
+          acceptConditions: [false, Validators.requiredTrue],
+        }),
       ])
     });
   }

diff --git a/front/src/app/modules/create-bot-form/resume-step/resume-step.component.html b/front/src/app/modules/create-bot-form/resume-step/resume-step.component.html
@@ -51,6 +51,12 @@ <h4>Personnalisation</h4>
         <div [ngStyle]="{'background-color': formArray.at(2).value.secondaryColor}"></div>
       </div>
     </div>
+
+    <div class="info-block">
+      <mat-checkbox [formControl]="conditionControl" data-cy="ConditionCheckbox">
+        Je m'engage à mettre à disposition du projet une personne afin de garantir la mise à jour du chatbot.
+      </mat-checkbox>
+    </div>
   </div>
 
   <div class="success-tab" *ngIf="chatbotGenerated">

diff --git a/front/src/app/modules/create-bot-form/resume-step/resume-step.component.ts b/front/src/app/modules/create-bot-form/resume-step/resume-step.component.ts
@@ -22,6 +22,10 @@ export class ResumeStepComponent implements OnInit {
     return <FormControl> (<FormGroup> this.formArray.at(2)).controls.icon;
   }
 
+  get conditionControl(): FormControl {
+    return <FormControl> (<FormGroup> this.formArray.at(3)).controls.acceptConditions;
+  }
+
   ngOnInit(): void {
     this.iconControl.valueChanges.subscribe(() => {
       this._generateIconPreview();