From c1dced00f7d64fe6037f7774ac3ae8d0a0a3a987 Mon Sep 17 00:00:00 2001 From: goodmice Date: Fri, 7 Oct 2022 14:55:22 +0500 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D1=8B=D1=82=20console.lo?= =?UTF-8?q?g=20=D0=BD=D0=B0=20WellTreeSelector?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/selectors/WellTreeSelector.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/selectors/WellTreeSelector.tsx b/src/components/selectors/WellTreeSelector.tsx index f2efb80..efe0b7e 100755 --- a/src/components/selectors/WellTreeSelector.tsx +++ b/src/components/selectors/WellTreeSelector.tsx @@ -99,8 +99,6 @@ export const WellTreeSelector = memo(({ show, expand, cur const navigate = useNavigate() const location = useLocation() - console.log(location.pathname) - useEffect(() => { if (current) setSelected([current]) }, [current]) From 1a02b39e52471a6a12e05d1c48a90f8be2305e76 Mon Sep 17 00:00:00 2001 From: goodmice Date: Mon, 17 Oct 2022 14:30:35 +0500 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20FileService?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Documents/DocumentsTemplate.jsx | 2 ++ src/pages/DrillingProgram/CategoryHistory.jsx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/Documents/DocumentsTemplate.jsx b/src/pages/Documents/DocumentsTemplate.jsx index 60d132d..f00e4ee 100755 --- a/src/pages/Documents/DocumentsTemplate.jsx +++ b/src/pages/Documents/DocumentsTemplate.jsx @@ -61,6 +61,8 @@ export const DocumentsTemplate = ({ idCategory, well: givenWell, mimeTypes, head filterFileName, begin, end, + undefined, + false, (page - 1) * pageSize, pageSize, ) diff --git a/src/pages/DrillingProgram/CategoryHistory.jsx b/src/pages/DrillingProgram/CategoryHistory.jsx index 7c3108a..fee651b 100755 --- a/src/pages/DrillingProgram/CategoryHistory.jsx +++ b/src/pages/DrillingProgram/CategoryHistory.jsx @@ -74,7 +74,7 @@ export const CategoryHistory = ({ idCategory, visible, onClose }) => { const [begin, end] = range?.length > 1 ? [range[0].toISOString(), range[1].toISOString()] : [null, null] const skip = (page - 1) * pageSize - const paginatedHistory = await FileService.getFilesInfo(well.caption, idCategory, companyName, fileName, begin, end, skip, pageSize) + const paginatedHistory = await FileService.getFilesInfo(well.caption, idCategory, companyName, fileName, begin, end, undefined, false, skip, pageSize) setTotal(paginatedHistory?.count ?? 0) setData(arrayOrDefault(paginatedHistory?.items)) }, From 85b17ccf660e6fbea37d5fb4fcf9a11eccfcaccc Mon Sep 17 00:00:00 2001 From: goodmice Date: Mon, 17 Oct 2022 14:39:02 +0500 Subject: [PATCH 3/3] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D1=91=D0=BD=20?= =?UTF-8?q?=D0=B0=D1=80=D0=B3=D1=83=D0=BC=D0=B5=D0=BD=D1=82=20idMark=20?= =?UTF-8?q?=D0=B2=20getFilesInfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Documents/DocumentsTemplate.jsx | 1 - src/pages/DrillingProgram/CategoryHistory.jsx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/Documents/DocumentsTemplate.jsx b/src/pages/Documents/DocumentsTemplate.jsx index f00e4ee..4452c05 100755 --- a/src/pages/Documents/DocumentsTemplate.jsx +++ b/src/pages/Documents/DocumentsTemplate.jsx @@ -61,7 +61,6 @@ export const DocumentsTemplate = ({ idCategory, well: givenWell, mimeTypes, head filterFileName, begin, end, - undefined, false, (page - 1) * pageSize, pageSize, diff --git a/src/pages/DrillingProgram/CategoryHistory.jsx b/src/pages/DrillingProgram/CategoryHistory.jsx index fee651b..12044cd 100755 --- a/src/pages/DrillingProgram/CategoryHistory.jsx +++ b/src/pages/DrillingProgram/CategoryHistory.jsx @@ -74,7 +74,7 @@ export const CategoryHistory = ({ idCategory, visible, onClose }) => { const [begin, end] = range?.length > 1 ? [range[0].toISOString(), range[1].toISOString()] : [null, null] const skip = (page - 1) * pageSize - const paginatedHistory = await FileService.getFilesInfo(well.caption, idCategory, companyName, fileName, begin, end, undefined, false, skip, pageSize) + const paginatedHistory = await FileService.getFilesInfo(well.caption, idCategory, companyName, fileName, begin, end, false, skip, pageSize) setTotal(paginatedHistory?.count ?? 0) setData(arrayOrDefault(paginatedHistory?.items)) },