ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2024-12-19 13:17:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Run yarn format.

Browse Source
This commit is contained in:
Orne Brocaar 2022-11-01 10:28:57 +00:00
parent 5b3b44bce4
commit 577a33ec9a
5 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/components/Header.tsx
View File

@ -72,13 +72,13 @@ class Header extends Component<IProps, IState> {
if (!oidc.getEnabled() || oidc.getLogoutUrl() === "") {
SessionStore.logout(true, () => {
this.props.history.push("/login");
});
});
} else {
SessionStore.logout(false, () => {
window.location.assign(oidc.getLogoutUrl());
});
}
}
};
render() {
if (this.state.settings === undefined) {
@ -94,9 +94,7 @@ class Header extends Component<IProps, IState> {
<Link to={`/users/${this.props.user.getId()}/password`}>Change password</Link>
</Menu.Item>
)}
<Menu.Item onClick={this.onLogout}>
Logout
</Menu.Item>
<Menu.Item onClick={this.onLogout}>Logout</Menu.Item>
</Menu>
);

4
ui/src/components/Menu.tsx
View File

@ -186,9 +186,7 @@ class SideMenu extends Component<RouteComponentProps, IState> {
key: "ns",
label: "Network Server",
icon: <CloudOutlined />,
children: [
{ key: "ns-regions", icon: <CompassOutlined />, label: <Link to="/regions">Regions</Link> },
],
children: [{ key: "ns-regions", icon: <CompassOutlined />, label: <Link to="/regions">Regions</Link> }],
});
}

4
ui/src/stores/InternalStore.ts
View File

@ -211,7 +211,7 @@ class InternalStore extends EventEmitter {
callbackFunc(resp);
});
}
};
getRegion = (req: GetRegionRequest, callbackFunc: (resp: GetRegionResponse) => void) => {
this.client.getRegion(req, SessionStore.getMetadata(), (err, resp) => {
@ -222,7 +222,7 @@ class InternalStore extends EventEmitter {
callbackFunc(resp);
});
}
};
}
const internalStore = new InternalStore();

10
ui/src/views/regions/ListRegions.tsx
View File

@ -4,10 +4,7 @@ import { Link } from "react-router-dom";
import { Space, Breadcrumb, PageHeader, Table } from "antd";
import { Region } from "@chirpstack/chirpstack-api-grpc-web/common/common_pb";
import {
ListRegionsResponse,
RegionListItem,
} from "@chirpstack/chirpstack-api-grpc-web/api/internal_pb";
import { ListRegionsResponse, RegionListItem } from "@chirpstack/chirpstack-api-grpc-web/api/internal_pb";
import { getEnumName } from "../helpers";
import InternalStore from "../../stores/InternalStore";
@ -18,7 +15,6 @@ interface IState {
regions?: ListRegionsResponse;
}
class ListRegions extends Component<IProps, IState> {
constructor(props: IProps) {
super(props);
@ -65,9 +61,7 @@ class ListRegions extends Component<IProps, IState> {
title: "Name",
dataIndex: "name",
key: "name",
render: (text, record) => (
<Link to={`/regions/${text}`}>{text}</Link>
),
render: (text, record) => <Link to={`/regions/${text}`}>{text}</Link>,
},
{
title: "Region",

50
ui/src/views/regions/RegionDetails.tsx
View File

@ -6,10 +6,7 @@ import { Space, Breadcrumb, PageHeader, Card, Row, Col, List, Typography } from
import ReactMarkdown from "react-markdown";
import { Region } from "@chirpstack/chirpstack-api-grpc-web/common/common_pb";
import {
GetRegionRequest,
GetRegionResponse,
} from "@chirpstack/chirpstack-api-grpc-web/api/internal_pb";
import { GetRegionRequest, GetRegionResponse } from "@chirpstack/chirpstack-api-grpc-web/api/internal_pb";
import { getEnumName } from "../helpers";
import InternalStore from "../../stores/InternalStore";
@ -19,7 +16,7 @@ interface MatchParams {
}
interface IState {
region?: GetRegionResponse,
region?: GetRegionResponse;
}
interface IProps extends RouteComponentProps<MatchParams> {}
@ -56,7 +53,9 @@ class RegionDetails extends Component<IProps, IState> {
<span>Network Server</span>
</Breadcrumb.Item>
<Breadcrumb.Item>
<span><Link to="/regions">Regions</Link></span>
<span>
<Link to="/regions">Regions</Link>
</span>
</Breadcrumb.Item>
<Breadcrumb.Item>
<span>{this.props.match.params.name}</span>
@ -66,14 +65,14 @@ class RegionDetails extends Component<IProps, IState> {
title={this.props.match.params.name}
subTitle={`common-name: ${getEnumName(Region, this.state.region.getRegion())}`}
/>
{this.state.region.getUserInfo() !== "" && <Card>
<ReactMarkdown>
{this.state.region.getUserInfo()}
</ReactMarkdown>
</Card>}
{this.state.region.getUserInfo() !== "" && (
<Card>
<ReactMarkdown>{this.state.region.getUserInfo()}</ReactMarkdown>
</Card>
)}
<Row gutter={24}>
<Col span={12}>
<Space direction="vertical" style={{width: "100%"}} size="large">
<Space direction="vertical" style={{ width: "100%" }} size="large">
<Card title="Uplink channels">
<List
itemLayout="horizontal"
@ -91,7 +90,7 @@ class RegionDetails extends Component<IProps, IState> {
</Space>
</Col>
<Col span={12}>
<Space direction="vertical" style={{width: "100%"}} size="large">
<Space direction="vertical" style={{ width: "100%" }} size="large">
<Card title="Downlink">
<List
dataSource={[
@ -100,16 +99,35 @@ class RegionDetails extends Component<IProps, IState> {
["RX2 DR", this.state.region.getRx2Dr()],
["RX2 frequency", `${this.state.region.getRx2Frequency()} Hz`],
]}
renderItem={item => <List.Item><Typography.Text strong style={{width: "175px", display: "block", float: "left"}}>{item[0]}:</Typography.Text> {item[1]}</List.Item>}
renderItem={item => (
<List.Item>
<Typography.Text strong style={{ width: "175px", display: "block", float: "left" }}>
{item[0]}:
</Typography.Text>{" "}
{item[1]}
</List.Item>
)}
/>
</Card>
<Card title="Class-B">
<List
dataSource={[
["Ping-slot DR", this.state.region.getClassBPingSlotDr()],
["Ping-slot frequency", this.state.region.getClassBPingSlotFrequency() === 0 ? "default frequency or frequency hopping" : `${this.state.region.getClassBPingSlotFrequency()} Hz`],
[
"Ping-slot frequency",
this.state.region.getClassBPingSlotFrequency() === 0
? "default frequency or frequency hopping"
: `${this.state.region.getClassBPingSlotFrequency()} Hz`,
],
]}
renderItem={item => <List.Item><Typography.Text strong style={{width: "175px", display: "block", float: "left"}}>{item[0]}:</Typography.Text> {item[1]}</List.Item>}
renderItem={item => (
<List.Item>
<Typography.Text strong style={{ width: "175px", display: "block", float: "left" }}>
{item[0]}:
</Typography.Text>{" "}
{item[1]}
</List.Item>
)}
/>
</Card>
</Space>