From 63bb1967e12077cbcea4c8e6ee8e9755057692c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jovan=20Kruni=C4=87?= <jovan.krunic@gmail.com>
Date: Fri, 13 Jan 2023 11:31:43 +0000
Subject: [PATCH] refactor: make feedback protocol data optional

Closes #356
---
 .../feedback/feedback-page.component.ts       | 16 ++++++++-
 src/app/modules/feedback/feedback-page.html   | 35 +++++++++++++------
 src/assets/i18n/de.json                       |  3 +-
 src/assets/i18n/en.json                       |  3 +-
 4 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/app/modules/feedback/feedback-page.component.ts b/src/app/modules/feedback/feedback-page.component.ts
index a28783df..864b9b70 100644
--- a/src/app/modules/feedback/feedback-page.component.ts
+++ b/src/app/modules/feedback/feedback-page.component.ts
@@ -74,6 +74,11 @@ export class FeedbackPageComponent {
    */
   termsAgree = false;
 
+  /**
+   * Providing of protocol data accepted or not
+   */
+  protocolDataAgree = false;
+
   /**
    * Show meta data or not
    */
@@ -103,8 +108,17 @@ export class FeedbackPageComponent {
 
     const feedbackRequest: SCFeedbackRequest = {
       ...this.message,
-      metaData: this.metaData,
+      metaData: {
+        platform: '',
+        scope: {},
+        state: {},
+        userAgent: '',
+        version: '',
+      },
     };
+    if (this.protocolDataAgree) {
+      feedbackRequest.metaData = this.metaData;
+    }
 
     try {
       await this.dataProvider.sendFeedback(feedbackRequest);
diff --git a/src/app/modules/feedback/feedback-page.html b/src/app/modules/feedback/feedback-page.html
index 3d2ac46a..00b700a7 100644
--- a/src/app/modules/feedback/feedback-page.html
+++ b/src/app/modules/feedback/feedback-page.html
@@ -67,9 +67,13 @@
       ></ion-textarea>
     </ion-item>
     <ion-item>
-      <ion-label class="ion-text-wrap">{{
-        'feedback.form.termsAgree' | translate
-      }}</ion-label>
+      <ion-label class="ion-text-wrap"
+        >{{ 'feedback.form.termsAgree.0' | translate }}
+        <a [routerLink]="['/about/privacy']">{{
+          'feedback.form.termsAgree.1' | translate
+        }}</a
+        >.</ion-label
+      >
       <ion-checkbox
         color="primary"
         slot="start"
@@ -77,13 +81,17 @@
         name="termsAgree"
       ></ion-checkbox>
     </ion-item>
-    <ion-button
-      type="submit"
-      color="primary"
-      expand="block"
-      [disabled]="!feedbackForm.valid || !termsAgree || submitSuccess"
-      >{{ 'feedback.form.submit' | translate }}</ion-button
-    >
+    <ion-item>
+      <ion-label class="ion-text-wrap">{{
+        'feedback.form.protocolDataAgree' | translate
+      }}</ion-label>
+      <ion-checkbox
+        color="primary"
+        slot="start"
+        [(ngModel)]="protocolDataAgree"
+        name="protocolDataAgree"
+      ></ion-checkbox>
+    </ion-item>
     <ion-card>
       <ion-card-title>
         <ion-button expand="block" fill="clear" (click)="toggleShowMetaData()">
@@ -99,5 +107,12 @@
         <pre>{{ metaData | json }}</pre>
       </ion-card-content>
     </ion-card>
+    <ion-button
+      type="submit"
+      color="primary"
+      expand="block"
+      [disabled]="!feedbackForm.valid || !termsAgree || submitSuccess"
+      >{{ 'feedback.form.submit' | translate }}</ion-button
+    >
   </form>
 </ion-content>
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 8e2b79e7..49b0c5ab 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -207,7 +207,8 @@
         "label": "Nachricht",
         "placeholder": "Deine Nachricht an uns... (minimal {{number}} Zeichen lang)"
       },
-      "termsAgree": "Ich bin damit einverstanden, dass Protokolldaten zur Nachverfolgbarkeit von Fehlern mitversandt werden. Es erfolgt keine Weitergabe dieser Daten an Dritte.",
+      "termsAgree": ["Hiermit bestätige ich, dass ich die Datenschutzerklärung gelesen habe und ihnen zustimme.", "Hier geht es zu unserer Datenschutzerklärung"],
+      "protocolDataAgree": "Ich bin damit einverstanden, dass die folgenden Protokolldaten zur Nachverfolgbarkeit von Fehlern mitversandt werden. Es erfolgt keine Weitergabe dieser Daten an Dritte.",
       "submit": "Absenden",
       "protocolData": {
         "show": "Protokolldaten einblenden",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 5a4d625d..a9a04a48 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -207,7 +207,8 @@
         "label": "Message",
         "placeholder": "Your message for us... (minimum {{number}} characters)"
       },
-      "termsAgree": "I agree to provide the protocol data for easier traceability of errors. The data will not be forwarded to any third parties.",
+      "termsAgree": ["I hereby confirm that I have read and agree to the terms of privacy policy.", "Here you can find our privacy policy"],
+      "protocolDataAgree": "I agree to provide the following protocol data for easier traceability of errors. The data will not be forwarded to any third parties.",
       "submit": "Submit",
       "protocolData": {
         "show": "Show protocol data",