Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: refactor publish/offline fe #991

Merged
merged 7 commits into from
Dec 21, 2020
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions web/src/pages/Route/Create.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ const Page: React.FC<Props> = (props) => {
form2={form2}
upstreamRef={upstreamRef}
step3Data={step3Data}
isEdit={props.route.path.indexOf('edit') > 0}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
isEdit={props.route.path.indexOf('edit') > 0}
We may have a helper function to check if the current page is in Edit mode in the future

/>
);
}
Expand Down
71 changes: 64 additions & 7 deletions web/src/pages/Route/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,34 @@ import { PlusOutlined } from '@ant-design/icons';

import { timestampToLocaleString } from '@/helpers';

import { fetchList, remove } from './service';
import { fetchList, remove, updateRouteStatus } from './service';

const Page: React.FC = () => {
const ref = useRef<ActionType>();
const { formatMessage } = useIntl();
enum RouteStatus {
Offline = 0,
Publish,
}

const handleTableActionSuccessResponse = (msgTip: string) => {
notification.success({
message: msgTip,
});

ref.current?.reload();
};

const handlePublishOffline = (rid: string, status: RouteModule.RouteStatus) => {
updateRouteStatus(rid, status).then(() => {
const actionName = status ? formatMessage({ id: 'page.route.publish' }) : formatMessage({ id: 'page.route.offline' })
handleTableActionSuccessResponse(
`${actionName}${formatMessage({
id: 'menu.routes',
})}${formatMessage({ id: 'component.status.success' })}`,
);
});
}

const columns: ProColumns<RouteModule.ResponseBody>[] = [
{
Expand Down Expand Up @@ -64,6 +87,19 @@ const Page: React.FC = () => {
dataIndex: 'desc',
hideInSearch: true,
},
{
title: formatMessage({ id: 'page.route.status' }),
dataIndex: 'status',
render: (_, record) => (
<>
{record.status ? (
<Tag color="green">{formatMessage({ id: 'page.route.published' })}</Tag>
) : (
<Tag color="red">{formatMessage({ id: 'page.route.unpublished' })}</Tag>
)}
</>
),
},
{
title: formatMessage({ id: 'component.global.updateTime' }),
dataIndex: 'update_time',
Expand All @@ -84,17 +120,38 @@ const Page: React.FC = () => {
>
{formatMessage({ id: 'component.global.edit' })}
</Button>
<Button
type="primary"
onClick={() => {
handlePublishOffline(record.id, RouteStatus.Publish)
}}
style={{ marginRight: 10 }}
disabled={Boolean(record.status)}
>
{formatMessage({ id: 'page.route.publish' })}
</Button>
<Popconfirm
title={formatMessage({ id: 'page.route.popconfirm.title.offline' })}
onConfirm={() => {
handlePublishOffline(record.id, RouteStatus.Offline)
}}
okText={formatMessage({ id: 'component.global.confirm' })}
cancelText={formatMessage({ id: 'component.global.cancel' })}
disabled={Boolean(!record.status)}
>
<Button type="primary" danger disabled={Boolean(!record.status)}>
{formatMessage({ id: 'page.route.offline' })}
</Button>
</Popconfirm>
<Popconfirm
title={formatMessage({ id: 'component.global.popconfirm.title.delete' })}
onConfirm={() => {
remove(record.id!).then(() => {
notification.success({
message: `${formatMessage({ id: 'component.global.delete' })} ${formatMessage({
handleTableActionSuccessResponse(
`${formatMessage({ id: 'component.global.delete' })}${formatMessage({
id: 'menu.routes',
})} ${formatMessage({ id: 'component.status.success' })}`,
});
/* eslint-disable no-unused-expressions */
ref.current?.reload();
})}${formatMessage({ id: 'component.status.success' })}`,
);
});
}}
okText={formatMessage({ id: 'component.global.confirm' })}
Expand Down
3 changes: 2 additions & 1 deletion web/src/pages/Route/components/CreateStep4/CreateStep4.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ type Props = {
step3Data: RouteModule.Step3Data;
advancedMatchingRules: RouteModule.MatchingRule[];
upstreamRef: any;
isEdit?: boolean;
};

const style = {
Expand All @@ -43,7 +44,7 @@ const CreateStep4: React.FC<Props> = ({ form1, form2, redirect, upstreamRef, ...
return (
<>
<h2>{formatMessage({ id: 'page.route.steps.stepTitle.defineApiRequest' })}</h2>
<Step1 {...rest} form={form1} disabled />
<Step1 {...rest} form={form1} disabled isEdit />
{!redirect && (
<>
<h2 style={style}>
Expand Down
11 changes: 9 additions & 2 deletions web/src/pages/Route/components/Step1/MetaView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
*/
import React from 'react';
import Form from 'antd/es/form';
import { Input } from 'antd';
import { Input, Switch } from 'antd';
import { useIntl } from 'umi';
import { PanelSection } from '@api7-dashboard/ui';

const MetaView: React.FC<RouteModule.Step1PassProps> = ({ disabled }) => {
const MetaView: React.FC<RouteModule.Step1PassProps> = ({ disabled, isEdit }) => {
const { formatMessage } = useIntl();

return (
Expand Down Expand Up @@ -55,6 +55,13 @@ const MetaView: React.FC<RouteModule.Step1PassProps> = ({ disabled }) => {
disabled={disabled}
/>
</Form.Item>
<Form.Item
label={formatMessage({ id: 'page.route.publish' })}
name="status"
valuePropName="checked"
>
<Switch disabled={isEdit} />
</Form.Item>
</PanelSection>
);
};
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Route/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const FORM_ITEM_WITHOUT_LABEL = {
export const DEFAULT_STEP_1_DATA: RouteModule.Form1Data = {
name: '',
desc: '',
status: false,
status: 1,
priority: 0,
websocket: false,
hosts: [''],
Expand Down
3 changes: 3 additions & 0 deletions web/src/pages/Route/locales/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ export default {
'page.route.status': 'Status',
'page.route.groupName': 'GroupName',
'page.route.offline': 'Offline',
'page.route.publish': 'Publish',
'page.route.published': 'Published',
'page.route.unpublished': 'UnPublished',

'page.route.select.option.inputManually': 'Input Manually',
'page.route.form.itemLabel.domainNameOrIp': 'Domain Name/IP',
Expand Down
3 changes: 3 additions & 0 deletions web/src/pages/Route/locales/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ export default {
'page.route.status': '状态',
'page.route.groupName': '分组名称',
'page.route.offline': '下线',
'page.route.publish': '发布',
'page.route.published': '已发布',
'page.route.unpublished': '未发布',

// button
'page.route.button.returnList': '返回路由列表',
Expand Down
6 changes: 6 additions & 0 deletions web/src/pages/Route/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,9 @@ export const checkHostWithSSL = (hosts: string[]) =>
method: 'POST',
data: hosts,
});

export const updateRouteStatus = (rid: string, status: RouteModule.RouteStatus) =>
request(`/routes/${rid}`, {
method: 'PATCH',
data: {status}
});
3 changes: 3 additions & 0 deletions web/src/pages/Route/transform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ export const transformStepData = ({
}
data.plugins!.redirect = redirect;
}
if (data.status !== undefined) {
data.status = Number(data.status);
}

// Remove some of the frontend custom variables
return omit(data, [
Expand Down
9 changes: 6 additions & 3 deletions web/src/pages/Route/typing.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ declare namespace RouteModule {
desc: string;
uris: string[];
hosts: string[];
status: boolean;
status: number;
};

type Step3Data = {
Expand Down Expand Up @@ -70,7 +70,7 @@ declare namespace RouteModule {
// Request Body or Response Data for API
type Body = {
id?: number;
status: boolean;
status: number;
name: string;
desc: string;
priority?: number;
Expand Down Expand Up @@ -181,7 +181,7 @@ declare namespace RouteModule {
redirectOption: 'forceHttps' | 'customRedirect' | 'disabled';
redirectURI?: string;
ret_code?: number;
status: boolean;
status: number;
};

type AdvancedMatchingRules = {
Expand Down Expand Up @@ -270,5 +270,8 @@ declare namespace RouteModule {
hosts?: string[];
create_time: number;
update_time: number;
status: number;
};

type RouteStatus = 0 | 1;
}