ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-06-16 06:18:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add tags to tenants and applications.

Browse Source 
Note that the integration events will contain the application +
device-profile + device tags. Integration events will NOT contain the
tenant tags. Most likely tenant tags will be used to store information
about the tenant, data that is unrelated to the integration events.

Fixes #211.
This commit is contained in:
Orne Brocaar
2023-10-19 17:11:50 +01:00
parent c7e586a326
commit a087c4c18b
24 changed files with 1005 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
ui/src/views/applications/ApplicationForm.tsx
View File

@ -1,5 +1,6 @@
import { Application } from "@chirpstack/chirpstack-api-grpc-web/api/application_pb";
import { Form, Input, Button } from "antd";
import { Form, Input, Button, Tabs, Row, Col } from "antd";
import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
import { onFinishFailed } from "../helpers";
@ -19,17 +20,66 @@ function ApplicationForm(props: IProps) {
app.setName(v.name);
app.setDescription(v.description);
// tags
for (const elm of v.tagsMap) {
app.getTagsMap().set(elm[0], elm[1]);
}
props.onFinish(app);
};
return (
<Form layout="vertical" initialValues={props.initialValues.toObject()} onFinish={onFinish} onFinishFailed={onFinishFailed}>
<Form.Item label="Name" name="name" rules={[{ required: true, message: "Please enter a name!" }]}>
<Input disabled={props.disabled} />
</Form.Item>
<Form.Item label="Description" name="description">
<Input.TextArea disabled={props.disabled} />
</Form.Item>
<Tabs>
<Tabs.TabPane tab="General" key="1">
<Form.Item label="Name" name="name" rules={[{ required: true, message: "Please enter a name!" }]}>
<Input disabled={props.disabled} />
</Form.Item>
<Form.Item label="Description" name="description">
<Input.TextArea disabled={props.disabled} />
</Form.Item>
</Tabs.TabPane>
<Tabs.TabPane tab="Tags" key="2">
<Form.List name="tagsMap">
{(fields, { add, remove }) => (
<>
{fields.map(({ key, name, ...restField }) => (
<Row gutter={24}>
<Col span={6}>
<Form.Item
{...restField}
name={[name, 0]}
fieldKey={[name, 0]}
rules={[{ required: true, message: "Please enter a key!" }]}
>
<Input placeholder="Key" />
</Form.Item>
</Col>
<Col span={16}>
<Form.Item
{...restField}
name={[name, 1]}
fieldKey={[name, 1]}
rules={[{ required: true, message: "Please enter a value!" }]}
>
<Input placeholder="Value" />
</Form.Item>
</Col>
<Col span={2}>
<MinusCircleOutlined onClick={() => remove(name)} />
</Col>
</Row>
))}
<Form.Item>
<Button type="dashed" onClick={() => add()} block icon={<PlusOutlined />}>
Add tag
</Button>
</Form.Item>
</>
)}
</Form.List>
</Tabs.TabPane>
</Tabs>
<Form.Item>
<Button type="primary" htmlType="submit" disabled={props.disabled}>
Submit

167
ui/src/views/tenants/TenantForm.tsx
View File

@ -1,4 +1,5 @@
import { Form, Input, InputNumber, Switch, Row, Col, Button } from "antd";
import { Form, Input, InputNumber, Switch, Row, Col, Button, Tabs } from "antd";
import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
import { Tenant } from "@chirpstack/chirpstack-api-grpc-web/api/tenant_pb";
@ -24,70 +25,120 @@ function TenantForm(props: IProps) {
tenant.setPrivateGatewaysUp(values.privateGatewaysUp);
tenant.setPrivateGatewaysDown(values.privateGatewaysDown);
// tags
for (const elm of v.tagsMap) {
tenant.getTagsMap().set(elm[0], elm[1]);
}
props.onFinish(tenant);
};
return (
<Form layout="vertical" initialValues={props.initialValues.toObject()} onFinish={onFinish} onFinishFailed={onFinishFailed}>
<Form.Item label="Name" name="name" rules={[{ required: true, message: "Please enter a name!" }]}>
<Input disabled={props.disabled} />
</Form.Item>
<Form.Item label="Description" name="description">
<Input.TextArea disabled={props.disabled} />
</Form.Item>
<Row>
<Col span={8}>
<Form.Item
label="Tenant can have gateways"
name="canHaveGateways"
tooltip="When checked, the tenant can add gateways. Note that the usage of the gateways is not limited to this tenant only unless these are marked private."
valuePropName="checked"
>
<Switch disabled={props.disabled} />
<Tabs>
<Tabs.TabPane tab="General" key="1">
<Form.Item label="Name" name="name" rules={[{ required: true, message: "Please enter a name!" }]}>
<Input disabled={props.disabled} />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label="Gateways are private (uplink)"
name="privateGatewaysUp"
tooltip="Uplink received by gateways of this tenant can only be used by the devices of this tenant."
valuePropName="checked"
>
<Switch disabled={props.disabled} />
<Form.Item label="Description" name="description">
<Input.TextArea disabled={props.disabled} />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label="Gateways are private (downlink)"
name="privateGatewaysDown"
tooltip="Other tenants can not use the gateways of this tenant for downlinks. This can be useful in case uplinks are shared with other tenants, but you want to avoid other tenants using downlink airtime of your gateways."
valuePropName="checked"
>
<Switch disabled={props.disabled} />
</Form.Item>
</Col>
</Row>
<Row>
<Col span={12}>
<Form.Item
label="Max. gateway count"
name="maxGatewayCount"
tooltip="The maximum number of gateways that can be added by this tenant (0 = unlimited)."
>
<InputNumber min={0} disabled={props.disabled} />
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label="Max. device count"
name="maxDeviceCount"
required={true}
tooltip="The maximum number of devices that can be added by this tenant (0 = unlimited)."
>
<InputNumber min={0} disabled={props.disabled} />
</Form.Item>
</Col>
</Row>
<Row>
<Col span={8}>
<Form.Item
label="Tenant can have gateways"
name="canHaveGateways"
tooltip="When checked, the tenant can add gateways. Note that the usage of the gateways is not limited to this tenant only unless these are marked private."
valuePropName="checked"
>
<Switch disabled={props.disabled} />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label="Gateways are private (uplink)"
name="privateGatewaysUp"
tooltip="Uplink received by gateways of this tenant can only be used by the devices of this tenant."
valuePropName="checked"
>
<Switch disabled={props.disabled} />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label="Gateways are private (downlink)"
name="privateGatewaysDown"
tooltip="Other tenants can not use the gateways of this tenant for downlinks. This can be useful in case uplinks are shared with other tenants, but you want to avoid other tenants using downlink airtime of your gateways."
valuePropName="checked"
>
<Switch disabled={props.disabled} />
</Form.Item>
</Col>
</Row>
<Row>
<Col span={12}>
<Form.Item
label="Max. gateway count"
name="maxGatewayCount"
tooltip="The maximum number of gateways that can be added by this tenant (0 = unlimited)."
>
<InputNumber min={0} disabled={props.disabled} />
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label="Max. device count"
name="maxDeviceCount"
required={true}
tooltip="The maximum number of devices that can be added by this tenant (0 = unlimited)."
>
<InputNumber min={0} disabled={props.disabled} />
</Form.Item>
</Col>
</Row>
</Tabs.TabPane>
<Tabs.TabPane tab="Tags" key="2">
<Form.List name="tagsMap">
{(fields, { add, remove }) => (
<>
{fields.map(({ key, name, ...restField }) => (
<Row gutter={24}>
<Col span={6}>
<Form.Item
{...restField}
name={[name, 0]}
fieldKey={[name, 0]}
rules={[{ required: true, message: "Please enter a key!" }]}
>
<Input placeholder="Key" disabled={props.disabled} />
</Form.Item>
</Col>
<Col span={16}>
<Form.Item
{...restField}
name={[name, 1]}
fieldKey={[name, 1]}
rules={[{ required: true, message: "Please enter a value!" }]}
>
<Input placeholder="Value" disabled={props.disabled} />
</Form.Item>
</Col>
{!props.disabled &&
<Col span={2}>
<MinusCircleOutlined onClick={() => remove(name)} />
</Col>}
</Row>
))}
{!props.disabled && <Form.Item>
<Button type="dashed" onClick={() => add()} block icon={<PlusOutlined />}>
Add tag
</Button>
</Form.Item>}
</>
)}
</Form.List>
</Tabs.TabPane>
</Tabs>
<Form.Item>
<Button type="primary" htmlType="submit" disabled={props.disabled}>
Submit