UI: Fixed build after merge

ui-ngx/src/app/modules/home/pages/notification-center/rule-table/alarm-severities-list.component.html

@@ -18,14 +18,13 @@
 <section [formGroup]="alarmSeveritiesForm">
   <mat-form-field fxFlex class="mat-block" [floatLabel]="flotLabel">
     <mat-label translate>alarm.alarm-severity-list</mat-label>
-    <mat-chip-list #severitiesChipList formControlName="alarmSeverities" [required]="required">
+    <mat-chip-grid #severitiesChipList formControlName="alarmSeverities" [required]="required">
-      <mat-chip *ngFor="let severity of alarmSeveritiesForm.get('alarmSeverities').value"
+      <mat-chip-row *ngFor="let severity of alarmSeveritiesForm.get('alarmSeverities').value"
-                [selectable]="!disabled"
                 [removable]="!disabled"
                 (removed)="onSeverityRemoved(severity)">
         {{ alarmSeverityTranslationMap.get(severity) | translate }}
         <mat-icon matChipRemove *ngIf="!disabled">close</mat-icon>
-      </mat-chip>
+      </mat-chip-row>
       <input matInput
              type="text"
              formControlName="alarmSeverity"
@@ -39,7 +38,7 @@
              [matChipInputFor]="severitiesChipList"
              [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
              (matChipInputTokenEnd)="addSeverityFromChipInput($event)">
-    </mat-chip-list>
+    </mat-chip-grid>
     <mat-autocomplete #severityAutocomplete="matAutocomplete"
                       class="tb-autocomplete"
                       (optionSelected)="addSeverityFromAutocomplete($event)"

ui-ngx/src/app/modules/home/pages/notification-center/template-table/template-autocomplete.component.html

@@ -25,7 +25,7 @@
          [matAutocomplete]="templateAutocomplete">
   <button *ngIf="selectTemplateFormGroup.get('templateName').value && !disabled"
           type="button"
-          matSuffix mat-button mat-icon-button aria-label="Clear"
+          matSuffix mat-icon-button aria-label="Clear"
           (click)="clear()">
     <mat-icon class="material-icons">close</mat-icon>
   </button>
@@ -41,11 +41,11 @@
                     >
     <mat-option *ngFor="let template of filteredTemplate | async" [value]="template" class="template-option">
       <span class="template-option-name" [innerHTML]="template.name | highlight:searchText"></span>
-      <mat-chip-list>
+      <mat-chip-grid>
-        <mat-chip disabled *ngFor="let method of template.configuration.deliveryMethodsTemplates | keyvalue">
+        <mat-chip-row disabled *ngFor="let method of template.configuration.deliveryMethodsTemplates | keyvalue">
           {{ notificationDeliveryMethodTranslateMap.get(method.key) | translate }}
-        </mat-chip>
+        </mat-chip-row>
-      </mat-chip-list>
+      </mat-chip-grid>
     </mat-option>
     <mat-option *ngIf="!(filteredTemplate | async)?.length" [value]="null" class="tb-not-found">
       <div class="tb-not-found-content" (click)="$event.stopPropagation()">

ui-ngx/src/app/shared/components/string-items-list.component.html

@@ -18,21 +18,20 @@
 <section [formGroup]="stringItemsForm">
   <mat-form-field fxFlex class="mat-block" [floatLabel]="floatLabel" [appearance]="appearance">
     <mat-label *ngIf="label">{{ label }}</mat-label>
-    <mat-chip-list #itemsChipList formControlName="items" [required]="required">
+    <mat-chip-grid #itemsChipList formControlName="items" [required]="required">
-      <mat-chip *ngFor="let item of stringItemsList"
+      <mat-chip-row *ngFor="let item of stringItemsList"
-                [selectable]="!disabled"
                 [removable]="!disabled"
                 [contentEditable]="editable && !disabled"
                 (removed)="removeItems(item)">
         {{item}}
         <mat-icon matChipRemove *ngIf="!disabled">close</mat-icon>
-      </mat-chip>
+      </mat-chip-row>
       <input placeholder="{{ placeholder }}"
              [matChipInputFor]="itemsChipList"
              [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
              matChipInputAddOnBlur
              (matChipInputTokenEnd)="addItem($event)">
-    </mat-chip-list>
+    </mat-chip-grid>
     <mat-hint>{{ hint }}</mat-hint>
     <mat-error *ngIf="stringItemsForm.get('items').hasError('required')">{{ requiredText }}</mat-error>
   </mat-form-field>

ui-ngx/src/app/shared/components/string-items-list.component.ts

@@ -73,7 +73,7 @@ export class StringItemsListComponent implements ControlValueAccessor{
   floatLabel: FloatLabelType = 'auto';
 
   @Input()
-  appearance: MatFormFieldAppearance = 'standard';
+  appearance: MatFormFieldAppearance = 'fill';
 
   @Input()
   @coerceBoolean()

ui-ngx/src/styles.scss

@@ -1446,6 +1446,14 @@ mat-label {
     white-space: pre-line;
   }
 
+  // TinyMCE
+
+  .tox-tinymce {
+    button:not(.mat-mdc-menu-item):not(.mat-sort-header-button) {
+      text-transform: none;
+    }
+  }
+
   .tb-toast-panel {
     pointer-events: none !important;
   }