@wix/himalaya-cli 0.1211.0 → 0.1213.0

package/templates/portfolio-creative-owner/tier5-src/himi-owner-lite-product/index.ts

@@ -59,6 +59,9 @@ interface ProductState {
   /** Non-empty when showing owner-preview-demo sample data (web preview, no owner bridge). */
   demoNote: string;
   notDemo: boolean;
+  /** #3158 — Delete ARMS a confirmation; only confirmDelete reaches the API. */
+  deletePending: boolean;
+  noDeleteConfirmation: boolean;
 }
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -143,6 +146,9 @@ function shape(s: Partial<ProductState>): ProductState {
     hideHide: !visible || status !== "ready",
     demoNote: s.demoNote ?? "",
     notDemo: !s.demoNote,
+    // Only a loaded entity can be pending deletion; every other action disarms it (`disarm`).
+    deletePending: !!s.deletePending && hasEntity,
+    noDeleteConfirmation: !(s.deletePending && hasEntity),
   };
 }
 
@@ -265,16 +271,33 @@ async function setVisibility(s: ProductState, visible: boolean, msg: string): Pr
   }
 }
 
+/** #3158 — a confirmed delete in flight. Synchronous and module-level on purpose: two
+ *  confirmDelete dispatches (a double tap) both start from a state that says "armed", and only a
+ *  flag set BEFORE the first await stops the second from issuing its own DELETE — whose late 404
+ *  would otherwise land after, and overwrite, the first one's "deleted". */
+let deleteInFlight = false;
+
+/** #3158 — the confirmation describes THIS visit. Never take it from a persisted snapshot, or a
+ *  reopened record comes back with "Delete this …?" already armed. */
+const DELETE_RUN_KEYS = ["deletePending", "noDeleteConfirmation"] as const;
+
+/** #3158 — clear an armed delete confirmation. */
+const disarm = <T extends { deletePending: boolean }>(s: T): T => ({ ...s, deletePending: false });
+
 const svc = defineService<ProductState, {
   load: (s: ProductState, arg?: unknown) => Promise<ProductState>;
   retry: (s: ProductState) => Promise<ProductState>;
   show: (s: ProductState) => Promise<ProductState>;
   hide: (s: ProductState) => Promise<ProductState>;
   delete: (s: ProductState) => Promise<ProductState>;
+  cancelDelete: (s: ProductState) => Promise<ProductState>;
+  confirmDelete: (s: ProductState) => Promise<ProductState | undefined>;
 }>("himiOwnerLiteProduct", {
   state: shape({ status: "loading" }),
+  notHydrated: [...DELETE_RUN_KEYS],
   actions: {
-    load: async (s, arg) => {
+    load: async (s0, arg) => {
+      const s = disarm(s0);
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       const id = idFrom(arg, s.id) || inputId();
       if (!id) return shape({ ...s, status: "error", error: copyParam("ownerProduct.errorNoId", "no product id") });
@@ -297,7 +320,8 @@ const svc = defineService<ProductState, {
         return shape({ ...s, id, status: "error", error: ownerLoadError(e) });
       }
     },
-    retry: async (s) => {
+    retry: async (s0) => {
+      const s = disarm(s0);
       if (!s.id) return shape({ ...s, status: "error", error: copyParam("ownerProduct.errorNoId", "no product id") });
       if (isOwnerPreviewDemo()) {
           const demo = demoDetail(s, s.id);
@@ -317,25 +341,46 @@ const svc = defineService<ProductState, {
         return shape({ ...s, status: "error", error: ownerLoadError(e) });
       }
     },
-    show: async (s) => setVisibility(s, true, copyParam("ownerProduct.shownMessage", "Product is now visible in your store.")),
-    hide: async (s) => setVisibility(s, false, copyParam("ownerProduct.hiddenMessage", "Product hidden from your store.")),
-    delete: async (s) => {
-      if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
-      if (!s.id) return shape({ ...s, actionMessage: copyParam("ownerProduct.noIdMessage", "No product id.") });
-      // Optimistic local delete — the list drops the row immediately.
-      await cacheDrop(s.id);
+    show: async (s0) => { const s = disarm(s0); return setVisibility(s, true, copyParam("ownerProduct.shownMessage", "Product is now visible in your store.")); },
+    hide: async (s0) => { const s = disarm(s0); return setVisibility(s, false, copyParam("ownerProduct.hiddenMessage", "Product hidden from your store.")); },
+    // #3158 — destructive, so two steps. `delete` (the Manage card's Delete button)
+    // only ARMS the inline confirmation, which names the record and says it cannot
+    // be undone; `cancelDelete` disarms it; only `confirmDelete` deletes. Anything
+    // that dispatches `delete` directly therefore still asks first.
+    delete: async (s) => shape({ ...s, deletePending: true, actionMessage: "" }),
+    cancelDelete: async (s) => shape({ ...s, deletePending: false }),
+    confirmDelete: async (s0) => {
+      // Nothing armed (a stray dispatch, a rehydrated snapshot) or a delete already running
+      // (a second tap): ignore it — `undefined` leaves the state exactly as it is.
+      if (!s0.deletePending || deleteInFlight) return undefined;
+      deleteInFlight = true;
       try {
-        await deleteProduct(s.id);
-        return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerProduct.deletedEmpty", "Product deleted."), actionMessage: "" });
-      } catch (e) {
-        if (shouldQueueOwnerWrite(e)) {
-          await queueWrite("tier5.himiOwnerLiteProduct.delete", { id: s.id });
-          return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerProduct.deletedEmpty", "Product deleted."), actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+        const s = disarm(s0);
+        if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+        if (!s.id) return shape({ ...s, actionMessage: copyParam("ownerProduct.noIdMessage", "No product id.") });
+        // Optimistic local delete — the list drops the row immediately.
+        await cacheDrop(s.id);
+        try {
+          await deleteProduct(s.id);
+          return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerProduct.deletedEmpty", "Product deleted."), actionMessage: "" });
+        } catch (e) {
+          if (shouldQueueOwnerWrite(e)) {
+            await queueWrite("tier5.himiOwnerLiteProduct.delete", { id: s.id });
+            return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerProduct.deletedEmpty", "Product deleted."), actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+          }
+          return shape({ ...s, actionMessage: ownerLoadError(e) });
         }
-        return shape({ ...s, actionMessage: ownerLoadError(e) });
+      } finally {
+        deleteInFlight = false;
       }
     },
   },
 });
 
+// The same reset on a runtime from before `notHydrated` (an older binary on a new bundle).
+if ((globalThis as { himalaya?: { hydrationOptOut?: unknown } }).himalaya?.hydrationOptOut !== true) {
+  const booted = svc.getState?.() as unknown as Record<string, unknown> | undefined;
+  if (booted && typeof booted === "object") Object.assign(booted, { deletePending: false, noDeleteConfirmation: true });
+}
+
 export { svc };

package/templates/restaurant-owner/dev/index.ts

@@ -80445,6 +80445,115 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                 }
                               }
                             },
+                            {
+                              "id": "product_delete_confirmation",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 10,
+                                  "alignment": "leading",
+                                  "children": [
+                                    {
+                                      "id": "product_delete_confirmation.title",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "Delete this dish?",
+                                          "style": "bodyEmphasis"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "product_delete_confirmation.record",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiOwnerLiteProduct.title",
+                                          "style": "body",
+                                          "color": "textSecondary",
+                                          "maxLines": 2
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "This cannot be undone.",
+                                          "style": "footnote",
+                                          "color": "textSecondary"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "HStack",
+                                        "props": {
+                                          "spacing": 8,
+                                          "children": [
+                                            {
+                                              "id": "product_delete_cancel",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Button",
+                                                "props": {
+                                                  "title": "Cancel",
+                                                  "style": "secondary",
+                                                  "action": {
+                                                    "actionId": "tier5.himiOwnerLiteProduct.cancelDelete"
+                                                  }
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "product_delete_confirm",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Button",
+                                                "props": {
+                                                  "title": "Delete",
+                                                  "style": "destructive",
+                                                  "action": {
+                                                    "actionId": "tier5.himiOwnerLiteProduct.confirmDelete"
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "background": {
+                                  "token": "surfaceElevated"
+                                },
+                                "border": {
+                                  "width": 1,
+                                  "color": {
+                                    "token": "danger"
+                                  }
+                                },
+                                "cornerRadius": 12,
+                                "padding": {
+                                  "leading": 14,
+                                  "trailing": 14,
+                                  "top": 14,
+                                  "bottom": 14
+                                },
+                                "fillMaxWidth": true,
+                                "hiddenPath": "$service:himiOwnerLiteProduct.noDeleteConfirmation"
+                              }
+                            },
                             {
                               "id": "",
                               "body": {
@@ -82036,6 +82145,115 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                 }
                               }
                             },
+                            {
+                              "id": "event_delete_confirmation",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 10,
+                                  "alignment": "leading",
+                                  "children": [
+                                    {
+                                      "id": "event_delete_confirmation.title",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "Delete this wine night?",
+                                          "style": "bodyEmphasis"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "event_delete_confirmation.record",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiOwnerLiteEvent.title",
+                                          "style": "body",
+                                          "color": "textSecondary",
+                                          "maxLines": 2
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "This cannot be undone.",
+                                          "style": "footnote",
+                                          "color": "textSecondary"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "HStack",
+                                        "props": {
+                                          "spacing": 8,
+                                          "children": [
+                                            {
+                                              "id": "event_delete_cancel",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Button",
+                                                "props": {
+                                                  "title": "Cancel",
+                                                  "style": "secondary",
+                                                  "action": {
+                                                    "actionId": "tier5.himiOwnerLiteEvent.cancelDelete"
+                                                  }
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "event_delete_confirm",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Button",
+                                                "props": {
+                                                  "title": "Delete",
+                                                  "style": "destructive",
+                                                  "action": {
+                                                    "actionId": "tier5.himiOwnerLiteEvent.confirmDelete"
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "background": {
+                                  "token": "surfaceElevated"
+                                },
+                                "border": {
+                                  "width": 1,
+                                  "color": {
+                                    "token": "danger"
+                                  }
+                                },
+                                "cornerRadius": 12,
+                                "padding": {
+                                  "leading": 14,
+                                  "trailing": 14,
+                                  "top": 14,
+                                  "bottom": 14
+                                },
+                                "fillMaxWidth": true,
+                                "hiddenPath": "$service:himiOwnerLiteEvent.noDeleteConfirmation"
+                              }
+                            },
                             {
                               "id": "",
                               "body": {
@@ -82897,6 +83115,115 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                 }
                               }
                             },
+                            {
+                              "id": "post_delete_confirmation",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 10,
+                                  "alignment": "leading",
+                                  "children": [
+                                    {
+                                      "id": "post_delete_confirmation.title",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "Delete this post?",
+                                          "style": "bodyEmphasis"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "post_delete_confirmation.record",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiOwnerLitePost.title",
+                                          "style": "body",
+                                          "color": "textSecondary",
+                                          "maxLines": 2
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "This cannot be undone.",
+                                          "style": "footnote",
+                                          "color": "textSecondary"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "HStack",
+                                        "props": {
+                                          "spacing": 8,
+                                          "children": [
+                                            {
+                                              "id": "post_delete_cancel",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Button",
+                                                "props": {
+                                                  "title": "Cancel",
+                                                  "style": "secondary",
+                                                  "action": {
+                                                    "actionId": "tier5.himiOwnerLitePost.cancelDelete"
+                                                  }
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "post_delete_confirm",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Button",
+                                                "props": {
+                                                  "title": "Delete",
+                                                  "style": "destructive",
+                                                  "action": {
+                                                    "actionId": "tier5.himiOwnerLitePost.confirmDelete"
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "background": {
+                                  "token": "surfaceElevated"
+                                },
+                                "border": {
+                                  "width": 1,
+                                  "color": {
+                                    "token": "danger"
+                                  }
+                                },
+                                "cornerRadius": 12,
+                                "padding": {
+                                  "leading": 14,
+                                  "trailing": 14,
+                                  "top": 14,
+                                  "bottom": 14
+                                },
+                                "fillMaxWidth": true,
+                                "hiddenPath": "$service:himiOwnerLitePost.noDeleteConfirmation"
+                              }
+                            },
                             {
                               "id": "",
                               "body": {

package/templates/restaurant-owner/tier5-src/himi-owner-lite-event/index.ts

@@ -62,6 +62,9 @@ interface EventState {
   /** Non-empty when showing owner-preview-demo sample data (web preview, no owner bridge). */
   demoNote: string;
   notDemo: boolean;
+  /** #3158 — Delete ARMS a confirmation; only confirmDelete reaches the API. */
+  deletePending: boolean;
+  noDeleteConfirmation: boolean;
 }
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -139,6 +142,9 @@ function shape(s: Partial<EventState>): EventState {
     noCover: !image,
     demoNote: s.demoNote ?? "",
     notDemo: !s.demoNote,
+    // Only a loaded entity can be pending deletion; every other action disarms it (`disarm`).
+    deletePending: !!s.deletePending && hasEntity,
+    noDeleteConfirmation: !(s.deletePending && hasEntity),
   };
 }
 
@@ -224,15 +230,32 @@ async function refresh(prev: EventState, id: string): Promise<EventState> {
   });
 }
 
+/** #3158 — a confirmed delete in flight. Synchronous and module-level on purpose: two
+ *  confirmDelete dispatches (a double tap) both start from a state that says "armed", and only a
+ *  flag set BEFORE the first await stops the second from issuing its own DELETE — whose late 404
+ *  would otherwise land after, and overwrite, the first one's "deleted". */
+let deleteInFlight = false;
+
+/** #3158 — the confirmation describes THIS visit. Never take it from a persisted snapshot, or a
+ *  reopened record comes back with "Delete this …?" already armed. */
+const DELETE_RUN_KEYS = ["deletePending", "noDeleteConfirmation"] as const;
+
+/** #3158 — clear an armed delete confirmation. */
+const disarm = <T extends { deletePending: boolean }>(s: T): T => ({ ...s, deletePending: false });
+
 const svc = defineService<EventState, {
   load: (s: EventState, arg?: unknown) => Promise<EventState>;
   retry: (s: EventState) => Promise<EventState>;
   delete: (s: EventState) => Promise<EventState>;
+  cancelDelete: (s: EventState) => Promise<EventState>;
+  confirmDelete: (s: EventState) => Promise<EventState | undefined>;
   openLink: (s: EventState, arg?: unknown) => Promise<EventState>;
 }>("himiOwnerLiteEvent", {
   state: shape({ status: "loading" }),
+  notHydrated: [...DELETE_RUN_KEYS],
   actions: {
-    load: async (s, arg) => {
+    load: async (s0, arg) => {
+      const s = disarm(s0);
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       const id = idFrom(arg, s.id) || inputId();
       if (!id) return shape({ ...s, status: "error", error: copyParam("ownerEvent.errorNoId", "no event id") });
@@ -257,7 +280,8 @@ const svc = defineService<EventState, {
         return shape({ ...s, id, status: "error", error: ownerLoadError(e) });
       }
     },
-    retry: async (s) => {
+    retry: async (s0) => {
+      const s = disarm(s0);
       if (!s.id) return shape({ ...s, status: "error", error: copyParam("ownerEvent.errorNoId", "no event id") });
       if (isOwnerPreviewDemo()) {
           const demo = demoDetail(s, s.id);
@@ -279,20 +303,35 @@ const svc = defineService<EventState, {
         return shape({ ...s, status: "error", error: ownerLoadError(e) });
       }
     },
-    delete: async (s) => {
-      if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
-      if (!s.id) return shape({ ...s, actionMessage: copyParam("ownerEvent.noIdMessage", "No event id.") });
-      // Optimistic local delete — the list drops the row immediately.
-      await cacheDrop(s.id);
+    // #3158 — destructive, so two steps. `delete` (the Manage card's Delete button)
+    // only ARMS the inline confirmation, which names the record and says it cannot
+    // be undone; `cancelDelete` disarms it; only `confirmDelete` deletes. Anything
+    // that dispatches `delete` directly therefore still asks first.
+    delete: async (s) => shape({ ...s, deletePending: true, actionMessage: "" }),
+    cancelDelete: async (s) => shape({ ...s, deletePending: false }),
+    confirmDelete: async (s0) => {
+      // Nothing armed (a stray dispatch, a rehydrated snapshot) or a delete already running
+      // (a second tap): ignore it — `undefined` leaves the state exactly as it is.
+      if (!s0.deletePending || deleteInFlight) return undefined;
+      deleteInFlight = true;
       try {
-        await deleteEvent(s.id);
-        return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerEvent.deletedEmpty", "Event deleted."), actionMessage: "" });
-      } catch (e) {
-        if (shouldQueueOwnerWrite(e)) {
-          await queueWrite("tier5.himiOwnerLiteEvent.delete", { id: s.id });
-          return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerEvent.deletedEmpty", "Event deleted."), actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+        const s = disarm(s0);
+        if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+        if (!s.id) return shape({ ...s, actionMessage: copyParam("ownerEvent.noIdMessage", "No event id.") });
+        // Optimistic local delete — the list drops the row immediately.
+        await cacheDrop(s.id);
+        try {
+          await deleteEvent(s.id);
+          return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerEvent.deletedEmpty", "Event deleted."), actionMessage: "" });
+        } catch (e) {
+          if (shouldQueueOwnerWrite(e)) {
+            await queueWrite("tier5.himiOwnerLiteEvent.delete", { id: s.id });
+            return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerEvent.deletedEmpty", "Event deleted."), actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+          }
+          return shape({ ...s, actionMessage: ownerLoadError(e) });
         }
-        return shape({ ...s, actionMessage: ownerLoadError(e) });
+      } finally {
+        deleteInFlight = false;
       }
     },
     // [rico] #3499 — a link tapped in the RichContent description.
@@ -303,4 +342,10 @@ const svc = defineService<EventState, {
   },
 });
 
+// The same reset on a runtime from before `notHydrated` (an older binary on a new bundle).
+if ((globalThis as { himalaya?: { hydrationOptOut?: unknown } }).himalaya?.hydrationOptOut !== true) {
+  const booted = svc.getState?.() as unknown as Record<string, unknown> | undefined;
+  if (booted && typeof booted === "object") Object.assign(booted, { deletePending: false, noDeleteConfirmation: true });
+}
+
 export { svc };