update document custom types

papermerge · Oct 7, 2024 · 3fd696d · 3fd696d
1 parent e4bb470
commit 3fd696d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/ui2/src/features/api/slice.ts b/ui2/src/features/api/slice.ts
@@ -47,8 +47,9 @@ export const apiSlice = createApi({
     "Node",
     "Folder",
     "Document",
-    "CustomField",
-    "DocumentType"
+    "CustomField", // CRUD custom field
+    "DocumentType",
+    "DocumentCustomField" // custom fields associated to specific document (via document type)
   ],
   endpoints: _ => ({})
 })
diff --git a/ui2/src/features/document/apiSlice.ts b/ui2/src/features/document/apiSlice.ts
@@ -1,7 +1,7 @@
 import {RootState} from "@/app/types"
 import {ONE_DAY_IN_SECONDS} from "@/cconstants"
 import {apiSlice} from "@/features/api/slice"
-import type {CustomFieldValueType} from "@/types"
+import type {CustomFieldValueType, DocumentCustomFieldValue} from "@/types"
 import {DocumentType, ExtractStrategyType, TransferStrategyType} from "@/types"
 import {getBaseURL, getDefaultHeaders, imageEncode} from "@/utils"
 
@@ -148,6 +148,14 @@ export const apiSliceWithDocuments = apiSlice.injectEndpoints({
         method: "PATCH",
         body: data.body
       })
+    }),
+    getDocumentCustomFields: builder.query<DocumentCustomFieldValue[], string>({
+      query: documentID => ({
+        url: `/documents/${documentID}/custom-fields`
+      }),
+      providesTags: (_result, _error, arg) => [
+        {type: "DocumentCustomField", id: arg}
+      ]
     })
   })
 })
@@ -158,5 +166,6 @@ export const {
   useApplyPageOpChangesMutation,
   useMovePagesMutation,
   useExtractPagesMutation,
-  useUpdateDocumentCustomFieldsMutation
+  useUpdateDocumentCustomFieldsMutation,
+  useGetDocumentCustomFieldsQuery
 } = apiSliceWithDocuments
diff --git a/ui2/src/features/document/components/DocumentDetails/CustomFields.tsx b/ui2/src/features/document/components/DocumentDetails/CustomFields.tsx
@@ -9,7 +9,10 @@ import {
   useGetDocumentTypeQuery,
   useGetDocumentTypesQuery
 } from "@/features/document-types/apiSlice"
-import {useUpdateDocumentCustomFieldsMutation} from "@/features/document/apiSlice"
+import {
+  useGetDocumentCustomFieldsQuery,
+  useUpdateDocumentCustomFieldsMutation
+} from "@/features/document/apiSlice"
 import {selectCurrentNodeID} from "@/features/ui/uiSlice"
 import type {CustomField, CustomFieldValueType, PanelMode} from "@/types"
 import {Button, ComboboxItem, Select, Skeleton, TextInput} from "@mantine/core"
@@ -30,6 +33,9 @@ export default function CustomFields() {
   >([])
   const [updateDocumentCustomFields, {error}] =
     useUpdateDocumentCustomFieldsMutation()
+  const {data: documentCustomFields} = useGetDocumentCustomFieldsQuery(
+    docID ?? skipToken
+  )
 
   useEffect(() => {
     if (documentType?.custom_fields) {
@@ -110,6 +116,7 @@ export default function CustomFields() {
       {showSaveButton && <Button onClick={onSave}>Save</Button>}
       {error && (
         <div>
+          {/* @ts-ignore*/}
           {error.status} {JSON.stringify(error.data)}
         </div>
       )}

diff --git a/ui2/src/types.ts b/ui2/src/types.ts
@@ -433,3 +433,11 @@ export interface CustomFieldValueType {
   custom_field_id: string
   value: string
 }
+
+export type DocumentCustomFieldValue = {
+  id: string
+  name: string
+  data_type: string
+  extra_data: string
+  value: string
+}