@bringg/dashboard-sdk 9.50.13-pre.3 → 9.50.13-pre.6

package/dist/Services/ServiceRequest.js

@@ -56,7 +56,7 @@ var lodash_1 = require("lodash");
 var BringgException_1 = require("../Core/BringgException");
 var Logger_1 = __importDefault(require("../Core/Logger"));
 var abort_1 = require("../utils/abort");
-var version = '9.50.13-pre.3';
+var version = '9.50.13-pre.6';
 function logErrorResponse(response) {
     var data = response.data, status = response.status;
     try {

package/dist/Task/v2/task-merger.d.ts

@@ -1,394 +1,10 @@
 import { Task } from '@bringg/types';
 import DataStore from '../../data-store';
 declare function mergeTaskIntoExisting(tasksStore: DataStore<Task>, task: Task, shouldRemoveInventories?: boolean): {
-    current: {
-        created_at?: string;
-        updated_at?: string;
-        task_notes?: import("@bringg/types").TaskNote[];
-        shared_locations?: import("@bringg/types").SharedLocation[];
-        scans?: import("@bringg/types").Scan[];
-        customer?: import("@bringg/types").Customer;
-        teams?: import("@bringg/types").Team[];
-        run?: import("@bringg/types").Run;
-        user?: import("@bringg/types").User;
-        child_tasks?: import("@bringg/types").ChildTask[];
-        title?: string;
-        origin_id?: number;
-        task_type_id?: number;
-        active_way_point_id?: number;
-        address?: string;
-        asap?: boolean;
-        automatically_assigned?: boolean;
-        automatically_cancelled?: import("@bringg/types").TaskAutomaticallyCancelled;
-        automatically_ended?: import("@bringg/types").StatusChangedType;
-        cancelled_at?: string;
-        chat_messages?: import("@bringg/types").ChatMessage[];
-        customer_id?: number;
-        customer_name?: string;
-        delete_at?: string;
-        discount?: number;
-        dispatcher_id?: number;
-        distance_traveled?: number;
-        driver_payments?: import("@bringg/types").DriverPayment[];
-        ended_time?: string;
-        external_id?: string;
-        extras?: import("@bringg/types").Extras;
-        group_leader_id?: number;
-        group_uuid?: string;
-        id?: number;
-        invalidated?: boolean;
-        invalid_reasons?: import("@bringg/types").InvalidReason[];
-        lat?: number;
-        late?: boolean;
-        left_to_be_paid?: number;
-        linked_task_id?: number;
-        lng?: number;
-        parent_task_id?: number;
-        payment_method?: import("@bringg/types").PaymentMethods;
-        payment_type_name?: string;
-        post_delivery_tip_cash?: number;
-        post_delivery_tip_credit?: number;
-        pre_delivery_tip?: number;
-        preparation_end_time_planned?: string;
-        preparation_ready_for_pickup_time_planned?: string;
-        preparation_ready_for_pickup_time_actual?: string;
-        preparation_start_time_planned?: string;
-        preparation_status?: import("@bringg/types").PreparationStatus;
-        preparation_external_id?: string;
-        price_before_tax?: number;
-        priority?: number;
-        ready_to_execute?: boolean;
-        recurrent_task_template_id?: number;
-        required_skills?: string[];
-        scheduled_at?: string;
-        started_time?: string;
-        status?: import("@bringg/types").TaskStatus;
-        tag_id?: number;
-        quote_id?: string;
-        tax_price?: number;
-        tip?: number;
-        tip_driver_enabled?: boolean;
-        total_price?: number;
-        total_weight?: number;
-        delivery_price?: number;
-        delivery_cost?: number;
-        estimated_delivery_cost?: number;
-        pre_estimated_delivery_cost?: number;
-        internal_fee?: number;
-        user_id?: number;
-        teams_ids?: number[];
-        team_ids?: number[];
-        uuid?: string;
-        fleet_delivery_external_id?: string;
-        fleet_id?: number;
-        merchant_id: number;
-        scheduled_to_be_ready?: string;
-        first_way_point_schedule?: string;
-        last_way_point_schedule?: string;
-        first_way_point_lat?: number;
-        first_way_point_lng?: number;
-        last_way_point_lat?: number;
-        last_way_point_lng?: number;
-        cancellation_custom_reason?: string;
-        cancellation_reason_id?: number;
-        cancellation_lat?: number;
-        cancellation_lng?: number;
-        inventory_changes?: import("@bringg/types").InventoryChange[];
-        task_configuration_id?: number;
-        task_configuration?: import("@bringg/types").TaskConfiguration;
-        rogue_reasons?: import("@bringg/types").RogueReasons[];
-        virtual_task?: boolean;
-        action_data?: import("@bringg/types").ActionData[];
-        run_id?: number;
-        service_plan_id?: number;
-        service_plan?: import("@bringg/types").ServicePlan;
-        rank?: number;
-        left_to_be_paid_for_delivery?: number;
-        additional_attributes?: import("@bringg/types").TaskAdditionalAttributes;
-        acknowledged_at?: string;
-        route_name?: string;
-        aggregations?: Partial<{
-            max_weight: number;
-            max_handling_units: import("@bringg/types").HandlingUnits;
-            inventory_total_quantity: number;
-            has_any_rejected_inventory: boolean;
-        }>;
-        test?: boolean;
-        failed_delivery_attempts?: number;
-        first_way_point_has_to_leave_by?: string;
-        origin_title?: string;
-        planning_done?: boolean;
-        planning_published?: boolean;
-        vehicle_id?: number;
-        service_fee?: number;
-        delivery_window_id?: number;
-        reserved_until?: string;
-        total_handling_units?: number;
-        user_external_id?: string;
-        task_cancellation_reason?: string;
-        cancellation_reason?: import("@bringg/types").CancelationReason;
-        way_points?: import("@bringg/types").WayPoint[];
-        task_payment_histories?: import("@bringg/types").TaskPaymentHistory[];
-    };
-    diff: {
-        created_at?: string;
-        updated_at?: string;
-        task_notes?: import("@bringg/types").TaskNote[];
-        shared_locations?: import("@bringg/types").SharedLocation[];
-        scans?: import("@bringg/types").Scan[];
-        customer?: import("@bringg/types").Customer;
-        teams?: import("@bringg/types").Team[];
-        run?: import("@bringg/types").Run;
-        user?: import("@bringg/types").User;
-        child_tasks?: import("@bringg/types").ChildTask[];
-        title?: string;
-        origin_id?: number;
-        task_type_id?: number;
-        active_way_point_id?: number;
-        address?: string;
-        asap?: boolean;
-        automatically_assigned?: boolean;
-        automatically_cancelled?: import("@bringg/types").TaskAutomaticallyCancelled;
-        automatically_ended?: import("@bringg/types").StatusChangedType;
-        cancelled_at?: string;
-        chat_messages?: import("@bringg/types").ChatMessage[];
-        customer_id?: number;
-        customer_name?: string;
-        delete_at?: string;
-        discount?: number;
-        dispatcher_id?: number;
-        distance_traveled?: number;
-        driver_payments?: import("@bringg/types").DriverPayment[];
-        ended_time?: string;
-        external_id?: string;
-        extras?: import("@bringg/types").Extras;
-        group_leader_id?: number;
-        group_uuid?: string;
-        id?: number;
-        invalidated?: boolean;
-        invalid_reasons?: import("@bringg/types").InvalidReason[];
-        lat?: number;
-        late?: boolean;
-        left_to_be_paid?: number;
-        linked_task_id?: number;
-        lng?: number;
-        parent_task_id?: number;
-        payment_method?: import("@bringg/types").PaymentMethods;
-        payment_type_name?: string;
-        post_delivery_tip_cash?: number;
-        post_delivery_tip_credit?: number;
-        pre_delivery_tip?: number;
-        preparation_end_time_planned?: string;
-        preparation_ready_for_pickup_time_planned?: string;
-        preparation_ready_for_pickup_time_actual?: string;
-        preparation_start_time_planned?: string;
-        preparation_status?: import("@bringg/types").PreparationStatus;
-        preparation_external_id?: string;
-        price_before_tax?: number;
-        priority?: number;
-        ready_to_execute?: boolean;
-        recurrent_task_template_id?: number;
-        required_skills?: string[];
-        scheduled_at?: string;
-        started_time?: string;
-        status?: import("@bringg/types").TaskStatus;
-        tag_id?: number;
-        quote_id?: string;
-        tax_price?: number;
-        tip?: number;
-        tip_driver_enabled?: boolean;
-        total_price?: number;
-        total_weight?: number;
-        delivery_price?: number;
-        delivery_cost?: number;
-        estimated_delivery_cost?: number;
-        pre_estimated_delivery_cost?: number;
-        internal_fee?: number;
-        user_id?: number;
-        teams_ids?: number[];
-        team_ids?: number[];
-        uuid?: string;
-        fleet_delivery_external_id?: string;
-        fleet_id?: number;
-        merchant_id: number;
-        scheduled_to_be_ready?: string;
-        first_way_point_schedule?: string;
-        last_way_point_schedule?: string;
-        first_way_point_lat?: number;
-        first_way_point_lng?: number;
-        last_way_point_lat?: number;
-        last_way_point_lng?: number;
-        cancellation_custom_reason?: string;
-        cancellation_reason_id?: number;
-        cancellation_lat?: number;
-        cancellation_lng?: number;
-        inventory_changes?: import("@bringg/types").InventoryChange[];
-        task_configuration_id?: number;
-        task_configuration?: import("@bringg/types").TaskConfiguration;
-        rogue_reasons?: import("@bringg/types").RogueReasons[];
-        virtual_task?: boolean;
-        action_data?: import("@bringg/types").ActionData[];
-        run_id?: number;
-        service_plan_id?: number;
-        service_plan?: import("@bringg/types").ServicePlan;
-        rank?: number;
-        left_to_be_paid_for_delivery?: number;
-        additional_attributes?: import("@bringg/types").TaskAdditionalAttributes;
-        acknowledged_at?: string;
-        route_name?: string;
-        aggregations?: Partial<{
-            max_weight: number;
-            max_handling_units: import("@bringg/types").HandlingUnits;
-            inventory_total_quantity: number;
-            has_any_rejected_inventory: boolean;
-        }>;
-        test?: boolean;
-        failed_delivery_attempts?: number;
-        first_way_point_has_to_leave_by?: string;
-        origin_title?: string;
-        planning_done?: boolean;
-        planning_published?: boolean;
-        vehicle_id?: number;
-        service_fee?: number;
-        delivery_window_id?: number;
-        reserved_until?: string;
-        total_handling_units?: number;
-        user_external_id?: string;
-        task_cancellation_reason?: string;
-        cancellation_reason?: import("@bringg/types").CancelationReason;
-        way_points?: import("@bringg/types").WayPoint[];
-        task_payment_histories?: import("@bringg/types").TaskPaymentHistory[];
-    };
+    current: Task;
+    diff: Task;
 } | {
-    current: {
-        created_at?: string;
-        updated_at?: string;
-        task_notes?: import("@bringg/types").TaskNote[];
-        shared_locations?: import("@bringg/types").SharedLocation[];
-        scans?: import("@bringg/types").Scan[];
-        customer?: import("@bringg/types").Customer;
-        teams?: import("@bringg/types").Team[];
-        run?: import("@bringg/types").Run;
-        user?: import("@bringg/types").User;
-        child_tasks?: import("@bringg/types").ChildTask[];
-        title?: string;
-        origin_id?: number;
-        task_type_id?: number;
-        active_way_point_id?: number;
-        address?: string;
-        asap?: boolean;
-        automatically_assigned?: boolean;
-        automatically_cancelled?: import("@bringg/types").TaskAutomaticallyCancelled;
-        automatically_ended?: import("@bringg/types").StatusChangedType;
-        cancelled_at?: string;
-        chat_messages?: import("@bringg/types").ChatMessage[];
-        customer_id?: number;
-        customer_name?: string;
-        delete_at?: string;
-        discount?: number;
-        dispatcher_id?: number;
-        distance_traveled?: number;
-        driver_payments?: import("@bringg/types").DriverPayment[];
-        ended_time?: string;
-        external_id?: string;
-        extras?: import("@bringg/types").Extras;
-        group_leader_id?: number;
-        group_uuid?: string;
-        id?: number;
-        invalidated?: boolean;
-        invalid_reasons?: import("@bringg/types").InvalidReason[];
-        lat?: number;
-        late?: boolean;
-        left_to_be_paid?: number;
-        linked_task_id?: number;
-        lng?: number;
-        parent_task_id?: number;
-        payment_method?: import("@bringg/types").PaymentMethods;
-        payment_type_name?: string;
-        post_delivery_tip_cash?: number;
-        post_delivery_tip_credit?: number;
-        pre_delivery_tip?: number;
-        preparation_end_time_planned?: string;
-        preparation_ready_for_pickup_time_planned?: string;
-        preparation_ready_for_pickup_time_actual?: string;
-        preparation_start_time_planned?: string;
-        preparation_status?: import("@bringg/types").PreparationStatus;
-        preparation_external_id?: string;
-        price_before_tax?: number;
-        priority?: number;
-        ready_to_execute?: boolean;
-        recurrent_task_template_id?: number;
-        required_skills?: string[];
-        scheduled_at?: string;
-        started_time?: string;
-        status?: import("@bringg/types").TaskStatus;
-        tag_id?: number;
-        quote_id?: string;
-        tax_price?: number;
-        tip?: number;
-        tip_driver_enabled?: boolean;
-        total_price?: number;
-        total_weight?: number;
-        delivery_price?: number;
-        delivery_cost?: number;
-        estimated_delivery_cost?: number;
-        pre_estimated_delivery_cost?: number;
-        internal_fee?: number;
-        user_id?: number;
-        teams_ids?: number[];
-        team_ids?: number[];
-        uuid?: string;
-        fleet_delivery_external_id?: string;
-        fleet_id?: number;
-        merchant_id: number;
-        scheduled_to_be_ready?: string;
-        first_way_point_schedule?: string;
-        last_way_point_schedule?: string;
-        first_way_point_lat?: number;
-        first_way_point_lng?: number;
-        last_way_point_lat?: number;
-        last_way_point_lng?: number;
-        cancellation_custom_reason?: string;
-        cancellation_reason_id?: number;
-        cancellation_lat?: number;
-        cancellation_lng?: number;
-        inventory_changes?: import("@bringg/types").InventoryChange[];
-        task_configuration_id?: number;
-        task_configuration?: import("@bringg/types").TaskConfiguration;
-        rogue_reasons?: import("@bringg/types").RogueReasons[];
-        virtual_task?: boolean;
-        action_data?: import("@bringg/types").ActionData[];
-        run_id?: number;
-        service_plan_id?: number;
-        service_plan?: import("@bringg/types").ServicePlan;
-        rank?: number;
-        left_to_be_paid_for_delivery?: number;
-        additional_attributes?: import("@bringg/types").TaskAdditionalAttributes;
-        acknowledged_at?: string;
-        route_name?: string;
-        aggregations?: Partial<{
-            max_weight: number;
-            max_handling_units: import("@bringg/types").HandlingUnits;
-            inventory_total_quantity: number;
-            has_any_rejected_inventory: boolean;
-        }>;
-        test?: boolean;
-        failed_delivery_attempts?: number;
-        first_way_point_has_to_leave_by?: string;
-        origin_title?: string;
-        planning_done?: boolean;
-        planning_published?: boolean;
-        vehicle_id?: number;
-        service_fee?: number;
-        delivery_window_id?: number;
-        reserved_until?: string;
-        total_handling_units?: number;
-        user_external_id?: string;
-        task_cancellation_reason?: string;
-        cancellation_reason?: import("@bringg/types").CancelationReason;
-        way_points?: import("@bringg/types").WayPoint[];
-        task_payment_histories?: import("@bringg/types").TaskPaymentHistory[];
-    };
+    current: Task;
     diff?: undefined;
 };
 export declare const taskMerger: {

package/dist/Task/v2/task-merger.js

@@ -1,37 +1,41 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskMerger = void 0;
 var merge_mapper_1 = require("../../Data/merge-mapper");
+function hasNoActualChanges(diffArray) {
+    if (!Array.isArray(diffArray)) {
+        return false;
+    }
+    return diffArray.every(function (item) {
+        if (item === undefined || item === null) {
+            return true;
+        }
+        if (typeof item === 'object') {
+            return Object.keys(item).length === 0;
+        }
+        return false;
+    });
+}
 function mergeTaskIntoExisting(tasksStore, task, shouldRemoveInventories) {
     if (shouldRemoveInventories === void 0) { shouldRemoveInventories = false; }
     var way_points = task.way_points;
     if (way_points) {
         way_points.sort(function (wp1, wp2) { return wp1.position - wp2.position; });
     }
+    var result = merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
     if (shouldRemoveInventories) {
-        var taskInventories = task.task_inventories;
-        var task_inventories = task.task_inventories, taskWithoutInventories = __rest(task, ["task_inventories"]);
-        var result = merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, taskWithoutInventories);
-        if (taskInventories !== undefined && result.diff) {
-            result.diff.task_inventories = taskInventories;
-        }
-        if (result.current && result.current.task_inventories) {
+        var existingTask = tasksStore.get(task.id);
+        var hasInventoriesInStore = existingTask && existingTask.task_inventories;
+        // Clean up task_inventories from diff if it hasn't actually changed
+        if (result.diff &&
+            result.diff.task_inventories &&
+            hasNoActualChanges(result.diff.task_inventories) &&
+            !hasInventoriesInStore) {
             delete result.current.task_inventories;
         }
         return result;
     }
-    return merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
+    return result;
 }
 exports.taskMerger = { mergeTaskIntoExisting: mergeTaskIntoExisting };
 //# sourceMappingURL=task-merger.js.map

package/dist/Task/v2/task-merger.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-merger.js","sourceRoot":"","sources":["../../../src/Task/v2/task-merger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,wDAAsD;AAGtD,SAAS,qBAAqB,CAAC,UAA2B,EAAE,IAAU,EAAE,uBAA+B;IAA/B,wCAAA,EAAA,+BAA+B;IAC9F,IAAA,UAAU,GAAK,IAAI,WAAT,CAAU;IAE5B,IAAI,UAAU,EAAE;QACf,UAAU,CAAC,IAAI,CAAC,UAAC,GAAG,EAAE,GAAG,IAAK,OAAA,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAA3B,CAA2B,CAAC,CAAC;KAC3D;IAED,IAAI,uBAAuB,EAAE;QAC5B,IAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACtC,IAAA,gBAAgB,GAAgC,IAAI,iBAApC,EAAK,sBAAsB,UAAK,IAAI,EAAtD,oBAA+C,CAAF,CAAU;QAE7D,IAAM,MAAM,GAAG,0BAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;QAEjF,IAAI,eAAe,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,EAAE;YAChD,MAAM,CAAC,IAAY,CAAC,gBAAgB,GAAG,eAAe,CAAC;SACxD;QAED,IAAI,MAAM,CAAC,OAAO,IAAK,MAAM,CAAC,OAAe,CAAC,gBAAgB,EAAE;YAC/D,OAAQ,MAAM,CAAC,OAAe,CAAC,gBAAgB,CAAC;SAChD;QAED,OAAO,MAAM,CAAC;KACd;IAED,OAAO,0BAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AACxD,CAAC;AAEY,QAAA,UAAU,GAAG,EAAE,qBAAqB,uBAAA,EAAE,CAAC"}
+{"version":3,"file":"task-merger.js","sourceRoot":"","sources":["../../../src/Task/v2/task-merger.ts"],"names":[],"mappings":";;;AAEA,wDAAsD;AAGtD,SAAS,kBAAkB,CAAC,SAAgB;IAC3C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC9B,OAAO,KAAK,CAAC;KACb;IAED,OAAO,SAAS,CAAC,KAAK,CAAC,UAAA,IAAI;QAC1B,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE;YACxC,OAAO,IAAI,CAAC;SACZ;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC7B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;SACtC;QAED,OAAO,KAAK,CAAC;IACd,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,UAA2B,EAAE,IAAU,EAAE,uBAA+B;IAA/B,wCAAA,EAAA,+BAA+B;IAC9F,IAAA,UAAU,GAAK,IAAI,WAAT,CAAU;IAE5B,IAAI,UAAU,EAAE;QACf,UAAU,CAAC,IAAI,CAAC,UAAC,GAAG,EAAE,GAAG,IAAK,OAAA,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAA3B,CAA2B,CAAC,CAAC;KAC3D;IAED,IAAM,MAAM,GAAG,0BAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAE/D,IAAI,uBAAuB,EAAE;QAC5B,IAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAM,qBAAqB,GAAG,YAAY,IAAI,YAAY,CAAC,gBAAgB,CAAC;QAE5E,oEAAoE;QACpE,IACC,MAAM,CAAC,IAAI;YACX,MAAM,CAAC,IAAI,CAAC,gBAAgB;YAC5B,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAyB,CAAC;YACzD,CAAC,qBAAqB,EACrB;YACD,OAAO,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC;SACvC;QAED,OAAO,MAAM,CAAC;KACd;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAEY,QAAA,UAAU,GAAG,EAAE,qBAAqB,uBAAA,EAAE,CAAC"}

package/dist/bringg-dashboard-sdk-cjs2.js

@@ -22401,7 +22401,7 @@ var lodash_1 = __webpack_require__(96486);
 var BringgException_1 = __webpack_require__(43605);
 var Logger_1 = __importDefault(__webpack_require__(55860));
 var abort_1 = __webpack_require__(34179);
-var version = '9.50.13-pre.3';
+var version = '9.50.13-pre.6';
 function logErrorResponse(response) {
     var data = response.data, status = response.status;
     try {
@@ -25113,43 +25113,47 @@ exports.taskDefaultFields = [
 /***/ }),
 
 /***/ 3892:
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.taskMerger = void 0;
 var merge_mapper_1 = __webpack_require__(59200);
+function hasNoActualChanges(diffArray) {
+    if (!Array.isArray(diffArray)) {
+        return false;
+    }
+    return diffArray.every(function (item) {
+        if (item === undefined || item === null) {
+            return true;
+        }
+        if (typeof item === 'object') {
+            return Object.keys(item).length === 0;
+        }
+        return false;
+    });
+}
 function mergeTaskIntoExisting(tasksStore, task, shouldRemoveInventories) {
     if (shouldRemoveInventories === void 0) { shouldRemoveInventories = false; }
     var way_points = task.way_points;
     if (way_points) {
         way_points.sort(function (wp1, wp2) { return wp1.position - wp2.position; });
     }
+    var result = merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
     if (shouldRemoveInventories) {
-        var taskInventories = task.task_inventories;
-        var task_inventories = task.task_inventories, taskWithoutInventories = __rest(task, ["task_inventories"]);
-        var result = merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, taskWithoutInventories);
-        if (taskInventories !== undefined && result.diff) {
-            result.diff.task_inventories = taskInventories;
-        }
-        if (result.current && result.current.task_inventories) {
+        var existingTask = tasksStore.get(task.id);
+        var hasInventoriesInStore = existingTask && existingTask.task_inventories;
+        // Clean up task_inventories from diff if it hasn't actually changed
+        if (result.diff &&
+            result.diff.task_inventories &&
+            hasNoActualChanges(result.diff.task_inventories) &&
+            !hasInventoriesInStore) {
             delete result.current.task_inventories;
         }
         return result;
     }
-    return merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
+    return result;
 }
 exports.taskMerger = { mergeTaskIntoExisting: mergeTaskIntoExisting };
 //# sourceMappingURL=task-merger.js.map