SHIBUI-1437 Implemented updated view for summary

ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.html

@@ -35,7 +35,6 @@
     </div>
     <metadata-configuration
         [numbered]="false"
-        [editable]="false"
         [configuration]="configuration"
         [entity]="filter"
         [definition]="definition"

ui/src/app/metadata/configuration/component/metadata-configuration.component.html

@@ -10,8 +10,7 @@ <h2 class="title h4 m-0 flex-grow-1">
                         </span>
                         <span class="text ml-2">{{ section.label | translate }}</span>
                     </h2>
-                    <div class="actions px-2"
-                        *ngIf="editable && configuration.dates.length === 1">
+                    <div class="actions px-2" *ngIf="editable">
                         <button class="btn btn-link edit-link change-view" (click)="edit(section.id)">
                             <i class="fa fa-edit"></i>&nbsp;
                             <span translate="action.edit">Edit</span>

ui/src/app/metadata/configuration/component/metadata-configuration.component.ts

@@ -1,5 +1,4 @@
-import { Component, ChangeDetectionStrategy, Input, Output, EventEmitter, OnChanges } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Component, Input, Output, EventEmitter, OnChanges } from '@angular/core';
 import { MetadataConfiguration } from '../model/metadata-configuration';
 import { Metadata } from '../../domain/domain.type';
 import { CONFIG_DATE_FORMAT } from '../configuration.values';
