From 8b14299e4d607b15275d2122bdb5d165e4906c78 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 9 Aug 2019 08:39:56 -0700
Subject: [PATCH] SHIBUI-1361 Fixed titles of config pages

---
 .../container/configuration.component.html             |  5 -----
 .../container/metadata-comparison.component.html       |  6 ++++++
 .../container/metadata-comparison.component.ts         |  4 +++-
 .../container/metadata-history.component.html          |  3 +++
 .../container/metadata-options.component.html          |  5 +++++
 .../container/metadata-options.component.ts            | 10 ++++++----
 .../container/metadata-xml.component.html              |  5 +++++
 .../container/metadata-xml.component.spec.ts           |  2 +-
 .../configuration/container/metadata-xml.component.ts  |  4 +++-
 .../configuration/container/restore.component.html     |  3 +++
 10 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/ui/src/app/metadata/configuration/container/configuration.component.html b/ui/src/app/metadata/configuration/container/configuration.component.html
index 53f8fa697..89d017139 100644
--- a/ui/src/app/metadata/configuration/container/configuration.component.html
+++ b/ui/src/app/metadata/configuration/container/configuration.component.html
@@ -13,11 +13,6 @@
                     </li>
                 </ol>
             </nav>
-            <h2 class="mb-4" [ngSwitch]="type$ | async">
-                <ng-container *ngSwitchCase="'resolver'" translate="label.source">Source</ng-container>
-                <ng-container *ngSwitchDefault translate="label.provider">Provider</ng-container>
-                Configuration
-            </h2>
             <ng-container *ngIf="name$ | async">
                 <router-outlet></router-outlet>
             </ng-container>
diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
index d5b533716..7117b7bf6 100644
--- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
@@ -1,3 +1,9 @@
+<h2 class="mb-4" [ngSwitch]="type$ | async">
+    Compare
+    <ng-container *ngSwitchCase="'resolver'" translate="label.source">Source</ng-container>
+    <ng-container *ngSwitchDefault translate="label.provider">Provider</ng-container>
+    Configuration
+</h2>
 <div class="" [ngClass]="{
     'container-fluid': (numVersions$ | async) > 2,
     'container': (numVersions$ | async) <= 2
diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
index 92019297d..cec29c2a6 100644
--- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
+++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
@@ -4,9 +4,9 @@ import { Store } from '@ngrx/store';
 import { ActivatedRoute } from '@angular/router';
 import { map } from 'rxjs/operators';
 import { ConfigurationState, getVersionConfigurations, getVersionConfigurationCount } from '../reducer';
-import { Metadata } from '../../domain/domain.type';
 import { CompareVersionRequest } from '../action/compare.action';
 import { MetadataConfiguration } from '../model/metadata-configuration';
