fix(merge-conflicts): fixes to reward-catalog

This commit is contained in:
Nino
2025-09-25 18:13:41 +02:00
parent 186e11e671
commit 2387c60228
2 changed files with 14 additions and 11 deletions

View File

@@ -83,7 +83,7 @@ export const RewardCatalogStore = signalStore(
config,
),
);
store.storeState();
store.saveToStorage();
},
updateItems(items: Item[], hits: number) {
const pid = store.activeTabId();
@@ -101,7 +101,7 @@ export const RewardCatalogStore = signalStore(
config,
),
);
store.storeState();
store.saveToStorage();
},
selectItem(itemId: number, item: Item) {
const pid = store.activeTabId();
@@ -139,7 +139,7 @@ export const RewardCatalogStore = signalStore(
},
clearState() {
patchState(store, setAllEntities<RewardCatalogEntity>([], config));
store.storeState();
store.saveToStorage();
},
removeAllEntitiesByTabId(tabId: number) {
const remaining = store.entities().filter((e) => e.tabId !== tabId);
@@ -147,7 +147,7 @@ export const RewardCatalogStore = signalStore(
store,
setAllEntities<RewardCatalogEntity>(remaining, config),
);
store.storeState();
store.saveToStorage();
},
};
}),

View File

@@ -18,14 +18,17 @@ export const createRewardCatalogResource = (
return resource({
params,
loader: async ({ abortSignal, params }) => {
// Load from session storage if items exist
if (params.searchTrigger === 'initial') {
await rewardCatalogStore.restoreState();
// TODO: Funktioniert nicht mehr seitdem der Storage angepasst wurde und man eine config reingeben kann (#5350, #5353)
// Der Store lädt die Items zu spät, die Resource wird vorher schon getriggered
if (rewardCatalogStore.items().length > 0) {
return;
}
}
// Load from session storage if items exist
// if (params.searchTrigger === 'initial') {
// await rewardCatalogStore.loadFromStorage();
// if (rewardCatalogStore.items().length > 0) {
// return;
// }
// }
let skip = rewardCatalogStore.items().length;