Перевод защищённой части приложения на Vue.js + Inertia

Дашборд, зоны, устройства, правила автоматизации и профиль теперь Vue 3 + Inertia вместо Blade+Alpine — гостевые страницы Breeze (логин/регистрация) сознательно оставлены на Blade, чтобы не трогать уже протестированную аутентификацию. Контроллеры возвращают Inertia::render() вместо view(), переиспользуют существующие API Resources и FormRequest. Ключевой нюанс: Resource/ResourceCollection, переданные напрямую в проп Inertia, заворачиваются в ключ "data" (Inertia вызывает toResponse() у Responsable-объектов) — везде используется ->resolve() и явное резолвление вложенных ресурсов (zone/device_type внутри Device и т.п.), иначе вложенные поля тоже задваивались бы обёрткой. Alpine.js и все Blade-вьюхи защищённой части удалены как мёртвый код. Тесты (ZoneControllerTest/DeviceControllerTest) переведены на assertInertia(). UserFactory теперь явно задаёт role=owner — без этого Eloquent не подтягивает DB-default обратно в модель после create(), что уронило бы общий auth.user проп на любой странице.
2026-08-12 10:52:04 +05:00
parent e739ef5d38
commit be1f238f89
71 changed files with 1988 additions and 1232 deletions
@@ -0,0 +1,25 @@
+<script setup>
+import AppLayout from '@/Layouts/AppLayout.vue';
+import Form from '@/Pages/Devices/Form.vue';
+
+defineProps({
+    zones: { type: Array, required: true },
+    deviceTypes: { type: Array, required: true },
+});
+</script>
+
+<template>
+    <AppLayout>
+        <template #header>
+            <h2 class="font-semibold text-xl text-gray-800 leading-tight">Новое устройство</h2>
+        </template>
+
+        <div class="py-12">
+            <div class="max-w-xl mx-auto sm:px-6 lg:px-8">
+                <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg p-6">
+                    <Form :zones="zones" :device-types="deviceTypes" />
+                </div>
+            </div>
+        </div>
+    </AppLayout>
+</template>
@@ -0,0 +1,26 @@
+<script setup>
+import AppLayout from '@/Layouts/AppLayout.vue';
+import Form from '@/Pages/Devices/Form.vue';
+
+defineProps({
+    device: { type: Object, required: true },
+    zones: { type: Array, required: true },
+    deviceTypes: { type: Array, required: true },
+});
+</script>
+
+<template>
+    <AppLayout>
+        <template #header>
+            <h2 class="font-semibold text-xl text-gray-800 leading-tight">Изменить устройство</h2>
+        </template>
+
+        <div class="py-12">
+            <div class="max-w-xl mx-auto sm:px-6 lg:px-8">
+                <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg p-6">
+                    <Form :device="device" :zones="zones" :device-types="deviceTypes" />
+                </div>
+            </div>
+        </div>
+    </AppLayout>
+</template>
@@ -0,0 +1,108 @@
+<script setup>
+import { useForm } from '@inertiajs/vue3';
+import { routes } from '@/routes';
+
+const props = defineProps({
+    device: { type: Object, default: null },
+    zones: { type: Array, required: true },
+    deviceTypes: { type: Array, required: true },
+});
+
+const isEdit = !!props.device;
+
+const form = useForm({
+    name: props.device?.name ?? '',
+    zone_id: props.device?.zone_id ?? '',
+    device_type_id: props.device?.device_type_id ?? '',
+    external_id: props.device?.external_id ?? '',
+    protocol: props.device?.protocol ?? 'mqtt',
+});
+
+function submit() {
+    if (isEdit) {
+        form.put(routes.devices.update(props.device.id));
+    } else {
+        form.post(routes.devices.store);
+    }
+}
+</script>
+
+<template>
+    <form @submit.prevent="submit">
+        <div>
+            <label for="name" class="block font-medium text-sm text-gray-700">Название</label>
+            <input
+                id="name"
+                v-model="form.name"
+                type="text"
+                required
+                autofocus
+                class="mt-1 block w-full border-gray-300 focus:border-indigo-500 focus:ring-indigo-500 rounded-md shadow-sm"
+            >
+            <div v-if="form.errors.name" class="mt-2 text-sm text-red-600">{{ form.errors.name }}</div>
+        </div>
+
+        <div class="mt-4">
+            <label for="zone_id" class="block font-medium text-sm text-gray-700">Зона</label>
+            <select
+                id="zone_id"
+                v-model="form.zone_id"
+                required
+                class="mt-1 block w-full border-gray-300 focus:border-indigo-500 focus:ring-indigo-500 rounded-md shadow-sm"
+            >
+                <option value="">— выбрать —</option>
+                <option v-for="zone in zones" :key="zone.id" :value="zone.id">{{ zone.name }}</option>
+            </select>
+            <div v-if="form.errors.zone_id" class="mt-2 text-sm text-red-600">{{ form.errors.zone_id }}</div>
+        </div>
+
+        <div class="mt-4">
+            <label for="device_type_id" class="block font-medium text-sm text-gray-700">Тип устройства</label>
+            <select
+                id="device_type_id"
+                v-model="form.device_type_id"
+                required
+                class="mt-1 block w-full border-gray-300 focus:border-indigo-500 focus:ring-indigo-500 rounded-md shadow-sm"
+            >
+                <option value="">— выбрать —</option>
+                <option v-for="type in deviceTypes" :key="type.id" :value="type.id">{{ type.code }} ({{ type.category }})</option>
+            </select>
+            <div v-if="form.errors.device_type_id" class="mt-2 text-sm text-red-600">{{ form.errors.device_type_id }}</div>
+        </div>
+
+        <div class="mt-4">
+            <label for="external_id" class="block font-medium text-sm text-gray-700">External ID (идентификатор физического устройства)</label>
+            <input
+                id="external_id"
+                v-model="form.external_id"
+                type="text"
+                required
+                class="mt-1 block w-full font-mono border-gray-300 focus:border-indigo-500 focus:ring-indigo-500 rounded-md shadow-sm"
+            >
+            <div v-if="form.errors.external_id" class="mt-2 text-sm text-red-600">{{ form.errors.external_id }}</div>
+        </div>
+
+        <div class="mt-4">
+            <label for="protocol" class="block font-medium text-sm text-gray-700">Протокол</label>
+            <input
+                id="protocol"
+                v-model="form.protocol"
+                type="text"
+                required
+                class="mt-1 block w-full border-gray-300 focus:border-indigo-500 focus:ring-indigo-500 rounded-md shadow-sm"
+            >
+            <div v-if="form.errors.protocol" class="mt-2 text-sm text-red-600">{{ form.errors.protocol }}</div>
+        </div>
+
+        <div class="mt-4 flex items-center gap-4">
+            <button
+                type="submit"
+                :disabled="form.processing"
+                class="inline-flex items-center px-4 py-2 bg-gray-800 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-gray-700 disabled:opacity-50"
+            >
+                Сохранить
+            </button>
+            <a :href="routes.devices.index" class="text-sm text-gray-600 hover:underline">Отмена</a>
+        </div>
+    </form>
+</template>
@@ -0,0 +1,73 @@
+<script setup>
+import { computed } from 'vue';
+import { Link, router, usePage } from '@inertiajs/vue3';
+import AppLayout from '@/Layouts/AppLayout.vue';
+import StatusBadge from '@/Components/StatusBadge.vue';
+import { routes } from '@/routes';
+
+defineProps({
+    devices: { type: Array, required: true },
+});
+
+const isOwner = computed(() => usePage().props.auth.user?.role === 'owner');
+
+function destroy(device) {
+    if (confirm('Удалить устройство?')) {
+        router.delete(routes.devices.destroy(device.id));
+    }
+}
+</script>
+
+<template>
+    <AppLayout>
+        <template #header>
+            <div class="flex justify-between items-center">
+                <h2 class="font-semibold text-xl text-gray-800 leading-tight">Устройства</h2>
+                <Link
+                    v-if="isOwner"
+                    :href="routes.devices.create"
+                    class="inline-flex items-center px-4 py-2 bg-gray-800 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-gray-700"
+                >
+                    Добавить устройство
+                </Link>
+            </div>
+        </template>
+
+        <div class="py-12">
+            <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
+                <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg p-6">
+                    <table class="w-full text-left text-sm">
+                        <thead>
+                            <tr class="border-b">
+                                <th class="py-2">Название</th>
+                                <th class="py-2">Зона</th>
+                                <th class="py-2">Тип</th>
+                                <th class="py-2">Статус</th>
+                                <th class="py-2">External ID</th>
+                                <th class="py-2" />
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr v-if="devices.length === 0">
+                                <td colspan="6" class="py-4 text-gray-500">Устройств пока нет.</td>
+                            </tr>
+                            <tr v-for="device in devices" :key="device.id" class="border-b">
+                                <td class="py-2">
+                                    <Link :href="routes.devices.show(device.id)" class="text-indigo-600 hover:underline">{{ device.name }}</Link>
+                                </td>
+                                <td class="py-2">{{ device.zone.name }}</td>
+                                <td class="py-2">{{ device.device_type.code }}</td>
+                                <td class="py-2"><StatusBadge :status="device.status" /></td>
+                                <td class="py-2 font-mono text-xs">{{ device.external_id }}</td>
+                                <td class="py-2 text-right space-x-2">
+                                    <Link v-if="isOwner" :href="routes.devices.edit(device.id)" class="text-indigo-600 hover:underline">Изменить</Link>
+                                    <button v-if="isOwner" type="button" class="text-red-600 hover:underline" @click="destroy(device)">Удалить</button>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </AppLayout>
+</template>
@@ -0,0 +1,132 @@
+<script setup>
+import { computed } from 'vue';
+import { useForm, usePage } from '@inertiajs/vue3';
+import AppLayout from '@/Layouts/AppLayout.vue';
+import StatusBadge from '@/Components/StatusBadge.vue';
+import { routes } from '@/routes';
+
+const props = defineProps({
+    device: { type: Object, required: true },
+    shadow: { type: Object, required: true },
+    telemetry: { type: Array, required: true },
+});
+
+const isOwner = computed(() => usePage().props.auth.user?.role === 'owner');
+const capabilities = computed(() => props.device.device_type.capabilities ?? []);
+const hasControls = computed(() => capabilities.value.some((c) => ['turn_on', 'turn_off', 'set_level'].includes(c)));
+
+const lastSeenLabel = computed(() => (
+    props.shadow.last_seen ? new Date(props.shadow.last_seen).toLocaleString('ru-RU') : 'нет данных'
+));
+
+const levelForm = useForm({ level: '' });
+
+function turnOn() {
+    useForm({}).post(routes.devices.turnOn(props.device.id));
+}
+
+function turnOff() {
+    useForm({}).post(routes.devices.turnOff(props.device.id));
+}
+
+function setLevel() {
+    levelForm.post(routes.devices.setLevel(props.device.id));
+}
+</script>
+
+<template>
+    <AppLayout>
+        <template #header>
+            <h2 class="font-semibold text-xl text-gray-800 leading-tight">{{ device.name }}</h2>
+        </template>
+
+        <div class="py-12">
+            <div class="max-w-4xl mx-auto sm:px-6 lg:px-8 space-y-6">
+                <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg p-6">
+                    <h3 class="font-semibold mb-4">Живое состояние (Redis device shadow)</h3>
+                    <dl class="grid grid-cols-2 gap-4 text-sm">
+                        <div>
+                            <dt class="text-gray-500">Статус</dt>
+                            <dd class="mt-1"><StatusBadge :status="device.status" /></dd>
+                        </div>
+                        <div>
+                            <dt class="text-gray-500">Последняя активность</dt>
+                            <dd>{{ lastSeenLabel }}</dd>
+                        </div>
+                        <div>
+                            <dt class="text-gray-500">Желаемое состояние (desired)</dt>
+                            <dd class="font-mono text-xs">{{ JSON.stringify(shadow.desired_state) }}</dd>
+                        </div>
+                        <div>
+                            <dt class="text-gray-500">Подтверждённое состояние (reported)</dt>
+                            <dd class="font-mono text-xs">{{ JSON.stringify(shadow.reported_state) }}</dd>
+                        </div>
+                    </dl>
+                </div>
+
+                <div v-if="isOwner && hasControls" class="bg-white overflow-hidden shadow-sm sm:rounded-lg p-6">
+                    <h3 class="font-semibold mb-4">Ручное управление</h3>
+                    <div class="flex items-center gap-4 flex-wrap">
+                        <button
+                            v-if="capabilities.includes('turn_on')"
+                            type="button"
+                            class="inline-flex items-center px-4 py-2 bg-gray-800 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-gray-700"
+                            @click="turnOn"
+                        >
+                            Включить
+                        </button>
+                        <button
+                            v-if="capabilities.includes('turn_off')"
+                            type="button"
+                            class="inline-flex items-center px-4 py-2 bg-white border border-gray-300 rounded-md font-semibold text-xs text-gray-700 uppercase tracking-widest hover:bg-gray-50"
+                            @click="turnOff"
+                        >
+                            Выключить
+                        </button>
+                        <form v-if="capabilities.includes('set_level')" class="flex items-center gap-2" @submit.prevent="setLevel">
+                            <input
+                                v-model="levelForm.level"
+                                type="number"
+                                step="any"
+                                required
+                                placeholder="уровень"
+                                class="border-gray-300 focus:border-indigo-500 focus:ring-indigo-500 rounded-md shadow-sm text-sm"
+                            >
+                            <button
+                                type="submit"
+                                class="inline-flex items-center px-4 py-2 bg-gray-800 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-gray-700"
+                            >
+                                Установить уровень
+                            </button>
+                        </form>
+                    </div>
+                </div>
+
+                <div v-if="device.device_type.category === 'sensor'" class="bg-white overflow-hidden shadow-sm sm:rounded-lg p-6">
+                    <h3 class="font-semibold mb-4">Последние показания (ClickHouse)</h3>
+                    <table class="w-full text-left text-sm">
+                        <thead>
+                            <tr class="border-b">
+                                <th class="py-2">Тип</th>
+                                <th class="py-2">Значение</th>
+                                <th class="py-2">Время</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr v-if="telemetry.length === 0">
+                                <td colspan="3" class="py-4 text-gray-500">Показаний пока нет.</td>
+                            </tr>
+                            <tr v-for="(row, i) in telemetry" :key="i" class="border-b">
+                                <td class="py-2">{{ row.sensor_type }}</td>
+                                <td class="py-2">{{ row.value }}</td>
+                                <td class="py-2">{{ row.recorded_at }}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+
+                <a :href="routes.devices.index" class="text-sm text-gray-600 hover:underline">← Назад к устройствам</a>
+            </div>
+        </div>
+    </AppLayout>
+</template>