SHIBUI Fixed issues to accomodate multiple types of providers

TIER · Nov 5, 2018 · 47d65b3 · 47d65b3
1 parent 8f3e0e8
commit 47d65b3
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 14 deletions.
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
-import { withLatestFrom, map, distinctUntilChanged, skipWhile } from 'rxjs/operators';
+import { withLatestFrom, map, distinctUntilChanged, skipWhile, filter } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 
 import * as fromProvider from '../reducer';
@@ -42,7 +42,9 @@ export class ProviderWizardStepComponent implements OnDestroy {
     constructor(
         private store: Store<fromProvider.ProviderState>,
     ) {
-        this.schema$ = this.store.select(fromWizard.getParsedSchema);
+        this.schema$ = this.store.select(fromWizard.getSchema).pipe(
+            filter(s => s && Object.keys(s.properties).length > 0)
+        );
         this.definition$ = this.store.select(fromWizard.getWizardDefinition);
         this.changes$ = this.store.select(fromProvider.getEntityChanges);
 

diff --git a/ui/src/app/metadata/provider/model/base.provider.form.ts b/ui/src/app/metadata/provider/model/base.provider.form.ts
@@ -1,6 +1,5 @@
 import { Wizard } from '../../../wizard/model';
 import { BaseMetadataProvider } from '../../domain/model/providers';
-import { UriValidator } from '../../../shared/validation/uri.validator';
 
 export const BaseMetadataProviderEditor: Wizard<BaseMetadataProvider> = {
     label: 'BaseMetadataProvider',
@@ -30,14 +29,6 @@ export const BaseMetadataProviderEditor: Wizard<BaseMetadataProvider> = {
                     params: [value]
                 } : null;
                 return err;
-            },
-            '/metadataURL': (value, property, form) => {
-                return !UriValidator.isUri(value) ? {
-                    code: 'INVALID_URI',
-                    path: `#${property.path}`,
-                    message: 'message.uri-valid-format',
-                    params: [value]
-                } : null;
             }
         };
         return validators;

diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.spec.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.spec.ts
@@ -113,8 +113,8 @@ describe('FileBackedHttpMetadataProviderWizard', () => {
             expect(Object.keys(getValidators([]))).toEqual([
                 '/',
                 '/name',
-                '/metadataURL',
-                '/xmlId'
+                '/xmlId',
+                '/metadataURL'
             ]);
         });
     });

diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
@@ -1,6 +1,7 @@
 import { Wizard } from '../../../wizard/model';
 import { FileBackedHttpMetadataProvider } from '../../domain/model/providers/file-backed-http-metadata-provider';
 import { BaseMetadataProviderEditor } from './base.provider.form';
+import UriValidator from '../../../shared/validation/uri.validator';
 
 export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadataProvider> = {
     ...BaseMetadataProviderEditor,
@@ -17,6 +18,15 @@ export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadata
             } : null;
             return err;
         };
+        validators['/metadataURL'] = (value, property, form) => {
+            return !UriValidator.isUri(value) ? {
+                code : 'INVALID_URI',
+                path: `#${property.path}`,
+                message: 'message.uri-valid-format',
+                params: [value]
+            } : null;
+        };
+
         return validators;
     },
     steps: [

diff --git a/ui/src/app/metadata/provider/model/provider.form.ts b/ui/src/app/metadata/provider/model/provider.form.ts
@@ -17,6 +17,16 @@ export const MetadataProviderWizard: Wizard<MetadataProvider> = {
             fields: [
                 'name',
                 '@type'
+            ],
+            fieldsets: [
+                {
+                    type: 'section',
+                    class: ['col-12'],
+                    fields: [
+                        'name',
+                        '@type'
+                    ]
+                }
             ]
         }
     ] as WizardStep[]

diff --git a/ui/src/app/wizard/reducer/index.ts b/ui/src/app/wizard/reducer/index.ts
@@ -61,12 +61,15 @@ export const getSplitSchema = (schema: any, step: WizardStep) => {
     const required = (schema.required || []).filter(val => keys.indexOf(val) > -1);
     let s: any = {
         type: schema.type,
-        definitions: schema.definitions,
         properties: {
             ...keys.reduce( (properties, key) => ({ ...properties, [key]: schema.properties[key] }) , {})
         }
     };
 
+    if (schema.definitions) {
+        s.definitions = schema.definitions;
+    }
+
     if (required && required.length) {
         s.required = required;
     }