From d61a2e597ca6fd5240b579d456f2353824a7307a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 6 Jun 2018 13:17:18 +0200
Subject: [PATCH] MOBILE-2428 core: Fix and complete input errors

---
 .../component/addon-user-profile-field-checkbox.html   |  6 ++++--
 .../component/addon-user-profile-field-datetime.html   |  1 +
 .../menu/component/addon-user-profile-field-menu.html  |  1 +
 .../text/component/addon-user-profile-field-text.html  |  1 +
 .../component/addon-user-profile-field-textarea.html   |  5 ++++-
 src/components/input-errors/core-input-errors.html     | 10 +++++++++-
 src/components/input-errors/input-errors.ts            |  4 +++-
 src/components/rich-text-editor/rich-text-editor.ts    |  7 +++++++
 src/core/login/pages/email-signup/email-signup.html    |  6 ++++--
 9 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/addon/userprofilefield/checkbox/component/addon-user-profile-field-checkbox.html b/src/addon/userprofilefield/checkbox/component/addon-user-profile-field-checkbox.html
index 41170009e..086d5534f 100644
--- a/src/addon/userprofilefield/checkbox/component/addon-user-profile-field-checkbox.html
+++ b/src/addon/userprofilefield/checkbox/component/addon-user-profile-field-checkbox.html
@@ -10,8 +10,10 @@
 </ion-item>
 <!-- Edit. -->
 <ion-item *ngIf="edit && field && field.shortname" [formGroup]="form">
-    <ion-label [core-mark-required]="field.required">{{ field.name }}</ion-label>
+    <ion-label>
+        <span [core-mark-required]="field.required">{{ field.name }}</span>
+        <core-input-errors [control]="form.controls[field.modelName]"></core-input-errors>
+    </ion-label>
     <ion-checkbox item-end [formControlName]="field.modelName">
     </ion-checkbox>
-    <core-input-errors [control]="form.controls[field.modelName]" [errorMessages]="errors"></core-input-errors>
 </ion-item>
\ No newline at end of file
diff --git a/src/addon/userprofilefield/datetime/component/addon-user-profile-field-datetime.html b/src/addon/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
index 5f7a554a0..34423ce92 100644
--- a/src/addon/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
+++ b/src/addon/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
@@ -7,4 +7,5 @@
 <ion-item *ngIf="edit && field && field.shortname" text-wrap [formGroup]="form">
     <ion-label stacked [core-mark-required]="field.required">{{ field.name }}</ion-label>
     <ion-datetime [formControlName]="field.modelName" [placeholder]="'core.choosedots' | translate" [displayFormat]="field.format" [max]="field.max" [min]="field.min"></ion-datetime>
+    <core-input-errors item-content [control]="form.controls[field.modelName]"></core-input-errors>
 </ion-item>
\ No newline at end of file
diff --git a/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html b/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html
index ce81fe385..351812d26 100644
--- a/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html
+++ b/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html
@@ -10,4 +10,5 @@
         <ion-option value="">{{ 'core.choosedots' | translate }}</ion-option>
         <ion-option *ngFor="let option of field.options" [value]="option">{{option}}</ion-option>
     </ion-select>
+    <core-input-errors item-content [control]="form.controls[field.modelName]"></core-input-errors>
 </ion-item>
diff --git a/src/addon/userprofilefield/text/component/addon-user-profile-field-text.html b/src/addon/userprofilefield/text/component/addon-user-profile-field-text.html
index 8701248f2..1ca1a727d 100644
--- a/src/addon/userprofilefield/text/component/addon-user-profile-field-text.html
+++ b/src/addon/userprofilefield/text/component/addon-user-profile-field-text.html
@@ -7,4 +7,5 @@
 <ion-item *ngIf="edit && field && field.shortname" text-wrap [formGroup]="form">
     <ion-label stacked [core-mark-required]="field.required">{{ field.name }}</ion-label>
     <ion-input [type]="field.inputType" [formControlName]="field.modelName" [placeholder]="field.name" maxlength="{{field.maxlength}}"></ion-input>
+    <core-input-errors item-content [control]="form.controls[field.modelName]"></core-input-errors>
 </ion-item>
diff --git a/src/addon/userprofilefield/textarea/component/addon-user-profile-field-textarea.html b/src/addon/userprofilefield/textarea/component/addon-user-profile-field-textarea.html
index 4921c3675..4a993015b 100644
--- a/src/addon/userprofilefield/textarea/component/addon-user-profile-field-textarea.html
+++ b/src/addon/userprofilefield/textarea/component/addon-user-profile-field-textarea.html
@@ -5,6 +5,9 @@
 </ion-item>
 <!-- Edit. -->
 <ion-item *ngIf="edit && field && field.shortname" text-wrap [formGroup]="form">
-    <ion-label stacked [core-mark-required]="field.required">{{ field.name }}</ion-label>
+    <ion-label stacked>
+        <span [core-mark-required]="field.required">{{ field.name }}</span>
+        <core-input-errors [control]="control"></core-input-errors>
+    </ion-label>
     <core-rich-text-editor item-content [control]="control" [placeholder]="field.name"></core-rich-text-editor>
 </ion-item>
