Merge branch 'main' into 951_auditList_resource_filter

DeepBlueCLtd · Jan 4, 2024 · 2ec18fe · 2ec18fe
2 parents b118cee + 2b01f54
commit 2ec18fe
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/hooks/useCustomId.ts b/src/hooks/useCustomId.ts
@@ -14,9 +14,9 @@ export default function useCustomid(): UseCustomId {
   const { getValues } = useFormContext()
   const [create] = useCreate() as any
   const resource = useResourceContext()
-  const { total = 0 } = useGetList(resource, {
-    sort: { field: 'id', order: 'DESC' },
-    pagination: { page: 1, perPage: 1 }
+  const {data : existingRcordes} = useGetList(resource, {
+    sort: {field: 'id', order: "DESC"},
+    pagination: {page: 1, perPage: 1}
   })
   const createPath = useCreatePath()
   const redirect = useRedirect()
@@ -26,10 +26,9 @@ export default function useCustomid(): UseCustomId {
     const values = getValues()
 
     const preFix = ID_FIX?.[resource]
-    const totalItems: number = total
-    const recordNumber = totalItems + 1
+    const highestId = existingRcordes?.[0]?.id || 0;
     const id =
-      typeof preFix !== 'undefined' ? `${preFix}-${recordNumber}` : recordNumber
+      typeof preFix !== 'undefined' ? `${preFix}-${highestId + 1}` : highestId + 1
 
     const data = { id, ...values }