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.

Sign up for GitHub

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

Implement Chaincode dashboard #573

Merged
merged 3 commits into from
Oct 21, 2023
Merged

Implement Chaincode dashboard #573

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74acc6e
Implement Chaincode dashboard
xichen1 Oct 17, 2023
b2493fd
Update outdated message ids
xichen1 Oct 17, 2023
b924565
Merge branch 'main' into chaincode-dashboard-main
xichen1 Oct 21, 2023
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
247 changes: 113 additions & 134 deletions src/dashboard/src/pages/ChainCode/ChainCode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
*/
import React, { PureComponent, Fragment } from 'react';
import { connect, injectIntl, useIntl } from 'umi';
import { Card, Button, Modal, Input, Upload, Divider, message } from 'antd';
import { PlusOutlined, UploadOutlined, FunctionOutlined } from '@ant-design/icons';
import { Card, Button, Modal, Input, Upload, Divider, message, Dropdown, Menu } from 'antd';
import { PlusOutlined, UploadOutlined, FunctionOutlined, DownOutlined } from '@ant-design/icons';
import PageHeaderWrapper from '@/components/PageHeaderWrapper';
import StandardTable from '@/components/StandardTable';
import { Form, Select } from 'antd/lib/index';
import { Form } from 'antd/lib/index';
import styles from './styles.less';

const FormItem = Form.Item;
const { Option } = Select;

const UploadChainCode = props => {
const [form] = Form.useForm();
Expand All @@ -31,14 +30,14 @@ const UploadChainCode = props => {
message.error(
intl.formatMessage({
id: 'app.chainCode.form.create.fail',
defaultMessage: 'Upload chain code failed',
defaultMessage: 'Upload chaincode failed',
})
);
} else {
message.success(
intl.formatMessage({
id: 'app.chainCode.form.create.success',
defaultMessage: 'Upload chain code succeed',
defaultMessage: 'Upload chaincode succeed',
})
);
form.resetFields();
Expand All @@ -63,17 +62,11 @@ const UploadChainCode = props => {
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 12 },
md: { span: 10 },
sm: { span: 14 },
md: { span: 12 },
},
};

const languageOptions = ['golang', 'java', 'nodejs'].map(item => (
<Option value={item} key={item}>
<span style={{ color: '#8c8f88' }}>{item}</span>
</Option>
));

const uploadProps = {
onRemove: () => {
setFile(null);
Expand All @@ -96,136 +89,64 @@ const UploadChainCode = props => {
destroyOnClose
title={intl.formatMessage({
id: 'app.chainCode.form.create.header.title',
defaultMessage: 'Upload Chain code',
defaultMessage: 'Upload chaincode',
})}
confirmLoading={uploading}
visible={modalVisible}
open={modalVisible}
onOk={onSubmit}
onCancel={() => handleModalVisible(false)}
>
<Form onFinish={onFinish} form={form} preserve={false}>
<FormItem
{...formItemLayout}
label={intl.formatMessage({
id: 'app.chainCode.form.create.name',
defaultMessage: 'Name',
})}
name="name"
initialValue=""
rules={[
{
required: true,
message: intl.formatMessage({
id: 'app.chainCode.form.create.checkName',
defaultMessage: 'Please enter the chain code name',
}),
},
]}
>
<Input
placeholder={intl.formatMessage({
id: 'app.chainCode.form.create.name',
defaultMessage: 'Name',
})}
/>
</FormItem>
<FormItem
{...formItemLayout}
label={intl.formatMessage({
id: 'app.chainCode.form.create.version',
defaultMessage: 'Version',
})}
name="version"
initialValue=""
rules={[
{
required: true,
message: intl.formatMessage({
id: 'app.chainCode.form.create.checkVersion',
defaultMessage: 'Please enter the chain code version',
}),
},
]}
>
<Input
placeholder={intl.formatMessage({
id: 'app.chainCode.form.create.version',
defaultMessage: 'Version',
})}
/>
</FormItem>
<FormItem
{...formItemLayout}
label={intl.formatMessage({
id: 'app.chainCode.form.create.language',
defaultMessage: 'Language',
id: 'app.chainCode.form.create.file',
defaultMessage: 'Package',
})}
name="language"
name="chaincodePackage"
getValueFromEvent={normFile}
rules={[
{
required: true,
message: intl.formatMessage({
id: 'app.chainCode.form.create.checkLanguage',
defaultMessage: 'Please select language',
id: 'app.chainCode.form.create.fileSelect',
defaultMessage: 'Please select the chaincode package',
}),
},
]}
extra="Only tar.gz file is supported"
>
<Select>{languageOptions}</Select>
<Upload {...uploadProps}>
<Button disabled={!!newFile}>
<UploadOutlined />
{intl.formatMessage({
id: 'app.chainCode.form.create.fileSelect',
defaultMessage: 'Please select the chaincode package',
})}
</Button>
</Upload>
</FormItem>
<FormItem
{...formItemLayout}
label={intl.formatMessage({
id: 'app.chainCode.form.create.md5',
defaultMessage: 'md5',
id: 'app.chainCode.form.create.description',
defaultMessage: 'Description',
})}
name="md5"
name="description"
initialValue=""
rules={[
{
required: true,
message: intl.formatMessage({
id: 'app.chainCode.form.create.checkMd5',
defaultMessage: 'Please enter the md5',
}),
required: false,
},
]}
>
<Input
placeholder={intl.formatMessage({
id: 'app.chainCode.form.create.md5',
defaultMessage: 'md5',
id: 'app.chainCode.form.create.description',
defaultMessage: 'Chaincode Description',
})}
/>
</FormItem>
<FormItem
{...formItemLayout}
label={intl.formatMessage({
id: 'app.chainCode.form.create.file',
defaultMessage: 'file',
})}
name="file"
getValueFromEvent={normFile}
rules={[
{
required: true,
message: intl.formatMessage({
id: 'app.chainCode.form.create.fileSelect',
defaultMessage: 'Please select the chain code file',
}),
},
]}
>
<Upload {...uploadProps}>
<Button disabled={!!newFile}>
<UploadOutlined />
{intl.formatMessage({
id: 'app.chainCode.form.create.fileSelect',
defaultMessage: 'Please select the chain code file',
})}
</Button>
</Upload>
</FormItem>
</Form>
</Modal>
);
Expand Down Expand Up @@ -264,6 +185,14 @@ class ChainCode extends PureComponent {
});
};

