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
cb5ab658
Commit
cb5ab658
authored
Jul 31, 2024
by
Merekeyev Dias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed resend btn
parent
35b4e88a
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
73 additions
and
50 deletions
+73
-50
src/pages/HomePage/HomePage.tsx
src/pages/HomePage/HomePage.tsx
+4
-3
src/pages/ManageOrganization/ManageOrganization.tsx
src/pages/ManageOrganization/ManageOrganization.tsx
+22
-13
src/pages/RequestPage/Columns.tsx
src/pages/RequestPage/Columns.tsx
+36
-25
src/pages/RequestPage/RequestPage.tsx
src/pages/RequestPage/RequestPage.tsx
+6
-4
src/store/api/mainApi.tsx
src/store/api/mainApi.tsx
+1
-1
src/store/api/requestApi.ts
src/store/api/requestApi.ts
+4
-4
No files found.
src/pages/HomePage/HomePage.tsx
View file @
cb5ab658
...
...
@@ -22,8 +22,8 @@ const HomePage: React.FC = () => {
const
ORG_NUMBER_PER_PAGE
=
useSelector
((
state
:
any
)
=>
state
.
mainPagination
.
ORG_NUMBER_PER_PAGE
);
const
syncBtnState
=
useSelector
((
state
:
any
)
=>
state
.
syncBtn
.
disabled
);
const
checkedCodes
=
useSelector
((
state
:
any
)
=>
state
.
syncBtn
.
checkedCodes
);
const
[
isSyncLoading
,
setIsSyncLoading
]
=
useState
(
false
);
const
[
isTableLoading
,
setIsTableLoading
]
=
useState
(
false
);
const
[
isSyncLoading
,
setIsSyncLoading
]
=
useState
<
boolean
>
(
false
);
const
[
isTableLoading
,
setIsTableLoading
]
=
useState
<
boolean
>
(
false
);
const
handleAddClick
=
()
=>
{
navigate
(
"
/add
"
);
...
...
@@ -84,7 +84,8 @@ const HomePage: React.FC = () => {
useEffect
(()
=>
{
if
(
isGetLoading
)
{
setIsTableLoading
(
true
);
}
else
if
(
isGetSuccess
)
{
}
if
(
isGetSuccess
)
{
setIsTableLoading
(
false
);
dispatch
(
setTotalOrgNumber
(
orgs
.
length
));
}
...
...
src/pages/ManageOrganization/ManageOrganization.tsx
View file @
cb5ab658
...
...
@@ -29,10 +29,10 @@ const ManageOrganization: React.FC = () => {
const
isEdit
=
Boolean
(
id
);
const
totalOrgNumber
=
useSelector
((
state
:
any
)
=>
state
.
mainPagination
.
totalOrgNumber
);
const
ORG_NUMBER_PER_PAGE
=
useSelector
((
state
:
any
)
=>
state
.
mainPagination
.
ORG_NUMBER_PER_PAGE
);
const
[
isBtnLoading
,
setIsBtnLoading
]
=
useState
(
false
);
const
[
isBtnLoading
,
setIsBtnLoading
]
=
useState
<
boolean
>
(
false
);
const
{
data
,
isLoading
:
isGetLoading
,
isError
:
isGetError
}
=
useGetOrganizationQuery
(
id
!
,
{
skip
:
!
isEdit
});
const
{
data
:
organizations
}
=
useGetOrganizationsQuery
();
const
[
editOrganization
]
=
useEditOrganizationMutation
();
const
[
editOrganization
,
{
isLoading
:
isEditLoading
,
isSuccess
:
isEditSuccess
,
isError
:
isEditError
}
]
=
useEditOrganizationMutation
();
useEffect
(()
=>
{
if
(
data
)
{
...
...
@@ -60,10 +60,15 @@ const ManageOrganization: React.FC = () => {
return
;
}
setIsBtnLoading
(
true
);
await
editOrganization
({
...
normalizedValues
}).
unwrap
();
setIsBtnLoading
(
false
);
navigate
(
'
/
'
);
};
useEffect
(()
=>
{
if
(
isEditLoading
)
{
setIsBtnLoading
(
true
);
}
if
(
isEditSuccess
)
{
if
(
isEdit
)
{
message
.
success
(
'
Организация успешно обновлена!
'
);
}
else
{
...
...
@@ -72,8 +77,12 @@ const ManageOrganization: React.FC = () => {
const
newCurrentPage
=
Math
.
ceil
((
totalOrgNumber
+
1
)
/
ORG_NUMBER_PER_PAGE
);
dispatch
(
setCurrentPage
(
newCurrentPage
));
}
navigate
(
'
/
'
);
};
setIsBtnLoading
(
false
);
}
if
(
isEditError
)
{
setIsBtnLoading
(
false
);
}
},
[
isEditLoading
,
isEditSuccess
,
isEditError
,
dispatch
])
if
(
isEdit
&&
isGetLoading
)
return
<
div
>
Loading...
</
div
>;
if
(
isEdit
&&
isGetError
)
return
<
div
>
Error loading organization data
</
div
>;
...
...
src/pages/RequestPage/Columns.tsx
View file @
cb5ab658
import
React
,
{
useState
}
from
'
react
'
;
import
React
,
{
use
Effect
,
use
State
}
from
'
react
'
;
import
{
Button
,
Tag
,
Modal
,
message
}
from
'
antd
'
;
import
type
{
TableProps
}
from
'
antd
'
;
import
dayjs
from
'
dayjs
'
;
import
{
getStatusText
,
getStatusColor
,
openXMLInNewPage
,
downloadXML
}
from
'
./utils
'
;
import
{
useLazyResendRequestQuery
}
from
'
@/store/api/requestApi
'
;
import
styles
from
'
./RequestPage.module.css
'
;
export
interface
DataType
{
...
...
@@ -124,52 +125,62 @@ export const columns: TableProps<DataType>['columns'] = [
{
width
:
'
1%
'
,
align
:
'
center
'
,
render
:
(
_
,
record
)
=>
{
return
(
render
:
(
_
,
record
)
=>
(
<
ResendColumn
data=
{
record
}
disabled=
{
record
.
status
!==
2
}
/>
)
}
}
]
];
export
const
ResendColumn
:
React
.
FC
<
{
data
:
DataType
}
>
=
({
data
})
=>
{
export
const
ResendColumn
:
React
.
FC
<
{
data
:
DataType
,
disabled
:
boolean
}
>
=
({
data
,
disabled
})
=>
{
const
[
open
,
setOpen
]
=
useState
<
boolean
>
(
false
);
const
[
isBtnLoading
,
setIsBtnLoading
]
=
useState
<
boolean
>
(
false
);
const
[
resendRequest
,
{
isLoading
,
isSuccess
}]
=
useLazyResendRequestQuery
();
const
showResendModal
=
()
=>
{
setOpen
(
true
);
};
const
handleResendModalOk
=
async
()
=>
{
try
{
// await resendRequest().unwrap();
message
.
success
(
'
Запрос успешно переотправлен!
'
);
setOpen
(
false
);
}
catch
(
err
)
{
message
.
error
(
'
Произошла ошибка при переотправке запроса!
'
);
}
await
resendRequest
(
data
.
id
);
};
const
handleResendModalCancel
=
()
=>
{
setOpen
(
false
);
};
useEffect
(()
=>
{
if
(
isLoading
)
{
setIsBtnLoading
(
true
);
}
if
(
isSuccess
)
{
message
.
success
(
'
Запрос успешно переотправлен!
'
);
setOpen
(
false
);
setIsBtnLoading
(
false
);
}
},
[
isLoading
,
isSuccess
]);
return
(
<>
<
Button
onClick=
{
showResendModal
}
icon=
{
<
span
className=
'material-icons text-blue text-125'
>
mail
</
span
>
}
type=
'text'
disabled=
{
disabled
}
/>
<
Modal
open=
{
open
}
title=
{
`Вы уверены, что хотите переотправить запрос с id ${data.id}?`
}
onCancel=
{
handleResendModalCancel
}
onOk=
{
handleResendModalOk
}
okButtonProps=
{
{
loading
:
isBtnLoading
}
}
>
<
p
>
Подтвердите переотправку запроса.
</
p
>
</
Modal
>
</>
)
}
\ No newline at end of file
);
};
\ No newline at end of file
src/pages/RequestPage/RequestPage.tsx
View file @
cb5ab658
...
...
@@ -29,8 +29,8 @@ const RequestPage: React.FC = () => {
dayjs
(
DEFAULT_DATES
.
startDate
,
DATE_FORMAT
),
dayjs
(
DEFAULT_DATES
.
endDate
,
DATE_FORMAT
),
]);
const
[
method
,
setMethod
]
=
useState
(
''
);
const
[
isTableLoading
,
setIsTableLoading
]
=
useState
(
false
);
const
[
method
,
setMethod
]
=
useState
<
string
>
(
''
);
const
[
isTableLoading
,
setIsTableLoading
]
=
useState
<
boolean
>
(
false
);
const
handlePaginationChange
=
(
page
:
number
)
=>
{
dispatch
(
setCurrentPage
(
page
));
...
...
@@ -125,12 +125,14 @@ const RequestPage: React.FC = () => {
useEffect
(()
=>
{
if
(
isLoading
)
{
setIsTableLoading
(
true
);
}
else
if
(
isSuccess
)
{
}
if
(
isSuccess
)
{
setIsTableLoading
(
false
);
setData
(
reqs
.
list
);
dispatch
(
setTotalReqNumber
(
reqs
.
list
.
length
));
setDates
([
dayjs
(
min
),
dayjs
(
max
)]);
}
else
if
(
isError
)
{
}
if
(
isError
)
{
setIsTableLoading
(
false
);
}
},
[
isLoading
,
isSuccess
,
isError
,
reqs
,
dispatch
,
min
,
max
]);
...
...
src/store/api/mainApi.tsx
View file @
cb5ab658
...
...
@@ -3,7 +3,7 @@ import { RootState } from '@/main';
import
{
notification
}
from
'
antd
'
;
const
baseQuery
=
fetchBaseQuery
({
baseUrl
:
'
http://77.243.80.217
:8080
/esutd/api
'
,
baseUrl
:
'
http://77.243.80.217/esutd/api
'
,
prepareHeaders
:
(
headers
,
{
getState
})
=>
{
const
accessToken
=
(
getState
()
as
RootState
).
auth
.
token
;
...
...
src/store/api/requestApi.ts
View file @
cb5ab658
...
...
@@ -30,7 +30,7 @@ export const requestApiSlice = apiSlice.injectEndpoints({
endpoints
:
(
builder
)
=>
({
getRequests
:
builder
.
query
<
RequestsResponse
,
void
>
({
query
:
()
=>
`requests/list?pageNumber=
${
getRequestsParams
.
pageNumber
}
&pageSize=
${
getRequestsParams
.
pageSize
}
`
,
providesTags
:
[
"
requests
"
],
providesTags
:
[
{
type
:
"
requests
"
,
id
:
"
REQ_LIST
"
}
],
}),
addNewRequest
:
builder
.
mutation
<
Request
,
Partial
<
Request
>>
({
query
:
(
initialReq
)
=>
({
...
...
@@ -38,11 +38,11 @@ export const requestApiSlice = apiSlice.injectEndpoints({
method
:
'
POST
'
,
body
:
initialReq
,
}),
invalidatesTags
:
[
"
requests
"
],
invalidatesTags
:
[
{
type
:
"
requests
"
,
id
:
"
REQ_LIST
"
}
],
}),
resendRequest
:
builder
.
query
({
query
:
(
reqId
)
=>
`requests/resent?id=
${
reqId
}
`
,
providesTags
:
[
'
requests
'
]
providesTags
:
(
_
,
__
,
arg
)
=>
[{
type
:
"
requests
"
,
id
:
arg
}
]
})
})
})
...
...
@@ -50,5 +50,5 @@ export const requestApiSlice = apiSlice.injectEndpoints({
export
const
{
useAddNewRequestMutation
,
useGetRequestsQuery
,
useResendRequestQuery
use
Lazy
ResendRequestQuery
}
=
requestApiSlice
;
\ No newline at end of file
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