forked from watchdogpolska/small_eod
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from watchdogpolska/dev
tworzenie, edytowanie i usuwanie tagów - close watchdogpolska#632 watchdogpolska#631 watchdogpolska#629 (watchdogpolska#716)
- Loading branch information
Showing
18 changed files
with
331 additions
and
315 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,79 +1,8 @@ | ||
| import { fetchAll, fetchPage, create } from '@/services/tags'; | ||
| import { Effect } from 'dva'; | ||
| import { Reducer } from 'redux'; | ||
| import { router } from 'umi'; | ||
| import { TagsService } from '@/services/tags'; | ||
| import { Tag } from '@/services/definitions'; | ||
| import { openNotificationWithIcon } from '@/models/global'; | ||
| import { formatMessage } from 'umi-plugin-react/locale'; | ||
| import { ReadWriteReduxResource } from '@/utils/reduxModel'; | ||
|
|
||
| export type TagDefaultState = Tag[]; | ||
|
|
||
| export interface TagModelType { | ||
| namespace: string; | ||
| state: Tag[]; | ||
| effects: { | ||
| create: Effect; | ||
| fetchAll: Effect; | ||
| fetchPage: Effect; | ||
| }; | ||
| reducers: { | ||
| saveAll: Reducer<TagDefaultState>; | ||
| savePage: Reducer<TagDefaultState>; | ||
| }; | ||
| } | ||
| const defaultTagsState: TagDefaultState = []; | ||
|
|
||
| const TagsModel: TagModelType = { | ||
| export default ReadWriteReduxResource<Tag>({ | ||
| namespace: 'tags', | ||
| state: defaultTagsState, | ||
| effects: { | ||
| *create({ payload }, { call }) { | ||
| try { | ||
| const response = yield call(create, payload); | ||
| openNotificationWithIcon( | ||
| 'success', | ||
| formatMessage({ id: 'tags-new.page-create-notiffy-success' }) + response.data.id, | ||
| ); | ||
| router.replace(`/tags/list`); | ||
| } catch (err) { | ||
| if (err.response.status === 400 && err.response.body.name) { | ||
| err.response.body.name.forEach(message => | ||
| openNotificationWithIcon( | ||
| 'error', | ||
| formatMessage({ id: 'tags-new.page-create-notiffy-error' }) + message, | ||
| ), | ||
| ); | ||
| } else { | ||
| openNotificationWithIcon( | ||
| 'error', | ||
| formatMessage({ id: 'tags-new.page-create-notiffy-error' }) + err.response.body.detail, | ||
| ); | ||
| } | ||
| } | ||
| }, | ||
| *fetchAll(_, { call, put }) { | ||
| const response = yield call(fetchAll); | ||
| yield put({ | ||
| type: 'saveAll', | ||
| payload: response, | ||
| }); | ||
| }, | ||
| *fetchPage({ payload }, { call, put }) { | ||
| const response = yield call(fetchPage, payload); | ||
| yield put({ | ||
| type: 'savePage', | ||
| payload: response, | ||
| }); | ||
| return response; | ||
| }, | ||
| }, | ||
| reducers: { | ||
| saveAll(_, { payload }) { | ||
| return payload.results; | ||
| }, | ||
| savePage(_, { payload }) { | ||
| return payload.data; | ||
| }, | ||
| }, | ||
| }; | ||
| export default TagsModel; | ||
| service: TagsService, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| import { PageHeaderWrapper } from '@ant-design/pro-layout'; | ||
| import { Button, Col, Card, Form, Input, Row, Space, Spin } from 'antd'; | ||
| import { connect, useDispatch } from 'dva'; | ||
| import React, { useEffect, useState } from 'react'; | ||
| import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; | ||
| import { Tag } from '@/services/definitions'; | ||
| import { ReduxResourceState } from '@/utils/reduxModel'; | ||
| import router from 'umi/router'; | ||
| import { localeKeys } from '../../locales/pl-PL'; | ||
| import { RouterTypes } from 'umi'; | ||
| import { ServiceResponse } from '@/services/service'; | ||
| import smallEodSDK from '@/utils/sdk'; | ||
| import { openNotificationWithIcon } from '@/models/global'; | ||
|
|
||
| interface TagsDetailViewProps { | ||
| tags: ReduxResourceState<Tag>; | ||
| match: RouterTypes['match'] & { params: { id: string | undefined } }; | ||
| } | ||
|
|
||
| const layout = { | ||
| labelCol: { span: 8 }, | ||
| wrapperCol: { span: 16 }, | ||
| }; | ||
|
|
||
| const tailLayout = { | ||
| wrapperCol: { offset: 8, span: 16 }, | ||
| }; | ||
|
|
||
| function TagsDetailView({ tags, match }: TagsDetailViewProps) { | ||
| const dispatch = useDispatch(); | ||
| const isEdit = Boolean(match.params.id); | ||
| const editetTags = tags.data.find(value => value.id === Number(match.params.id)); | ||
| const [isSubmitting, setIsSubmitting] = useState(false); | ||
| const [form] = Form.useForm(); | ||
| (window as any).se = smallEodSDK; | ||
| function onRequestDone(response: ServiceResponse<Tag>) { | ||
| setIsSubmitting(false); | ||
| if (response.status === 'success') { | ||
| router.push('/tags/list'); | ||
| } else if (response.statusCode === 400) { | ||
| form.setFields( | ||
| Array.from( | ||
| Object.entries(response.errorBody), | ||
| ).map(([name, errors]: [string, Array<string>]) => ({ name, errors })), | ||
| ); | ||
| } else { | ||
| openNotificationWithIcon( | ||
| 'error', | ||
| formatMessage({ id: localeKeys.error }), | ||
| `${formatMessage({ | ||
| id: isEdit | ||
| ? localeKeys.tags.detailView.errors.updateFailed | ||
| : localeKeys.tags.detailView.errors.createFailed, | ||
| })} ${response.errorText}`, | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| function onFinish() { | ||
| if (isEdit) { | ||
| dispatch({ | ||
| type: 'tags/update', | ||
| payload: { | ||
| ...form.getFieldsValue(), | ||
| id: match.params.id, | ||
| onResponse: onRequestDone, | ||
| }, | ||
| }); | ||
| } else { | ||
| dispatch({ | ||
| type: 'tags/create', | ||
| payload: { | ||
| ...form.getFieldsValue(), | ||
| onResponse: onRequestDone, | ||
| }, | ||
| }); | ||
| } | ||
| setIsSubmitting(true); | ||
| } | ||
|
|
||
| useEffect(() => { | ||
| if (isEdit) dispatch({ type: 'tags/fetchOne', payload: { id: Number(match.params.id) } }); | ||
| }, []); | ||
|
|
||
| if (tags.isLoading || (isEdit && !editetTags) || isSubmitting) { | ||
| return ( | ||
| <Row justify="center"> | ||
| <Col> | ||
| <Spin size="large" /> | ||
| </Col> | ||
| </Row> | ||
| ); | ||
| } | ||
| if (isEdit) form.setFieldsValue(editetTags); | ||
|
|
||
| return ( | ||
| <Form {...layout} form={form} onFinish={onFinish}> | ||
| <PageHeaderWrapper | ||
| content={formatMessage({ | ||
| id: isEdit | ||
| ? localeKeys.tags.detailView.editPageHeaderContent | ||
| : localeKeys.tags.detailView.newPageHeaderContent, | ||
| })} | ||
| > | ||
| <Card bordered={false}> | ||
| <Row> | ||
| <Col span={16}> | ||
| <Form.Item | ||
| label={formatMessage({ id: localeKeys.tags.fields.name })} | ||
| name="name" | ||
| rules={[ | ||
| { | ||
| required: true, | ||
| message: formatMessage({ id: localeKeys.tags.detailView.errors.name }), | ||
| }, | ||
| ]} | ||
| > | ||
| <Input | ||
| placeholder={formatMessage({ id: localeKeys.tags.detailView.placeholders.name })} | ||
| /> | ||
| </Form.Item> | ||
| </Col> | ||
| </Row> | ||
| <Row> | ||
| <Col span={16}> | ||
| <Form.Item {...tailLayout}> | ||
| <Space> | ||
| <Button type="primary" htmlType="submit"> | ||
| <FormattedMessage id={localeKeys.form.save} /> | ||
| </Button> | ||
| </Space> | ||
| </Form.Item> | ||
| </Col> | ||
| </Row> | ||
| </Card> | ||
| </PageHeaderWrapper> | ||
| </Form> | ||
| ); | ||
| } | ||
|
|
||
| export default connect((props: TagsDetailViewProps) => props)(TagsDetailView); |
Oops, something went wrong.