SHIBUI-598 Reorganizing code

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/provider/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 Provider</ng-container>
                     </a>
                     <a class="nav-link"
-                        routerLink="/new"
+                        routerLink="/metadata/resolver/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 Source</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="/dashboard" 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/dashboard/action/search.action.ts

@@ -7,7 +7,7 @@ export const ENTITY_FILTER = '[Metadata Entity Filter] Entity Filter';
 export const ENTITY_SEARCH_COMPLETE = '[Metadata Entity Search] Entity Search COMPLETE';
 
 /**
- * Add Provider to Collection Actions
+ * Add Resolver to Collection Actions
  */
 export class SearchAction implements Action {
     readonly type = ENTITY_SEARCH;

ui/src/app/dashboard/component/entity-item.component.spec.ts

@@ -3,7 +3,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { EntityItemComponent } from './entity-item.component';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 
-describe('Provider List item', () => {
+describe('Resolver List item', () => {
     let fixture: ComponentFixture<EntityItemComponent>;
     let instance: EntityItemComponent;
 

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

@@ -13,7 +13,7 @@ import { DeleteDialogComponent } from '../component/delete-dialog.component';
 import { RouterStub } from '../../../testing/router.stub';
 import { NgbModalStub } from '../../../testing/modal.stub';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { Provider } from '../../domain/entity/provider';
+import { Resolver } from '../../domain/entity/provider';
 
 
 describe('Dashboard Page', () => {
@@ -23,11 +23,11 @@ describe('Dashboard Page', () => {
     let modal: NgbModal;
     let instance: DashboardComponent;
 
-    let draft = new Provider({
+    let draft = new Resolver({
             entityId: 'foo',
             serviceProviderName: 'bar'
         }),
-        provider = new Provider({
+        provider = new Resolver({
             ...draft,
             id: '1'
         });

ui/src/app/dashboard/container/dashboard.component.ts

@@ -7,7 +7,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { MetadataEntity, MetadataProvider, DomainTypes } from '../../domain/domain.type';
-import { Provider } from '../../domain/entity/provider';
+import { Resolver } from '../../domain/entity/provider';
 import * as searchActions from '../action/search.action';
 import * as providerActions from '../../domain/action/provider-collection.action';
 import * as draftActions from '../../domain/action/draft-collection.action';

ui/src/app/dashboard/effect/search.effects.ts

@@ -9,7 +9,7 @@ import * as fromCollections from '../../domain/reducer';
 import * as fromDashboard from '../reducer';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
-import { Provider } from '../../domain/entity/provider';
+import { Resolver } from '../../domain/entity/provider';
 import { Filter } from '../../domain/entity/filter';
 import { MetadataEntity, DomainTypes, MetadataFilter } from '../../domain/domain.type';
 
@@ -45,7 +45,7 @@ export class SearchEffects {
                 (o: any[], p: MetadataProvider[], f: MetadataFilter[]): Array<MetadataEntity> => {
                     return o.concat(
                         f.map(filter => new Filter(filter)),
-                        p.map(provider => new Provider(provider))
+                        p.map(provider => new Resolver(provider))
                     );
                 }
             ),

ui/src/app/dashboard/reducer/dashboard.reducer.spec.ts

@@ -15,7 +15,7 @@ describe('Dashboard Reducer', () => {
         });
     });
 
-    describe('Toggle Provider Display', () => {
+    describe('Toggle Resolver Display', () => {
         it('should toggle the selected providers open state', () => {
             const id = 'foo';
             const action = new ToggleEntityDisplay(id);

ui/src/app/edit-provider/container/provider.component.spec.ts

@@ -9,7 +9,7 @@ import * as fromCollections from '../../domain/reducer';
 import { ActivatedRouteStub } from '../../../testing/activated-route.stub';
 import { routes } from '../editor.module';
 
-describe('Provider Select (Editor) Page', () => {
+describe('Resolver Select (Editor) Page', () => {
     let fixture: ComponentFixture<ProviderComponent>;
     let store: Store<fromCollections.State>;
     let instance: ProviderComponent;

ui/src/app/edit-provider/reducer/editor.reducer.spec.ts

@@ -23,7 +23,7 @@ describe('Editor Reducer', () => {
         });
     });
 
-    describe('Editor Add Provider', () => {
+    describe('Editor Add Resolver', () => {
         it('should update the status when a provider is saved', () => {
             const action = new collectionActions.AddProviderRequest(changes);
             const result = reducer(initialState, action);

ui/src/app/metadata-provider/action/copy.action.ts

@@ -2,17 +2,17 @@ import { Action } from '@ngrx/store';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 
 export enum CopySourceActionTypes {
-    CREATE_PROVIDER_COPY_REQUEST = '[Copy Provider] Create Provider Copy Request',
-    CREATE_PROVIDER_COPY_SUCCESS = '[Copy Provider] Create Provider Copy Success',
-    CREATE_PROVIDER_COPY_ERROR = '[Copy Provider] Create Provider Copy Error',
+    CREATE_PROVIDER_COPY_REQUEST = '[Copy Resolver] Create Resolver Copy Request',
+    CREATE_PROVIDER_COPY_SUCCESS = '[Copy Resolver] Create Resolver Copy Success',
+    CREATE_PROVIDER_COPY_ERROR = '[Copy Resolver] Create Resolver Copy Error',
 
-    UPDATE_PROVIDER_COPY = '[Copy Provider] Update Provider Copy Request',
+    UPDATE_PROVIDER_COPY = '[Copy Resolver] Update Resolver Copy Request',
 
-    UPDATE_PROVIDER_COPY_SECTIONS = '[Copy Provider] Update Provider Sections',
+    UPDATE_PROVIDER_COPY_SECTIONS = '[Copy Resolver] Update Resolver Sections',
 
-    SAVE_PROVIDER_COPY_REQUEST = '[Copy Provider] Save Provider Copy Request',
-    SAVE_PROVIDER_COPY_SUCCESS = '[Copy Provider] Save Provider Copy Request',
-    SAVE_PROVIDER_COPY_ERROR = '[Copy Provider] Save Provider Copy Request',
+    SAVE_PROVIDER_COPY_REQUEST = '[Copy Resolver] Save Resolver Copy Request',
+    SAVE_PROVIDER_COPY_SUCCESS = '[Copy Resolver] Save Resolver Copy Request',
+    SAVE_PROVIDER_COPY_ERROR = '[Copy Resolver] Save Resolver Copy Request',
 }
 
 export class CreateProviderCopyRequest implements Action {

ui/src/app/metadata-provider/action/search.action.ts

@@ -2,9 +2,9 @@ import { Action } from '@ngrx/store';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 
 export enum SearchActionTypes {
-    SEARCH_IDS = '[Search Provider Ids] Request',
-    SEARCH_IDS_SUCCESS = '[Search Provider Ids] Success',
-    SEARCH_IDS_ERROR = '[Search Provider Ids] Error'
+    SEARCH_IDS = '[Search Resolver Ids] Request',
+    SEARCH_IDS_SUCCESS = '[Search Resolver Ids] Success',
+    SEARCH_IDS_ERROR = '[Search Resolver Ids] Error'
 }
 
 export class SearchIds implements Action {

ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts

@@ -7,7 +7,7 @@ import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/ser
 import * as fromCollections from '../../../domain/reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { ListValuesService } from '../../../domain/service/list-values.service';
-import { Provider } from '../../../domain/entity/provider';
+import { Resolver } from '../../../domain/entity/provider';
 import { DescriptorInfoFormComponent } from './descriptor-info-form.component';
 
 import * as stubs from '../../../../testing/provider.stub';
@@ -17,7 +17,7 @@ import { SharedModule } from '../../../shared/shared.module';
     template: `<descriptor-info-form [provider]="provider"></descriptor-info-form>`
 })
 class TestHostComponent {
-    provider = new Provider({
+    provider = new Resolver({
         ...stubs.provider,
         serviceProviderSsoDescriptor: {
             protocolSupportEnum: 'foo',

ui/src/app/metadata-provider/component/forms/finish-form.component.spec.ts

@@ -15,13 +15,13 @@ import { ActivatedRouteStub } from '../../../../testing/activated-route.stub';
 import * as stubs from '../../../../testing/provider.stub';
 import { InputDefaultsDirective } from '../../directive/input-defaults.directive';
 import { I18nTextComponent } from '../../../domain/component/i18n-text.component';
-import { Provider } from '../../../domain/entity/provider';
+import { Resolver } from '../../../domain/entity/provider';
 
 @Component({
     template: `<finish-form [provider]="provider"></finish-form>`
 })
 class TestHostComponent {
-    provider = new Provider({
+    provider = new Resolver({
         ...stubs.provider
     });
 

ui/src/app/metadata-provider/component/forms/key-info-form.component.spec.ts

@@ -12,13 +12,13 @@ import { InputDefaultsDirective } from '../../directive/input-defaults.directive
 
 import * as stubs from '../../../../testing/provider.stub';
 import { I18nTextComponent } from '../../../domain/component/i18n-text.component';
-import { Provider } from '../../../domain/entity/provider';
+import { Resolver } from '../../../domain/entity/provider';
 
 @Component({
     template: `<key-info-form [provider]="provider"></key-info-form>`
 })
 class TestHostComponent {
-    provider = new Provider({
+    provider = new Resolver({
         ...stubs.provider,
         securityInfo: {
             ...stubs.secInfo,

ui/src/app/metadata-provider/component/forms/logout-form.component.spec.ts

@@ -12,13 +12,13 @@ import { LogoutFormComponent } from './logout-form.component';
 import * as stubs from '../../../../testing/provider.stub';
 import { InputDefaultsDirective } from '../../directive/input-defaults.directive';
 import { I18nTextComponent } from '../../../domain/component/i18n-text.component';
-import { Provider } from '../../../domain/entity/provider';
+import { Resolver } from '../../../domain/entity/provider';
 
 @Component({
     template: `<logout-form [provider]="provider"></logout-form>`
 })
 class TestHostComponent {
-    provider = new Provider({
+    provider = new Resolver({
         ...stubs.provider,
         logoutEndpoints: [stubs.logoutEndpoint]
     });
@@ -85,7 +85,7 @@ describe('Logout Endpoints Form Component', () => {
 
     describe('ngOnChanges method', () => {
         it('should add endpoints if provided', () => {
-            instance.provider = new Provider({
+            instance.provider = new Resolver({
                 ...stubs.provider
             });
             fixture.detectChanges();

ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.spec.ts

@@ -7,7 +7,7 @@ import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/ser
 import * as fromCollections from '../../../domain/reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { ListValuesService } from '../../../domain/service/list-values.service';
-import { Provider } from '../../../domain/entity/provider';
+import { Resolver } from '../../../domain/entity/provider';
 import { MetadataUiFormComponent } from './metadata-ui-form.component';
 
 import * as stubs from '../../../../testing/provider.stub';
@@ -18,7 +18,7 @@ import { I18nTextComponent } from '../../../domain/component/i18n-text.component
     template: `<metadata-ui-form [provider]="provider"></metadata-ui-form>`
 })
 class TestHostComponent {
-    provider = new Provider({
+    provider = new Resolver({
         ...stubs.provider
     });
 

ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.spec.ts

@@ -5,7 +5,7 @@ import { ProviderFormFragmentComponent } from './provider-form-fragment.componen
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
 
 
-describe('Provider Form Fragment Component', () => {
+describe('Resolver Form Fragment Component', () => {
     let fixture: ComponentFixture<ProviderFormFragmentComponent>;
     let instance: ProviderFormFragmentComponent;
 

ui/src/app/metadata-provider/component/forms/relying-party-form.component.spec.ts

@@ -8,7 +8,7 @@ import * as fromCollections from '../../../domain/reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 import { RelyingPartyFormComponent } from './relying-party-form.component';
-import { Provider } from '../../../domain/entity/provider';
+import { Resolver } from '../../../domain/entity/provider';
 import * as stubs from '../../../../testing/provider.stub';
 import { SharedModule } from '../../../shared/shared.module';
 
@@ -17,7 +17,7 @@ import { SharedModule } from '../../../shared/shared.module';
     template: `<relying-party-form [provider]="provider"></relying-party-form>`
 })
 class TestHostComponent {
-    provider = new Provider({
+    provider = new Resolver({
         ...stubs.provider,
         relyingPartyOverrides: {
             nameIdFormats: [],

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

@@ -7,7 +7,7 @@ import * as fromCollections from '../../domain/reducer';
 import { BlankProviderComponent } from './blank-provider.component';
 import { UploadProviderComponent } from './upload-provider.component';
 
-describe('Blank Provider Page', () => {
+describe('Blank Resolver Page', () => {
     let fixture: ComponentFixture<BlankProviderComponent>;
     let store: Store<fromCollections.State>;
     let instance: BlankProviderComponent;