From 00f7963c8aac4e585346ab6f9c15d068436cda57 Mon Sep 17 00:00:00 2001 From: Vasilii Mikhailovskii Date: Tue, 19 Nov 2024 15:33:56 +0200 Subject: [PATCH] validate in one place --- src/api/qrCode.ts | 7 +- .../create/CreateSummarySection.vue | 10 +-- src/types/DBDocumentTypes/QRCodeDocument.ts | 2 +- src/views/CreateView.vue | 74 ++++++++++--------- 4 files changed, 50 insertions(+), 43 deletions(-) diff --git a/src/api/qrCode.ts b/src/api/qrCode.ts index 930ba5e..0f715e4 100644 --- a/src/api/qrCode.ts +++ b/src/api/qrCode.ts @@ -6,7 +6,12 @@ const EPOHE = 1731661630981 export const createQrCodeDocument = async ( qrCodeDocPartial: Pick< QRCodeDocument, - 'name' | 'placement' | 'actions' | 'user_uuid' | 'predefinedMessage' | 'messageDeliveryMethod' + | 'name' + | 'placement' + | 'actions' + //| 'user_uuid' + | 'predefinedMessage' + | 'messageDeliveryMethod' >, ) => { const uri = Math.abs(Date.now() - EPOHE).toString(36) diff --git a/src/components/create/CreateSummarySection.vue b/src/components/create/CreateSummarySection.vue index ddd8af8..5f6a20f 100644 --- a/src/components/create/CreateSummarySection.vue +++ b/src/components/create/CreateSummarySection.vue @@ -27,15 +27,15 @@ import { createQrCodeDocument } from '@/api/qrCode' const router = useRouter() -const { placement, actions, messageDeliveryMethod, user_uuid, predefinedMessage } = defineProps<{ +const { placement, actions, messageDeliveryMethod, predefinedMessage } = defineProps<{ placement: QRCodeDocument['placement'] actions: QRCodeDocument['actions'] - messageDeliveryMethod: QRCodeDocument['messageDeliveryMethod'] | undefined - user_uuid: QRCodeDocument['user_uuid'] + messageDeliveryMethod: QRCodeDocument['messageDeliveryMethod'] + // user_uuid: QRCodeDocument['user_uuid'] predefinedMessage: QRCodeDocument['predefinedMessage'] | undefined }>() -const name = ref('') +const name = ref('name') const error = ref(null) async function saveQRCode() { @@ -44,7 +44,7 @@ async function saveQRCode() { name: name.value, placement, actions, - user_uuid, + // user_uuid, messageDeliveryMethod, predefinedMessage, }) diff --git a/src/types/DBDocumentTypes/QRCodeDocument.ts b/src/types/DBDocumentTypes/QRCodeDocument.ts index c8dae01..5654080 100644 --- a/src/types/DBDocumentTypes/QRCodeDocument.ts +++ b/src/types/DBDocumentTypes/QRCodeDocument.ts @@ -15,7 +15,7 @@ export interface QRCodeDocument extends BaseDocument { url: string /** Идентификатор пользователя, который создал QR‑код */ - user_uuid: string + // user_uuid: string /** Название объекта, для которого создан QR‑код, например "Мой автомобиль" */ name: string diff --git a/src/views/CreateView.vue b/src/views/CreateView.vue index 520c6d6..ae80fa2 100644 --- a/src/views/CreateView.vue +++ b/src/views/CreateView.vue @@ -3,41 +3,26 @@
- - + + - + - - + + - + @@ -46,7 +31,6 @@ :placement="placement" :actions="selectedActions" :messageDeliveryMethod="messageDeliveryMethod" - :user_uuid="user_uuid" :predefinedMessage="selectedActions.includes('sendMessage') ? messages : undefined" /> @@ -58,24 +42,42 @@