+import * as fromReducer from '../reducer';
 
 @Component({
     selector: 'metadata-comparison',
@@ -18,6 +18,7 @@ export class MetadataComparisonComponent {
 
     versions$: Observable<MetadataConfiguration>;
     numVersions$: Observable<number>;
+    type$: Observable<string>;
 
     constructor(
         private store: Store<ConfigurationState>,
@@ -30,5 +31,6 @@ export class MetadataComparisonComponent {
 
         this.versions$ = this.store.select(getVersionConfigurations);
         this.numVersions$ = this.store.select(getVersionConfigurationCount);
+        this.type$ = this.store.select(fromReducer.getConfigurationModelType);
     }
 }
diff --git a/ui/src/app/metadata/configuration/container/metadata-history.component.html b/ui/src/app/metadata/configuration/container/metadata-history.component.html
index 8c95fe28c..5291b4907 100644
--- a/ui/src/app/metadata/configuration/container/metadata-history.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-history.component.html
@@ -1,3 +1,6 @@
+<h2 class="mb-4">
+    Version History
+</h2>
 <div class="container">
     <history-list
         [history]="history$ | async"
diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html
index 972e0e4da..ebed36bf3 100644
--- a/ui/src/app/metadata/configuration/container/metadata-options.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-options.component.html
@@ -1,3 +1,8 @@
+<h2 class="mb-4" [ngSwitch]="type$ | async">
+    <ng-container *ngSwitchCase="'resolver'" translate="label.source">Source</ng-container>
+    <ng-container *ngSwitchDefault translate="label.provider">Provider</ng-container>
+    Configuration
+</h2>
 <div class="container" id="header">
     <metadata-header
         [isEnabled]="isEnabled$ | async"
diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.ts
index a19875a54..ddd4f0df6 100644
--- a/ui/src/app/metadata/configuration/container/metadata-options.component.ts
+++ b/ui/src/app/metadata/configuration/container/metadata-options.component.ts
@@ -2,9 +2,9 @@ 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, Event, Scroll } from '@angular/router';
+import { Router } from '@angular/router';
 import { ViewportScroller } from '@angular/common';
-import { takeUntil, filter, delay } from 'rxjs/operators';
+import { takeUntil, filter } from 'rxjs/operators';
 
 import {
     ConfigurationState,
@@ -15,7 +15,8 @@ import {
     getConfigurationModelEnabled,
     getConfigurationHasXml,
     getConfigurationModel,
-    getConfigurationDefinition
+    getConfigurationDefinition,
+    getConfigurationModelType
 } from '../reducer';
 import { MetadataConfiguration } from '../model/metadata-configuration';
 import { MetadataVersion } from '../model/version';
@@ -32,7 +33,6 @@ import {
 import { Metadata } from '../../domain/domain.type';
 import { DeleteFilterComponent } from '../../provider/component/delete-filter.component';
 import { Wizard } from '../../../wizard/model';
-import { PreviewEntity } from '../../domain/action/entity.action';
 
 @Component({
     selector: 'metadata-options-page',
@@ -53,6 +53,7 @@ export class MetadataOptionsComponent implements OnDestroy {
     filters$: Observable<unknown[]>;
     model$: Observable<Metadata>;
     definition: Wizard<any>;
+    type$: Observable<string>;
     id: string;
     kind: string;
 
@@ -73,6 +74,7 @@ export class MetadataOptionsComponent implements OnDestroy {
         this.isCurrent$ = this.store.select(getSelectedIsCurrent);
         this.hasXml$ = this.store.select(getConfigurationHasXml);
         this.filters$ = this.store.select(getAdditionalFilters);
+        this.type$ = this.store.select(getConfigurationModelType);
 
         this.model$
             .pipe(
diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.html b/ui/src/app/metadata/configuration/container/metadata-xml.component.html
index 613dc7699..7c3d533cc 100644
--- a/ui/src/app/metadata/configuration/container/metadata-xml.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-xml.component.html
@@ -1,3 +1,8 @@
+<h2 class="mb-4" [ngSwitch]="type$ | async">
+    <ng-container *ngSwitchCase="'resolver'" translate="label.source">Source</ng-container>
+    <ng-container *ngSwitchDefault translate="label.provider">Provider</ng-container>
+    Configuration
+</h2>
 <div class="container-fluid">
     <div class="px-3 my-3 d-flex justify-content-end">
         <div class="btn-group">
diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts
index 6f7e052e3..c9129dfaa 100644
--- a/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts
+++ b/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts
@@ -54,6 +54,6 @@ describe('Metadata Xml Page Component', () => {
 
     it('should load metadata objects', async(() => {
         expect(app).toBeTruthy();
-        expect(store.select).toHaveBeenCalledTimes(2);
+        expect(store.select).toHaveBeenCalledTimes(3);
     }));
 });
diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.ts b/ui/src/app/metadata/configuration/container/metadata-xml.component.ts
index 1a56906a0..b49a06184 100644
--- a/ui/src/app/metadata/configuration/container/metadata-xml.component.ts
+++ b/ui/src/app/metadata/configuration/container/metadata-xml.component.ts
@@ -1,6 +1,6 @@
 import { Store } from '@ngrx/store';
 import { Component } from '@angular/core';
-import { Observable, Subject } from 'rxjs';
+import { Observable } from 'rxjs';
 
 import * as fromConfiguration from '../reducer';
 import { Metadata } from '../../domain/domain.type';
@@ -17,12 +17,14 @@ export class MetadataXmlComponent {
     entity$: Observable<Metadata>;
     xml: string;
     xml$: Observable<string>;
+    type$: Observable<string>;
 
     constructor(
         private store: Store<fromConfiguration.ConfigurationState>
     ) {
         this.xml$ = this.store.select(fromConfiguration.getConfigurationXml);
         this.entity$ = this.store.select(fromConfiguration.getConfigurationModel);
+        this.type$ = this.store.select(fromConfiguration.getConfigurationModelType);
     }
 
     preview(): void {
diff --git a/ui/src/app/metadata/configuration/container/restore.component.html b/ui/src/app/metadata/configuration/container/restore.component.html
index 86c411255..c842aa47d 100644
--- a/ui/src/app/metadata/configuration/container/restore.component.html
+++ b/ui/src/app/metadata/configuration/container/restore.component.html
@@ -1,3 +1,6 @@
+<h2 class="mb-4">
+    Restore Version
+</h2>
 <div class="d-flex justify-content-center align-items-center">
     <div class="card m-4 w-50">
         <div class="card-body">