From f4a6dbda94aea0518926bcd3c0dd1c5f59c7da69 Mon Sep 17 00:00:00 2001
From: Michael Bromley <michael@michaelbromley.co.uk>
Date: Fri, 10 Dec 2021 20:46:30 +0100
Subject: [PATCH] fix(admin-ui): Fix display of facet value custom fields

Fixes #1282
---
 .../facet-detail/facet-detail.component.html        | 13 +------------
 .../tabbed-custom-fields.component.ts               |  4 +++-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/packages/admin-ui/src/lib/catalog/src/components/facet-detail/facet-detail.component.html b/packages/admin-ui/src/lib/catalog/src/components/facet-detail/facet-detail.component.html
index b38ea65c4b..6a1c8a951c 100644
--- a/packages/admin-ui/src/lib/catalog/src/components/facet-detail/facet-detail.component.html
+++ b/packages/admin-ui/src/lib/catalog/src/components/facet-detail/facet-detail.component.html
@@ -119,20 +119,9 @@
                     </td>
                     <td class="align-middle"><input type="text" formControlName="code" readonly /></td>
                     <td class="" *ngIf="customValueFields.length">
-                        <!--                    <ng-container *ngFor="let customField of customValueFields">-->
-                        <!--                       -->
-                        <!--                            <vdr-custom-field-control-->
-                        <!--                                *ngIf="customValueFieldIsSet(i, customField.name)"-->
-                        <!--                                entityName="FacetValue"-->
-                        <!--                                [showLabel]="false"-->
-                        <!--                                [customFieldsFormGroup]="detailForm.get(['values', i, 'customFields'])"-->
-                        <!--                                [customField]="customField"-->
-                        <!--                            ></vdr-custom-field-control>-->
-                        <!--                      -->
-                        <!--                    </ng-container>-->
                         <vdr-tabbed-custom-fields
                             entityName="FacetValue"
-                            [customFields]="customFields"
+                            [customFields]="customValueFields"
                             [compact]="true"
                             [customFieldsFormGroup]="detailForm.get(['values', i, 'customFields'])"
                             [readonly]="!(updatePermission | hasPermission)"
diff --git a/packages/admin-ui/src/lib/core/src/shared/components/tabbed-custom-fields/tabbed-custom-fields.component.ts b/packages/admin-ui/src/lib/core/src/shared/components/tabbed-custom-fields/tabbed-custom-fields.component.ts
index e4df5f5f65..fb7ce65b19 100644
--- a/packages/admin-ui/src/lib/core/src/shared/components/tabbed-custom-fields/tabbed-custom-fields.component.ts
+++ b/packages/admin-ui/src/lib/core/src/shared/components/tabbed-custom-fields/tabbed-custom-fields.component.ts
@@ -40,6 +40,8 @@ export class TabbedCustomFieldsComponent implements OnInit {
                 tabMap.set(tabName, [field]);
             }
         }
-        return Array.from(tabMap.entries()).map(([tabName, customFields]) => ({ tabName, customFields }));
+        return Array.from(tabMap.entries())
+            .sort((a, b) => (a[0] < b[0] ? -1 : 1))
+            .map(([tabName, customFields]) => ({ tabName, customFields }));
     }
 }