From b7da0a1df2bbfb1cb3457a90ae93b6c89ad7f3b4 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 14 Nov 2018 13:27:21 -0700
Subject: [PATCH] Fixed issue with sorting

---
 .../domain/service/provider.service.ts        |  3 +-
 .../model/local-dynamic.provider.form.ts      | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/ui/src/app/metadata/domain/service/provider.service.ts b/ui/src/app/metadata/domain/service/provider.service.ts
index dca9bb1c3..f17557902 100644
--- a/ui/src/app/metadata/domain/service/provider.service.ts
+++ b/ui/src/app/metadata/domain/service/provider.service.ts
@@ -18,7 +18,8 @@ export class MetadataProviderService {
     ) {}
     query(): Observable<MetadataProvider[]> {
         return this.http.get<MetadataProvider[]>(`${this.base}${this.endpoint}`).pipe(
-            map(providers => providers.filter(p => p['@type'] !== 'BaseMetadataResolver'))
+            map(providers => providers.filter(p => p['@type'] !== 'BaseMetadataResolver')),
+            map(providers => providers.map(p => ({ ...p, id: p.resourceId })))
         );
     }
 
diff --git a/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts b/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts
index e04bc917c..4485409bc 100644
--- a/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts
@@ -93,9 +93,38 @@ export const LocalDynamicMetadataProviderEditor: Wizard<LocalDynamicMetadataProv
             initialValues: [],
             schema: '/api/ui/MetadataResolver/LocalDynamicMetadataResolver',
             fields: [
+                'name',
+                '@type',
                 'enabled',
                 'xmlId',
                 'sourceDirectory',
+            ],
+            override: {
+                '@type': {
+                    type: 'string',
+                    readOnly: true,
+                    widget: 'string',
+                    oneOf: [{ enum: ['LocalDynamicMetadataResolver'], description: 'value.local-dynamic-metadata-provider' }]
+                }
+            },
+            fieldsets: [
+                {
+                    type: 'section',
+                    class: ['mb-3'],
+                    fields: [
+                        'name',
+                        '@type',
+                        'enabled'
+                    ]
+                },
+                {
+                    type: 'group-lg',
+                    class: ['col-12'],
+                    fields: [
+                        'xmlId',
+                        'sourceDirectory',
+                    ]
+                }
             ]
         },
         {