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
09d90b26
Commit
09d90b26
authored
Jul 25, 2024
by
Дияр Амангельды
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing errors build for server
parent
3bd3239c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
12 deletions
+15
-12
src/features/api/apiSlice.tsx
src/features/api/apiSlice.tsx
+2
-1
src/pages/(crudPages)/AddPage.tsx
src/pages/(crudPages)/AddPage.tsx
+6
-4
src/pages/(crudPages)/EditPage.tsx
src/pages/(crudPages)/EditPage.tsx
+6
-6
vite.config.ts
vite.config.ts
+1
-1
No files found.
src/features/api/apiSlice.tsx
View file @
09d90b26
...
@@ -13,11 +13,12 @@ interface Organization {
...
@@ -13,11 +13,12 @@ interface Organization {
host
:
string
;
host
:
string
;
}
}
export
const
apiSlice
=
createApi
({
export
const
apiSlice
=
createApi
({
reducerPath
:
'
api
'
,
reducerPath
:
'
api
'
,
baseQuery
:
fetchBaseQuery
({
baseQuery
:
fetchBaseQuery
({
baseUrl
:
"
/esutd/api/organizations
"
,
baseUrl
:
"
/esutd/api/organizations
"
,
prepareHeaders
:
(
headers
,
{
getState
}
)
=>
{
prepareHeaders
:
(
headers
)
=>
{
const
accessToken
=
`OTA3MTEzNzctYzA3YS00NzRkLTkyNDgtNzk4ZmEzMzViNzlj`
;
const
accessToken
=
`OTA3MTEzNzctYzA3YS00NzRkLTkyNDgtNzk4ZmEzMzViNzlj`
;
if
(
accessToken
)
{
if
(
accessToken
)
{
...
...
src/pages/(crudPages)/AddPage.tsx
View file @
09d90b26
...
@@ -6,16 +6,17 @@ import { setTotalOrgNumber, setCurrentPage } from '../../features/pagination/mai
...
@@ -6,16 +6,17 @@ import { setTotalOrgNumber, setCurrentPage } from '../../features/pagination/mai
import
{
useSelector
,
useDispatch
}
from
'
react-redux
'
;
import
{
useSelector
,
useDispatch
}
from
'
react-redux
'
;
import
'
./style.css
'
;
import
'
./style.css
'
;
interface
AddValues
{
interface
AddValues
{
bin
:
string
;
bin
:
string
;
host
:
string
;
host
:
string
;
login
:
string
;
login
:
string
;
organization_code
:
string
;
organization_code
:
string
;
organization_name
:
string
;
organization_name
:
string
;
password
:
string
;
password
:
string
;
status
:
string
;
status
:
number
;
// Change this line
}
}
const
{
Item
}
=
Form
;
const
{
Item
}
=
Form
;
const
{
Option
}
=
Select
;
const
{
Option
}
=
Select
;
...
@@ -29,7 +30,7 @@ const AddPage: React.FC = () => {
...
@@ -29,7 +30,7 @@ const AddPage: React.FC = () => {
const
onFinish
=
async
(
values
:
AddValues
)
=>
{
const
onFinish
=
async
(
values
:
AddValues
)
=>
{
const
newValues
=
{
const
newValues
=
{
...
values
,
...
values
,
status
:
values
.
status
===
'
active
'
?
'
2
'
:
values
.
status
===
'
blocked
'
?
'
1
'
:
'
0
'
,
status
:
values
.
status
,
// Since it's now a number
deleted
:
null
,
deleted
:
null
,
created
:
new
Date
().
toISOString
(),
created
:
new
Date
().
toISOString
(),
};
};
...
@@ -46,12 +47,13 @@ const AddPage: React.FC = () => {
...
@@ -46,12 +47,13 @@ const AddPage: React.FC = () => {
}
}
};
};
return
(
return
(
<
div
className=
'container'
>
<
div
className=
'container'
>
<
Form
<
Form
layout=
"vertical"
layout=
"vertical"
name=
"organization_form"
name=
"organization_form"
initialValues=
{
{
status
:
'
active
'
}
}
initialValues=
{
{
status
:
2
}
}
// Change this line
onFinish=
{
onFinish
}
onFinish=
{
onFinish
}
className=
'form'
className=
'form'
>
>
...
...
src/pages/(crudPages)/EditPage.tsx
View file @
09d90b26
...
@@ -3,16 +3,15 @@ import { useNavigate, useParams } from 'react-router';
...
@@ -3,16 +3,15 @@ import { useNavigate, useParams } from 'react-router';
import
{
Form
,
Input
,
Button
,
Select
,
message
}
from
'
antd
'
;
import
{
Form
,
Input
,
Button
,
Select
,
message
}
from
'
antd
'
;
import
{
useGetOrganizationQuery
,
useEditOrganizationMutation
}
from
'
../../features/api/apiSlice
'
;
import
{
useGetOrganizationQuery
,
useEditOrganizationMutation
}
from
'
../../features/api/apiSlice
'
;
import
'
./style.css
'
;
import
'
./style.css
'
;
interface
EditValues
{
interface
EditValues
{
id
:
string
;
id
:
number
;
// Change this line
bin
:
string
;
bin
:
string
;
host
:
string
;
host
:
string
;
login
:
string
;
login
:
string
;
organization_code
:
string
;
organization_code
:
string
;
organization_name
:
string
;
organization_name
:
string
;
password
:
string
;
password
:
string
;
status
:
string
;
status
:
number
;
// Change this line
}
}
const
{
Item
}
=
Form
;
const
{
Item
}
=
Form
;
...
@@ -29,28 +28,29 @@ const EditPage: React.FC = () => {
...
@@ -29,28 +28,29 @@ const EditPage: React.FC = () => {
if
(
data
)
{
if
(
data
)
{
form
.
setFieldsValue
({
form
.
setFieldsValue
({
...
data
,
...
data
,
status
:
data
.
status
===
'
2
'
?
'
active
'
:
data
.
status
===
'
1
'
?
'
blocked
'
:
'
deleted
'
status
:
data
.
status
===
2
?
'
active
'
:
data
.
status
===
1
?
'
blocked
'
:
'
deleted
'
});
});
}
}
},
[
data
,
form
]);
},
[
data
,
form
]);
const
onFinish
=
async
(
values
:
EditValues
)
=>
{
const
onFinish
=
async
(
values
:
EditValues
)
=>
{
const
updatedValues
=
{
const
updatedValues
=
{
...
values
,
...
values
,
status
:
values
.
status
===
'
active
'
?
'
2
'
:
values
.
status
===
'
blocked
'
?
'
1
'
:
'
0
'
,
status
:
values
.
status
,
// Since it's now a number
deleted
:
null
,
deleted
:
null
,
};
};
try
{
try
{
await
editOrganization
({
...
updatedValues
}).
unwrap
();
await
editOrganization
({
...
updatedValues
}).
unwrap
();
message
.
success
(
'
Организация успешно обновлена!
'
);
message
.
success
(
'
Организация успешно обновлена!
'
);
// console.log('Edit values: ', values);
navigate
(
'
/
'
);
navigate
(
'
/
'
);
}
catch
(
err
)
{
}
catch
(
err
)
{
message
.
error
(
'
Произошла ошибка при обновлении организации!
'
);
message
.
error
(
'
Произошла ошибка при обновлении организации!
'
);
}
}
};
};
if
(
isLoading
)
return
<
div
>
Loading...
</
div
>;
if
(
isLoading
)
return
<
div
>
Loading...
</
div
>;
if
(
isError
)
return
<
div
>
Error loading organization data
</
div
>;
if
(
isError
)
return
<
div
>
Error loading organization data
</
div
>;
...
...
vite.config.ts
View file @
09d90b26
...
@@ -3,7 +3,7 @@ import react from '@vitejs/plugin-react';
...
@@ -3,7 +3,7 @@ import react from '@vitejs/plugin-react';
export
default
defineConfig
({
export
default
defineConfig
({
plugins
:
[
react
()],
plugins
:
[
react
()],
server
:
{
server
:
{
proxy
:
{
proxy
:
{
'
/api
'
:
{
'
/api
'
:
{
target
:
'
http://77.243.80.217:8080
'
,
target
:
'
http://77.243.80.217:8080
'
,
...
...
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