From a9f5dcc01cadf13a2dd9c98f6ea2258b2b23d19d Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Fri, 27 Apr 2018 00:03:04 +0000 Subject: [PATCH] Merged in bugfix/SHIBUI-441 (pull request #61) SHIBUI-441: Fixed issue with minimum four characters * Fixed issue with minimum four characters * Implemented save stop for filters * Fixed issue with reset entity id --- .../component/search-dialog.component.html | 6 +- .../component/search-dialog.component.ts | 5 +- .../container/edit-filter.component.html | 56 ++++++++++++------- .../container/edit-filter.component.ts | 6 +- .../container/new-filter.component.html | 20 ++++++- .../container/new-filter.component.ts | 2 + .../reducer/filter.reducer.spec.ts | 3 +- .../metadata-filter/reducer/filter.reducer.ts | 12 +++- ui/src/app/metadata-filter/reducer/index.ts | 1 + .../autocomplete/autocomplete.component.scss | 7 ++- ui/src/locale/en.xlf | 8 +++ ui/src/locale/es.xlf | 8 +++ 12 files changed, 105 insertions(+), 29 deletions(-) diff --git a/ui/src/app/metadata-filter/component/search-dialog.component.html b/ui/src/app/metadata-filter/component/search-dialog.component.html index b850746c8..317a11e63 100644 --- a/ui/src/app/metadata-filter/component/search-dialog.component.html +++ b/ui/src/app/metadata-filter/component/search-dialog.component.html @@ -17,12 +17,16 @@

class="form-control" aria-label="Entity ID search text box" /> + + Minimum 4 characters. +
- - +
+ + + + Minimum 4 characters. + + + + Entity ID is required + Entity ID not found + + +
- - - Entity ID is required - Entity ID not found - - @@ -99,11 +104,24 @@ Preview XML - - diff --git a/ui/src/app/metadata-filter/container/edit-filter.component.ts b/ui/src/app/metadata-filter/container/edit-filter.component.ts index 8a7e9f0cf..f3bc80385 100644 --- a/ui/src/app/metadata-filter/container/edit-filter.component.ts +++ b/ui/src/app/metadata-filter/container/edit-filter.component.ts @@ -47,6 +47,7 @@ export class EditFilterComponent implements OnInit, OnDestroy { loading$: Observable; processing$: Observable; preview$: Observable; + isSaving$: Observable; form: FormGroup = this.fb.group({ entityId: ['', [Validators.required]], @@ -55,6 +56,7 @@ export class EditFilterComponent implements OnInit, OnDestroy { }); filter: MetadataFilter; + filterEntity: Filter; isValid = false; @@ -75,6 +77,7 @@ export class EditFilterComponent implements OnInit, OnDestroy { this.loading$ = this.store.select(fromFilter.getIsLoading); this.processing$ = this.loading$.withLatestFrom(this.showMore$, (l, s) => !s && l); this.preview$ = this.store.select(fromFilter.getPreview); + this.isSaving$ = this.store.select(fromFilter.getSaving); this.entityIds$.subscribe(ids => this.ids = ids); @@ -86,6 +89,7 @@ export class EditFilterComponent implements OnInit, OnDestroy { filterEnabled }); this.filter = filter; + this.filterEntity = new Filter(filter); this.store.dispatch(new SelectId(entityId)); }); @@ -139,7 +143,7 @@ export class EditFilterComponent implements OnInit, OnDestroy { const input = this.form.get('entityId'); input.disable(); input.clearAsyncValidators(); - input.reset(this.filter.entityId); + input.setValue(this.filterEntity.entityId); } searchEntityIds(term: string): void { diff --git a/ui/src/app/metadata-filter/container/new-filter.component.html b/ui/src/app/metadata-filter/container/new-filter.component.html index dec981eaf..bae6ea5e2 100644 --- a/ui/src/app/metadata-filter/container/new-filter.component.html +++ b/ui/src/app/metadata-filter/container/new-filter.component.html @@ -60,6 +60,9 @@ + + Minimum 4 characters. + Entity ID is required @@ -70,11 +73,22 @@
- -
diff --git a/ui/src/app/metadata-filter/container/new-filter.component.ts b/ui/src/app/metadata-filter/container/new-filter.component.ts index 5b67a08b9..f83ad5efd 100644 --- a/ui/src/app/metadata-filter/container/new-filter.component.ts +++ b/ui/src/app/metadata-filter/container/new-filter.component.ts @@ -54,6 +54,7 @@ export class NewFilterComponent implements OnInit, OnDestroy { loading$: Observable; processing$: Observable; preview$: Observable; + isSaving$: Observable; form: FormGroup = this.fb.group({ entityId: ['', [Validators.required], [ @@ -79,6 +80,7 @@ export class NewFilterComponent implements OnInit, OnDestroy { this.loading$ = this.store.select(fromFilter.getIsLoading); this.processing$ = this.loading$.withLatestFrom(this.showMore$, (l, s) => !s && l); this.preview$ = this.store.select(fromFilter.getPreview); + this.isSaving$ = this.store.select(fromFilter.getSaving); this.entityIds$.subscribe(ids => this.ids = ids); } diff --git a/ui/src/app/metadata-filter/reducer/filter.reducer.spec.ts b/ui/src/app/metadata-filter/reducer/filter.reducer.spec.ts index f482928c5..2b42917c2 100644 --- a/ui/src/app/metadata-filter/reducer/filter.reducer.spec.ts +++ b/ui/src/app/metadata-filter/reducer/filter.reducer.spec.ts @@ -5,7 +5,8 @@ import * as actions from '../action/filter.action'; const snapshot: fromFilter.FilterState = { selected: null, changes: null, - preview: null + preview: null, + saving: false }; describe('Filter Reducer', () => { diff --git a/ui/src/app/metadata-filter/reducer/filter.reducer.ts b/ui/src/app/metadata-filter/reducer/filter.reducer.ts index 86f2e04b7..4b36bff38 100644 --- a/ui/src/app/metadata-filter/reducer/filter.reducer.ts +++ b/ui/src/app/metadata-filter/reducer/filter.reducer.ts @@ -9,12 +9,14 @@ export interface FilterState { selected: string | null; changes: MetadataFilter | null; preview: MDUI | null; + saving: boolean; } export const initialState: FilterState = { selected: null, changes: null, - preview: null + preview: null, + saving: false }; export function reducer(state = initialState, action: filter.Actions | FilterCollectionActionsUnion): FilterState { @@ -46,6 +48,13 @@ export function reducer(state = initialState, action: filter.Actions | FilterCol } }; } + case FilterCollectionActionTypes.ADD_FILTER: + case FilterCollectionActionTypes.UPDATE_FILTER_REQUEST: { + return { + ...initialState, + saving: true + }; + } case FilterCollectionActionTypes.ADD_FILTER_SUCCESS: case FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS: case filter.CANCEL_CREATE_FILTER: { @@ -62,3 +71,4 @@ export function reducer(state = initialState, action: filter.Actions | FilterCol export const getSelected = (state: FilterState) => state.selected; export const getFilterChanges = (state: FilterState) => state.changes; export const getPreview = (state: FilterState) => state.preview; +export const getSaving = (state: FilterState) => state.saving; diff --git a/ui/src/app/metadata-filter/reducer/index.ts b/ui/src/app/metadata-filter/reducer/index.ts index 73b342ff2..f94f5d385 100644 --- a/ui/src/app/metadata-filter/reducer/index.ts +++ b/ui/src/app/metadata-filter/reducer/index.ts @@ -25,6 +25,7 @@ export const getFilterFromState = createSelector(getFilterState, getFiltersFromS export const getSelected = createSelector(getFilterFromState, fromFilter.getSelected); export const getFilter = createSelector(getFilterFromState, fromFilter.getFilterChanges); export const getPreview = createSelector(getFilterFromState, fromFilter.getPreview); +export const getSaving = createSelector(getFilterFromState, fromFilter.getSaving); export const getSearchFromState = createSelector(getFilterState, getSearchFromStateFn); export const getEntityCollection = createSelector(getSearchFromState, fromSearch.getEntityIds); diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.scss b/ui/src/app/shared/autocomplete/autocomplete.component.scss index a491882aa..192e30310 100644 --- a/ui/src/app/shared/autocomplete/autocomplete.component.scss +++ b/ui/src/app/shared/autocomplete/autocomplete.component.scss @@ -1,3 +1,8 @@ +.dropdown.form-group { + margin-bottom: 0px; +} + .dropdown-menu { - width: 100%; + min-width: 100%; + width: auto; } \ No newline at end of file diff --git a/ui/src/locale/en.xlf b/ui/src/locale/en.xlf index 4ab25f300..21ced3e8e 100644 --- a/ui/src/locale/en.xlf +++ b/ui/src/locale/en.xlf @@ -2103,6 +2103,14 @@ 93 + + Minimum 4 characters. + Minimum 4 characters. + + app/metadata-filter/container/new-filter.component.ts + 93 + + Entity Preview Entity Preview diff --git a/ui/src/locale/es.xlf b/ui/src/locale/es.xlf index cb3d21da3..d9001cead 100644 --- a/ui/src/locale/es.xlf +++ b/ui/src/locale/es.xlf @@ -2071,6 +2071,14 @@ 93 + + Minimum 4 characters. + Minimum 4 characters. (es) + + app/metadata-filter/container/new-filter.component.ts + 93 + + Entity Preview Entity Preview