Merge branch 'master' into feature/SHIBUI-1408-QA

ui/src/app/metadata/domain/domain.module.ts

@@ -22,10 +22,8 @@ import { UnsavedEntityComponent } from './component/unsaved-entity.dialog';
 import { EditorNavComponent } from './component/editor-nav.component';
 import { RouterModule } from '@angular/router';
 import { SharedModule } from '../../shared/shared.module';
-import { WizardSummaryComponent } from './component/wizard-summary.component';
 
 export const COMPONENTS = [
-    WizardSummaryComponent,
     PreviewDialogComponent,
     UnsavedEntityComponent,
     SummaryPropertyComponent,

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

@@ -19,11 +19,12 @@
                     <router-outlet></router-outlet>
                 </div>
             </div>
-            <wizard-summary
-                [summary]="summary$ | async"
-                (onPageSelect)="gotoPage($event)"
-                *ngIf="currentPage === 'summary'">
-            </wizard-summary>
+            <div *ngIf="currentPage === 'summary'">
+                <metadata-configuration
+                    [configuration]="summary$ | async"
+                    (onEdit)="gotoPage($event)"
+                    id="configuration"></metadata-configuration>
+            </div>
         </div>
     </div>
 </section>

ui/src/app/metadata/provider/container/provider-wizard.component.spec.ts

@@ -8,10 +8,10 @@ import { NgbDropdownModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
 import { ProviderWizardComponent } from './provider-wizard.component';
 import * as fromRoot from '../reducer';
 import { WizardModule } from '../../../wizard/wizard.module';
-import { WizardSummaryComponent } from '../../domain/component/wizard-summary.component';
 import { SummaryPropertyComponent } from '../../domain/component/summary-property.component';
 import * as fromWizard from '../../../wizard/reducer';
 import { MockI18nModule } from '../../../../testing/i18n.stub';
+import { MetadataConfigurationComponentStub } from '../../../../testing/metadata-configuration.stub';
 
 @Component({
     template: `
@@ -46,7 +46,7 @@ describe('Provider Wizard Component', () => {
             declarations: [
                 ProviderWizardComponent,
                 SummaryPropertyComponent,
-                WizardSummaryComponent,
+                MetadataConfigurationComponentStub,
                 TestHostComponent
             ]
         }).compileComponents();

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

@@ -1,5 +1,5 @@
 import { Component, OnDestroy } from '@angular/core';
-import { Observable, combineLatest, Subject } from 'rxjs';
+import { Observable, Subject } from 'rxjs';
 import { Store } from '@ngrx/store';
 
 import * as fromProvider from '../reducer';
@@ -11,9 +11,9 @@ import { startWith, takeUntil } from 'rxjs/operators';
 import { Wizard, WizardStep } from '../../../wizard/model';
 import { MetadataProvider } from '../../domain/model';
 import { ClearProvider } from '../action/entity.action';
-import { map } from 'rxjs/operators';
 import { AddProviderRequest } from '../action/collection.action';
 import { MetadataProviderWizard } from '../model';
+import { MetadataConfiguration } from '../../configuration/model/metadata-configuration';
 
 @Component({
     selector: 'provider-wizard',
@@ -33,7 +33,7 @@ export class ProviderWizardComponent implements OnDestroy {
     nextStep: WizardStep;
     previousStep: WizardStep;
 
-    summary$: Observable<{ definition: Wizard<MetadataProvider>, schema: { [id: string]: any }, model: any }>;
+    summary$: Observable<MetadataConfiguration> = this.store.select(fromProvider.getProviderConfiguration);
 
     provider: MetadataProvider;
 
@@ -61,14 +61,6 @@ export class ProviderWizardComponent implements OnDestroy {
                 this.store.dispatch(new SetDisabled(!valid));
             });
 
-        this.summary$ = combineLatest(
-            this.store.select(fromWizard.getWizardDefinition),
-            this.store.select(fromWizard.getParsedSchema),
-            this.store.select(fromProvider.getEntityChanges)
-        ).pipe(
-            map(([ definition, schema, model ]) => ({ definition, schema, model }))
-        );
-
         this.changes$.pipe(takeUntil(this.ngUnsubscribe)).subscribe(c => this.provider = c);
 
         this.store.dispatch(new SetDefinition(MetadataProviderWizard));

ui/src/app/metadata/provider/provider.module.ts

@@ -27,6 +27,7 @@ import { I18nModule } from '../../i18n/i18n.module';
 import { DomainModule } from '../domain/domain.module';
 import { MetadataProviderPageComponent } from './provider.component';
 import { FilterModule } from '../filter/filter.module';
+import { MetadataConfigurationModule } from '../configuration/configuration.module';
 
 @NgModule({
     declarations: [
@@ -55,7 +56,8 @@ import { FilterModule } from '../filter/filter.module';
         NgbModalModule,
         I18nModule,
         DomainModule,
-        FilterModule
+        FilterModule,
+        MetadataConfigurationModule
     ],
     exports: []
 })

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

@@ -8,6 +8,7 @@ import * as utils from '../../domain/domain.util';
 import * as fromWizard from '../../../wizard/reducer';
 
 import { MetadataProvider } from '../../domain/model';
+import { getConfigurationSectionsFn } from '../../configuration/reducer/utilities';
 
 export interface ProviderState {
     editor: fromEditor.EditorState;
@@ -79,3 +80,12 @@ export const getOrderedProviders = createSelector(getAllProviders, getProviderOr
 export const getOrderedProvidersInSearch = createSelector(getAllProviders, getProviderOrder, utils.mergeOrderFn);
 
 export const getFilteredProviderXmlIds = createSelector(getProviderXmlIds, getSelectedProvider, getFilteredListFn('xmlId'));
+
+export const getProviderModelList = createSelector(getEntityChanges, (model) => [model]);
+
+export const getProviderConfiguration = createSelector(
+    getProviderModelList,
+    fromWizard.getWizardDefinition,
+    fromWizard.getProcessedSchema,
+    getConfigurationSectionsFn
+);