mirror of
https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend
synced 2025-12-28 22:42:11 +01:00
fix(merge-conflicts): fixes to reward-catalog
This commit is contained in:
@@ -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();
|
||||
},
|
||||
};
|
||||
}),
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user