\ No newline at end of file
diff --git a/src/components/input-errors/core-input-errors.html b/src/components/input-errors/core-input-errors.html
index 390ad0ce0..e960807e8 100644
--- a/src/components/input-errors/core-input-errors.html
+++ b/src/components/input-errors/core-input-errors.html
@@ -1,7 +1,15 @@
 <div class="core-input-error-container" role="alert" *ngIf="(formControl && formControl.dirty && !formControl.valid) || errorText">
     <ng-container *ngIf="formControl && formControl.dirty && !formControl.valid">
         <ng-container *ngFor="let error of errorKeys">
-            <div *ngIf="formControl.hasError(error)" class="core-input-error">{{errorMessages[error]}}</div>
+            <div *ngIf="formControl.hasError(error)" class="core-input-error">
+                <span *ngIf="errorMessages[error]">{{errorMessages[error]}}</span>
+                <span *ngIf="!errorMessages[error] && error == 'max' && formControl.errors.max">
+                    {{ 'core.login.invalidvaluemax' | translate:{$a: formControl.errors.max.max} }}
+                </span>
+                <span *ngIf="!errorMessages[error] && error == 'min' && formControl.errors.min">
+                    {{ 'core.login.invalidvaluemin' | translate:{$a: formControl.errors.min.min} }}
+                </span>
+            </div>
         </ng-container>
     </ng-container>
     <div *ngIf="errorText" class="core-input-error">{{ errorText }}</div>
diff --git a/src/components/input-errors/input-errors.ts b/src/components/input-errors/input-errors.ts
index 6a6d5ab57..2c4b5361d 100644
--- a/src/components/input-errors/input-errors.ts
+++ b/src/components/input-errors/input-errors.ts
@@ -75,7 +75,9 @@ export class CoreInputErrorsComponent implements OnInit, OnChanges {
         this.errorMessages.time = this.errorMessages.time || this.translate.instant('core.login.invalidtime');
         this.errorMessages.url = this.errorMessages.url || this.translate.instant('core.login.invalidurl');
 
-        // @todo: Check how to handle min/max errors once we have a test case to use. Also, review previous errors.
+        // Set empty values by default, the default error messages will be built in the template when needed.
+        this.errorMessages.max = this.errorMessages.max || '';
+        this.errorMessages.min = this.errorMessages.min || '';
     }
 
     /**
diff --git a/src/components/rich-text-editor/rich-text-editor.ts b/src/components/rich-text-editor/rich-text-editor.ts
index c082aba9b..7a33d6e19 100644
--- a/src/components/rich-text-editor/rich-text-editor.ts
+++ b/src/components/rich-text-editor/rich-text-editor.ts
@@ -181,6 +181,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
             } else {
                 // Don't emit event so our valueChanges doesn't get notified by this change.
                 this.control.setValue(this.editorElement.innerHTML, {emitEvent: false});
+                this.control.markAsDirty();
                 this.textarea.value = this.editorElement.innerHTML;
             }
         } else {
@@ -189,6 +190,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
             } else {
                 // Don't emit event so our valueChanges doesn't get notified by this change.
                 this.control.setValue(this.textarea.value, {emitEvent: false});
+                this.control.markAsDirty();
             }
         }
 
@@ -240,6 +242,11 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
      * Treating videos and audios in here is complex, so if a user manually adds one he won't be able to play it in the editor.
      */
     protected treatExternalContent(): void {
+        if (!this.sitesProvider.isLoggedIn()) {
+            // Only treat external content if the user is logged in.
+            return;
+        }
+
         const elements = Array.from(this.editorElement.querySelectorAll('img')),
             siteId = this.sitesProvider.getCurrentSiteId(),
             canDownloadFiles = this.sitesProvider.getCurrentSite().canDownloadFiles();
diff --git a/src/core/login/pages/email-signup/email-signup.html b/src/core/login/pages/email-signup/email-signup.html
index 51e0ec216..e2289567a 100644
--- a/src/core/login/pages/email-signup/email-signup.html
+++ b/src/core/login/pages/email-signup/email-signup.html
@@ -128,9 +128,11 @@
                     <p><a [href]="settings.sitepolicy" core-link capture="false">{{ 'core.login.policyagreementclick' | translate }}</a></p>
                 </ion-item>
                 <ion-item text-wrap>
-                    <ion-label core-mark-required="true">{{ 'core.login.policyaccept' | translate }}</ion-label>
+                    <ion-label>
+                        <span [core-mark-required]="true">{{ 'core.login.policyaccept' | translate }}</span>
+                        <core-input-errors [control]="signupForm.controls.policyagreed" [errorMessages]="policyErrors"></core-input-errors>
+                    </ion-label>
                     <ion-checkbox item-end name="policyagreed" formControlName="policyagreed"></ion-checkbox>
-                    <core-input-errors [control]="signupForm.controls.policyagreed" [errorMessages]="policyErrors"></core-input-errors>
                 </ion-item>
             </ng-container>