{
const householdProductOrdersForThisProduct = new HoloHashMap<
ActionHash,
- ProductOrder
+ [number, ProductOrder]
>();
- for (const [householdHash, householdOrder] of Array.from(
+ for (const [householdOrderHash, householdOrder] of Array.from(
householdOrders.entries(),
)) {
for (const product of householdOrder.entry.products) {
@@ -82,10 +82,19 @@ export class HouseholdsOrdersSummary extends SignalWatcher(LitElement) {
encodeHashToBase64(product.original_product_hash) ===
encodeHashToBase64(productHash)
) {
- householdProductOrdersForThisProduct.set(
- householdHash,
- product,
- );
+ const previousProductOrder =
+ householdProductOrdersForThisProduct.get(
+ householdOrder.entry.household_hash,
+ );
+ if (
+ !previousProductOrder ||
+ previousProductOrder[0] < householdOrder.action.timestamp
+ ) {
+ householdProductOrdersForThisProduct.set(
+ householdOrder.entry.household_hash,
+ [householdOrder.action.timestamp, product],
+ );
+ }
}
}
}
@@ -102,7 +111,7 @@ export class HouseholdsOrdersSummary extends SignalWatcher(LitElement) {
householdProductOrdersForThisProduct.entries(),
).map(([householdHash, productOrder]) => ({
name: households.get(householdHash)!.entry.name,
- amount: productOrder.amount,
+ amount: productOrder[1].amount,
// total_price: (
// Math.round(productOrder.amount * price_with_vat * 100) / 100
// ).toFixed(2),
@@ -110,7 +119,7 @@ export class HouseholdsOrdersSummary extends SignalWatcher(LitElement) {
const amount = Array.from(
householdProductOrdersForThisProduct.values(),
- ).reduce((acc, next) => acc + next.amount, 0);
+ ).reduce((acc, next) => acc + next[1].amount, 0);
return {
name: product.entry.name,
packaging: product.entry.packaging,
@@ -307,11 +316,15 @@ export class HouseholdsOrdersSummary extends SignalWatcher(LitElement) {
if (householdOrdersLatestVersion.status !== "completed")
return householdOrdersLatestVersion;
+ const householdHashes = uniquify(
+ Array.from(householdOrdersLatestVersion.value.values()).map(
+ (ho) => ho.entry.household_hash,
+ ),
+ );
+
const householdsLatestVersion = joinAsyncMap(
- mapValues(householdOrdersLatestVersion.value, (ho) =>
- this.householdsStore.households
- .get(ho.entry.household_hash)
- .latestVersion.get(),
+ mapValues(slice(this.householdsStore.households, householdHashes), (h) =>
+ h.latestVersion.get(),
),
);
if (householdsLatestVersion.status !== "completed")
diff --git a/ui/src/plenty/orders/elements/my-household-order.ts b/ui/src/plenty/orders/elements/my-household-order.ts
index fbf334c..e2b6d29 100644
--- a/ui/src/plenty/orders/elements/my-household-order.ts
+++ b/ui/src/plenty/orders/elements/my-household-order.ts
@@ -334,22 +334,22 @@ export class MyHouseholdOrder extends SignalWatcher(LitElement) {
.header=${msg("Maximum Available")}
path="maximum_available"
>
- {
- if (!model.value)
- model.value = productsRandom.get(model.item.productHash);
-
- // TODO: actually set the value here
- render(
- html``,
- root,
- );
- }}
- >
+ if (!model.value)
+ model.value = productsRandom.get(model.item.productHash);
+
+ // TODO: actually set the value here
+ render(
+ html``,
+ root,
+ );
+ }}
+ > -->
{
+ // const myHousehold = this.householdStore.myHousehold.get();
+ // if (myHousehold.status !== "completed" || !myHousehold.value) return;
+ // const orders = this.ordersForHousehold
+ // .get(myHousehold.value.householdHash)
+ // .get();
+ // if (orders.status !== "completed") return;
+ // });
+ }
/** Order */
@@ -294,3 +288,39 @@ export class OrdersStore {
}),
);
}
+
+// NOTE: This scheduling logic is too basic to be useful. Do not copy/paste.
+// This function would usually live in a library/framework, not application code
+let pending = false;
+
+const w = new Signal.subtle.Watcher(() => {
+ if (!pending) {
+ pending = true;
+ queueMicrotask(() => {
+ pending = false;
+ for (const s of w.getPending()) s.get();
+ w.watch();
+ });
+ }
+});
+
+// TODO: why do we need to use this complicated effect method?
+// An effect effect Signal which evaluates to cb, which schedules a read of
+// itself on the microtask queue whenever one of its dependencies might change
+function effect(cb: any) {
+ let destructor: any;
+ const c = new Signal.Computed(() => {
+ if (typeof destructor === "function") {
+ destructor();
+ }
+ destructor = cb();
+ });
+ w.watch(c);
+ c.get();
+ return () => {
+ if (typeof destructor === "function") {
+ destructor();
+ }
+ w.unwatch(c);
+ };
+}