Merge pull request #981 from DeepBlueCLtd/952_user_show_history_does_…

…not_filter_result user show history doesn't filter results issue resolved
DeepBlueCLtd · Jan 9, 2024 · afe9c86 · afe9c86
2 parents 25abc08 + 7c72bff
commit afe9c86
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/src/resources/users/UserShow.tsx b/src/resources/users/UserShow.tsx
@@ -364,25 +364,11 @@ const UserShowComp = ({
 export default function UserShow(): React.ReactElement {
   const [record, setRecord] = useState<User>()
   const { hasAccess } = useCanAccess()
-  const [filteredData, setFilteredData] = useState<Audit[]>([])
   const hasWriteAccess = hasAccess(R_USERS, { write: true })
-  const { isLoading, data } = useGetList<Audit>(R_AUDIT, {})
+  const { isLoading } = useGetList<Audit>(R_AUDIT, {})
   const audit = useAudit()
   const navigate = useNavigate()
 
-  useEffect(() => {
-    if (data != null)
-      setFilteredData(
-        data.filter((audit) => {
-          return (
-            audit.user === record?.id ||
-            audit.subjectId === record?.id ||
-            (audit.dataId === record?.id && audit.resource === R_USERS)
-          )
-        })
-      )
-  }, [data, record, isLoading])
-
   if (isLoading) return <Loading />
 
   return (
@@ -394,7 +380,14 @@ export default function UserShow(): React.ReactElement {
             <EditButton />
             <HistoryButton
               onClick={() => {
-                navigate('/audit', { state: { data: filteredData } })
+                if (record) {
+                  navigate(
+                    `/audit?filter=${JSON.stringify({
+                      resource: constants.R_USERS,
+                      dataId: record.id ?? ''
+                    })}`
+                  )
+                }
               }}
             />
           </TopToolbar>

diff --git a/src/resources/users/index.tsx b/src/resources/users/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { Create, Edit, useEditContext, useRedirect } from 'react-admin'
 import UserForm from './UserForm'
 import * as constants from '../../constants'
@@ -54,8 +54,11 @@ interface EditValType {
 
 const EditVal = ({ setPrev }: EditValType): React.ReactElement => {
   const { record } = useEditContext()
-  console.log(record)
-  setPrev(record)
+
+  useEffect(() => {
+    setPrev(record as User)
+  }, [record, setPrev])
+
   return <UserForm isEdit />
 }