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
7c1232a6
Commit
7c1232a6
authored
Jul 30, 2024
by
Merekeyev Dias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
request to dictionary/update
parent
6737c329
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
16 deletions
+24
-16
src/features/api/manualApiSlice.ts
src/features/api/manualApiSlice.ts
+1
-1
src/features/sync_btn/syncBtn.ts
src/features/sync_btn/syncBtn.ts
+6
-3
src/pages/HomePage/Columns.tsx
src/pages/HomePage/Columns.tsx
+11
-7
src/pages/HomePage/HomePage.tsx
src/pages/HomePage/HomePage.tsx
+6
-5
No files found.
src/features/api/manualApiSlice.ts
View file @
7c1232a6
...
...
@@ -6,7 +6,7 @@ export const manualApiSlice = apiSlice.injectEndpoints({
query
:
(
codes
)
=>
({
url
:
'
dictionary/update
'
,
method
:
'
POST
'
,
body
:
codes
,
body
:
codes
}),
invalidatesTags
:
[
'
manuals
'
]
})
})
...
...
src/features/sync_btn/syncBtn.ts
View file @
7c1232a6
...
...
@@ -14,17 +14,20 @@ const syncBtnSlice = createSlice({
name
:
'
syncBtn
'
,
initialState
,
reducers
:
{
addCheckedCode
s
:
(
state
,
action
)
=>
{
addCheckedCode
:
(
state
,
action
)
=>
{
state
.
checkedCodes
.
push
(
action
.
payload
);
},
removeCheckedCode
s
:
(
state
,
action
)
=>
{
removeCheckedCode
:
(
state
,
action
)
=>
{
state
.
checkedCodes
=
state
.
checkedCodes
.
filter
(
code
=>
code
!==
action
.
payload
);
},
clearCheckedCodes
:
(
state
)
=>
{
state
.
checkedCodes
=
[];
},
setDisabled
:
(
state
,
action
)
=>
{
state
.
disabled
=
action
.
payload
;
}
}
});
export
const
{
addCheckedCode
s
,
remove
CheckedCodes
,
setDisabled
}
=
syncBtnSlice
.
actions
;
export
const
{
addCheckedCode
,
removeCheckedCode
,
clear
CheckedCodes
,
setDisabled
}
=
syncBtnSlice
.
actions
;
export
default
syncBtnSlice
.
reducer
;
\ No newline at end of file
src/pages/HomePage/Columns.tsx
View file @
7c1232a6
...
...
@@ -5,10 +5,9 @@ import { Button, Space, Tag, Modal, Checkbox, message } from 'antd';
import
type
{
TableProps
}
from
'
antd
'
;
import
{
useDeleteOrganizationMutation
}
from
'
../../features/api/organizationApiSlice
'
;
import
{
addCheckedCode
s
,
removeCheckedCodes
}
from
'
../../features/sync_btn/syncBtn
'
;
import
{
setCurrentPage
,
setTotalOrgNumber
}
from
'
../../features/pagination/mainPagination
'
;
import
{
addCheckedCode
,
removeCheckedCode
}
from
'
../../features/sync_btn/syncBtn
'
;
import
{
setCurrentPage
}
from
'
../../features/pagination/mainPagination
'
;
import
{
getStatusText
,
getStatusColor
}
from
'
./utils
'
;
import
{
current
}
from
'
@reduxjs/toolkit
'
;
export
interface
DataType
{
id
:
number
;
...
...
@@ -68,15 +67,20 @@ export const columns: TableProps<DataType>['columns'] = [
export
const
CheckboxColumn
:
React
.
FC
<
{
data
:
DataType
}
>
=
({
data
})
=>
{
const
dispatch
=
useDispatch
();
const
checkedCodes
=
useSelector
((
state
:
any
)
=>
state
.
syncBtn
.
checkedCodes
);
const
[
checked
,
setChecked
]
=
useState
(
false
);
const
handleCheck
=
(
e
:
{
target
:
{
checked
:
any
;
};
})
=>
{
useEffect
(()
=>
{
setChecked
(
checkedCodes
.
includes
(
data
.
code
));
},
[
checkedCodes
,
data
.
code
]);
const
handleCheck
=
(
e
:
{
target
:
{
checked
:
any
}
})
=>
{
const
isChecked
=
e
.
target
.
checked
;
setChecked
(
isChecked
);
if
(
isChecked
)
{
dispatch
(
addCheckedCode
s
(
data
.
code
));
dispatch
(
addCheckedCode
(
data
.
code
));
}
else
{
dispatch
(
removeCheckedCode
s
(
data
.
code
));
dispatch
(
removeCheckedCode
(
data
.
code
));
}
};
...
...
src/pages/HomePage/HomePage.tsx
View file @
7c1232a6
...
...
@@ -4,9 +4,10 @@ import { useSelector, useDispatch } from 'react-redux';
import
{
Button
,
message
,
Pagination
,
Space
,
Spin
,
Table
}
from
'
antd
'
;
import
{
TableRef
}
from
'
antd/es/table
'
;
import
{
useDeleteOrganizationMutation
,
useGetOrganizationsQuery
}
from
'
../../features/api/organizationApiSlice
'
;
import
{
useGetOrganizationsQuery
}
from
'
../../features/api/organizationApiSlice
'
;
import
{
useUpdateDictionaryMutation
}
from
'
../../features/api/manualApiSlice
'
;
import
{
setCurrentPage
,
setTotalOrgNumber
}
from
'
../../features/pagination/mainPagination
'
;
import
{
setDisabled
}
from
'
../../features/sync_btn/syncBtn
'
;
import
{
setDisabled
,
clearCheckedCodes
}
from
'
../../features/sync_btn/syncBtn
'
;
import
{
DataType
,
columns
}
from
'
./Columns
'
;
import
'
./Homepage.css
'
;
...
...
@@ -19,7 +20,7 @@ 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
[
updateDictionary
]
=
use
DeleteOrganization
Mutation
();
const
[
updateDictionary
]
=
use
UpdateDictionary
Mutation
();
const
handleAddClick
=
()
=>
{
navigate
(
"
/add
"
);
...
...
@@ -27,8 +28,8 @@ const HomePage: React.FC = () => {
const
handleSyncClick
=
async
()
=>
{
try
{
console
.
log
(
checkedCodes
);
await
updateDictionary
(
JSON
.
stringify
(
checkedCodes
)).
unwrap
(
);
await
updateDictionary
(
checkedCodes
);
dispatch
(
clearCheckedCodes
()
);
message
.
success
(
'
Организации успешны синхронизированы!
'
)
}
catch
(
err
)
{
message
.
error
(
'
Произошла ошибка при синхронизации организации!
'
)
...
...
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