hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

62849: fixed issues with multiple selections, improved UX, updating to use new REST response

Browse Source
This commit is contained in:
lotte
2019-07-29 15:42:30 +02:00
parent 16feb61ebf
commit 1f7b8b8210
20 changed files with 130 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/shared/object-list/selectable-list/selectable-list.reducer.ts
View File

@@ -71,10 +71,12 @@ function select(state: SelectableListState, action: SelectableListSelectAction)
function selectSingle(state: SelectableListState, action: SelectableListSelectSingleAction) {
let newSelection;
if (action.payload.multipleSelectionsAllowed && !isObjectInSelection(state.selection, action.payload.object)) {
newSelection = [...state.selection, action.payload.object];
} else {
newSelection = [action.payload.object];
if (!isObjectInSelection(state.selection, action.payload.object)) {
if (action.payload.multipleSelectionsAllowed) {
newSelection = [...state.selection, action.payload.object];
} else {
newSelection = [action.payload.object];
}
}
return Object.assign({}, state, { selection: newSelection });
}

5
src/app/shared/object-list/selectable-list/selectable-list.service.ts
View File

@@ -37,8 +37,9 @@ export class SelectableListService {
* 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
* @param {boolean} multipleSelectionsAllowed Defines if the multiple selections are allowed for this selectable list
*/
selectSingle(id: string, object: ListableObject, multipleSelectionsAllowed?) {
selectSingle(id: string, object: ListableObject, multipleSelectionsAllowed?: boolean) {
this.store.dispatch(new SelectableListSelectSingleAction(id, object, multipleSelectionsAllowed));
}
@@ -86,7 +87,7 @@ export class SelectableListService {
isObjectSelected(id: string, object: ListableObject): Observable<boolean> {
return this.getSelectableList(id).pipe(
filter((state: SelectableListState) => hasValue(state)),
map((state: SelectableListState) => isNotEmpty(state.selection) && hasValue(state.selection.find((selected) => selected === object))),
map((state: SelectableListState) => isNotEmpty(state.selection) && hasValue(state.selection.find((selected) => selected.equals(object)))),
startWith(false),
distinctUntilChanged()
);