From b1585ac7f23379efa15d22f837f2f35371b865d5 Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 11 Jul 2019 15:09:28 +0200 Subject: [PATCH] progress july 11 - store/selection to object list --- src/app/app.reducer.ts | 6 + src/app/core/core.module.ts | 2 + ...namic-lookup-relation-modal.component.html | 211 +++++++++--------- ...dynamic-lookup-relation-modal.component.ts | 89 +------- .../object-collection.component.html | 2 + .../object-collection.component.ts | 3 + .../object-list/object-list.component.html | 10 + .../object-list/object-list.component.ts | 76 ++++++- .../selectable-list.actions.ts | 87 ++++++++ .../selectable-list.reducer.ts | 106 +++++++++ .../selectable-list.service.ts | 94 ++++++++ .../search-filters.component.ts | 2 - .../search-results.component.html | 30 ++- .../search-results.component.ts | 3 + 14 files changed, 520 insertions(+), 201 deletions(-) create mode 100644 src/app/shared/object-list/selectable-list/selectable-list.actions.ts create mode 100644 src/app/shared/object-list/selectable-list/selectable-list.reducer.ts create mode 100644 src/app/shared/object-list/selectable-list/selectable-list.service.ts diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts index b0ca9d697d..26a9c6d2e2 100644 --- a/src/app/app.reducer.ts +++ b/src/app/app.reducer.ts @@ -23,6 +23,10 @@ import { hasValue } from './shared/empty.util'; import { cssVariablesReducer, CSSVariablesState } from './shared/sass-helper/sass-helper.reducer'; import { menusReducer, MenusState } from './shared/menu/menu.reducer'; import { historyReducer, HistoryState } from './shared/history/history.reducer'; +import { + selectableListReducer, + SelectableListsState +} from './shared/object-list/selectable-list/selectable-list.reducer'; export interface AppState { router: fromRouter.RouterReducerState; @@ -36,6 +40,7 @@ export interface AppState { truncatable: TruncatablesState; cssVariables: CSSVariablesState; menus: MenusState; + selectableLists: SelectableListsState } export const appReducers: ActionReducerMap = { @@ -50,6 +55,7 @@ export const appReducers: ActionReducerMap = { truncatable: truncatableReducer, cssVariables: cssVariablesReducer, menus: menusReducer, + selectableLists: selectableListReducer }; export const routerStateSelector = (state: AppState) => state.router; diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 90231808e5..63accb53b1 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -100,6 +100,7 @@ import { SearchFilterService } from './shared/search/search-filter.service'; import { SearchFixedFilterService } from './shared/search/search-fixed-filter.service'; import { FilteredSearchPageGuard } from '../+search-page/filtered-search-page.guard'; import { SearchConfigurationService } from './shared/search/search-configuration.service'; +import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service'; export const restServiceFactory = (cfg: GlobalConfig, mocks: MockResponseMap, http: HttpClient) => { // if (ENV_CONFIG.production) { @@ -205,6 +206,7 @@ const PROVIDERS = [ FilteredSearchPageGuard, SearchFilterService, SearchConfigurationService, + SelectableListService, // register AuthInterceptor as HttpInterceptor { provide: HTTP_INTERCEPTORS, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html index 06688d2de1..16b700f93e 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html @@ -5,111 +5,114 @@ -
-
-
- -
-
- -
- -
-
- -
-
-
-
-
- - - - -
-
- -
- +
+
+ +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- - - - -
-
-
-
- -
- - - -
- -
-
- {{ 'form.no-results' | translate}} -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts index 4f0f2d1fbe..2b4ea67d0f 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts @@ -14,6 +14,7 @@ import { concat, map, multicast, take, takeWhile, tap } from 'rxjs/operators'; import { Router } from '@angular/router'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../+my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; +import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service'; const RELATION_TYPE_FILTER_PREFIX = 'f.entityType='; @@ -37,22 +38,21 @@ export class DsDynamicLookupRelationModalComponent implements OnInit { resultsRD$: Observable>>>; searchConfig: PaginatedSearchOptions; repeatable: boolean; - selection: DSpaceObject[] = []; previousSelection: DSpaceObject[] = []; - allSelected = false; searchQuery; initialPagination = Object.assign(new PaginationComponentOptions(), { id: 'submission-relation-list', pageSize: 10 }); - selectAllLoading = false; + listId; - constructor(public modal: NgbActiveModal, private searchService: SearchService, private router: Router) { + constructor(public modal: NgbActiveModal, private searchService: SearchService, private router: Router, private selectableListService: SelectableListService) { } ngOnInit(): void { this.resetRoute(); this.fieldName = this.relationKey.substring(RELATION_TYPE_METADATA_PREFIX.length); + this.listId = 'list-' + this.fieldName; this.onPaginationChange(this.initialPagination); } @@ -60,7 +60,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit { this.searchQuery = query; this.resetRoute(); this.onPaginationChange(this.initialPagination); - this.deselectAll(); + this.selectableListService.deselectAll(this.listId); } onPaginationChange(pagination: PaginationComponentOptions) { @@ -84,84 +84,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit { } close() { - this.modal.close(this.selection); - } - - isSelected(dso: DSpaceObject): boolean { - const completeSelection = [...this.selection, ...this.previousSelection]; - return hasValue(completeSelection.find((selected) => selected.uuid === dso.uuid)); - } - - isDisabled(dso: DSpaceObject): boolean { - return hasValue(this.previousSelection.find((selected) => selected.uuid === dso.uuid)); - } - - selectCheckbox(value: boolean, dso: DSpaceObject) { - if (value) { - this.selection = [...this.selection, dso]; - } else { - this.allSelected = false; - this.selection = this.selection.filter((selected) => { - return selected.uuid !== dso.uuid - }); - } - } - - selectRadio(value: boolean, dso: DSpaceObject) { - if (value) { - this.selection = [dso]; - } - } - - selectPage(page: SearchResult[]) { - const newObjects: DSpaceObject[] = page - .map((searchResult) => searchResult.indexableObject) - .filter((dso) => hasNoValue(this.selection.find((selected) => selected.uuid === dso.uuid))) - .filter((dso) => hasNoValue(this.previousSelection.find((object) => object.uuid === dso.uuid))); - this.selection = [...this.selection, ...newObjects] - } - - deselectPage(page: SearchResult[]) { - this.allSelected = false; - const objects: DSpaceObject[] = page - .map((searchResult) => searchResult.indexableObject); - this.selection = this.selection.filter((selected) => hasNoValue(objects.find((object) => object.uuid === selected.uuid))); - } - - selectAll() { - this.allSelected = true; - this.selectAllLoading = true; - const fullPagination = Object.assign(new PaginationComponentOptions(), { - query: this.searchQuery, - currentPage: 1, - pageSize: Number.POSITIVE_INFINITY - }); - const fullSearchConfig = Object.assign(this.searchConfig, { pagination: fullPagination }); - const results = this.searchService.search(fullSearchConfig); - results.pipe( - getSucceededRemoteData(), - map((resultsRD) => resultsRD.payload.page), - tap(() => this.selectAllLoading = false) - ) - .subscribe((results) => - this.selection = results - .map((searchResult) => searchResult.indexableObject) - .filter((dso) => hasNoValue(this.previousSelection.find((object) => object.uuid === dso.uuid))) - ); - } - - deselectAll() { - this.allSelected = false; - this.selection = []; - } - - - isAllSelected() { - return this.allSelected; - } - - isSomeSelected() { - return isNotEmpty(this.selection); + this.modal.close(this.selectableListService.getSelectableList(this.listId)); } resetRoute() { diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html index 5ba889892a..0323251b12 100644 --- a/src/app/shared/object-collection/object-collection.component.html +++ b/src/app/shared/object-collection/object-collection.component.html @@ -8,6 +8,8 @@ (pageSizeChange)="onPageSizeChange($event)" (sortDirectionChange)="onSortDirectionChange($event)" (sortFieldChange)="onSortFieldChange($event)" + [selectable]="selectable" + [selectionConfig]="selectionConfig" *ngIf="getViewMode()===viewModeEnum.List"> diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts index ccc1de1f2f..fcc3bd330e 100644 --- a/src/app/shared/object-collection/object-collection.component.ts +++ b/src/app/shared/object-collection/object-collection.component.ts @@ -33,6 +33,9 @@ export class ObjectCollectionComponent implements OnChanges, OnInit { @Input() sortConfig: SortOptions; @Input() hasBorder = false; @Input() hideGear = false; + @Input() selectable = false; + @Input() selectionConfig: {repeatable: boolean, listId: string}; + pageInfo: Observable; private sub; /** diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html index 1fdc06d5bf..4e1eb62aa9 100644 --- a/src/app/shared/object-list/object-list.component.html +++ b/src/app/shared/object-list/object-list.component.html @@ -12,6 +12,16 @@ (paginationChange)="onPaginationChange($event)">
  • + +
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts index afc376034f..a8467d92af 100644 --- a/src/app/shared/object-list/object-list.component.ts +++ b/src/app/shared/object-list/object-list.component.ts @@ -12,6 +12,9 @@ import { RemoteData } from '../../core/data/remote-data'; import { fadeIn } from '../animations/fade'; import { ListableObject } from '../object-collection/shared/listable-object.model'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; +import { SearchResult } from '../search/search-result.model'; +import { SelectableListService } from './selectable-list/selectable-list.service'; @Component({ changeDetection: ChangeDetectionStrategy.Default, @@ -22,13 +25,22 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o animations: [fadeIn] }) export class ObjectListComponent { - @Input() config: PaginationComponentOptions; @Input() sortConfig: SortOptions; @Input() hasBorder = false; @Input() hideGear = false; @Input() hidePagerWhenSinglePage = true; + @Input() selectable = false; + @Input() selectionConfig: { repeatable: boolean, listId: string }; + // @Input() previousSelection: ListableObject[] = []; + // allSelected = false; + // selectAllLoading = false; + private _objects: RemoteData>; + + constructor(protected selectionService: SelectableListService) { + } + @Input() set objects(objects: RemoteData>) { this._objects = objects; } @@ -96,4 +108,66 @@ export class ObjectListComponent { this.paginationChange.emit(event); } + // isDisabled(object: ListableObject): boolean { + // return hasValue(this.previousSelection.find((selected) => selected === object)); + // } + + selectCheckbox(value: boolean, object: ListableObject) { + if (value) { + this.selectionService.selectSingle(this.selectionConfig.listId, object); + } else { + this.selectionService.deselectSingle(this.selectionConfig.listId, object); + } + } + + selectRadio(value: boolean, object: ListableObject) { + if (value) { + this.selectionService.selectSingle(this.selectionConfig.listId, object, false); + } + } + + selectPage(page: SearchResult[]) { + this.selectionService.select(this.selectionConfig.listId, this.objects.payload.page); + } + + deselectPage(page: SearchResult[]) { + this.selectionService.deselect(this.selectionConfig.listId, this.objects.payload.page); + + } + + deselectAll() { + this.selectionService.deselectAll(this.selectionConfig.listId); + } + + // isAllSelected() { + // return this.allSelected; + // } + // + // isSomeSelected() { + // return isNotEmpty(this.selection); + // } + // + // + // selectAll() { + // this.allSelected = true; + // this.selectAllLoading = true; + // const fullPagination = Object.assign(new PaginationComponentOptions(), { + // query: this.searchQuery, + // currentPage: 1, + // pageSize: Number.POSITIVE_INFINITY + // }); + // const fullSearchConfig = Object.assign(this.searchConfig, { pagination: fullPagination }); + // const results = this.searchService.search(fullSearchConfig); + // results.pipe( + // getSucceededRemoteData(), + // map((resultsRD) => resultsRD.payload.page), + // tap(() => this.selectAllLoading = false) + // ) + // .subscribe((results) => + // this.selection = results + // .map((searchResult) => searchResult.indexableObject) + // .filter((dso) => hasNoValue(this.previousSelection.find((object) => object === dso))) + // ); + // } + } diff --git a/src/app/shared/object-list/selectable-list/selectable-list.actions.ts b/src/app/shared/object-list/selectable-list/selectable-list.actions.ts new file mode 100644 index 0000000000..c1d41b1d92 --- /dev/null +++ b/src/app/shared/object-list/selectable-list/selectable-list.actions.ts @@ -0,0 +1,87 @@ +import { Action } from '@ngrx/store'; +import { type } from '../../ngrx/type'; +import { ListableObject } from '../../object-collection/shared/listable-object.model'; + +/** + * For each action type in an action group, make a simple + * enum object for all of this group's action types. + * + * The 'type' utility function coerces strings into string + * literal types and runs a simple check to guarantee all + * action types in the application are unique. + */ +export const SelectableListActionTypes = { + SELECT: type('dspace/selectable-lists/SELECT'), + SELECT_SINGLE: type('dspace/selectable-lists/SELECT_SINGLE'), + DESELECT: type('dspace/selectable-lists/DESELECT'), + DESELECT_SINGLE: type('dspace/selectable-lists/DESELECT_SINGLE'), + SET_SELECTION: type('dspace/selectable-lists/SET_SELECTION'), + DESELECT_ALL: type('dspace/selectable-lists/DESELECT_ALL') +}; + +/* tslint:disable:max-classes-per-file */ +export abstract class SelectableListAction implements Action { + constructor(public type, public id: string) { + } +} + +/** + * Used to select an item in a the selectable list + */ +export class SelectableListSelectAction extends SelectableListAction { + payload: ListableObject[]; + + constructor(id: string, objects: ListableObject[]) { + super(SelectableListActionTypes.SELECT_SINGLE, id); + this.payload = objects; + } +} + +export class SelectableListSelectSingleAction extends SelectableListAction { + payload: { + object: ListableObject, + multipleSelectionsAllowed: boolean + }; + + constructor(id: string, object: ListableObject, multipleSelectionsAllowed: boolean = true) { + super(SelectableListActionTypes.SELECT, id); + this.payload = { object, multipleSelectionsAllowed }; + } +} + +export class SelectableListDeselectSingleAction extends SelectableListAction { + payload: ListableObject; + + constructor(id: string, object: ListableObject) { + super(SelectableListActionTypes.DESELECT_SINGLE, id); + this.payload = object; + } +} + +export class SelectableListDeselectAction extends SelectableListAction { + payload: ListableObject[]; + + constructor(id: string, objects: ListableObject[]) { + super(SelectableListActionTypes.DESELECT, id); + this.payload = objects; + } +} + +export class SelectableListSetSelectionAction extends SelectableListAction { + payload: ListableObject; + + constructor(id: string, objects: ListableObject[]) { + super(SelectableListActionTypes.SET_SELECTION, id); + this.payload = objects; + } +} + + +export class SelectableListDeselectAllAction extends SelectableListAction { + constructor(id: string) { + super(SelectableListActionTypes.DESELECT_ALL, id); + } +} + + +/* tslint:enable:max-classes-per-file */ \ No newline at end of file diff --git a/src/app/shared/object-list/selectable-list/selectable-list.reducer.ts b/src/app/shared/object-list/selectable-list/selectable-list.reducer.ts new file mode 100644 index 0000000000..ec4f57d752 --- /dev/null +++ b/src/app/shared/object-list/selectable-list/selectable-list.reducer.ts @@ -0,0 +1,106 @@ +import { ListableObject } from '../../object-collection/shared/listable-object.model'; +import { + SelectableListAction, + SelectableListActionTypes, + SelectableListSelectAction, + SelectableListSelectSingleAction, + SelectableListDeselectAction, + SelectableListDeselectSingleAction, SelectableListSetSelectionAction +} from './selectable-list.actions'; +import { hasNoValue } from '../../empty.util'; + +/** + * Represents the state of all selectable lists in the store + */ +export type SelectableListsState = { + [id: string]: SelectableListState; +} + +/** + * Represents the state of a single selectable list in the store + */ +export interface SelectableListState { + id: string; + selection: ListableObject[]; +} + +/** + * Reducer that handles SelectableListAction to update the SelectableListsState + * @param {SelectableListsState} state The initial SelectableListsState + * @param {SelectableListAction} action The Action to be performed on the state + * @returns {SelectableListsState} The new, reducer SelectableListsState + */ +export function selectableListReducer(state: SelectableListsState = {}, action: SelectableListAction): SelectableListsState { + const listState: SelectableListState = state[action.id] || clearSelection(action.id); + switch (action.type) { + case SelectableListActionTypes.SELECT: { + const newListState = select(listState, action as SelectableListSelectAction); + return Object.assign({}, state, { [action.id]: newListState }); + } + case SelectableListActionTypes.SELECT_SINGLE: { + const newListState = selectSingle(listState, action as SelectableListSelectSingleAction); + return Object.assign({}, state, { [action.id]: newListState }); + } + case SelectableListActionTypes.DESELECT: { + const newListState = deselect(listState, action as SelectableListDeselectAction); + return Object.assign({}, state, { [action.id]: newListState }); + } + case SelectableListActionTypes.DESELECT_SINGLE: { + const newListState = deselectSingle(listState, action as SelectableListDeselectSingleAction); + return Object.assign({}, state, { [action.id]: newListState }); + } + case SelectableListActionTypes.SET_SELECTION: { + const newListState = setList(listState, action as SelectableListSetSelectionAction); + return Object.assign({}, state, { [action.id]: newListState }); + } + case SelectableListActionTypes.DESELECT_ALL: { + const newListState = clearSelection(action.id); + return Object.assign({}, state, { [action.id]: newListState }); + } + default: { + return state; + } + } +} + +function select(state: SelectableListState, action: SelectableListSelectAction) { + const filteredNewObjects = action.payload.filter((object) => !isObjectInSelection(state.selection, object)); + const newSelection = [...state.selection, ...filteredNewObjects]; + return Object.assign({}, state, { selection: newSelection }); +} + +function selectSingle(state: SelectableListState, action: SelectableListSelectSingleAction) { + let newSelection; + if (action.payload.multipleSelectionsAllowed && !isObjectInSelection(state.selection, action.payload)) { + newSelection = [...state.selection, action.payload.object]; + } else { + newSelection = [action.payload.object]; + } + return Object.assign({}, state, { selection: newSelection }); +} + +function deselect(state: SelectableListState, action: SelectableListDeselectAction) { + const newSelection = state.selection.filter((selected) => hasNoValue(action.payload.find((object) => object === selected))); + return Object.assign({}, state, { selection: newSelection }); +} + +function deselectSingle(state: SelectableListState, action: SelectableListDeselectSingleAction) { + const newSelection = state.selection.filter((selected) => { + return selected !== action.payload + }); + return Object.assign({}, state, { selection: newSelection }); +} + +function setList(state: SelectableListState, action: SelectableListSetSelectionAction) { + const newSelection = [...state.selection, action.payload]; + return Object.assign({}, state, { selection: newSelection }); +} + +function clearSelection(id: string) { + return { id: id, selection: [] }; +} + + +function isObjectInSelection(selection: ListableObject[], object: ListableObject) { + return selection.findIndex((selected) => selected === object) >= 0 +} diff --git a/src/app/shared/object-list/selectable-list/selectable-list.service.ts b/src/app/shared/object-list/selectable-list/selectable-list.service.ts new file mode 100644 index 0000000000..097e7da30f --- /dev/null +++ b/src/app/shared/object-list/selectable-list/selectable-list.service.ts @@ -0,0 +1,94 @@ +import { Injectable } from '@angular/core'; +import { MemoizedSelector, select, Store } from '@ngrx/store'; +import { Observable } from 'rxjs'; +import { distinctUntilChanged, filter, map, startWith, tap } from 'rxjs/operators'; +import { SelectableListsState, SelectableListState } from './selectable-list.reducer'; +import { AppState, keySelector } from '../../../app.reducer'; +import { ListableObject } from '../../object-collection/shared/listable-object.model'; +import { + SelectableListDeselectAction, SelectableListDeselectAllAction, + SelectableListDeselectSingleAction, SelectableListSelectAction, + SelectableListSelectSingleAction +} from './selectable-list.actions'; +import { hasNoValue, hasValue, isNotEmpty } from '../../empty.util'; + +const selectableListsStateSelector = (state) => state.selectableLists; + +const menuByIDSelector = (id: string): MemoizedSelector => { + return keySelector(id, selectableListsStateSelector); +}; + +@Injectable() +export class SelectableListService { + + constructor(private store: Store) { + } + + /** + * Retrieve a selectable list's state by its ID + * @param {string} id ID of the requested Selectable list + * @returns {Observable} Observable that emits the current state of the requested selectable list + */ + getSelectableList(id: string): Observable { + return this.store.pipe(select(menuByIDSelector(id))); + } + + /** + * Select an object in a specific list in the store + * @param {string} id The id of the list on which the object should be selected + * @param {ListableObject} object The object to select + */ + selectSingle(id: string, object: ListableObject, multipleSelectionsAllowed?) { + this.store.dispatch(new SelectableListSelectSingleAction(id, object, multipleSelectionsAllowed)); + } + + /** + * Select multiple objects in a specific list in the store + * @param {string} id The id of the list on which the objects should be selected + * @param {ListableObject[]} objects The objects to select + */ + select(id: string, objects: ListableObject[]) { + this.store.dispatch(new SelectableListSelectAction(id, objects)); + } + + /** + * Deselect an object in a specific list in the store + * @param {string} id The id of the list on which the object should be deselected + * @param {ListableObject} object The object to deselect + */ + deselectSingle(id: string, object: ListableObject) { + this.store.dispatch(new SelectableListDeselectSingleAction(id, object)); + } + + /** + * Deselect multiple objects in a specific list in the store + * @param {string} id The id of the list on which the objects should be deselected + * @param {ListableObject[]} objects The objects to deselect + */ + deselect(id: string, objects: ListableObject[]) { + this.store.dispatch(new SelectableListDeselectAction(id, objects)); + } + + /** + * Deselect all objects in a specific list in the store + * @param {string} id The id of the list on which the objects should be deselected + */ + deselectAll(id: string) { + this.store.dispatch(new SelectableListDeselectAllAction(id)); + } + + /** + * Check if a given object is selected in a specific list + * @param {string} id The ID of the selectable list the object should be selected in + * @param {ListableObject} object The object to check for if it's selected + * @returns {Observable} Emits true if the given object is selected, emits false when it's deselected + */ + isObjectSelected(id: string, object: ListableObject): Observable { + return this.getSelectableList(id).pipe( + filter((state: SelectableListState) => hasValue(state)), + map((state: SelectableListState) => isNotEmpty(state.selection) && hasValue(state.selection.find((selected) => selected === object))), + startWith(false), + distinctUntilChanged() + ); + } +} diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts index 81d6c72b5a..737772c744 100644 --- a/src/app/shared/search/search-filters/search-filters.component.ts +++ b/src/app/shared/search/search-filters/search-filters.component.ts @@ -51,7 +51,6 @@ export class SearchFiltersComponent implements OnInit { } ngOnInit(): void { - this.filters = this.searchConfigService.searchOptions.pipe( switchMap((options) => this.searchService.getConfig(options.scope, options.configuration).pipe(getSucceededRemoteData())) ); @@ -78,5 +77,4 @@ export class SearchFiltersComponent implements OnInit { trackUpdate(index, config: SearchFilterConfig) { return config ? config.name : undefined; } - } diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html index 824d531155..6e74177106 100644 --- a/src/app/shared/search/search-results/search-results.component.html +++ b/src/app/shared/search/search-results/search-results.component.html @@ -1,18 +1,26 @@

{{ getTitleKey() | translate }}

- -
- - + + +
+ + diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts index 03f0d117fc..21222e9241 100644 --- a/src/app/shared/search/search-results/search-results.component.ts +++ b/src/app/shared/search/search-results/search-results.component.ts @@ -55,6 +55,9 @@ export class SearchResultsComponent { */ @Input() disableHeader = false; + @Input() selectable = false; + + @Input() selectionConfig: {repeatable: boolean, listId: string}; /** * Get the i18n key for the title depending on the fixed filter * Defaults to 'search.results.head' if there's no fixed filter found