From e6ea2667eb031a0143580ea5725f46ef2ea232cf Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 27 Dec 2018 17:48:35 +0100
Subject: [PATCH] Fix fontawesome icons

---
 config/environment.default.js                               | 6 ++----
 src/app/shared/chips/chips.component.html                   | 6 +++---
 src/app/shared/chips/models/chips-item.model.ts             | 5 +++--
 .../models/tag/dynamic-tag.component.html                   | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/config/environment.default.js b/config/environment.default.js
index 6a32874e4d..79b8202793 100644
--- a/config/environment.default.js
+++ b/config/environment.default.js
@@ -56,15 +56,13 @@ module.exports = {
          * {
          *    // NOTE: metadata name
          *    name: 'dc.author',
-         *    // NOTE: fontawesome (v4.x) icon classes and bootstrap utility classes can be used
+         *    // NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
          *    style: 'fa-user'
          * }
          */
         {
-          // NOTE: metadata name
           name: 'dc.author',
-          // NOTE: fontawesome (v4.x) icon classes and bootstrap utility classes can be used
-          style: 'fa-user'
+          style: 'fas fa-user'
         },
         // default configuration
         {
diff --git a/src/app/shared/chips/chips.component.html b/src/app/shared/chips/chips.component.html
index 1923b23123..db8f08dad0 100644
--- a/src/app/shared/chips/chips.component.html
+++ b/src/app/shared/chips/chips.component.html
@@ -20,13 +20,13 @@
            [ngClass]="{'chip-selected disabled': (editable && c.editMode) || dragged == i}"
            (click)="chipsSelected($event, i);">
           <span>
-            <i *ngIf="showIcons && !c.isNestedItem()" dsAuthorityConfidenceState [authorityValue]="c.item" class="fa fa-circle-o" aria-hidden="true"></i>
-            <ng-container *ngIf="showIcons && c.hasIcons()">
+            <i *ngIf="showIcons && !c.isNestedItem()" dsAuthorityConfidenceState [authorityValue]="c.item" class="far fa-circle" aria-hidden="true"></i>
+            <ng-container *ngIf="showIcons && c.hasVisibleIcons()">
               <i *ngFor="let icon of c.icons; let l = last"
                  [ngbTooltip]="tipContent"
                  triggers="manual"
                  #t="ngbTooltip"
-                 class="fas {{icon.style}}"
+                 class="{{icon.style}}"
                  [class.mr-1]="!l"
                  [class.mr-2]="l"
                  dsAuthorityConfidenceState
diff --git a/src/app/shared/chips/models/chips-item.model.ts b/src/app/shared/chips/models/chips-item.model.ts
index 38841eea8a..540f94166f 100644
--- a/src/app/shared/chips/models/chips-item.model.ts
+++ b/src/app/shared/chips/models/chips-item.model.ts
@@ -63,8 +63,9 @@ export class ChipsItem {
           && (((typeof this._item[icon.metadata] === 'string') && hasValue(this._item[icon.metadata]))
             || (this._item[icon.metadata] as FormFieldMetadataValueObject).hasValue())
           && !(this._item[icon.metadata] as FormFieldMetadataValueObject).hasPlaceholder()) {
-          if (icon.visibleWhenAuthorityEmpty
-            || (this._item[icon.metadata] as FormFieldMetadataValueObject).confidence !== ConfidenceType.CF_UNSET) {
+          if ((icon.visibleWhenAuthorityEmpty
+            || (this._item[icon.metadata] as FormFieldMetadataValueObject).confidence !== ConfidenceType.CF_UNSET)
+            && isNotEmpty(icon.style)) {
             hasVisible = true;
             break;
           }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
index 8926957865..dee8771940 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
@@ -45,6 +45,6 @@
          (keydown)="preventEventsPropagation($event)"
          (keyup)="onKeyUp($event)"
          #instance="ngbTypeahead"/>
-    <i *ngIf="searching" class="far fa-circle fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
+    <i *ngIf="searching" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
   </ds-chips>