Merged in bugfix/nojira-ldprovider (pull request #237)

NOJIRA: Fixed issue Local dynamic provider, sorting providers
TIER · Nov 14, 2018 · 5dab7dd · 5dab7dd
2 parents 52eb652 + b7da0a1
commit 5dab7dd
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git 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
@@ -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',
+                    ]
+                }
             ]
         },
         {