-
Notifications
You must be signed in to change notification settings - Fork 310
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 #6639 from TheThingsNetwork/fix/packet-broker-view
Simplify Packet Broker settings
- Loading branch information
Showing
21 changed files
with
795 additions
and
445 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
11 changes: 11 additions & 0 deletions
11
cypress/fixtures/console/packet-broker/default-custom-policy.json
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,11 @@ | ||
| { | ||
| "updated_at": "2021-06-21T12:09:26.810087Z", | ||
| "uplink": { | ||
| "join_request": true, | ||
| "mac_data": false, | ||
| "application_data": true, | ||
| "signal_quality": false, | ||
| "localization": false | ||
| }, | ||
| "downlink": { "join_accept": true, "mac_data": false, "application_data": true } | ||
| } |
118 changes: 118 additions & 0 deletions
118
pkg/webui/console/components/default-routing-policy-form/index.js
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,118 @@ | ||
| // Copyright © 2023 The Things Network Foundation, The Things Industries B.V. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| import React, { useCallback, useState } from 'react' | ||
| import { Col, Row } from 'react-grid-system' | ||
| import { defineMessages } from 'react-intl' | ||
|
|
||
| import Form, { useFormContext } from '@ttn-lw/components/form' | ||
| import Checkbox from '@ttn-lw/components/checkbox' | ||
| import Radio from '@ttn-lw/components/radio-button' | ||
|
|
||
| import Message from '@ttn-lw/lib/components/message' | ||
|
|
||
| import sharedMessages from '@ttn-lw/lib/shared-messages' | ||
|
|
||
| import policyMessages from '@console/lib/packet-broker/messages' | ||
|
|
||
| const m = defineMessages({ | ||
| doNotUseADefaultPolicy: 'Do not use a default routing policy for this network', | ||
| }) | ||
|
|
||
| const useDefaultEncode = val => val === 'default' | ||
| const useDefaultDecode = val => (val ? 'default' : 'no-default') | ||
|
|
||
| const DefaultRoutingPolicyForm = () => { | ||
| const { values } = useFormContext() | ||
| const [useDefault, setUseDefault] = useState(values._use_default_policy || false) | ||
| const handlePolicySourceChange = useCallback(setUseDefault, [setUseDefault]) | ||
|
|
||
| return ( | ||
| <Row> | ||
| <Col md={12}> | ||
| <Form.Field | ||
| component={Radio.Group} | ||
| className="mb-ls-s" | ||
| name="_use_default_policy" | ||
| onChange={handlePolicySourceChange} | ||
| encode={useDefaultEncode} | ||
| decode={useDefaultDecode} | ||
| > | ||
| <Radio label={m.doNotUseADefaultPolicy} value="no-default" /> | ||
| <Radio label={sharedMessages.useDefaultPolicy} value="default" /> | ||
| </Form.Field> | ||
| </Col> | ||
| {useDefault && ( | ||
| <> | ||
| <Col md={6} xs={12}> | ||
| <Message content={sharedMessages.uplink} component="h4" className="mb-cs-xs" /> | ||
| <Form.Field | ||
| name="policy.uplink.join_request" | ||
| component={Checkbox} | ||
| label={policyMessages.joinRequest} | ||
| description={policyMessages.joinRequestDesc} | ||
| /> | ||
| <Form.Field | ||
| name="policy.uplink.mac_data" | ||
| component={Checkbox} | ||
| label={sharedMessages.macData} | ||
| description={policyMessages.macDataDesc} | ||
| /> | ||
| <Form.Field | ||
| name="policy.uplink.application_data" | ||
| component={Checkbox} | ||
| label={sharedMessages.appData} | ||
| description={policyMessages.applicationDataDesc} | ||
| /> | ||
| <Form.Field | ||
| name="policy.uplink.signal_quality" | ||
| component={Checkbox} | ||
| label={policyMessages.signalQualityInformation} | ||
| description={policyMessages.signalQualityInformationDesc} | ||
| /> | ||
| <Form.Field | ||
| name="policy.uplink.localization" | ||
| component={Checkbox} | ||
| label={policyMessages.localizationInformation} | ||
| description={policyMessages.localizationInformationDesc} | ||
| /> | ||
| </Col> | ||
| <Col sm={6} xs={12}> | ||
| <Message content={sharedMessages.downlink} component="h4" className="mb-cs-xs" /> | ||
| <Form.Field | ||
| name="policy.downlink.join_accept" | ||
| component={Checkbox} | ||
| label={sharedMessages.joinAccept} | ||
| description={policyMessages.joinAcceptDesc} | ||
| /> | ||
| <Form.Field | ||
| name="policy.downlink.mac_data" | ||
| component={Checkbox} | ||
| label={sharedMessages.macData} | ||
| description={policyMessages.macDataAllowDesc} | ||
| /> | ||
| <Form.Field | ||
| name="policy.downlink.application_data" | ||
| component={Checkbox} | ||
| label={sharedMessages.appData} | ||
| description={policyMessages.applicationDataAllowDesc} | ||
| /> | ||
| </Col> | ||
| </> | ||
| )} | ||
| </Row> | ||
| ) | ||
| } | ||
|
|
||
| export default DefaultRoutingPolicyForm |
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
Oops, something went wrong.