diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts
index 732b920d3..9e94bcdbd 100644
--- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts
+++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts
@@ -1,4 +1,5 @@
import { Component, ChangeDetectionStrategy, Input } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
import { MetadataConfiguration } from '../model/metadata-configuration';
@Component({
@@ -10,5 +11,12 @@ import { MetadataConfiguration } from '../model/metadata-configuration';
export class MetadataConfigurationComponent {
@Input() configuration: MetadataConfiguration;
- constructor() { }
+ constructor(
+ private router: Router,
+ private activatedRoute: ActivatedRoute
+ ) { }
+
+ edit(id: string): void {
+ this.router.navigate(['../', 'edit', id], { relativeTo: this.activatedRoute.parent });
+ }
}
diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.html b/ui/src/app/metadata/configuration/component/metadata-header.component.html
new file mode 100644
index 000000000..19f183ba8
--- /dev/null
+++ b/ui/src/app/metadata/configuration/component/metadata-header.component.html
@@ -0,0 +1,19 @@
+
+
+
+ Version {{ versionNumber }}
+
+
+ Saved
+ {{ version.date | date }},
+ by
+ {{ version.creator }}
+
+
+ Enabled
+
+ Disabled
+ Current
+
+
+
\ No newline at end of file
diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts b/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts
new file mode 100644
index 000000000..e8db42c36
--- /dev/null
+++ b/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts
@@ -0,0 +1,58 @@
+import { Component, ViewChild } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { MockI18nModule } from '../../../../testing/i18n.stub';
+import { MetadataVersion } from '../model/version';
+import { MetadataHeaderComponent } from './metadata-header.component';
+
+@Component({
+ template: `
+
+ `
+})
+class TestHostComponent {
+ @ViewChild(MetadataHeaderComponent)
+ public componentUnderTest: MetadataHeaderComponent;
+
+ isEnabled = true;
+
+ version: MetadataVersion = {
+ id: 'foo',
+ creator: 'foobar',
+ date: new Date().toDateString()
+ };
+ versionNumber = 1;
+ isCurrent = false;
+}
+
+describe('Metadata Header Component', () => {
+
+ let fixture: ComponentFixture
;
+ let instance: TestHostComponent;
+ let app: MetadataHeaderComponent;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ imports: [
+ MockI18nModule
+ ],
+ declarations: [
+ MetadataHeaderComponent,
+ TestHostComponent
+ ]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(TestHostComponent);
+ instance = fixture.componentInstance;
+ app = instance.componentUnderTest;
+ fixture.detectChanges();
+ }));
+
+ it('should accept a property input', async(() => {
+ expect(app).toBeTruthy();
+ }));
+});
diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.ts b/ui/src/app/metadata/configuration/component/metadata-header.component.ts
new file mode 100644
index 000000000..8d0dcc3db
--- /dev/null
+++ b/ui/src/app/metadata/configuration/component/metadata-header.component.ts
@@ -0,0 +1,19 @@
+import { Component, Input } from '@angular/core';
+import { Metadata, MetadataTypes } from '../../domain/domain.type';
+import { MetadataVersion } from '../model/version';
+
+@Component({
+ selector: 'metadata-header',
+ templateUrl: './metadata-header.component.html',
+ styleUrls: []
+})
+
+export class MetadataHeaderComponent {
+ @Input() isEnabled: boolean;
+ @Input() version: MetadataVersion;
+ @Input() versionNumber: number;
+ @Input() isCurrent: boolean;
+
+ constructor() {}
+}
+
diff --git a/ui/src/app/metadata/configuration/configuration.module.ts b/ui/src/app/metadata/configuration/configuration.module.ts
index 2cf56580d..9aa2cf880 100644
--- a/ui/src/app/metadata/configuration/configuration.module.ts
+++ b/ui/src/app/metadata/configuration/configuration.module.ts
@@ -12,13 +12,17 @@ import { MetadataConfigurationService } from './service/configuration.service';
import * as fromConfig from './reducer';
import { MetadataConfigurationEffects } from './effect/configuration.effect';
import { ConfigurationPropertyComponent } from './component/configuration-property.component';
-import { DomainModule } from '../domain/domain.module';
import { PrimitivePropertyComponent } from './component/primitive-property.component';
import { ObjectPropertyComponent } from './component/object-property.component';
import { ArrayPropertyComponent } from './component/array-property.component';
import { RouterModule } from '@angular/router';
import { MetadataOptionsComponent } from './container/metadata-options.component';
import { MetadataXmlComponent } from './container/metadata-xml.component';
+import { MetadataHeaderComponent } from './component/metadata-header.component';
+import { MetadataHistoryEffects } from './effect/history.effect';
+import { MetadataHistoryService } from './service/history.service';
+import { MetadataHistoryComponent } from './container/metadata-history.component';
+import { HistoryListComponent } from './component/history-list.component';
@NgModule({
declarations: [
@@ -29,7 +33,10 @@ import { MetadataXmlComponent } from './container/metadata-xml.component';
PrimitivePropertyComponent,
ObjectPropertyComponent,
ArrayPropertyComponent,
- ConfigurationComponent
+ ConfigurationComponent,
+ MetadataHeaderComponent,
+ MetadataHistoryComponent,
+ HistoryListComponent
],
entryComponents: [],
imports: [
@@ -46,7 +53,8 @@ export class MetadataConfigurationModule {
return {
ngModule: RootMetadataConfigurationModule,
providers: [
- MetadataConfigurationService
+ MetadataConfigurationService,
+ MetadataHistoryService
]
};
}
@@ -56,7 +64,7 @@ export class MetadataConfigurationModule {
imports: [
MetadataConfigurationModule,
StoreModule.forFeature('metadata-configuration', fromConfig.reducers),
- EffectsModule.forFeature([MetadataConfigurationEffects])
+ EffectsModule.forFeature([MetadataConfigurationEffects, MetadataHistoryEffects])
],
providers: []
})
diff --git a/ui/src/app/metadata/configuration/configuration.routing.ts b/ui/src/app/metadata/configuration/configuration.routing.ts
index 8e7327792..d27b29872 100644
--- a/ui/src/app/metadata/configuration/configuration.routing.ts
+++ b/ui/src/app/metadata/configuration/configuration.routing.ts
@@ -2,6 +2,7 @@ import { Routes } from '@angular/router';
import { ConfigurationComponent } from './container/configuration.component';
import { MetadataOptionsComponent } from './container/metadata-options.component';
import { MetadataXmlComponent } from './container/metadata-xml.component';
+import { MetadataHistoryComponent } from './container/metadata-history.component';
export const ConfigurationRoutes: Routes = [
{
@@ -19,6 +20,10 @@ export const ConfigurationRoutes: Routes = [
{
path: 'xml',
component: MetadataXmlComponent
+ },
+ {
+ path: 'history',
+ component: MetadataHistoryComponent
}
]
}
diff --git a/ui/src/app/metadata/configuration/configuration.values.ts b/ui/src/app/metadata/configuration/configuration.values.ts
new file mode 100644
index 000000000..c7f696eae
--- /dev/null
+++ b/ui/src/app/metadata/configuration/configuration.values.ts
@@ -0,0 +1,10 @@
+import { MetadataSourceEditor } from '../domain/model/wizards/metadata-source-editor';
+
+export enum PATHS {
+ resolver = 'EntityDescriptor',
+ provider = 'MetadataResolvers'
+}
+
+export const DEFINITIONS = {
+ resolver: MetadataSourceEditor
+};
diff --git a/ui/src/app/metadata/configuration/container/configuration.component.ts b/ui/src/app/metadata/configuration/container/configuration.component.ts
index d18e5ab34..2c49c0961 100644
--- a/ui/src/app/metadata/configuration/container/configuration.component.ts
+++ b/ui/src/app/metadata/configuration/container/configuration.component.ts
@@ -5,8 +5,10 @@ import { ActivatedRoute, Params } from '@angular/router';
import * as fromConfiguration from '../reducer';
import { MetadataConfiguration } from '../model/metadata-configuration';
-import { takeUntil, map } from 'rxjs/operators';
-import { LoadMetadataRequest, ClearConfiguration } from '../action/configuration.action';
+import { takeUntil, map, withLatestFrom, filter } from 'rxjs/operators';
+import { LoadMetadataRequest, ClearConfiguration, LoadXmlRequest } from '../action/configuration.action';
+import { LoadHistoryRequest, ClearHistory, SelectVersion } from '../action/history.action';
+import * as fromReducer from '../reducer';
@Component({
selector: 'configuration-page',
@@ -25,11 +27,34 @@ export class ConfigurationComponent implements OnDestroy {
takeUntil(this.ngUnsubscribe),
map(params => new LoadMetadataRequest({id: params.id, type: params.type}))
).subscribe(store);
+
+ this.routerState.params.pipe(
+ takeUntil(this.ngUnsubscribe),
+ map(params => new LoadHistoryRequest({ id: params.id, type: params.type }))
+ ).subscribe(store);
+
+ this.store.select(fromReducer.getVersionCollection).pipe(
+ takeUntil(this.ngUnsubscribe),
+ withLatestFrom(
+ this.routerState.queryParams
+ ),
+ map(([collection, params]) => {
+ if (collection && collection.length) {
+ return params.version || collection[0].id;
+ }
+ return null;
+ })
+ ).subscribe(version => {
+ if (version) {
+ this.store.dispatch(new SelectVersion(version));
+ }
+ });
}
ngOnDestroy() {
this.ngUnsubscribe.next();
this.ngUnsubscribe.complete();
this.store.dispatch(new ClearConfiguration());
+ this.store.dispatch(new ClearHistory());
}
}
diff --git a/ui/src/app/metadata/configuration/container/metadata-history.component.html b/ui/src/app/metadata/configuration/container/metadata-history.component.html
new file mode 100644
index 000000000..225912756
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/metadata-history.component.html
@@ -0,0 +1,3 @@
+
+
+
diff --git a/ui/src/app/metadata/version/container/version-history.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-history.component.spec.ts
similarity index 65%
rename from ui/src/app/metadata/version/container/version-history.component.spec.ts
rename to ui/src/app/metadata/configuration/container/metadata-history.component.spec.ts
index 4398b5128..084d79ef0 100644
--- a/ui/src/app/metadata/version/container/version-history.component.spec.ts
+++ b/ui/src/app/metadata/configuration/container/metadata-history.component.spec.ts
@@ -1,11 +1,13 @@
import { Component, ViewChild, Input, EventEmitter, Output } from '@angular/core';
import { TestBed, ComponentFixture } from '@angular/core/testing';
import { MockI18nModule } from '../../../../testing/i18n.stub';
-import { VersionHistoryComponent } from './version-history.component';
+import { MetadataHistoryComponent } from './metadata-history.component';
import { MetadataHistory } from '../model/history';
import { MetadataVersion } from '../model/version';
-import { HistoryService } from '../service/history.service';
+import { MetadataHistoryService } from '../service/history.service';
import { of } from 'rxjs';
+import { StoreModule, combineReducers } from '@ngrx/store';
+import * as fromConfiguration from '../reducer';
export const TestData = {
versions: [
@@ -33,26 +35,29 @@ const MockHistoryService = {
};
describe('Metadata Version History Component', () => {
- let fixture: ComponentFixture;
- let instance: VersionHistoryComponent;
+ let fixture: ComponentFixture;
+ let instance: MetadataHistoryComponent;
beforeEach(() => {
TestBed.configureTestingModule({
providers: [
{
- provide: HistoryService, useValue: MockHistoryService
+ provide: MetadataHistoryService, useValue: MockHistoryService
}
],
imports: [
- MockI18nModule
+ MockI18nModule,
+ StoreModule.forRoot({
+ 'metadata-configuration': combineReducers(fromConfiguration.reducers),
+ }),
],
declarations: [
MockHistoryListComponent,
- VersionHistoryComponent
+ MetadataHistoryComponent
],
});
- fixture = TestBed.createComponent(VersionHistoryComponent);
+ fixture = TestBed.createComponent(MetadataHistoryComponent);
instance = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/ui/src/app/metadata/configuration/container/metadata-history.component.ts b/ui/src/app/metadata/configuration/container/metadata-history.component.ts
new file mode 100644
index 000000000..6fb60bdb9
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/metadata-history.component.ts
@@ -0,0 +1,22 @@
+import { Component, ChangeDetectionStrategy } from '@angular/core';
+import { Observable } from 'rxjs';
+import { Store } from '@ngrx/store';
+import { ConfigurationState, getVersionCollection } from '../reducer';
+import { MetadataVersion } from '../model/version';
+
+@Component({
+ selector: 'metadata-history',
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ templateUrl: './metadata-history.component.html',
+ styleUrls: []
+})
+export class MetadataHistoryComponent {
+
+ history$: Observable;
+
+ constructor(
+ private store: Store
+ ) {
+ this.history$ = this.store.select(getVersionCollection);
+ }
+}
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 5e6b85384..9c4dbb489 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,18 @@
\ No newline at end of file
diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts
index 2e35d8c75..0cb1bd5b0 100644
--- a/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts
+++ b/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts
@@ -8,6 +8,9 @@ import { MetadataConfiguration } from '../model/metadata-configuration';
import * as fromConfiguration from '../reducer';
import { MockI18nModule } from '../../../../testing/i18n.stub';
import { MetadataOptionsComponent } from './metadata-options.component';
+import { Metadata } from '../../domain/domain.type';
+import { MetadataVersion } from '../model/version';
+import { CommonModule } from '@angular/common';
@Component({
selector: 'metadata-configuration',
@@ -17,6 +20,17 @@ class MetadataConfigurationComponent {
@Input() configuration: MetadataConfiguration;
}
+@Component({
+ selector: 'metadata-header',
+ template: ``
+})
+class MetadataHeaderComponent {
+ @Input() isEnabled: boolean;
+ @Input() version: MetadataVersion;
+ @Input() versionNumber: number;
+ @Input() isCurrent: boolean;
+}
+
@Component({
template: `
@@ -44,18 +58,20 @@ describe('Metadata Options Page Component', () => {
'metadata-configuration': combineReducers(fromConfiguration.reducers),
}),
MockI18nModule,
- RouterTestingModule
+ RouterTestingModule,
+ CommonModule
],
declarations: [
MetadataOptionsComponent,
MetadataConfigurationComponent,
+ MetadataHeaderComponent,
TestHostComponent
],
}).compileComponents();
store = TestBed.get(Store);
spyOn(store, 'dispatch');
- spyOn(store, 'select');
+ spyOn(store, 'select').and.callThrough();
fixture = TestBed.createComponent(TestHostComponent);
instance = fixture.componentInstance;
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 bc2d0bb0d..461252f1d 100644
--- a/ui/src/app/metadata/configuration/container/metadata-options.component.ts
+++ b/ui/src/app/metadata/configuration/container/metadata-options.component.ts
@@ -2,8 +2,17 @@ import { Store } from '@ngrx/store';
import { Component, ChangeDetectionStrategy } from '@angular/core';
import { Observable } from 'rxjs';
-import * as fromConfiguration from '../reducer';
+import {
+ ConfigurationState,
+ getConfigurationSections,
+ getConfigurationModel,
+ getSelectedVersion,
+ getSelectedVersionNumber,
+ getSelectedIsCurrent
+} from '../reducer';
import { MetadataConfiguration } from '../model/metadata-configuration';
+import { MetadataVersion } from '../model/version';
+import { map } from 'rxjs/operators';
@Component({
selector: 'metadata-options-page',
@@ -14,10 +23,20 @@ import { MetadataConfiguration } from '../model/metadata-configuration';
export class MetadataOptionsComponent {
configuration$: Observable;
+ isEnabled$: Observable;
+ version$: Observable;
+ versionNumber$: Observable;
+ isCurrent$: Observable;
constructor(
- private store: Store
+ private store: Store
) {
- this.configuration$ = this.store.select(fromConfiguration.getConfigurationSections);
+ this.configuration$ = this.store.select(getConfigurationSections);
+ this.isEnabled$ = this.store.select(getConfigurationModel).pipe(
+ map(config => config ? ('serviceEnabled' in config) ? config.serviceEnabled : config.enabled : false)
+ );
+ this.version$ = this.store.select(getSelectedVersion);
+ this.versionNumber$ = this.store.select(getSelectedVersionNumber);
+ this.isCurrent$ = this.store.select(getSelectedIsCurrent);
}
}
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 57560ea78..613dc7699 100644
--- a/ui/src/app/metadata/configuration/container/metadata-xml.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-xml.component.html
@@ -1,7 +1,15 @@
-
{{ xml$ | async }}
-
+
+
+
{{ xml$ | async }}
+
+