Fixing paths and names

ui/src/app/app.component.ts

@@ -6,10 +6,7 @@ import { Store } from '@ngrx/store';
 
 import * as fromRoot from './core/reducer';
 import { VersionInfo } from './core/model/version';
-import { LoadProviderRequest } from './domain/action/provider-collection.action';
-import { LoadDraftRequest } from './domain/action/draft-collection.action';
 import { VersionInfoLoadRequestAction } from './core/action/version.action';
-import { LoadFilterRequest } from './domain/action/filter-collection.action';
 @Component({
     selector: 'app-root',
     templateUrl: './app.component.html',
@@ -30,9 +27,6 @@ export class AppComponent implements OnInit {
     }
 
     ngOnInit(): void {
-        this.store.dispatch(new LoadProviderRequest());
-        this.store.dispatch(new LoadFilterRequest());
-        this.store.dispatch(new LoadDraftRequest());
         this.store.dispatch(new VersionInfoLoadRequestAction());
     }
 }

ui/src/app/app.module.ts

@@ -7,23 +7,17 @@ import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 
 import { NgbDropdownModule, NgbModalModule, NgbPopoverModule, NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { AppRoutingModule } from './routing.module';
+import { AppRoutingModule } from './app.routing';
 import { AppComponent } from './app.component';
 
 import { CoreModule } from './core/core.module';
-import { DomainModule } from './domain/domain.module';
-import { MetadataProviderModule } from './metadata-provider/metadata-provider.module';
 
 import { reducers, metaReducers } from './app.reducer';
 import { CustomRouterStateSerializer } from './shared/util';
-
-import { CachingInterceptor } from './core/service/cache.interceptor';
 import { AuthorizedInterceptor } from './core/service/authorized.interceptor';
 import { NotificationModule } from './notification/notification.module';
 import { ErrorInterceptor } from './core/service/error.interceptor';
 import { NavigatorService } from './core/service/navigator.service';
-
-import { environment } from '../environments/environment';
 import { ContentionModule } from './contention/contention.module';
 
 @NgModule({
@@ -38,25 +32,18 @@ import { ContentionModule } from './contention/contention.module';
         BrowserModule,
         AppRoutingModule,
         CoreModule.forRoot(),
-        MetadataProviderModule.forRoot(),
-        DomainModule.forRoot(),
         StoreRouterConnectingModule,
         NgbDropdownModule.forRoot(),
         NgbModalModule.forRoot(),
         NgbPopoverModule.forRoot(),
         NgbPaginationModule.forRoot(),
         NotificationModule,
-        ContentionModule,
-        HttpClientModule
+        HttpClientModule,
+        ContentionModule
     ],
     providers: [
         NavigatorService,
         { provide: RouterStateSerializer, useClass: CustomRouterStateSerializer },
-        /*{
-            provide: HTTP_INTERCEPTORS,
-            useClass: CachingInterceptor,
-            multi: true
-        },*/
         {
             provide: HTTP_INTERCEPTORS,
             useClass: AuthorizedInterceptor,

ui/src/app/app.routing.ts

@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+const routes: Routes = [
+    { path: '', redirectTo: '/metadata/manager', pathMatch: 'full' },
+    {
+        path: 'metadata',
+        loadChildren: './metadata/metadata.module#MetadataModule'
+    }
+];
+
+@NgModule({
+    imports: [RouterModule.forRoot(routes)],
+    exports: [RouterModule]
+})
+export class AppRoutingModule { }

ui/src/app/contention/action/contention.action.ts

@@ -1,7 +1,5 @@
 import { Action } from '@ngrx/store';
 import { Contention, ContentionResolution } from '../model/contention';
-import { MetadataEntity } from '../../domain/domain.type';
-
 
 export enum ContentionActionTypes {
     SHOW_CONTENTION = '[Contention] Show Contention',

ui/src/app/contention/component/change-item.component.ts

@@ -1,15 +1,5 @@
-import { Component, OnInit, Input, OnChanges } from '@angular/core';
-import { FormGroup, Validators, FormBuilder } from '@angular/forms';
-import { Observable, of } from 'rxjs';
-import { map, withLatestFrom } from 'rxjs/operators';
-import { Router } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-
-import * as fromContention from '../reducer';
-import { ResolveContentionAction } from '../action/contention.action';
+import { Component, Input, OnChanges } from '@angular/core';
 import { ChangeItem } from '../model/contention';
-import { DifferentialService } from '../../core/service/differential.service';
 
 export enum ValueTypes {
     array = 'array',

ui/src/app/contention/component/contention-dialog.component.ts

@@ -1,13 +1,9 @@
-import { Component, OnInit, Input, OnChanges } from '@angular/core';
-import { FormGroup, Validators, FormBuilder } from '@angular/forms';
-import { Observable, of } from 'rxjs';
-import { map, withLatestFrom } from 'rxjs/operators';
-import { Router } from '@angular/router';
+import { Component } from '@angular/core';
+import { Observable } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 import * as fromContention from '../reducer';
-import { ResolveContentionAction } from '../action/contention.action';
 import { Contention, ChangeItem } from '../model/contention';
 
 @Component({

ui/src/app/contention/contention.module.ts

@@ -1,15 +1,12 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { RouterModule } from '@angular/router';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
-import { HttpClientModule } from '@angular/common/http';
 
 import { reducers } from './reducer';
 import { ContentionEffects } from './effect/contention.effect';
 import { ContentionDialogComponent } from './component/contention-dialog.component';
 import { ChangeItemComponent } from './component/change-item.component';
-import { DomainModule } from '../domain/domain.module';
 import { ContentionService } from './service/contention.service';
 
 export const COMPONENTS = [
@@ -20,7 +17,6 @@ export const COMPONENTS = [
 @NgModule({
     imports: [
         CommonModule,
-        DomainModule,
         StoreModule.forFeature('contention', reducers),
         EffectsModule.forFeature([ContentionEffects])
     ],

ui/src/app/contention/effect/contention.effect.ts

@@ -1,15 +1,12 @@
 import { Injectable } from '@angular/core';
 import { Effect, Actions, ofType } from '@ngrx/effects';
-import { Location } from '@angular/common';
-
 import { of } from 'rxjs';
 import { map, tap, catchError, switchMap } from 'rxjs/operators';
 
 import {
     ShowContentionAction,
     ResolveContentionAction,
     ContentionActionTypes,
-    ContentionActionUnion,
     CancelContentionAction
 } from '../action/contention.action';
 import { ModalService, DEFAULT_MODAL_OPTIONS } from '../../core/service/modal.service';

ui/src/app/contention/reducer/contention.reducer.ts

@@ -1,6 +1,5 @@
 import { ContentionActionTypes, ContentionActionUnion } from '../action/contention.action';
 import { Contention } from '../model/contention';
-import { MetadataEntity } from '../../domain/domain.type';
 
 export interface State {
     contention: Contention<any>;

ui/src/app/metadata/domain/action/entity.action.ts

@@ -1,5 +1,5 @@
 import { Action } from '@ngrx/store';
-import { MetadataEntity } from '../../domain/domain.type';
+import { MetadataEntity } from '../../domain/model';
 
 export const PREVIEW_ENTITY = '[Domain] Preview Entity';
 

ui/src/app/metadata/domain/component/forms/advanced-info-form.component.ts

@@ -5,7 +5,6 @@ import { takeUntil, combineLatest, switchMap, map, startWith } from 'rxjs/operat
 
 import { Store } from '@ngrx/store';
 
-import * as fromCollection from '../../../domain/reducer';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
 import { MetadataResolver, Contact } from '../../../domain/model';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
@@ -43,6 +42,7 @@ export class AdvancedInfoFormComponent extends ProviderFormFragmentComponent imp
     ) {
         super(fb, statusEmitter, valueEmitter);
 
+        /*
         this.ids$ = this.store
             .select(fromCollection.getAllEntityIds)
             .pipe(
@@ -51,6 +51,7 @@ export class AdvancedInfoFormComponent extends ProviderFormFragmentComponent imp
                     return ids.filter(id => provider.entityId !== id);
                 })
             );
+            */
     }
 
     createForm(): void {

ui/src/app/metadata/domain/component/forms/assertion-form.component.ts

@@ -1,5 +1,5 @@
-import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, FormArray, AbstractControl, Validators } from '@angular/forms';
+import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
+import { FormBuilder, FormGroup, FormArray, AbstractControl } from '@angular/forms';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 

ui/src/app/metadata/domain/component/forms/finish-form.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../theme/_palette';
+@import '../../../../../theme/_palette';
 
 .value:empty {
     &::after {

ui/src/app/metadata/domain/component/preview-dialog.component.ts

@@ -0,0 +1,25 @@
+import { Component, Input } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import * as FileSaver from 'file-saver';
+import { Subscription } from 'rxjs/Subscription';
+import { MetadataEntity } from '../../domain/model';
+
+@Component({
+    selector: 'preview-dialog',
+    templateUrl: './preview-dialog.component.html'
+})
+export class PreviewDialogComponent {
+    @Input() entity: MetadataEntity;
+    @Input() xml: string;
+
+    sub: Subscription;
+
+    constructor(
+        public activeModal: NgbActiveModal
+    ) {}
+
+    preview(xml): void {
+        const blob = new Blob([xml], { type: 'text/xml;charset=utf-8' });
+        FileSaver.saveAs(blob, `${ this.entity.name }.xml`);
+    }
+} /* istanbul ignore next */

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

@@ -1,38 +1,33 @@
 import { NgModule, ModuleWithProviders } from '@angular/core';
 import { HttpModule } from '@angular/http';
-import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { CommonModule } from '@angular/common';
 
-import { EntityDescriptorService } from './service/entity-descriptor.service';
+import { ResolverService } from './service/resolver.service';
 import { ListValuesService } from './service/list-values.service';
 import { ProviderStatusEmitter, ProviderValueEmitter } from './service/provider-change-emitter.service';
 import { EntityIdService } from './service/entity-id.service';
-import { EntityDraftService } from './service/entity-draft.service';
+import { EntityDraftService } from './service/draft.service';
 
-import { reducers } from './reducer';
-import { DraftCollectionEffects } from './effect/draft-collection.effects';
-import { ProviderCollectionEffects } from './effect/provider-collection.effects';
-import { FilterCollectionEffects } from './effect/filter-collection.effect';
-import { MetadataResolverService } from './service/metadata-resolver.service';
+import { MetadataProviderService } from './service/provider.service';
 import { EntityEffects } from './effect/entity.effect';
-import { PreviewDialogModule } from '../shared/preview/preview-dialog.module';
 import { I18nTextComponent } from './component/i18n-text.component';
+import { PreviewDialogComponent } from './component/preview-dialog.component';
 
 export const COMPONENTS = [];
 
 export const DECLARATIONS = [
     ...COMPONENTS,
-    I18nTextComponent
+    I18nTextComponent,
+    PreviewDialogComponent
 ];
 
 @NgModule({
     declarations: DECLARATIONS,
     entryComponents: COMPONENTS,
     imports: [
         HttpModule,
-        CommonModule,
-        PreviewDialogModule
+        CommonModule
     ],
     exports: DECLARATIONS,
     providers: []
@@ -42,13 +37,13 @@ export class DomainModule {
         return {
             ngModule: RootDomainModule,
             providers: [
-                EntityDescriptorService,
+                ResolverService,
                 EntityIdService,
                 EntityDraftService,
                 ListValuesService,
                 ProviderStatusEmitter,
                 ProviderValueEmitter,
-                MetadataResolverService
+                MetadataProviderService
             ]
         };
     }
@@ -57,11 +52,7 @@ export class DomainModule {
 @NgModule({
     imports: [
         DomainModule,
-        StoreModule.forFeature('collections', reducers),
         EffectsModule.forFeature([
-            FilterCollectionEffects,
-            DraftCollectionEffects,
-            ProviderCollectionEffects,
             EntityEffects
         ])
     ],

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

@@ -34,6 +34,3 @@ export enum MetadataTypes {
     PROVIDER = '[Type] Metadata Provider',
     RESOLVER = '[Type] Metadata Resolver'
 }
-
-export * from './model';
-export * from './entity';

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

@@ -0,0 +1,10 @@
+/*
+ *   Utility functions
+*/
+
+export const combineAllFn = (d, p) => [...p, ...d];
+export const doesExistFn = (ids, selected) => ids.indexOf(selected) > -1;
+export const getInCollectionFn = (entities, selectedId) => {
+    return selectedId && entities[selectedId];
+};
+export const getEntityIdsFn = list => list.map(entity => entity.entityId);

ui/src/app/metadata/domain/effect/entity.effect.spec.ts

@@ -8,7 +8,7 @@ import { EntityIdService } from '../service/entity-id.service';
 import { EntityDescriptorService } from '../service/entity-descriptor.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { NgbModalStub } from '../../../../testing/modal.stub';
-import { EntityAttributesFilter } from '../entity/filter/entity-attributes-filter';
+import { EntityAttributesFilter } from '../entity';
 
 describe('Entity Effects', () => {
     let effects: EntityEffects;

ui/src/app/metadata/domain/effect/entity.effect.ts

@@ -5,9 +5,10 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Observable } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 
-import { EntityDescriptorService } from '../service/entity-descriptor.service';
-import { PreviewDialogComponent } from '../../../shared/preview/preview-dialog.component';
-import { MetadataEntity, MetadataTypes } from '../domain.type';
+import { ResolverService } from '../service/resolver.service';
+import { PreviewDialogComponent } from '../component/preview-dialog.component';
+import { MetadataEntity } from '../model';
+import { MetadataTypes } from '../domain.type';
 import { EntityIdService } from '../service/entity-id.service';
 import * as entityActions from '../action/entity.action';
 
@@ -25,7 +26,7 @@ export class EntityEffects {
     constructor(
         private actions$: Actions,
         private modalService: NgbModal,
-        private providerService: EntityDescriptorService,
+        private providerService: ResolverService,
         private entityService: EntityIdService
     ) { }