SHIBUI-914 Fixing validation

ui/package.json

@@ -34,7 +34,7 @@
     "deep-object-diff": "^1.1.0",
     "file-saver": "^1.3.3",
     "font-awesome": "^4.7.0",
-    "ngx-schema-form": "^2.0.0-beta.3",
+    "ngx-schema-form": "^2.2.0-beta.1",
     "rxjs": "^6.1.0",
     "rxjs-compat": "^6.1.0",
     "xml-formatter": "^1.0.1",

ui/src/app/metadata/domain/model/wizards/metadata-source-wizard.ts

@@ -140,6 +140,7 @@ export class MetadataSourceWizard implements Wizard<MetadataResolver> {
     }
 
     getValidators(...args: any[]): { [key: string]: any } {
-        return {};
+        const validators = {};
+        return validators;
     }
 }

ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts

@@ -71,7 +71,15 @@ export class DashboardResolversListComponent implements OnInit {
     }
 
     edit(entity: MetadataEntity): void {
-        this.router.navigate(['metadata', 'resolver', entity.getId(), entity.isDraft() ? 'wizard' : 'edit']);
+        if (entity.isDraft()) {
+            this.router.navigate(['metadata', 'resolver', 'new', 'blank'], {
+                queryParams: {
+                    entityId: entity.getId()
+                }
+            });
+        } else {
+            this.router.navigate(['metadata', 'resolver', entity.getId(), 'edit']);
+        }
     }
 
     toggleEntity(entity: MetadataEntity): void {

ui/src/app/metadata/resolver/container/new-resolver.component.ts

@@ -1,7 +1,10 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
-import { map, withLatestFrom } from 'rxjs/operators';
+import { Observable, Subscription } from 'rxjs';
+import { map, withLatestFrom, distinctUntilChanged } from 'rxjs/operators';
+import { SelectDraft } from '../action/draft.action';
+import { Store } from '@ngrx/store';
+import * as fromCollection from '../reducer';
 
 @Component({
     selector: 'new-resolver-page',
@@ -10,14 +13,22 @@ import { map, withLatestFrom } from 'rxjs/operators';
 })
 export class NewResolverComponent {
 
+    actionsSubscription: Subscription;
+
     canSetNewType$: Observable<boolean>;
 
     constructor(
-        private route: ActivatedRoute
+        private route: ActivatedRoute,
+        private store: Store<fromCollection.State>
     ) {
         this.canSetNewType$ = this.route.queryParams.pipe(
             withLatestFrom(this.route.url),
             map(([params, url]) => this.route.snapshot.firstChild.routeConfig.path !== 'blank' || params.index === 'common')
         );
+
+        this.actionsSubscription = this.route.queryParams.pipe(
+            distinctUntilChanged(),
+            map(params => new SelectDraft(params.entityId))
+        ).subscribe(store);
     }
 }

ui/src/app/metadata/resolver/container/resolver-wizard-step.component.ts

@@ -6,11 +6,9 @@ import { Store } from '@ngrx/store';
 import * as fromResolver from '../reducer';
 import * as fromWizard from '../../../wizard/reducer';
 
-import { SetDefinition } from '../../../wizard/action/wizard.action';
 import { UpdateStatus, UpdateChanges } from '../action/entity.action';
 import { Wizard } from '../../../wizard/model';
 import { MetadataResolver } from '../../domain/model';
-import { pick } from '../../../shared/util';
 
 @Component({
     selector: 'resolver-wizard-step',
@@ -70,10 +68,11 @@ export class ResolverWizardStepComponent implements OnDestroy {
         this.valueChangeEmitted$.pipe(
             withLatestFrom(this.definition$),
             skipWhile(([ changes, definition ]) => !definition || !changes),
-            map(([ changes, definition ]) => definition.parser(changes.value))
+            map(([ changes, definition ]) => definition.parser(changes.value)),
+            withLatestFrom(this.store.select(fromResolver.getSelectedDraft)),
+            map(([changes, original]) => ({ ...changes }))
         )
         .subscribe(changes => {
-            // console.log(changes);
             this.store.dispatch(new UpdateChanges(changes));
         });
 

ui/src/app/metadata/resolver/container/resolver-wizard.component.html

@@ -2,4 +2,6 @@
 <hr />
 <div class="py-4">
     <router-outlet></router-outlet>
-</div>
+</div>
+<pre>{{ changes$ | async | json }}</pre>
+<pre>{{ schema$ | async | json }}</pre>

ui/src/app/metadata/resolver/container/resolver-wizard.component.ts

@@ -10,7 +10,7 @@ import {
     RouterStateSnapshot
 } from '@angular/router';
 import { Observable, Subject, of } from 'rxjs';
-import { skipWhile } from 'rxjs/operators';
+import { skipWhile, startWith } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -55,6 +55,9 @@ export class ResolverWizardComponent implements OnDestroy, CanComponentDeactivat
     saved$: Observable<boolean>;
     saving: boolean;
 
+    valid$: Observable<boolean>;
+    schema$: Observable<any>;
+
     constructor(
         private store: Store<fromCollections.State>,
         private route: ActivatedRoute,
@@ -73,13 +76,22 @@ export class ResolverWizardComponent implements OnDestroy, CanComponentDeactivat
                 }
             });
 
+        this.valid$ = this.store.select(fromResolver.getEntityIsValid);
+
+        this.valid$
+            .pipe(startWith(false))
+            .subscribe((valid) => {
+                this.store.dispatch(new SetDisabled(!valid));
+            });
+
         this.store.dispatch(new SetDefinition(this.sourceWizard));
 
         this.store.select(fromWizard.getNext).subscribe(n => this.nextStep = n);
         this.store.select(fromWizard.getPrevious).subscribe(p => this.previousStep = p);
         this.store.select(fromWizard.getWizardIndex).subscribe(i => this.currentPage = i);
 
         this.changes$ = this.store.select(fromResolver.getEntityChanges);
+        this.schema$ = this.store.select(fromWizard.getSchema);
 
         this.route.queryParams.subscribe(params => {
             if (params.index) {

ui/src/app/metadata/resolver/effect/wizard.effect.ts

@@ -46,7 +46,8 @@ export class WizardEffects {
             const params = { ...this.activatedRoute.snapshot.queryParams, index };
             this.router.navigate([], {
                 relativeTo: this.activatedRoute,
-                queryParams: params
+                queryParams: params,
+                queryParamsHandling: 'preserve'
             });
         })
     );
@@ -61,7 +62,8 @@ export class WizardEffects {
             const params = { ...this.activatedRoute.snapshot.queryParams, entityId };
             this.router.navigate([], {
                 relativeTo: this.activatedRoute,
-                queryParams: params
+                queryParams: params,
+                queryParamsHandling: 'preserve'
             });
         })
     );

ui/src/app/schema-form/widget/button/icon-button.component.ts

@@ -2,7 +2,7 @@ import {
     Component, AfterViewInit, ChangeDetectorRef
 } from '@angular/core';
 import { ButtonWidget } from 'ngx-schema-form';
-import { ɵb as ActionRegistry } from 'ngx-schema-form';
+import { ActionRegistry } from 'ngx-schema-form';
 import { interval } from 'rxjs';
 
 @Component({

ui/src/app/wizard/reducer/index.ts

@@ -60,7 +60,8 @@ export const getSplitSchema = (schema: any, step: WizardStep) => {
     const keys = Object.keys(schema.properties).filter(key => step.fields.indexOf(key) > -1);
     const required = (schema.required || []).filter(val => keys.indexOf(val) > -1);
     let s: any = {
-        ...schema,
+        type: schema.type,
+        definitions: schema.definitions,
         properties: {
             ...keys.reduce( (properties, key) => ({ ...properties, [key]: schema.properties[key] }) , {})
         }

ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json

@@ -50,6 +50,7 @@
             ]
         },
         {
+            "type": "group-lg",
             "fields": [
                 "xmlId",
                 "metadataURL",