Merged in feature/SHIBUI-598 (pull request #91)

* SHIBUI-598 Reorganizing code

Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>

ui/src/app/app.component.html

@@ -4,7 +4,7 @@
         <img src="/assets/shibboleth_icon_color_130x130.png" width="30" height="30" class="d-inline-block align-top" alt="Shibboleth Logo - Click to be directed to www.shibboleth.net">
         <span class="d-lg-inline d-none">Shibboleth</span>
     </a>
-    <span class="navbar-text" i18n="@@label--app">Metadata Source Management</span>
+    <span class="navbar-text" i18n="@@label--app">Source Management</span>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar"
             aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
@@ -24,29 +24,29 @@
                 </button>
                 <div ngbDropdownMenu aria-labelledby="addNewDropdown">
                     <a class="nav-link"
-                        routerLink="/filter/new"
+                        routerLink="/metadata/resolver/new"
                         routerLinkActive="active"
-                        aria-label="Add a new metadata filter"
+                        aria-label="Add a new metadata provider"
                         role="button">
-                        <i class="fa fa-cubes fa-fw" aria-hidden="true"></i>
+                        <i class="fa fa-cube fa-fw" aria-hidden="true"></i>
                         &nbsp;
-                        <ng-container i18n="@@action--add-filter">Filter</ng-container>
+                        <ng-container i18n="@@action--add-source">Metadata Source</ng-container>
                     </a>
                     <a class="nav-link"
-                        routerLink="/new"
+                        routerLink="/metadata/provider/new"
                         routerLinkActive="active"
-                        aria-label="Launch wizard to add a new provider"
+                        aria-label="Add a new metadata resolver"
                         role="button">
-                        <i class="fa fa-cube fa-fw" aria-hidden="true"></i>
+                        <i class="fa fa-cubes fa-fw" aria-hidden="true"></i>
                         &nbsp;
-                        <ng-container i18n="@@action--add-source">Metadata Source</ng-container>
+                        <ng-container i18n="@@action--add-filter">Metadata Provider</ng-container>
                     </a>
                 </div>
             </li>
             <li class="nav-item">
-                <a class="nav-link" routerLink="/dashboard" routerLinkActive="active" aria-label="Metadata sources dashboard">
+                <a class="nav-link" routerLink="/metadata" routerLinkActive="active" aria-label="Metadata Dashboard">
                     <i class="fa fa-th fa-fw" aria-hidden="true"></i>
-                    <ng-container i18n="@@action--manage-sources">Manage Sources</ng-container>
+                    <ng-container i18n="@@action--dashboard">Dashboard</ng-container>
                 </a>
             </li>
             <li>

ui/src/app/app.component.spec.ts

@@ -54,7 +54,7 @@ describe('AppComponent', () => {
 
     it('should create the app', async(() => {
         expect(app).toBeTruthy();
-        expect(store.dispatch).toHaveBeenCalledTimes(4);
+        expect(store.dispatch).toHaveBeenCalledTimes(1);
     }));
 
     it(`should have as title 'Shib-UI'`, async(() => {

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,24 +7,19 @@ 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';
+import { SharedModule } from './shared/shared.module';
 
 @NgModule({
     declarations: [
@@ -36,27 +31,21 @@ import { ContentionModule } from './contention/contention.module';
         }),
         EffectsModule.forRoot([]),
         BrowserModule,
-        AppRoutingModule,
         CoreModule.forRoot(),
-        MetadataProviderModule.forRoot(),
-        DomainModule.forRoot(),
         StoreRouterConnectingModule,
         NgbDropdownModule.forRoot(),
         NgbModalModule.forRoot(),
         NgbPopoverModule.forRoot(),
         NgbPaginationModule.forRoot(),
         NotificationModule,
+        HttpClientModule,
         ContentionModule,
-        HttpClientModule
+        SharedModule,
+        AppRoutingModule
     ],
     providers: [
         NavigatorService,
         { provide: RouterStateSerializer, useClass: CustomRouterStateSerializer },
-        /*{
-            provide: HTTP_INTERCEPTORS,
-            useClass: CachingInterceptor,
-            multi: true
-        },*/
         {
             provide: HTTP_INTERCEPTORS,
             useClass: AuthorizedInterceptor,

ui/src/app/app.reducer.ts

@@ -1,5 +1,4 @@
-import { ActionReducerMap, MetaReducer, ActionReducer } from '@ngrx/store';
-import { routerReducer, RouterReducerState } from '@ngrx/router-store';
+import { ActionReducerMap, MetaReducer } from '@ngrx/store';
 import * as fromRouter from '@ngrx/router-store';
 
 import { RouterStateUrl } from './shared/util';

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', 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,16 +1,14 @@
 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';
+import { SharedModule } from '../shared/shared.module';
 
 export const COMPONENTS = [
     ContentionDialogComponent,
@@ -20,7 +18,7 @@ export const COMPONENTS = [
 @NgModule({
     imports: [
         CommonModule,
-        DomainModule,
+        SharedModule,
         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/core/service/differential.service.ts

@@ -20,7 +20,6 @@ export class DifferentialService {
         return lib.updatedDiff(originalObj, updatedObj);
     }
     detailedDiff(originalObj, updatedObj) { // returns an object with the added, deleted and updated differences
-        console.log(originalObj, updatedObj);
         return lib.detailedDiff(originalObj, updatedObj);
     }
 }