Merged in feature/SHIBUI-1437 (pull request #381)

SHIBUI-1437 Integrated config component to replace summary Approved-by: Dmitriy Kopylenko <dkopylenko@unicon.net>
TIER · Oct 1, 2019 · 6ca0950 · 6ca0950
2 parents 58da1ac + 40feb8a
commit 6ca0950
Show file tree

Hide file tree

Showing 29 changed files with 424 additions and 297 deletions.
diff --git a/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.html b/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.html
@@ -35,7 +35,6 @@
     </div>
     <metadata-configuration
         [numbered]="false"
-        [editable]="false"
         [configuration]="configuration"
         [entity]="filter"
         [definition]="definition"

diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html
@@ -10,8 +10,7 @@ <h2 class="title h4 m-0 flex-grow-1">
                         </span>
                         <span class="text ml-2">{{ section.label | translate }}</span>
                     </h2>
-                    <div class="actions px-2"
-                        *ngIf="editable && configuration.dates.length === 1">
+                    <div class="actions px-2" *ngIf="editable">
                         <button class="btn btn-link edit-link change-view" (click)="edit(section.id)">
                             <i class="fa fa-edit"></i>&nbsp;
                             <span translate="action.edit">Edit</span>

diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts
@@ -66,10 +66,10 @@ describe('Metadata Configuration Component', () => {
     }));
 
     describe('edit method', () => {
-        it('should call router.navigate', () => {
-            spyOn(router, 'navigate');
+        it('should call onEdit.emit', () => {
+            spyOn(app.onEdit, 'emit');
             app.edit('foo');
-            expect(router.navigate).toHaveBeenCalled();
+            expect(app.onEdit.emit).toHaveBeenCalled();
         });
     });
 

diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts
@@ -1,5 +1,4 @@
-import { Component, ChangeDetectionStrategy, Input, Output, EventEmitter, OnChanges } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Component, Input, Output, EventEmitter, OnChanges } from '@angular/core';
 import { MetadataConfiguration } from '../model/metadata-configuration';
 import { Metadata } from '../../domain/domain.type';
 import { CONFIG_DATE_FORMAT } from '../configuration.values';
@@ -14,25 +13,26 @@ export class MetadataConfigurationComponent implements OnChanges {
     @Input() definition: any;
     @Input() entity: Metadata;
     @Input() numbered = true;
-    @Input() editable = true;
 
     @Output() preview: EventEmitter<any> = new EventEmitter();
+    @Output() onEdit: EventEmitter<string> = new EventEmitter();
 
     zero = false;
 
     DATE_FORMAT = CONFIG_DATE_FORMAT;
 
-    constructor(
-        private router: Router,
-        private activatedRoute: ActivatedRoute
-    ) {}
-
     ngOnChanges(): void {
-        this.zero = !this.configuration.sections.some(s => !!s.properties.length);
+        if (this.configuration) {
+            this.zero = !this.configuration.sections.some(s => !!s.properties.length);
+        }
+    }
+
+    get editable(): boolean {
+        return !!this.onEdit.observers.length;
     }
 
     edit(id: string): void {
-        this.router.navigate(['../', 'edit', id], { relativeTo: this.activatedRoute.parent });
+        this.onEdit.emit(id);
     }
 
     onPreview($event): void {

diff --git a/ui/src/app/metadata/configuration/configuration.module.ts b/ui/src/app/metadata/configuration/configuration.module.ts
@@ -84,7 +84,9 @@ import { FilterCompareVersionEffects } from './effect/filter.effect';
         WizardModule,
         FormModule
     ],
-    exports: [],
+    exports: [
+        MetadataConfigurationComponent
+    ],
     providers: [
         DatePipe,
         IndexResolver
@@ -114,7 +116,8 @@ export class MetadataConfigurationModule {
                 RestoreEffects,
                 FilterCompareVersionEffects,
                 VersionEffects
-            ])
+            ]
+        )
     ],
     providers: []
 })

diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
@@ -23,9 +23,7 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
         </button>
     </div>
     <metadata-configuration
-        [configuration]="versions$ | async"
-        [editable]="false"></metadata-configuration>
-
+        [configuration]="versions$ | async"></metadata-configuration>
     <div class="numbered-header d-flex justify-content-start bg-light align-items-center py-1">
         <h2 class="title h4 m-0 flex-grow-1">
             <span class="text ml-2" translate="label.metadata-filter">Metadata Filter</span>
@@ -41,8 +39,7 @@ <h2 class="title h4 m-0 flex-grow-1">
     <ng-container *ngIf="(filterCompare$ | async)">
         <br />
         <metadata-configuration
-            [configuration]="filterCompare$ | async"
-            [editable]="false"></metadata-configuration>
+            [configuration]="filterCompare$ | async"></metadata-configuration>
         <div class="d-flex justify-content-end my-2">
             <button class="btn btn-success" (click)="resetCompareFilters()">
                 <i class="fa fa-arrow-left" aria-hidden="true"></i>&nbsp;

diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html
@@ -32,7 +32,11 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
         </div>
     </div>
     <ng-container *ngIf="configuration$ | async">
-        <metadata-configuration [configuration]="configuration$ | async" id="configuration"></metadata-configuration>
+        <metadata-configuration
+            [configuration]="configuration$ | async"
+            (onEdit)="edit($event)"
+            id="configuration">
+        </metadata-configuration>
     </ng-container>
     <ng-container *ngIf="!(configuration$ | async)">
         <div class="d-flex justify-content-center">

diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.ts
@@ -2,7 +2,7 @@ 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 } from '@angular/router';
+import { Router, ActivatedRoute } from '@angular/router';
 import { ViewportScroller } from '@angular/common';
 import { takeUntil, filter } from 'rxjs/operators';
 
