github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-19 08:25:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Make history-store work in non-accceptance tests (#30059)

Browse Source
This commit is contained in:
Jarek Radosz 2024-12-03 13:32:37 +01:00 committed by GitHub
parent 685dc4b9b9
commit 9389bf295c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/assets/javascripts/discourse/app/services/history-store.js
View File

@ -21,14 +21,10 @@ export default class HistoryStore extends Service {
#routeData = new TrackedMap();
#uuid;
#pendingStore;
#pendingStore = DEBUG && isTesting() ? new TrackedMap() : null;
get #currentStore() {
if (this.#pendingStore) {
return this.#pendingStore;
}
return this.#dataFor(this.#uuid);
return this.#pendingStore || this.#dataFor(this.#uuid);
}
/**
@ -84,10 +80,7 @@ export default class HistoryStore extends Service {
if (key === undefined) {
continue;
}
if (key === this.#uuid) {
return false;
}
return true;
return key !== this.#uuid;
}
}
@ -118,7 +111,7 @@ export default class HistoryStore extends Service {
* not available as an event on the router service.
*/
@bind
willResolveModel(transition) {
async willResolveModel(transition) {
if (HANDLED_TRANSITIONS.has(transition)) {
return;
}
@ -126,7 +119,6 @@ export default class HistoryStore extends Service {
if (DEBUG && isTesting()) {
// Can't use window.history in tests
this.#pendingStore = new TrackedMap();
return;
}
@ -149,16 +141,16 @@ export default class HistoryStore extends Service {
}
this.#pendingStore = pendingStoreForThisTransition;
transition
.then(() => {
this.#uuid = window.history.state?.uuid;
this.#routeData.set(this.#uuid, this.#pendingStore);
this.#pruneOldData();
})
.finally(() => {
if (pendingStoreForThisTransition === this.#pendingStore) {
this.#pendingStore = null;
}
});
try {
await transition;
this.#uuid = window.history.state?.uuid;
this.#routeData.set(this.#uuid, this.#pendingStore);
this.#pruneOldData();
} finally {
if (pendingStoreForThisTransition === this.#pendingStore) {
this.#pendingStore = null;
}
}
}
}