From 9393832a66f4925d02bf38c6b3cf88909235aba4 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 25 Jul 2019 09:00:11 -0700 Subject: [PATCH] SHIBUI-1332 Fixed layout --- .../component/array-property.component.html | 30 +++++++++---------- ...ter-configuration-list-item.component.html | 2 +- .../metadata-configuration.component.html | 28 +++++++++-------- .../primitive-property.component.html | 2 +- .../container/configuration.component.spec.ts | 4 +++ .../metadata-comparison.component.html | 11 +++---- .../metadata-comparison.component.ts | 4 ++- .../container/metadata-options.component.html | 6 ++-- .../reducer/configuration.reducer.spec.ts | 9 +++--- .../metadata/configuration/reducer/index.ts | 2 +- ui/src/theme/modal.scss | 1 + 11 files changed, 53 insertions(+), 46 deletions(-) diff --git a/ui/src/app/metadata/configuration/component/array-property.component.html b/ui/src/app/metadata/configuration/component/array-property.component.html index 692cb3a5f..c2f976657 100644 --- a/ui/src/app/metadata/configuration/component/array-property.component.html +++ b/ui/src/app/metadata/configuration/component/array-property.component.html @@ -1,7 +1,7 @@
-
{{ property.name }}
-
+
{{ property.name }}
+
{{ property.items.properties[prop].title }} @@ -11,12 +11,13 @@ [ngbPopover]="version[i][prop]" triggers="mouseenter:mouseleave" container="body" - placement="left" - [ngStyle]="{'width': width}"> + [ngStyle]="{'width': width}" + class="text-truncate" + popoverClass="popover-lg"> {{ version[i][prop] }}
- — + -
@@ -34,9 +35,9 @@
-
- {{ attr.label }} -
+
+ {{ attr.label }} +
true @@ -51,17 +52,16 @@
- {{ property.name }} + {{ property.name }} -

—

- {{ v }} +

-

    -
  • + popoverClass="popover-lg" + *ngIf="v && v.length > 0"> +
-
+
diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html index b61ba4b0e..6f4628c75 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html @@ -18,20 +18,22 @@

-
- Option - - Value - {{ date | date:'medium' }} - +
+
+ Option + + Value + {{ date | date:'medium' }} + +
+ +
- -
\ No newline at end of file diff --git a/ui/src/app/metadata/configuration/component/primitive-property.component.html b/ui/src/app/metadata/configuration/component/primitive-property.component.html index 608f4acdd..4d93c07cc 100644 --- a/ui/src/app/metadata/configuration/component/primitive-property.component.html +++ b/ui/src/app/metadata/configuration/component/primitive-property.component.html @@ -1,4 +1,4 @@ -
+
{ NgbDropdownModule, StoreModule.forRoot({ 'metadata-configuration': combineReducers(fromConfiguration.reducers), + 'provider': combineReducers(fromProviders.reducers), + 'resolver': combineReducers(fromResolvers.reducers) }), MockI18nModule, RouterTestingModule 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 fabdb5338..d5b533716 100644 --- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html @@ -1,10 +1,7 @@ -
- +
  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 701c99d2a..92019297d 100644 --- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts +++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts @@ -3,7 +3,7 @@ import { Observable } from 'rxjs'; import { Store } from '@ngrx/store'; import { ActivatedRoute } from '@angular/router'; import { map } from 'rxjs/operators'; -import { ConfigurationState, getVersionConfigurations } from '../reducer'; +import { ConfigurationState, getVersionConfigurations, getVersionConfigurationCount } from '../reducer'; import { Metadata } from '../../domain/domain.type'; import { CompareVersionRequest } from '../action/compare.action'; import { MetadataConfiguration } from '../model/metadata-configuration'; @@ -17,6 +17,7 @@ import { MetadataConfiguration } from '../model/metadata-configuration'; export class MetadataComparisonComponent { versions$: Observable; + numVersions$: Observable; constructor( private store: Store, @@ -28,5 +29,6 @@ export class MetadataComparisonComponent { ).subscribe(this.store); this.versions$ = this.store.select(getVersionConfigurations); + this.numVersions$ = this.store.select(getVersionConfigurationCount); } } 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 77e63d79d..972e0e4da 100644 --- a/ui/src/app/metadata/configuration/container/metadata-options.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.html @@ -7,11 +7,11 @@ >
- - diff --git a/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts b/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts index 4be8661e0..a0dd05d58 100644 --- a/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts +++ b/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts @@ -45,10 +45,10 @@ describe('Configuration Reducer', () => { describe('SET_METADATA action', () => { it('should set the state metadata model', () => { - const action = new actions.SetMetadata(model as MetadataResolver); + const action = new actions.SetMetadata({ id: model.id, type: 'resolver' }); const result = reducer(initialState, action); - expect(result).toEqual({ ...initialState, model }); + expect(result).toEqual({ ...initialState, modelId: model.id, modelType: 'resolver' }); }); }); @@ -66,7 +66,8 @@ describe('Configuration Reducer', () => { const action = new actions.ClearConfiguration(); const result = reducer({ ...initialState, - model, + modelType: 'resolver', + modelId: model.id, definition, schema }, action); @@ -84,7 +85,7 @@ describe('Configuration Reducer', () => { */ describe('getModel', () => { it('should retrieve the model from state', () => { - expect(fromConfig.getModel({...initialState, model})).toBe(model); + expect(fromConfig.getModelKind({...initialState, modelType: 'resolver'})).toBe('resolver'); }); }); describe('getDefinition', () => { diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts index 63b16d44f..b4538bae4 100644 --- a/ui/src/app/metadata/configuration/reducer/index.ts +++ b/ui/src/app/metadata/configuration/reducer/index.ts @@ -160,4 +160,4 @@ export const getVersionConfigurations = createSelector( getConfigurationSectionsFn ); - +export const getVersionConfigurationCount = createSelector(getVersionConfigurations, (config) => config ? config.dates.length : 0); diff --git a/ui/src/theme/modal.scss b/ui/src/theme/modal.scss index 065d41840..06b327456 100644 --- a/ui/src/theme/modal.scss +++ b/ui/src/theme/modal.scss @@ -3,6 +3,7 @@ } .modal.modal-xl { + max-width: 100% !important; .modal-dialog { width: 1200px; max-width: 98%;