Fix order detail routing and loading

This commit is contained in:
Ruslan Bakiev
2026-04-04 13:45:39 +07:00
parent 4fe3f72579
commit 2a5e38f488
6 changed files with 98 additions and 13 deletions

View File

@@ -1,8 +1,8 @@
<script setup lang="ts">
import { useQuery } from '@vue/apollo-composable';
import {
MyOrdersDocument,
type MyOrdersQuery,
OrderDetailDocument,
type OrderDetailQuery,
} from '~/composables/graphql/generated';
import {
orderLogisticsStateText,
@@ -10,14 +10,16 @@ import {
orderLineStateText,
} from '~/composables/useOrderDetailPresentation';
type OrderItem = MyOrdersQuery['myOrders'][number];
type OrderItem = NonNullable<OrderDetailQuery['order']>;
const route = useRoute();
const orderId = computed(() => String(route.params.id || ''));
const ordersQuery = useQuery(MyOrdersDocument);
const orderQuery = useQuery(OrderDetailDocument, () => ({
id: orderId.value,
}));
const currentOrder = computed<OrderItem | null>(() =>
(ordersQuery.result.value?.myOrders ?? []).find((item: OrderItem) => item.id === orderId.value) ?? null,
orderQuery.result.value?.order ?? null,
);
</script>
@@ -25,7 +27,7 @@ const currentOrder = computed<OrderItem | null>(() =>
<section class="space-y-6">
<NuxtLink to="/orders" class="text-sm font-semibold text-[#0d854a]"> Назад к моим заказам</NuxtLink>
<div v-if="ordersQuery.loading.value" class="manager-empty-state">
<div v-if="orderQuery.loading.value" class="manager-empty-state">
Загружаем заказ...
</div>