@@ -53,7 +53,9 @@ export class MetadataOptionsComponent implements OnDestroy {
     constructor(
         protected store: Store<ConfigurationState>,
         protected modalService: NgbModal,
-        protected scroller: ViewportScroller
+        protected scroller: ViewportScroller,
+        protected router: Router,
+        protected activatedRoute: ActivatedRoute
     ) {
         this.model$
             .pipe(
@@ -63,6 +65,10 @@ export class MetadataOptionsComponent implements OnDestroy {
             .subscribe(p => this.setModel(p));
     }
 
+    edit(id: string) {
+        this.router.navigate(['../', 'edit', id], { relativeTo: this.activatedRoute.parent });
+    }
+
     setModel(data: Metadata): void {
         this.id = 'resourceId' in data ? data.resourceId : data.id;
         this.kind = '@type' in data ? 'provider' : 'resolver';

diff --git a/ui/src/app/metadata/configuration/container/version-options.component.html b/ui/src/app/metadata/configuration/container/version-options.component.html
@@ -23,7 +23,6 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
     </div>
     <metadata-configuration
         [configuration]="configuration$ | async"
-        [editable]="false"
         id="configuration">
     </metadata-configuration>
     <div *ngIf="kind === 'provider'" id="filters">

diff --git a/ui/src/app/metadata/configuration/reducer/index.spec.ts b/ui/src/app/metadata/configuration/reducer/index.spec.ts
@@ -1,143 +1,31 @@
 import {
-    getConfigurationSectionsFn,
     getConfigurationModelNameFn,
     getConfigurationModelEnabledFn,
-    assignValueToProperties,
-    getLimitedPropertiesFn,
     getConfigurationModelTypeFn,
     getSelectedVersionNumberFn,
     getSelectedIsCurrentFn
 } from './index';
-import { SCHEMA as schema } from '../../../../testing/form-schema.stub';
+
 import { Metadata } from '../../domain/domain.type';
-import { MockMetadataWizard } from '../../../../testing/mockMetadataWizard';
 
 describe('Configuration Reducer', () => {
-    const model = {
-        name: 'foo',
-        serviceEnabled: true,
-        foo: {
-            bar: 'bar',
-            baz: 'baz'
-        },
-        list: [
-            'super',
-            'cool'
-        ]
-    };
-
-    const props = [
-        {
-            id: 'name',
-            items: null,
-            name: 'label.metadata-provider-name-dashboard-display-only',
-            properties: [],
-            type: 'string',
-            value: null,
-            widget: { id: 'string', help: 'message.must-be-unique' }
-        },
-        {
-            id: 'serviceEnabled',
-            items: null,
-            name: 'serviceEnabled',
-            properties: [],
-            type: 'string',
-            value: null,
-            widget: { id: 'select', disabled: true }
-        },
-        {
-            id: 'foo',
-            items: null,
-            name: 'foo',
-            type: 'object',
-            properties: [
-                {
-                    id: 'bar',
-                    name: 'bar',
-                    type: 'string',
-                    properties: []
-                },
-                {
-                    id: 'baz',
-                    name: 'baz',
-                    type: 'string',
-                    properties: []
-                }
-            ]
-        },
-        {
-            id: 'list',
-            name: 'list',
-            type: 'array',
-            items: {
-                type: 'string'
-            },
-            widget: {
-                id: 'datalist',
-                data: [
-                    { key: 'super', label: 'super' },
-                    { key: 'cool', label: 'cool' },
-                    { key: 'notcool', label: 'notcool' }
-                ]
-            }
-        }
-    ];
-
-    const definition = MockMetadataWizard;
-
-    describe('getConfigurationSectionsFn', () => {
-        it('should parse the schema, definition, and model into a MetadataConfiguration', () => {
-            const config = getConfigurationSectionsFn([model], definition, schema);
-            expect(config.sections).toBeDefined();
-        });
-    });
 
     describe('getConfigurationModelNameFn function', () => {
         it('should return the name attribute', () => {
             expect(getConfigurationModelNameFn({ serviceProviderName: 'foo' } as Metadata)).toBe('foo');
             expect(getConfigurationModelNameFn({ name: 'bar' } as Metadata)).toBe('bar');
-            expect(getConfigurationModelNameFn(null)).toBe(false);
+            expect(getConfigurationModelNameFn(null)).toBe('');
         });
     });
 
     describe('getConfigurationModelEnabledFn function', () => {
-        it('should return the name attribute', () => {
+        it('should return the enabled attribute', () => {
             expect(getConfigurationModelEnabledFn({ serviceEnabled: true } as Metadata)).toBe(true);
             expect(getConfigurationModelEnabledFn({ enabled: true } as Metadata)).toBe(true);
             expect(getConfigurationModelEnabledFn(null)).toBe(false);
         });
     });
 
-    describe('assignValueToProperties function', () => {
-        it('should assign appropriate values to the given schema properties', () => {
-            const assigned = assignValueToProperties([model], props, definition);
-            expect(assigned[0].value).toEqual(['foo']);
-            expect(assigned[1].value).toEqual([true]);
-        });
-
-        it('should assign differences when passed multiple models', () => {
-            const assigned = assignValueToProperties([model, {
-                ...model,
-                name: 'bar',
-                list: [
-                    'super',
-                    'notcool'
-                ]
-            }], props, definition);
-            expect(assigned[0].differences).toBe(true);
-        });
-    });
-
-    describe('getLimitedPropertiesFn function', () => {
-        it('should filter properties without differences', () => {
-            const assigned = assignValueToProperties([model, {
-                ...model,
-                name: 'bar'
-            }], props, definition);
-            expect(getLimitedPropertiesFn(assigned).length).toBe(1);
-        });
-    });
-
     describe('getConfigurationModelTypeFn function ', () => {
         it('should return provider type if the object has an @type property', () => {
             const md = { '@type': 'FilebackedHttpMetadataResolver' } as Metadata;