@@ -14,25 +13,26 @@ export class MetadataConfigurationComponent implements OnChanges {
     @Input() definition: any;
     @Input() entity: Metadata;
     @Input() numbered = true;
-    @Input() editable = true;
 
     @Output() preview: EventEmitter<any> = new EventEmitter();
+    @Output() onEdit: EventEmitter<string> = new EventEmitter();
 
     zero = false;
 
     DATE_FORMAT = CONFIG_DATE_FORMAT;
 
-    constructor(
-        private router: Router,
-        private activatedRoute: ActivatedRoute
-    ) {}
-
     ngOnChanges(): void {
-        this.zero = !this.configuration.sections.some(s => !!s.properties.length);
+        if (this.configuration) {
+            this.zero = !this.configuration.sections.some(s => !!s.properties.length);
+        }
+    }
+
+    get editable(): boolean {
+        return !!this.onEdit.observers.length;
     }
 
     edit(id: string): void {
-        this.router.navigate(['../', 'edit', id], { relativeTo: this.activatedRoute.parent });
+        this.onEdit.emit(id);
     }
 
     onPreview($event): void {

ui/src/app/metadata/configuration/container/metadata-comparison.component.html

@@ -23,9 +23,7 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
         </button>
     </div>
     <metadata-configuration
-        [configuration]="versions$ | async"
-        [editable]="false"></metadata-configuration>
-
+        [configuration]="versions$ | async"></metadata-configuration>
     <div class="numbered-header d-flex justify-content-start bg-light align-items-center py-1">
         <h2 class="title h4 m-0 flex-grow-1">
             <span class="text ml-2" translate="label.metadata-filter">Metadata Filter</span>
@@ -41,8 +39,7 @@ <h2 class="title h4 m-0 flex-grow-1">
     <ng-container *ngIf="(filterCompare$ | async)">
         <br />
         <metadata-configuration
-            [configuration]="filterCompare$ | async"
-            [editable]="false"></metadata-configuration>
+            [configuration]="filterCompare$ | async"></metadata-configuration>
         <div class="d-flex justify-content-end my-2">
             <button class="btn btn-success" (click)="resetCompareFilters()">
                 <i class="fa fa-arrow-left" aria-hidden="true"></i>&nbsp;

ui/src/app/metadata/configuration/container/metadata-options.component.html

@@ -32,7 +32,11 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
         </div>
     </div>
     <ng-container *ngIf="configuration$ | async">
-        <metadata-configuration [configuration]="configuration$ | async" id="configuration"></metadata-configuration>
+        <metadata-configuration
+            [configuration]="configuration$ | async"
+            (onEdit)="edit($event)"
+            id="configuration">
+        </metadata-configuration>
     </ng-container>
     <ng-container *ngIf="!(configuration$ | async)">
         <div class="d-flex justify-content-center">

ui/src/app/metadata/configuration/container/metadata-options.component.ts

@@ -2,7 +2,7 @@ import { Store } from '@ngrx/store';
 import { Component, ChangeDetectionStrategy, OnDestroy } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { Router } from '@angular/router';
+import { Router, ActivatedRoute } from '@angular/router';
 import { ViewportScroller } from '@angular/common';
 import { takeUntil, filter } from 'rxjs/operators';
 
@@ -53,7 +53,9 @@ export class MetadataOptionsComponent implements OnDestroy {
     constructor(
         protected store: Store<ConfigurationState>,
         protected modalService: NgbModal,
-        protected scroller: ViewportScroller
+        protected scroller: ViewportScroller,
+        protected router: Router,
+        protected activatedRoute: ActivatedRoute
     ) {
         this.model$
             .pipe(
@@ -63,6 +65,10 @@ export class MetadataOptionsComponent implements OnDestroy {
             .subscribe(p => this.setModel(p));
     }
 
+    edit(id: string) {
+        this.router.navigate(['../', 'edit', id], { relativeTo: this.activatedRoute.parent });
+    }
+
     setModel(data: Metadata): void {
         this.id = 'resourceId' in data ? data.resourceId : data.id;
         this.kind = '@type' in data ? 'provider' : 'resolver';

ui/src/app/metadata/configuration/container/version-options.component.html

@@ -23,7 +23,6 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
     </div>
     <metadata-configuration
         [configuration]="configuration$ | async"
-        [editable]="false"
         id="configuration">
     </metadata-configuration>
     <div *ngIf="kind === 'provider'" id="filters">

ui/src/app/metadata/configuration/reducer/index.ts

@@ -7,13 +7,11 @@ import * as fromCompare from './compare.reducer';
 import * as fromVersion from './version.reducer';
 import * as fromRestore from './restore.reducer';
 import * as fromFilter from './filter.reducer';
-import { WizardStep } from '../../../wizard/model';
 
 import * as utils from '../../domain/utility/configuration';
-import { getConfigurationSectionsFn, assignValueToProperties } from './utilities';
-import { getSplitSchema, getModel } from '../../../wizard/reducer';
+import { getConfigurationSectionsFn } from './utilities';
+import { getModel } from '../../../wizard/reducer';
 import { getInCollectionFn } from '../../domain/domain.util';
-import { MetadataConfiguration } from '../model/metadata-configuration';
 import { Metadata } from '../../domain/domain.type';
 
 import * as fromResolver from '../../resolver/reducer';

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

@@ -5,8 +5,9 @@
         <router-outlet></router-outlet>
     </div>
 </div>
-<ng-container *ngIf="currentPage === 'summary'">
+<div *ngIf="currentPage === 'summary'">
     <metadata-configuration
         [configuration]="summary$ | async"
+        (onEdit)="go($event)"
         id="configuration"></metadata-configuration>
-</ng-container>
+</div>

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

@@ -9,7 +9,7 @@ import {
     ActivatedRouteSnapshot,
     RouterStateSnapshot
 } from '@angular/router';
-import { Observable, Subject, of, combineLatest as combine } from 'rxjs';
+import { Observable, Subject, of } from 'rxjs';
 import { skipWhile, startWith, distinctUntilChanged, map, takeUntil, combineLatest, withLatestFrom } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -28,8 +28,6 @@ import * as fromWizard from '../../../wizard/reducer';
 import { LoadSchemaRequest } from '../../../wizard/action/wizard.action';
 import { UnsavedEntityComponent } from '../../domain/component/unsaved-entity.dialog';
 import { Clear } from '../action/entity.action';
-import { DifferentialService } from '../../../core/service/differential.service';
-import { getConfigurationSections } from '../../configuration/reducer';
 import { MetadataConfiguration } from '../../configuration/model/metadata-configuration';
 
 @Component({
@@ -69,7 +67,6 @@ export class ResolverWizardComponent implements OnDestroy, CanComponentDeactivat
         private route: ActivatedRoute,
         private router: Router,
         private modalService: NgbModal,
-        private diffService: DifferentialService,
         @Inject(METADATA_SOURCE_WIZARD) private sourceWizard: Wizard<MetadataResolver>
     ) {
         this.store
@@ -151,16 +148,16 @@ export class ResolverWizardComponent implements OnDestroy, CanComponentDeactivat
         this.store.dispatch(new SetIndex(page));
     }
 
+    get blacklist(): string[] {
+        return ['id', 'resourceId'];
+    }
+
     hasChanges(changes: MetadataResolver): boolean {
-        // const updated = this.diffService.updatedDiff(this.resolver, changes);
-        // const deleted = this.diffService.deletedDiff(this.resolver, changes);
-        let blacklist = ['id', 'resourceId'];
-        return Object.keys(changes).filter(key => !(blacklist.indexOf(key) > -1)).length > 0;
+        return Object.keys(changes).filter(key => !(this.blacklist.indexOf(key) > -1)).length > 0;
     }
 
     isNew(changes: MetadataResolver): boolean {
-        let blacklist = ['id', 'resourceId'];
-        return Object.keys(changes).filter(key => !(blacklist.indexOf(key) > -1)).length === 0;
+        return Object.keys(changes).filter(key => !(this.blacklist.indexOf(key) > -1)).length === 0;
     }
 
     ngOnDestroy(): void {

ui/src/app/metadata/resolver/reducer/index.ts

@@ -130,6 +130,6 @@ export const getDraftModelList = createSelector(getDraftModelWithChanges, (model
 export const getResolverConfiguration = createSelector(
     getDraftModelList,
     fromWizard.getWizardDefinition,
-    fromWizard.getSchema,
+    fromWizard.getProcessedSchema,
     getConfigurationSectionsFn
 );