Merge branch 'release/6.2.3' into NAE-1740

Author: machacjozef

projects/netgrif-components-core/src/lib/data-fields/i18n-field/models/i18n-field.ts

@@ -36,8 +36,8 @@ export class I18nField extends DataField<I18nFieldValue> {
     }
 
     private static translationsEquality(a: I18nFieldValue, b: I18nFieldValue): boolean {
-        const aKeys = Object.keys(a.translations).sort();
-        const bKeys = Object.keys(b.translations).sort();
+        const aKeys = !!a.translations ? Object.keys(a.translations).sort() : [];
+        const bKeys = !!b.translations ? Object.keys(b.translations).sort() : [];
         if (aKeys.length !== bKeys.length
             || !aKeys.every((element, index) => {
                 return element === bKeys[index];
@@ -166,14 +166,14 @@ export class I18nField extends DataField<I18nFieldValue> {
     private validTranslationRequired(countries: Array<string>): ValidatorFn {
         return (fc: FormControl): { [key: string]: any } | null => {
             return countries.every(languageCode => languageCode in fc.value.translations)
-                ? (null) : ({translationRequired: true});
+                ? null : ({translationRequired: true});
         };
     }
 
     private validTranslationOnly(countries: Array<string>): ValidatorFn {
         return (fc: FormControl): { [key: string]: any } | null => {
             return Object.keys(fc.value.translations).every(translation => countries.includes(translation))
-                ? (null) : ({translationOnly: true});
+                ? null : ({translationOnly: true});
         };
     }
 

projects/netgrif-components/src/lib/data-fields/boolean-field/boolean-field.component.html

@@ -12,6 +12,7 @@
         <mat-slide-toggle color="primary" [formControl]="formControl">
             {{createValueLabel()}}
         </mat-slide-toggle>
+        <mat-hint>{{dataField.description}}</mat-hint>
         <mat-error *ngIf="dataField.isInvalid(formControl)">{{getErrorMessage()}}</mat-error>
     </div>
 </ng-template>

projects/netgrif-components/src/lib/data-fields/boolean-field/boolean-field.component.scss

@@ -0,0 +1,3 @@
+mat-hint {
+    display: block;
+}