fetchNodes = () => {
const { dispatch } = this.props;

dispatch({
type: 'chainCode/listNode',
});
};

handleTableChange = pagination => {
const { dispatch } = this.props;
const { formValues } = this.state;
Expand All @@ -289,9 +218,11 @@ class ChainCode extends PureComponent {
const { dispatch } = this.props;
const formData = new FormData();

Object.keys(values).forEach(key => {
formData.append(key, values[key]);
});
Object.keys(values)
.filter(key => !(key === 'description' && !values[key])) // filter out empty description
.forEach(key => {
formData.append(key, values[key]);
});

dispatch({
type: 'chainCode/uploadChainCode',
Expand All @@ -311,7 +242,7 @@ class ChainCode extends PureComponent {
render() {
const { selectedRows, modalVisible, newFile } = this.state;
const {
chainCode: { chainCodes, pagination },
chainCode: { chainCodes, paginations },
loadingChainCodes,
intl,
uploading,
Expand All @@ -328,13 +259,43 @@ class ChainCode extends PureComponent {
intl,
};

const menu = record => (
<Menu>
<Menu.Item>
<a
onClick={() => {
this.handleDeleteChaincode(record);
fengyangsy marked this conversation as resolved.
Show resolved Hide resolved
}}
>
{intl.formatMessage({
id: 'app.chainCode.table.operate.delete',
defaultMessage: 'Delete',
})}
</a>
</Menu.Item>
</Menu>
);

const MoreBtn = () => (
<Dropdown overlay={menu}>
<a>
{intl.formatMessage({
id: 'app.node.table.operation.more',
defaultMessage: 'More',
})}{' '}
<DownOutlined />
</a>
</Dropdown>
);

const columns = [
{
title: intl.formatMessage({
id: 'app.chainCode.table.header.name',
defaultMessage: 'Name',
id: 'app.chainCode.table.header.packageID',
defaultMessage: 'PackageID',
}),
dataIndex: 'name',
dataIndex: 'packageID',
ellipsis: true,
},
{
title: intl.formatMessage({
Expand All @@ -346,23 +307,16 @@ class ChainCode extends PureComponent {
{
title: intl.formatMessage({
id: 'app.chainCode.table.header.language',
defaultMessage: 'Language',
defaultMessage: 'Chaincode Language',
}),
dataIndex: 'language',
},
{
title: intl.formatMessage({
id: 'app.chainCode.table.header.time',
defaultMessage: 'Time',
id: 'app.chainCode.table.header.description',
defaultMessage: 'Description',
}),
dataIndex: 'create_ts',
},
{
title: intl.formatMessage({
id: 'app.chainCode.table.header.md5',
defaultMessage: 'MD5',
}),
dataIndex: 'md5',
dataIndex: 'description',
},
{
title: intl.formatMessage({
Expand All @@ -379,24 +333,48 @@ class ChainCode extends PureComponent {
})}
</a>
<Divider type="vertical" />
<a className={styles.danger}>
<a>
{intl.formatMessage({
id: 'app.chainCode.table.operate.approve',
Copy link
Contributor

Choose a reason for hiding this comment

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

Can't find "app.chainCode.table.operate.approve" in locales

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's added in #572, which may need to be reviewed and merged first.

I created two pr to make the purpose of each task more clear.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK

defaultMessage: 'Approve',
})}
</a>
<Divider type="vertical" />
<a>
{intl.formatMessage({
id: 'app.chainCode.table.operate.delete',
defaultMessage: 'Delete',
id: 'app.chainCode.table.operate.commit',
Copy link
Contributor

Choose a reason for hiding this comment

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

Can't find "app.chainCode.table.operate.commit" in locales

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also in #572

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok

defaultMessage: 'Commit',
})}
</a>
<Divider type="vertical" />
<MoreBtn />
</Fragment>
),
},
];
// TODO: remove dummy data after API is connected
const dummyList = [
{
packageID: 'cc1v1:cc7bb5f50a53c207f68d37e9423c32f968083282e5ffac00d41ffc5768dc1873',
description: 'chaincode demo',
version: 'v1',
language: 'golang',
approve: false,
},
];
const dummyPagination = {
total: 0,
current: 1,
pageSize: 10,
};
return (
<PageHeaderWrapper
title={
<span>
{<FunctionOutlined style={{ marginRight: 15 }} />}
{intl.formatMessage({
id: 'app.chainCode.title',
defaultMessage: 'Chain code Management',
defaultMessage: 'Chaincode Management',
})}
</span>
}
Expand All @@ -413,9 +391,10 @@ class ChainCode extends PureComponent {
selectedRows={selectedRows}
loading={loadingChainCodes}
rowKey="id"
// TODO: remove length check after API is connected
data={{
list: chainCodes,
pagination,
list: chainCodes.length !== 0 ? chainCodes : dummyList,
pagination: chainCodes.length !== 0 ? paginations : dummyPagination,
}}
columns={columns}
onSelectRow={this.handleSelectRows}
Expand Down