yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

current user history store

Browse Source
This commit is contained in:
Niels Lyngsø
2023-01-09 20:14:23 +01:00
parent 456a72e1fc
commit 79abef60a8
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-history.store.ts
View File

@@ -1,4 +1,4 @@
import { BehaviorSubject, map, Observable } from 'rxjs';
import { CreateObservablePart, UniqueBehaviorSubject } from 'src/core/observable-api/unique-behavior-subject';
export type UmbModelType = 'dialog' | 'sidebar';
@@ -9,10 +9,13 @@ export type UmbCurrentUserHistoryItem = {
};
export class UmbCurrentUserHistoryStore {
private _history: BehaviorSubject<Array<UmbCurrentUserHistoryItem>> = new BehaviorSubject(
#history = new UniqueBehaviorSubject(
<Array<UmbCurrentUserHistoryItem>>[]
);
public readonly history: Observable<Array<UmbCurrentUserHistoryItem>> = this._history.asObservable();
public readonly history = this.#history.asObservable();
public readonly latestHistory = CreateObservablePart(this.#history, historyItems => historyItems.slice(-10));
constructor() {
if (!('navigation' in window)) return;
@@ -23,14 +26,6 @@ export class UmbCurrentUserHistoryStore {
});
}
public getLatestHistory(): Observable<Array<UmbCurrentUserHistoryItem>> {
return this._history.pipe(
map((historyItem) => {
return historyItem.slice(-10);
})
);
}
/**
* Pushes a new history item to the history array
* @public
@@ -38,17 +33,17 @@ export class UmbCurrentUserHistoryStore {
* @memberof UmbHistoryService
*/
public push(historyItem: UmbCurrentUserHistoryItem): void {
const history = this._history.getValue();
const history = this.#history.getValue();
const lastItem = history[history.length - 1];
// This prevents duplicate entries in the history array.
if (!lastItem || lastItem.path !== historyItem.path) {
this._history.next([...this._history.getValue(), historyItem]);
this.#history.next([...this.#history.getValue(), historyItem]);
} else {
//Update existing item
const newHistory = this._history.getValue();
const newHistory = this.#history.getValue();
newHistory[history.length - 1] = historyItem;
this._history.next(newHistory);
this.#history.next(newHistory);
}
}
@@ -58,6 +53,6 @@ export class UmbCurrentUserHistoryStore {
* @memberof UmbHistoryService
*/
public clear() {
this._history.next([]);
this.#history.next([]);
}
}

2
src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts
View File

@@ -108,7 +108,7 @@ export class UmbModalLayoutCurrentUserElement extends UmbLitElement {
}
private async _observeHistory() {
if (this._currentUserHistoryStore) {
this.observe(this._currentUserHistoryStore.getLatestHistory(), (history) => {
this.observe(this._currentUserHistoryStore.latestHistory, (history) => {
this._history = history;
});
}