From 974d63550bbfe8e071e01e10a9bfe47619290053 Mon Sep 17 00:00:00 2001 From: Ivan <8611739+IRBorisov@users.noreply.github.com> Date: Mon, 10 Nov 2025 21:43:47 +0300 Subject: [PATCH] B: Fix file upload api --- rsconcept/frontend/src/features/rsform/backend/api.ts | 4 ++-- rsconcept/frontend/src/features/rsform/backend/types.ts | 2 -- .../frontend/src/features/rsform/backend/use-upload-trs.ts | 2 +- .../src/features/rsform/dialogs/dlg-upload-rsform.tsx | 7 ++++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rsconcept/frontend/src/features/rsform/backend/api.ts b/rsconcept/frontend/src/features/rsform/backend/api.ts index 918cb08f..8c7fd5dc 100644 --- a/rsconcept/frontend/src/features/rsform/backend/api.ts +++ b/rsconcept/frontend/src/features/rsform/backend/api.ts @@ -48,10 +48,10 @@ export const rsformsApi = { endpoint: version ? `/api/versions/${version}/export-file` : `/api/rsforms/${itemID}/export-trs`, options: { responseType: 'blob' } }), - upload: (data: IRSFormUploadDTO) => + upload: ({ itemID, data }: { itemID: number; data: IRSFormUploadDTO }) => axiosPatch({ schema: schemaRSForm, - endpoint: `/api/rsforms/${data.itemID}/load-trs`, + endpoint: `/api/rsforms/${itemID}/load-trs`, request: { data: data, successMessage: infoMsg.uploadSuccess diff --git a/rsconcept/frontend/src/features/rsform/backend/types.ts b/rsconcept/frontend/src/features/rsform/backend/types.ts index fe7a4129..f5cca787 100644 --- a/rsconcept/frontend/src/features/rsform/backend/types.ts +++ b/rsconcept/frontend/src/features/rsform/backend/types.ts @@ -51,10 +51,8 @@ export type IRSFormDTO = z.infer; /** Represents data, used for uploading {@link IRSForm} as file. */ export interface IRSFormUploadDTO { - itemID: number; load_metadata: boolean; file: File; - fileName: string; } /** Represents {@link IConstituenta} data, used in creation process. */ diff --git a/rsconcept/frontend/src/features/rsform/backend/use-upload-trs.ts b/rsconcept/frontend/src/features/rsform/backend/use-upload-trs.ts index f74b6d2c..426cd5e0 100644 --- a/rsconcept/frontend/src/features/rsform/backend/use-upload-trs.ts +++ b/rsconcept/frontend/src/features/rsform/backend/use-upload-trs.ts @@ -29,6 +29,6 @@ export const useUploadTRS = () => { onError: () => client.invalidateQueries() }); return { - upload: (data: IRSFormUploadDTO) => mutation.mutateAsync(data) + upload: (data: { itemID: number; data: IRSFormUploadDTO }) => mutation.mutateAsync(data) }; }; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-upload-rsform.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-upload-rsform.tsx index b9e86886..e7495ea0 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-upload-rsform.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-upload-rsform.tsx @@ -24,9 +24,10 @@ export function DlgUploadRSForm() { if (file) { void upload({ itemID: itemID, - load_metadata: loadMetadata, - file: file, - fileName: file.name + data: { + load_metadata: loadMetadata, + file: file + } }); } };