Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions core/components/minishop3/tests/OrderSaveRecalcRaceTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?php

/**
* Guards OrderView save/recalculate in-flight lock (issue #379).
*
* Run: php tests/OrderSaveRecalcRaceTest.php
*/

declare(strict_types=1);

$fail = static function (string $message): never {
fwrite(STDERR, "FAIL: {$message}\n");
exit(1);
};

$repoRoot = dirname(__DIR__, 4);
$orderView = $repoRoot . '/vueManager/src/components/OrderView.vue';
$actionsBar = $repoRoot . '/vueManager/src/components/order/OrderFormActionsBar.vue';

foreach ([$orderView => 'OrderView.vue', $actionsBar => 'OrderFormActionsBar.vue'] as $path => $label) {
if (!is_readable($path)) {
$fail("cannot read {$label}");
}
}

$orderViewSource = file_get_contents($orderView);
$actionsBarSource = file_get_contents($actionsBar);

if ($orderViewSource === false || $actionsBarSource === false) {
$fail('cannot read vue sources');
}

if (!preg_match('/async function saveOrder\(\)[\s\S]*?if \(recalculatingCost\.value \|\| saving\.value\)/', $orderViewSource)) {
$fail('saveOrder must bail out when recalculatingCost or saving is active');
}

if (!preg_match('/async function recalculateOrderCost[\s\S]*?if \(saving\.value \|\| recalculatingCost\.value\)/', $orderViewSource)) {
$fail('recalculateOrderCost must bail out when saving or recalculatingCost is active');
}

if (!str_contains($actionsBarSource, 'recalculatingCost')) {
$fail('OrderFormActionsBar must accept recalculatingCost prop');
}

if (!str_contains($actionsBarSource, ':disabled="recalculatingCost"')) {
$fail('Save button must be disabled while recalculatingCost');
}

fwrite(STDOUT, "OK OrderSaveRecalcRaceTest\n");
exit(0);
7 changes: 7 additions & 0 deletions vueManager/src/components/OrderView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,9 @@ async function recalculateOrderCost(opts = {}) {
if (isCreateMode.value || !orderId.value || orderId.value === 'new') {
return
}
if (saving.value || recalculatingCost.value) {
return
}

recalculatingCost.value = true
costRecalcWarnings.value = []
Expand Down Expand Up @@ -1065,6 +1068,10 @@ async function recalculateOrderCost(opts = {}) {
* Save order
*/
async function saveOrder() {
if (recalculatingCost.value || saving.value) {
return
}

saving.value = true

try {
Expand Down
2 changes: 2 additions & 0 deletions vueManager/src/components/order/OrderAddressTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const {
createOrder,
saveOrder,
goBack,
recalculatingCost,
} = orderCtx

const { _ } = useLexicon()
Expand Down Expand Up @@ -242,6 +243,7 @@ const showAddressTabActions = computed(
v-if="showAddressTabActions"
:is-create-mode="isCreateMode"
:saving="saving"
:recalculating-cost="recalculatingCost"
@create="createOrder"
@save="saveOrder"
@cancel="goBack"
Expand Down
3 changes: 3 additions & 0 deletions vueManager/src/components/order/OrderFormActionsBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import Button from 'primevue/button'
defineProps({
isCreateMode: { type: Boolean, required: true },
saving: { type: Boolean, default: false },
/** Blocks save while manager cost recalculation is in flight (#379). */
recalculatingCost: { type: Boolean, default: false },
})

const emit = defineEmits(['create', 'save', 'cancel'])
Expand All @@ -26,6 +28,7 @@ const { _ } = useLexicon()
:label="_('save')"
icon="pi pi-check"
:loading="saving"
:disabled="recalculatingCost"
@click="emit('save')"
/>
<Button
Expand Down
1 change: 1 addition & 0 deletions vueManager/src/components/order/OrderInfoTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ const showOrderInfoActions = computed(
v-if="showOrderInfoActions"
:is-create-mode="isCreateMode"
:saving="saving"
:recalculating-cost="recalculatingCost"
@create="createOrder"
@save="saveOrder"
@cancel="goBack"
Expand Down