Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ESYTD
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Дияр Амангельды
ESYTD
Commits
6737c329
Commit
6737c329
authored
Jul 30, 2024
by
Merekeyev Dias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug: after deleting the last org on the page, it returns to the previous with no data
parent
589dfa53
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
11 deletions
+22
-11
src/features/pagination/mainPagination.ts
src/features/pagination/mainPagination.ts
+1
-1
src/pages/HomePage/Columns.tsx
src/pages/HomePage/Columns.tsx
+15
-5
src/pages/HomePage/HomePage.tsx
src/pages/HomePage/HomePage.tsx
+4
-3
src/pages/ManageOrganization/ManageOrganization.tsx
src/pages/ManageOrganization/ManageOrganization.tsx
+2
-2
No files found.
src/features/pagination/mainPagination.ts
View file @
6737c329
...
@@ -9,7 +9,7 @@ interface InitialState {
...
@@ -9,7 +9,7 @@ interface InitialState {
const
initialState
:
InitialState
=
{
const
initialState
:
InitialState
=
{
currentPage
:
1
,
currentPage
:
1
,
totalOrgNumber
:
0
,
totalOrgNumber
:
0
,
ORG_NUMBER_PER_PAGE
:
1
5
ORG_NUMBER_PER_PAGE
:
1
2
}
}
const
mainPaginationSlice
=
createSlice
({
const
mainPaginationSlice
=
createSlice
({
...
...
src/pages/HomePage/Columns.tsx
View file @
6737c329
import
React
,
{
useState
}
from
'
react
'
;
import
React
,
{
use
Effect
,
use
State
}
from
'
react
'
;
import
{
useNavigate
}
from
'
react-router
'
;
import
{
useNavigate
}
from
'
react-router
'
;
import
{
useDispatch
,
useSelector
}
from
'
react-redux
'
;
import
{
Button
,
Space
,
Tag
,
Modal
,
Checkbox
,
message
}
from
'
antd
'
;
import
{
Button
,
Space
,
Tag
,
Modal
,
Checkbox
,
message
}
from
'
antd
'
;
import
type
{
TableProps
}
from
'
antd
'
;
import
type
{
TableProps
}
from
'
antd
'
;
import
{
useDispatch
}
from
'
react-redux
'
;
import
{
useDeleteOrganizationMutation
}
from
'
../../features/api/organizationApiSlice
'
;
import
{
useDeleteOrganizationMutation
}
from
'
../../features/api/organizationApiSlice
'
;
import
{
getStatusText
,
getStatusColor
}
from
'
./utils
'
;
import
{
addCheckedCodes
,
removeCheckedCodes
}
from
'
../../features/sync_btn/syncBtn
'
;
import
{
addCheckedCodes
,
removeCheckedCodes
}
from
'
../../features/sync_btn/syncBtn
'
;
import
{
setCurrentPage
,
setTotalOrgNumber
}
from
'
../../features/pagination/mainPagination
'
;
import
{
getStatusText
,
getStatusColor
}
from
'
./utils
'
;
import
{
current
}
from
'
@reduxjs/toolkit
'
;
export
interface
DataType
{
export
interface
DataType
{
id
:
number
;
id
:
number
;
...
@@ -87,8 +90,12 @@ export const CheckboxColumn: React.FC<{ data: DataType }> = ({ data }) => {
...
@@ -87,8 +90,12 @@ export const CheckboxColumn: React.FC<{ data: DataType }> = ({ data }) => {
};
};
export
const
ActionColumn
:
React
.
FC
<
{
data
:
DataType
}
>
=
({
data
})
=>
{
export
const
ActionColumn
:
React
.
FC
<
{
data
:
DataType
}
>
=
({
data
})
=>
{
const
[
open
,
setOpen
]
=
useState
<
boolean
>
(
false
);
const
navigate
=
useNavigate
();
const
navigate
=
useNavigate
();
const
dispatch
=
useDispatch
();
const
[
open
,
setOpen
]
=
useState
<
boolean
>
(
false
);
const
currentPage
=
useSelector
((
state
:
any
)
=>
state
.
mainPagination
.
currentPage
);
const
totalOrgNumber
=
useSelector
((
state
:
any
)
=>
state
.
mainPagination
.
totalOrgNumber
);
const
ORG_NUMBER_PER_PAGE
=
useSelector
((
state
:
any
)
=>
state
.
mainPagination
.
ORG_NUMBER_PER_PAGE
);
const
[
deleteOrganization
]
=
useDeleteOrganizationMutation
();
const
[
deleteOrganization
]
=
useDeleteOrganizationMutation
();
const
showDeleteModal
=
()
=>
{
const
showDeleteModal
=
()
=>
{
...
@@ -97,10 +104,13 @@ export const ActionColumn: React.FC<{ data: DataType }> = ({ data }) => {
...
@@ -97,10 +104,13 @@ export const ActionColumn: React.FC<{ data: DataType }> = ({ data }) => {
const
handleDeleteModalOk
=
async
()
=>
{
const
handleDeleteModalOk
=
async
()
=>
{
try
{
try
{
await
deleteOrganization
(
data
.
code
);
await
deleteOrganization
(
data
.
code
).
unwrap
();
if
(
totalOrgNumber
%
ORG_NUMBER_PER_PAGE
===
1
)
dispatch
(
setCurrentPage
(
currentPage
-
1
));
message
.
success
(
'
Организация успешно удалена!
'
);
message
.
success
(
'
Организация успешно удалена!
'
);
setOpen
(
false
);
setOpen
(
false
);
}
catch
(
err
)
{
}
catch
(
err
)
{
console
.
log
(
err
);
message
.
error
(
'
Произошла ошибка при удалении организации!
'
);
message
.
error
(
'
Произошла ошибка при удалении организации!
'
);
}
}
};
};
...
...
src/pages/HomePage/HomePage.tsx
View file @
6737c329
import
React
,
{
createRef
,
useEffect
,
useState
}
from
'
react
'
;
import
React
,
{
createRef
,
useEffect
}
from
'
react
'
;
import
{
useNavigate
}
from
'
react-router
'
;
import
{
useNavigate
}
from
'
react-router
'
;
import
{
useSelector
,
useDispatch
}
from
'
react-redux
'
;
import
{
useSelector
,
useDispatch
}
from
'
react-redux
'
;
import
{
Button
,
message
,
Pagination
,
Space
,
Spin
,
Table
}
from
'
antd
'
;
import
{
Button
,
message
,
Pagination
,
Space
,
Spin
,
Table
}
from
'
antd
'
;
import
{
TableRef
}
from
'
antd/es/table
'
;
import
{
useDeleteOrganizationMutation
,
useGetOrganizationsQuery
}
from
'
../../features/api/organizationApiSlice
'
;
import
{
useDeleteOrganizationMutation
,
useGetOrganizationsQuery
}
from
'
../../features/api/organizationApiSlice
'
;
import
{
setCurrentPage
,
setTotalOrgNumber
}
from
'
../../features/pagination/mainPagination
'
;
import
{
setCurrentPage
,
setTotalOrgNumber
}
from
'
../../features/pagination/mainPagination
'
;
import
{
setDisabled
}
from
'
../../features/sync_btn/syncBtn
'
;
import
{
DataType
,
columns
}
from
'
./Columns
'
;
import
{
DataType
,
columns
}
from
'
./Columns
'
;
import
{
TableRef
}
from
'
antd/es/table
'
;
import
'
./Homepage.css
'
;
import
'
./Homepage.css
'
;
import
{
setDisabled
}
from
'
../../features/sync_btn/syncBtn
'
;
const
HomePage
:
React
.
FC
=
()
=>
{
const
HomePage
:
React
.
FC
=
()
=>
{
const
navigate
=
useNavigate
();
const
navigate
=
useNavigate
();
...
...
src/pages/ManageOrganization/ManageOrganization.tsx
View file @
6737c329
...
@@ -67,8 +67,8 @@ const ManageOrganization: React.FC = () => {
...
@@ -67,8 +67,8 @@ const ManageOrganization: React.FC = () => {
await
addNewOrganization
({
...
normalizedValues
,
created
:
new
Date
().
toISOString
()
}).
unwrap
();
await
addNewOrganization
({
...
normalizedValues
,
created
:
new
Date
().
toISOString
()
}).
unwrap
();
message
.
success
(
'
Организация успешно добавлена!
'
);
message
.
success
(
'
Организация успешно добавлена!
'
);
dispatch
(
setTotalOrgNumber
(
totalOrgNumber
+
1
));
dispatch
(
setTotalOrgNumber
(
totalOrgNumber
+
1
));
const
new
TotalPages
=
Math
.
ceil
((
totalOrgNumber
+
1
)
/
ORG_NUMBER_PER_PAGE
);
const
new
CurrentPage
=
Math
.
ceil
((
totalOrgNumber
+
1
)
/
ORG_NUMBER_PER_PAGE
);
dispatch
(
setCurrentPage
(
new
TotalPages
));
dispatch
(
setCurrentPage
(
new
CurrentPage
));
}
}
navigate
(
'
/
'
);
navigate
(
'
/
'
);
}
catch
(
err
)
{
}
catch
(
err
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment