@salla.sa/twilight-components 2.14.522 → 2.14.524

package/dist/collection/Helpers/latest-request.js

@@ -0,0 +1,31 @@
+/*!
+ * Crafted with ❤ by Salla
+ */
+/**
+ * Keeps only the newest request alive: every `run()` aborts whatever the previous one started,
+ * so a slow earlier response can never overwrite a newer one.
+ *
+ * @example
+ * private request = new LatestRequest();
+ * const { aborted, result } = await this.request.run(signal => salla.order.api.getShipments(id, signal));
+ * if (aborted) return;
+ */
+export class LatestRequest {
+    /** `aborted` is true when a newer run (or `abort()`) superseded this one; `result` is then undefined. */
+    async run(fn) {
+        this.abort();
+        const { signal } = (this.controller = new AbortController());
+        try {
+            const result = await fn(signal);
+            return signal.aborted ? { aborted: true } : { aborted: false, result };
+        }
+        catch (error) {
+            if (signal.aborted)
+                return { aborted: true };
+            throw error;
+        }
+    }
+    abort() {
+        this.controller?.abort();
+    }
+}

package/dist/collection/components/salla-bullet-delivery/salla-bullet-delivery.js

@@ -405,13 +405,16 @@ export class SallaBulletDelivery {
                 getIntentCountryId(savedIntent) != null &&
                 getIntentCityId(savedIntent) != null;
             // Set default tab first so we can lazy-load tab-specific data.
-            if (this.supportsPickup &&
+            if (this.supportsPickup && !this.isSupportsDelivery) {
+                this.activeTab = 'branch';
+            }
+            else if (this.supportsPickup &&
                 savedIntent?.type &&
-                (savedIntent.type === "address" || savedIntent.type === "branch")) {
+                (savedIntent.type === 'address' || savedIntent.type === 'branch')) {
                 this.activeTab = savedIntent.type;
             }
             else {
-                this.activeTab = "address";
+                this.activeTab = 'address';
             }
             // Fetch address token for map (fire-and-forget, non-blocking)
             this.fetchAddressToken();

package/dist/collection/components/salla-order-shipments/salla-order-shipments.js

@@ -3,6 +3,7 @@
  */
 import { h, Host } from "@stencil/core";
 import SwapStrokeIcon from "../../assets/svg/swap-stroke.svg";
+import { LatestRequest } from "../../Helpers/latest-request";
 /**
  * @salla/ui-components
  * The `salla-order-shipments` component renders a per-shipment tracking breakdown
@@ -12,6 +13,7 @@ import SwapStrokeIcon from "../../assets/svg/swap-stroke.svg";
 export class SallaOrderShipments {
     constructor() {
         this.shipments = [];
+        this.request = new LatestRequest();
     }
     async componentWillLoad() {
         await salla.onReady();
@@ -21,15 +23,22 @@ export class SallaOrderShipments {
         this.shipments = [];
         await this.fetchShipments();
     }
+    disconnectedCallback() {
+        this.request.abort();
+    }
     async fetchShipments() {
+        // supersede whatever is in flight first — the guards below can bail out before run() would
+        this.request.abort();
         if (!salla.config.get('store.features', []).includes('thankyou-page-multi-shipments'))
             return;
         const orderId = this.orderId || salla.config.get('page.id');
         if (!orderId)
             return;
         try {
-            const response = await salla.order.api.getShipments(orderId);
-            const data = response?.data;
+            const { aborted, result } = await this.request.run(signal => salla.order.api.getShipments(orderId, signal));
+            if (aborted)
+                return;
+            const data = result?.data;
             this.shipments = Array.isArray(data) ? data : Array.isArray(data?.data) ? data.data : [];
         }
         catch (error) {
@@ -52,7 +61,7 @@ export class SallaOrderShipments {
     }
     renderTracking(shipment) {
         const number = shipment.number;
-        if (!number) {
+        if (!number || Number(number) === 0) {
             return (h("span", { class: "s-order-shipments-placeholder" }, this.label('pages.thank_you.tracking_placeholder', 'سيتم تعيين رقم تتبع بمجرد تجهيز الشحنة')));
         }
         return (h("span", { class: "s-order-shipments-tracking" }, this.label('pages.thank_you.tracking_no', 'رقم تتبع الشحنة'), h("b", { dir: "ltr" }, "#", number), h("button", { type: "button", class: "s-order-shipments-copy", title: this.label('common.elements.copy', 'نسخ'), onClick: () => this.copyTracking(String(number)) }, h("span", { innerHTML: SwapStrokeIcon }))));