ia.novokshanov/asb_cloud_front
1
0
Fork 0
forked from ddrilling/asb_cloud_front
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into fix/tooltip-font-fix

Browse Source
This commit is contained in:
ts_salikhov 2022-10-19 14:02:18 +04:00
commit f336ceb698
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/selectors/WellTreeSelector.tsx
View File

@ -99,8 +99,6 @@ export const WellTreeSelector = memo<WellTreeSelectorProps>(({ show, expand, cur
const navigate = useNavigate() const navigate = useNavigate()
const location = useLocation() const location = useLocation()
console.log(location.pathname)
useEffect(() => { useEffect(() => {
if (current) setSelected([current]) if (current) setSelected([current])
}, [current]) }, [current])

1
src/pages/Documents/DocumentsTemplate.jsx
View File

@ -61,6 +61,7 @@ export const DocumentsTemplate = ({ idCategory, well: givenWell, mimeTypes, head
filterFileName, filterFileName,
begin, begin,
end, end,
false,
(page - 1) * pageSize, (page - 1) * pageSize,
pageSize, pageSize,
) )

2
src/pages/DrillingProgram/CategoryHistory.jsx
View File

@ -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 [begin, end] = range?.length > 1 ? [range[0].toISOString(), range[1].toISOString()] : [null, null]
const skip = (page - 1) * pageSize 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, false, skip, pageSize)
setTotal(paginatedHistory?.count ?? 0) setTotal(paginatedHistory?.count ?? 0)
setData(arrayOrDefault(paginatedHistory?.items)) setData(arrayOrDefault(paginatedHistory?.items))
}, },