From 86706622968056a35a8c1fbe92e607595cab723e Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 16 Oct 2023 13:55:54 +0200
Subject: [PATCH 01/28] console: Refactor packet broker view

---
 .../components/routing-policy-form/index.js   |  44 +----
 .../admin-packet-broker.js                    | 187 ++++++++++--------
 .../default-routing-policy.js                 |  68 ++-----
 .../views/admin-packet-broker/messages.js     |  27 ++-
 pkg/webui/locales/en.json                     |  24 +--
 pkg/webui/locales/ja.json                     |  12 +-
 6 files changed, 149 insertions(+), 213 deletions(-)

diff --git a/pkg/webui/console/components/routing-policy-form/index.js b/pkg/webui/console/components/routing-policy-form/index.js
index 17453e8319..cee2254d36 100644
--- a/pkg/webui/console/components/routing-policy-form/index.js
+++ b/pkg/webui/console/components/routing-policy-form/index.js
@@ -16,10 +16,8 @@ import React, { useState, useCallback } from 'react'
 import { Col, Row } from 'react-grid-system'
 import { defineMessages } from 'react-intl'
 
-import Form from '@ttn-lw/components/form'
+import Form, { useFormContext } from '@ttn-lw/components/form'
 import Checkbox from '@ttn-lw/components/checkbox'
-import SubmitBar from '@ttn-lw/components/submit-bar'
-import SubmitButton from '@ttn-lw/components/submit-button'
 import Radio from '@ttn-lw/components/radio-button'
 
 import Message from '@ttn-lw/lib/components/message'
@@ -28,7 +26,6 @@ import RoutingPolicy from '@console/components/routing-policy'
 
 import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import Yup from '@ttn-lw/lib/yup'
 
 import { isValidPolicy } from '@console/lib/packet-broker/utils'
 import policyMessages from '@console/lib/packet-broker/messages'
@@ -36,36 +33,20 @@ import policyMessages from '@console/lib/packet-broker/messages'
 import style from './routing-policy-form.styl'
 
 const m = defineMessages({
-  saveDefaultPolicy: 'Save default policy',
   useDefaultPolicy: 'Use default routing policy for this network',
   useSpecificPolicy: 'Use network specific routing policy',
   doNotUseADefaultPolicy: 'Do not use a default routing policy for this network',
   doNotUseAPolicy: 'Do not use a routing policy for this network',
 })
 
-const validationSchema = Yup.object({
-  _use_default_policy: Yup.bool(),
-  policy: Yup.object({
-    uplink: Yup.object({}),
-    downlink: Yup.object({}),
-  }).when('_use_default_policy', { is: 'default', then: schema => schema.strip() }),
-})
-
 const policySourceEncode = val => val === 'default'
 const policySourceDecode = val => (val ? 'default' : 'specific')
 const useDefaultEncode = val => val === 'default'
 const useDefaultDecode = val => (val ? 'default' : 'no-default')
 
-const RoutingPolicyForm = ({
-  onSubmit,
-  initialValues,
-  error,
-  defaultPolicy,
-  networkLevel,
-  submitMessage,
-}) => {
-  const handleSubmit = useCallback(values => onSubmit(validationSchema.cast(values)), [onSubmit])
-  const [useDefault, setUseDefault] = useState(initialValues._use_default_policy || false)
+const RoutingPolicyForm = ({ defaultPolicy, networkLevel }) => {
+  const { values } = useFormContext()
+  const [useDefault, setUseDefault] = useState(values._use_default_policy || false)
   const handlePolicySourceChange = useCallback(setUseDefault, [setUseDefault])
   const hasDefaultPolicy = isValidPolicy(defaultPolicy)
 
@@ -73,12 +54,7 @@ const RoutingPolicyForm = ({
   const showPolicyCheckboxes = (useDefault && !networkLevel) || (!useDefault && networkLevel)
 
   return (
-    <Form
-      onSubmit={handleSubmit}
-      initialValues={initialValues}
-      error={error}
-      validationSchema={validationSchema}
-    >
+    <>
       <Row>
         <Col md={12}>
           {networkLevel ? (
@@ -182,30 +158,22 @@ const RoutingPolicyForm = ({
           </>
         )}
       </Row>
-      <SubmitBar>
-        <Form.Submit component={SubmitButton} message={submitMessage} />
-      </SubmitBar>
-    </Form>
+    </>
   )
 }
 
 RoutingPolicyForm.propTypes = {
   defaultPolicy: PropTypes.routingPolicy,
-  error: PropTypes.error,
   initialValues: PropTypes.shape({
     _use_default_policy: PropTypes.bool,
     policy: PropTypes.shape({}),
   }),
   networkLevel: PropTypes.bool,
-  onSubmit: PropTypes.func.isRequired,
-  submitMessage: PropTypes.message,
 }
 
 RoutingPolicyForm.defaultProps = {
-  error: undefined,
   networkLevel: false,
   defaultPolicy: undefined,
-  submitMessage: m.saveDefaultPolicy,
   initialValues: {
     _use_default_policy: false,
     policy: {
diff --git a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
index c5d01fc26b..32e832f3f0 100644
--- a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
+++ b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
@@ -22,12 +22,15 @@ import PacketBrokerLogo from '@assets/misc/packet-broker.svg'
 
 import Link from '@ttn-lw/components/link'
 import PageTitle from '@ttn-lw/components/page-title'
-import Icon from '@ttn-lw/components/icon'
 import Switch from '@ttn-lw/components/switch'
 import Tabs from '@ttn-lw/components/tabs'
 import PortalledModal from '@ttn-lw/components/modal/portalled'
-import Notification from '@ttn-lw/components/notification'
 import ErrorNotification from '@ttn-lw/components/error-notification'
+import Radio from '@ttn-lw/components/radio-button'
+import Form from '@ttn-lw/components/form'
+import toast from '@ttn-lw/components/toast'
+import SubmitBar from '@ttn-lw/components/submit-bar'
+import SubmitButton from '@ttn-lw/components/submit-button'
 
 import Message from '@ttn-lw/lib/components/message'
 import RequireRequest from '@ttn-lw/lib/components/require-request'
@@ -35,15 +38,18 @@ import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 
 import SubViewErrorComponent from '@console/views/sub-view-error'
 
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
+import Yup from '@ttn-lw/lib/yup'
 
-import { isNotEnabledError } from '@console/lib/packet-broker/utils'
+import { isNotEnabledError, isValidPolicy } from '@console/lib/packet-broker/utils'
 
 import {
   registerPacketBroker,
   deregisterPacketBroker,
   getHomeNetworkDefaultRoutingPolicy,
-  getHomeNetworkDefaultGatewayVisibility,
+  setHomeNetworkDefaultRoutingPolicy,
+  deleteHomeNetworkDefaultRoutingPolicy,
 } from '@console/store/actions/packet-broker'
 
 import {
@@ -51,17 +57,24 @@ import {
   selectRegisterEnabled,
   selectEnabled,
   selectListed,
-  selectInfo,
   selectInfoError,
+  selectHomeNetworkDefaultRoutingPolicy,
 } from '@console/store/selectors/packet-broker'
 
 import DefaultRoutingPolicyView from './default-routing-policy'
 import NetworkRoutingPoliciesView from './network-routing-policies'
-import DefaultGatewayVisibilityView from './default-gateway-visibility'
 import m from './messages'
 
 import style from './admin-packet-broker.styl'
 
+const validationSchema = Yup.object({
+  _use_default_policy: Yup.bool(),
+  policy: Yup.object({
+    uplink: Yup.object({}),
+    downlink: Yup.object({}),
+  }).when('_use_default_policy', { is: 'default', then: schema => schema.strip() }),
+})
+
 const PacketBroker = () => {
   const [activeTab, setActiveTab] = useState('default-routing-policy')
   const [deregisterModalVisible, setDeregisterModalVisible] = useState(false)
@@ -70,7 +83,6 @@ const PacketBroker = () => {
   const enabled = useSelector(selectEnabled)
   const [unlistModalVisible, setUnlistModalVisible] = useState(false)
   const listed = useSelector(selectListed)
-  const info = useSelector(selectInfo)
   const infoError = useSelector(selectInfoError)
   const dispatch = useDispatch()
   const showError = Boolean(infoError) && !isNotEnabledError(infoError)
@@ -113,11 +125,11 @@ const PacketBroker = () => {
 
   const tabs = [
     { title: m.defaultRoutingPolicy, link: '/admin-panel/packet-broker', name: 'default' },
-    {
+    /*     {
       title: m.defaultGatewayVisibility,
       link: '/admin-panel/packet-broker/default-gateway-visibility',
       name: 'default-gateway-visibility',
-    },
+    }, */
     {
       title: sharedMessages.networks,
       link: '/admin-panel/packet-broker/networks',
@@ -126,7 +138,43 @@ const PacketBroker = () => {
     },
   ]
 
-  const boldMessage = { b: msg => <b>{msg}</b> }
+  const defaultRoutingPolicy = useSelector(selectHomeNetworkDefaultRoutingPolicy)
+  const initialValues = {
+    _use_default_policy: isValidPolicy(defaultRoutingPolicy),
+    _routing_configuration: 'default',
+  }
+  initialValues.policy = initialValues._use_default_policy
+    ? defaultRoutingPolicy
+    : { uplink: {}, downlink: {} }
+  const [rountingConfig, setRoutingConfig] = useState(initialValues._routing_configuration)
+  const [formError, setFormError] = useState(undefined)
+  const handleDefaultRoutingPolicySubmit = useCallback(
+    async values => {
+      const vals = validationSchema.cast(values)
+      const { _use_default_policy, policy } = vals
+      try {
+        if (_use_default_policy) {
+          await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
+        } else {
+          await dispatch(attachPromise(deleteHomeNetworkDefaultRoutingPolicy()))
+        }
+        toast({
+          message: m.defaultRoutingPolicySet,
+          type: toast.types.SUCCESS,
+        })
+      } catch (error) {
+        setFormError(error)
+      }
+    },
+    [dispatch, setFormError],
+  )
+
+  const handleRoutingConfigChange = useCallback(
+    value => {
+      setRoutingConfig(value)
+    },
+    [setRoutingConfig],
+  )
 
   return (
     <Container>
@@ -138,29 +186,23 @@ const PacketBroker = () => {
             <img className={style.logo} src={PacketBrokerLogo} alt="Packet Broker" />
           </div>
           <div>
-            <Message
-              component="h4"
-              content={sharedMessages.furtherResources}
-              className={style.furtherResources}
-            />
+            <Message component="h4" content={m.learnMore} className={style.furtherResources} />
             <Link.DocLink path="/reference/packet-broker/" secondary>
-              Packet Broker documentation
+              Packet Broker
             </Link.DocLink>
             {' | '}
             <Link.Anchor href="https://www.packetbroker.net" external secondary>
               <Message content={m.packetBrokerWebsite} />
             </Link.Anchor>
-            {' | '}
-            <Link.Anchor href="https://status.packetbroker.net" external secondary>
-              <Message content={m.packetBrokerStatusPage} />
-            </Link.Anchor>
           </div>
           <hr className={style.hRule} />
-          <Message content={m.registrationStatus} component="h3" />
-          {!enabled && <Notification warning small content={m.packetBrokerDisabledDesc} />}
+          <Message content={m.whyNetworkPeeringTitle} component="h3" />
+          <Message content={m.whyNetworkPeeringText} className={style.info} component="p" />
+          <Message content={m.enbaling} className={style.info} />
+          <Message content={m.registrationStatus} component="h3" className="mt-cs-xxl" />
           {showError && <ErrorNotification small content={infoError} />}
           {enabled && (
-            <Row gutterWidth={48}>
+            <Row gutterWidth={48} className="mb-cs-xl">
               <Col md={4}>
                 {registerEnabled && (
                   <label
@@ -177,48 +219,6 @@ const PacketBroker = () => {
                     />
                   </label>
                 )}
-                {registered && (
-                  <div className={style.featureInfo}>
-                    {info.forwarder_enabled ? (
-                      <span data-test-id="feature-info-forwarder-enabled">
-                        <Icon icon="check" className="c-active" textPaddedRight />
-                        <Message
-                          content={m.forwarderEnabled}
-                          values={boldMessage}
-                          component="span"
-                        />
-                      </span>
-                    ) : (
-                      <span data-test-id="feature-info-forwarder-disabled">
-                        <Icon icon="close" className="c-error" textPaddedRight />
-                        <Message
-                          content={m.forwarderDisabled}
-                          values={boldMessage}
-                          component="span"
-                        />
-                      </span>
-                    )}
-                    {info.home_network_enabled ? (
-                      <span data-test-id="feature-info-home-network-enabled">
-                        <Icon icon="check" className="c-active" textPaddedRight />
-                        <Message
-                          content={m.homeNetworkEnabled}
-                          values={boldMessage}
-                          component="span"
-                        />
-                      </span>
-                    ) : (
-                      <span data-test-id="feature-info-forwarder-disabled">
-                        <Icon icon="close" className="c-error" textPaddedRight />
-                        <Message
-                          content={m.homeNetworkDisabled}
-                          values={boldMessage}
-                          component="span"
-                        />
-                      </span>
-                    )}
-                  </div>
-                )}
               </Col>
               <Col md={8} className={style.switchInfo}>
                 <Message
@@ -251,7 +251,6 @@ const PacketBroker = () => {
         {registered && (
           <>
             <Col md={12}>
-              <Message content={m.networkVisibility} component="h3" className={style.subTitle} />
               <Row gutterWidth={48}>
                 <Col md={4}>
                   <label className={style.toggleContainer}>
@@ -281,27 +280,53 @@ const PacketBroker = () => {
                   component="span"
                 />
               </PortalledModal>
-              <hr className={style.hRule} />
             </Col>
             <Col md={12} style={{ position: 'relative' }}>
-              <Tabs tabs={tabs} active={activeTab} onTabChange={setActiveTab} divider />
+              <Message
+                content={'Routing configuration'}
+                component="h3"
+                className={style.subTitle}
+              />
               <RequireRequest
-                requestAction={[
-                  getHomeNetworkDefaultRoutingPolicy(),
-                  getHomeNetworkDefaultGatewayVisibility(),
-                ]}
+                requestAction={getHomeNetworkDefaultRoutingPolicy()}
                 errorRenderFunction={SubViewErrorComponent}
                 spinnerProps={{ inline: true, center: true, className: 'mt-ls-s' }}
               >
-                <Routes>
-                  <Route index Component={DefaultRoutingPolicyView} />
-                  <Route
-                    path="default-gateway-visibility"
-                    Component={DefaultGatewayVisibilityView}
-                  />
-                  <Route path="networks/*" Component={NetworkRoutingPoliciesView} />
-                  <Route path="*" component={GenericNotFound} />
-                </Routes>
+                <Form
+                  onSubmit={handleDefaultRoutingPolicySubmit}
+                  initialValues={initialValues}
+                  error={formError}
+                >
+                  <Form.Field
+                    component={Radio.Group}
+                    className="mb-cs-xl"
+                    name="_routing_configuration"
+                    onChange={handleRoutingConfigChange}
+                  >
+                    <Radio
+                      label="Forward traffic to all networks registered in Packet Broker"
+                      value="default"
+                    />
+                    <Radio
+                      label="Forward traffic to The Things Stack Sandbox (community network) only"
+                      value="ttn"
+                    />
+                    <Radio label="Use custom routing policies" value="custom" />
+                  </Form.Field>
+                  {rountingConfig === 'custom' && (
+                    <>
+                      <Tabs tabs={tabs} active={activeTab} onTabChange={setActiveTab} divider />
+                      <Routes>
+                        <Route index Component={DefaultRoutingPolicyView} />
+                        <Route path="networks/*" Component={NetworkRoutingPoliciesView} />
+                        <Route path="*" component={GenericNotFound} />
+                      </Routes>
+                    </>
+                  )}
+                  <SubmitBar align="end">
+                    <Form.Submit component={SubmitButton} message={'Save routing configuration'} />
+                  </SubmitBar>
+                </Form>
               </RequireRequest>
             </Col>
           </>
diff --git a/pkg/webui/console/views/admin-packet-broker/default-routing-policy.js b/pkg/webui/console/views/admin-packet-broker/default-routing-policy.js
index 7bfbb9bb44..881ccbbec2 100644
--- a/pkg/webui/console/views/admin-packet-broker/default-routing-policy.js
+++ b/pkg/webui/console/views/admin-packet-broker/default-routing-policy.js
@@ -12,72 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { useCallback, useState } from 'react'
+import React from 'react'
 import { Col } from 'react-grid-system'
-import { useSelector, useDispatch } from 'react-redux'
-
-import toast from '@ttn-lw/components/toast'
 
 import Message from '@ttn-lw/lib/components/message'
 
 import RoutingPolicyForm from '@console/components/routing-policy-form'
 
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-
-import { isValidPolicy } from '@console/lib/packet-broker/utils'
-
-import {
-  setHomeNetworkDefaultRoutingPolicy,
-  deleteHomeNetworkDefaultRoutingPolicy,
-} from '@console/store/actions/packet-broker'
-
-import { selectHomeNetworkDefaultRoutingPolicy } from '@console/store/selectors/packet-broker'
-
 import m from './messages'
 
 import style from './admin-packet-broker.styl'
 
-const DefaultRoutingPolicyView = () => {
-  const dispatch = useDispatch()
-  const defaultRoutingPolicy = useSelector(selectHomeNetworkDefaultRoutingPolicy)
-  const initialValues = { _use_default_policy: isValidPolicy(defaultRoutingPolicy) }
-  initialValues.policy = initialValues._use_default_policy
-    ? defaultRoutingPolicy
-    : { uplink: {}, downlink: {} }
-  const [formError, setFormError] = useState(undefined)
-  const handleDefaultRoutingPolicySubmit = useCallback(
-    async ({ _use_default_policy, policy }) => {
-      try {
-        if (_use_default_policy) {
-          await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
-        } else {
-          await dispatch(attachPromise(deleteHomeNetworkDefaultRoutingPolicy()))
-        }
-        toast({
-          message: m.defaultRoutingPolicySet,
-          type: toast.types.SUCCESS,
-        })
-      } catch (error) {
-        setFormError(error)
-      }
-    },
-    [dispatch, setFormError],
-  )
-
-  return (
-    <Col md={12}>
-      <Message
-        content={m.routingPolicyInformation}
-        component="p"
-        className={style.routingPolicyInformation}
-      />
-      <RoutingPolicyForm
-        onSubmit={handleDefaultRoutingPolicySubmit}
-        initialValues={initialValues}
-        error={formError}
-      />
-    </Col>
-  )
-}
+const DefaultRoutingPolicyView = () => (
+  <Col md={12}>
+    <Message
+      content={m.routingPolicyInformation}
+      component="p"
+      className={style.routingPolicyInformation}
+    />
+    <RoutingPolicyForm />
+  </Col>
+)
 
 export default DefaultRoutingPolicyView
diff --git a/pkg/webui/console/views/admin-packet-broker/messages.js b/pkg/webui/console/views/admin-packet-broker/messages.js
index bdcc4304eb..1b77167270 100644
--- a/pkg/webui/console/views/admin-packet-broker/messages.js
+++ b/pkg/webui/console/views/admin-packet-broker/messages.js
@@ -16,25 +16,22 @@ import { defineMessages } from 'react-intl'
 
 export default defineMessages({
   packetBrokerInfoText:
-    'Packet Broker can be used to exchange traffic (peering) with other LoRaWAN networks to share coverage and improve the overall network performance.',
+    'Packet Broker is a service by The Things Industries to facilitate peering between LoRaWAN networks. This extends network coverage and improves overall network performance and device battery lifetime.',
   packetBrokerWebsite: 'Packet Broker website',
-  registrationStatus: 'Registration status',
-  registerNetwork: 'Register network',
-  networkVisibility: 'Network visibility',
+  learnMore: 'Learn more',
+  whyNetworkPeeringTitle: 'Why choose network peering?',
+  whyNetworkPeeringText:
+    'Since LoRaWAN uses shared spectrum, gateways receive messages from devices registered on other LoRaWAN networks. Instead of discarding this traffic, these messages can be forwarded via Packet Broker to the home network of these devices. This extends coverage of networks and allows devices to use higher data rates that reduce channel utilization and increase battery life. No sensitive data is exposed as LoRaWAN is end-to-end encrypted and integrity protected.',
+  enbaling:
+    'Enable forwarding via the options below or define custom routing policies. In the Networks tab below, you can see which other networks are forwarding data to this network.',
+  registrationStatus: 'Setup',
+  registerNetwork: 'Enable Packet Broker',
   packetBrokerRegistrationDesc:
-    "To enable peering from or to your home network, it is necessary to register your network. This will make your network known to Packet Broker and enable you to configure your network's peering behavior.",
-  packetBrokerDisabledDesc:
-    'The Things Stack is not set up to use Packet Broker. Please refer to the documentation link above for instructions on how to set up The Things Stack for peering with Packet Broker.',
-  packetBrokerRegistrationDisabledDesc:
-    'The Things Stack is set up to use Packet Broker, but security settings disallow (de)registering your network here. Please contact Packet Broker to manage your registration. Refer to the documentation link above for contact information.',
+    'Enabling will allow other networks to send traffic to you as well as you forwarding traffic to them, based on the exact routing policy.',
   network: 'Network: {network}',
-  homeNetworkEnabled: 'Home network <b>enabled</b>',
-  homeNetworkDisabled: 'Home network <b>disabled</b>',
-  forwarderEnabled: 'Forwarder <b>enabled</b>',
-  forwarderDisabled: 'Forwarder <b>disabled</b>',
-  listNetwork: 'List network publicly',
+  listNetwork: 'List my network in Packet Broker publicly',
   listNetworkDesc:
-    'Listing your network allows other network administrators to see your network. This allows them to easily configure routing policies with your network.',
+    'Public listing will make it easier for other network operators to set up routing policies for your network. Hence public listing is generally recommended.',
   unlistNetwork: 'Unlist this network',
   confirmUnlist: 'Confirm unlist',
   unlistModal:
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index b1d61a2403..91cb74cec1 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -353,7 +353,6 @@
   "console.components.pubsub-form.messages.replacePubsub": "Replace Pub/Sub",
   "console.components.pubsub-form.messages.useSecureConnection": "Use secure connection",
   "console.components.pubsub-form.messages.pubsubsDescription": "The Pub/Sub integration allows the Application Server to publish and subscribe to topics, using The Things Stack built-in MQTT client or NATS client. Learn more in our <Link>Pub/Sub guide</Link>.",
-  "console.components.routing-policy-form.index.saveDefaultPolicy": "Save default policy",
   "console.components.routing-policy-form.index.useDefaultPolicy": "Use default routing policy for this network",
   "console.components.routing-policy-form.index.useSpecificPolicy": "Use network specific routing policy",
   "console.components.routing-policy-form.index.doNotUseADefaultPolicy": "Do not use a default routing policy for this network",
@@ -677,21 +676,18 @@
   "console.store.middleware.logics.users.errEmailValidationActionSuccess": "Validation email sent (please also check your spam folder)",
   "console.store.middleware.logics.users.errEmailValidationActionFailure": "There was an error and the validation email could not be sent.",
   "console.store.middleware.logics.users.errEmailValidationAlreadySent": "A validation email has already been sent recently to your email address. Please also check your spam folder.",
-  "console.views.admin-packet-broker.messages.packetBrokerInfoText": "Packet Broker can be used to exchange traffic (peering) with other LoRaWAN networks to share coverage and improve the overall network performance.",
+  "console.views.admin-packet-broker.messages.packetBrokerInfoText": "Packet Broker is a service by The Things Industries to facilitate peering between LoRaWAN networks. This extends network coverage and improves overall network performance and device battery lifetime.",
   "console.views.admin-packet-broker.messages.packetBrokerWebsite": "Packet Broker website",
-  "console.views.admin-packet-broker.messages.registrationStatus": "Registration status",
-  "console.views.admin-packet-broker.messages.registerNetwork": "Register network",
-  "console.views.admin-packet-broker.messages.networkVisibility": "Network visibility",
-  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "To enable peering from or to your home network, it is necessary to register your network. This will make your network known to Packet Broker and enable you to configure your network's peering behavior.",
-  "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "The Things Stack is not set up to use Packet Broker. Please refer to the documentation link above for instructions on how to set up The Things Stack for peering with Packet Broker.",
-  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDisabledDesc": "The Things Stack is set up to use Packet Broker, but security settings disallow (de)registering your network here. Please contact Packet Broker to manage your registration. Refer to the documentation link above for contact information.",
+  "console.views.admin-packet-broker.messages.learnMore": "Learn more",
+  "console.views.admin-packet-broker.messages.whyNetworkPeeringTitle": "Why choose network peering?",
+  "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "Since LoRaWAN uses shared spectrum, gateways receive messages from devices registered on other LoRaWAN networks. Instead of discarding this traffic, these messages can be forwarded via Packet Broker to the home network of these devices. This extends coverage of networks and allows devices to use higher data rates that reduce channel utilization and increase battery life. No sensitive data is exposed as LoRaWAN is end-to-end encrypted and integrity protected.",
+  "console.views.admin-packet-broker.messages.enbaling": "Enable forwarding via the options below or define custom routing policies. In the Networks tab below, you can see which other networks are forwarding data to this network.",
+  "console.views.admin-packet-broker.messages.registrationStatus": "Setup",
+  "console.views.admin-packet-broker.messages.registerNetwork": "Enable Packet Broker",
+  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "Enabling will allow other networks to send traffic to you as well as you forwarding traffic to them, based on the exact routing policy.",
   "console.views.admin-packet-broker.messages.network": "Network: {network}",
-  "console.views.admin-packet-broker.messages.homeNetworkEnabled": "Home network <b>enabled</b>",
-  "console.views.admin-packet-broker.messages.homeNetworkDisabled": "Home network <b>disabled</b>",
-  "console.views.admin-packet-broker.messages.forwarderEnabled": "Forwarder <b>enabled</b>",
-  "console.views.admin-packet-broker.messages.forwarderDisabled": "Forwarder <b>disabled</b>",
-  "console.views.admin-packet-broker.messages.listNetwork": "List network publicly",
-  "console.views.admin-packet-broker.messages.listNetworkDesc": "Listing your network allows other network administrators to see your network. This allows them to easily configure routing policies with your network.",
+  "console.views.admin-packet-broker.messages.listNetwork": "List my network in Packet Broker publicly",
+  "console.views.admin-packet-broker.messages.listNetworkDesc": "Public listing will make it easier for other network operators to set up routing policies for your network. Hence public listing is generally recommended.",
   "console.views.admin-packet-broker.messages.unlistNetwork": "Unlist this network",
   "console.views.admin-packet-broker.messages.confirmUnlist": "Confirm unlist",
   "console.views.admin-packet-broker.messages.Are you sure you want to unlist your network in Packet Broker?{lineBreak}This will hide your network. Other network administrators will not be able to see your network to configure routing policies.": "Are you sure you want to unlist your network in Packet Broker?{lineBreak}This will hide your network. Other network administrators will not be able to see your network to configure routing policies.",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index bcac6340bf..0ce757f864 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -353,7 +353,6 @@
   "console.components.pubsub-form.messages.replacePubsub": "Pub/Subを置き換え",
   "console.components.pubsub-form.messages.useSecureConnection": "安全な接続を使用",
   "console.components.pubsub-form.messages.pubsubsDescription": "Pub/Sub統合により、The Things Stack内蔵のMQTTクライアントまたはNATSクライアントを使用して、アプリケーションサーバーがトピックを公開および購読することができます。詳しくは、<リンク>Pub/Subガイド</リンク>をご覧ください",
-  "console.components.routing-policy-form.index.saveDefaultPolicy": "デフォルトポリシーの保存",
   "console.components.routing-policy-form.index.useDefaultPolicy": "このネットワークでデフォルトのルーティングポリシーを使用",
   "console.components.routing-policy-form.index.useSpecificPolicy": "ネットワーク固有のルーティングポリシーを使用",
   "console.components.routing-policy-form.index.doNotUseADefaultPolicy": "このネットワークでは、デフォルトのルーティングポリシーを使用しないでください",
@@ -679,17 +678,14 @@
   "console.store.middleware.logics.users.errEmailValidationAlreadySent": "最近、あなたのメールアドレスに確認メールが送信されました。迷惑メールフォルダも確認してください。",
   "console.views.admin-packet-broker.messages.packetBrokerInfoText": "Packet Brokerは、他のLoRaWANネットワークとトラフィックを交換（ピアリング）することで、カバレッジを共有し、ネットワーク全体のパフォーマンスを向上させるために使用することができます",
   "console.views.admin-packet-broker.messages.packetBrokerWebsite": "Packer Brokerのサイト",
+  "console.views.admin-packet-broker.messages.learnMore": "",
+  "console.views.admin-packet-broker.messages.whyNetworkPeeringTitle": "",
+  "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "",
+  "console.views.admin-packet-broker.messages.enbaling": "",
   "console.views.admin-packet-broker.messages.registrationStatus": "登録状況",
   "console.views.admin-packet-broker.messages.registerNetwork": "ネットワーク登録",
-  "console.views.admin-packet-broker.messages.networkVisibility": "ネットワークの可視化",
   "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "ご自宅のネットワークから、またはご自宅のネットワークへのピアリングを可能にするには、ご自宅のネットワークを登録する必要があります。これにより、お客様のネットワークがPacket Brokerに認識され、お客様のネットワークのピアリング動作を設定することができます",
-  "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "The Things Stackは、Packet Brokerを使用するための設定はされていません。Packet BrokerとピアリングするためのThe Things Stackのセットアップ方法については、上記のドキュメントリンクを参照してください",
-  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDisabledDesc": "The Things Stackは、Packet Brokerを使用するように設定されていますが、セキュリティの設定により、ここでネットワークを登録することはできません（解除）。登録の管理は、Packet Brokerにお問い合わせください。連絡先については、上記のドキュメントリンクを参照してください",
   "console.views.admin-packet-broker.messages.network": "ネットワーク: {network}",
-  "console.views.admin-packet-broker.messages.homeNetworkEnabled": "ホームネットワーク<b>有効</b>",
-  "console.views.admin-packet-broker.messages.homeNetworkDisabled": "ホームネットワーク<b>無効</b>",
-  "console.views.admin-packet-broker.messages.forwarderEnabled": "フォワ―ダ―ネットワーク <b>有効</b>",
-  "console.views.admin-packet-broker.messages.forwarderDisabled": "フォワ―ダ―ネットワーク <b>無効</b>",
   "console.views.admin-packet-broker.messages.listNetwork": "ネットワーク公開で一覧表示",
   "console.views.admin-packet-broker.messages.listNetworkDesc": "ネットワークをリストアップすることで、他のネットワーク管理者があなたのネットワークを見ることができます。これにより、他のネットワーク管理者は、あなたのネットワークでルーティングポリシーを簡単に設定することができます",
   "console.views.admin-packet-broker.messages.unlistNetwork": "このネットワークをアンリスト化",

From 0cf3251f193e4a35aa365cdd136d6482961b4e6b Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Wed, 18 Oct 2023 11:53:13 +0200
Subject: [PATCH 02/28] console: Determine initial values and submit form

---
 .../console/store/actions/packet-broker.js    |  15 +++
 .../store/middleware/logics/packet-broker.js  |  29 +++++
 .../admin-packet-broker.js                    | 114 +++++++++++++++---
 .../views/admin-packet-broker/messages.js     |   6 +-
 4 files changed, 146 insertions(+), 18 deletions(-)

diff --git a/pkg/webui/console/store/actions/packet-broker.js b/pkg/webui/console/store/actions/packet-broker.js
index fc90e5b136..640826f679 100644
--- a/pkg/webui/console/store/actions/packet-broker.js
+++ b/pkg/webui/console/store/actions/packet-broker.js
@@ -210,6 +210,21 @@ export const [
   },
 ] = createRequestActions(DELETE_HOME_NETWORK_ROUTING_POLICY_BASE, (id, policy) => ({ id, policy }))
 
+export const DELETE_ALL_HOME_NETWORK_ROUTING_POLICIES_BASE =
+  'DELETE_ALL_HOME_NETWORK_ROUTING_POLICIES'
+export const [
+  {
+    request: DELETE_ALL_HOME_NETWORK_ROUTING_POLICIES,
+    success: DELETE_ALL_HOME_NETWORK_ROUTING_POLICIES_SUCCESS,
+    failure: DELETE_ALL_HOME_NETWORK_ROUTING_POLICIES_FAILURE,
+  },
+  {
+    request: deleteAllHomeNetworkRoutingPolicies,
+    success: deleteAllHomeNetworkRoutingPoliciesSuccess,
+    failure: deleteAllHomeNetworkRoutingPoliciesFailure,
+  },
+] = createRequestActions(DELETE_ALL_HOME_NETWORK_ROUTING_POLICIES_BASE, ids => ({ ids }))
+
 export const GET_HOME_NETWORK_ROUTING_POLICIES_BASE = 'GET_HOME_NETWORK_ROUTING_POLICIES'
 export const [
   {
diff --git a/pkg/webui/console/store/middleware/logics/packet-broker.js b/pkg/webui/console/store/middleware/logics/packet-broker.js
index 1eeed2ac8f..edb59ec395 100644
--- a/pkg/webui/console/store/middleware/logics/packet-broker.js
+++ b/pkg/webui/console/store/middleware/logics/packet-broker.js
@@ -289,6 +289,34 @@ const deletePacketBrokerHomeNetworkPolicyLogic = createRequestLogic({
   },
 })
 
+const deleteAllPacketBrokerHomeNetworkPoliciesLogic = createRequestLogic({
+  type: packetBroker.DELETE_ALL_HOME_NETWORK_ROUTING_POLICIES,
+  process: async ({ action }) => {
+    const {
+      payload: { ids },
+    } = action
+
+    try {
+      await Promise.all(
+        ids.map(async id => {
+          const ids = extractPacketBrokerIdsFromCombinedId(id)
+          if (typeof ids === 'number') {
+            return tts.PacketBrokerAgent.deleteHomeNetworkRoutingPolicy(ids)
+          }
+
+          return tts.PacketBrokerAgent.deleteHomeNetworkRoutingPolicy(ids.net_id, ids.tenant_id)
+        }),
+      )
+
+      return ids
+    } catch (error) {
+      if (!isNotFoundError(error)) {
+        throw error
+      }
+    }
+  },
+})
+
 const getDefaultGatewayVisibilityLogic = createRequestLogic({
   type: packetBroker.GET_HOME_NETWORK_DEFAULT_GATEWAY_VISIBILITY,
   process: async () => {
@@ -346,6 +374,7 @@ export default [
   getPacketBrokerHomeNetworkPoliciesLogic,
   setPacketBrokerHomeNetworkPolicyLogic,
   deletePacketBrokerHomeNetworkPolicyLogic,
+  deleteAllPacketBrokerHomeNetworkPoliciesLogic,
   getDefaultGatewayVisibilityLogic,
   setDefaultGatewayVisibilityLogic,
   deleteDefaultGatewayVisibilityLogic,
diff --git a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
index 32e832f3f0..975b89abc1 100644
--- a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
+++ b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
@@ -17,6 +17,7 @@ import { Container, Col, Row } from 'react-grid-system'
 import { useSelector, useDispatch } from 'react-redux'
 import { Routes, Route } from 'react-router-dom'
 import classnames from 'classnames'
+import { isEqual } from 'lodash'
 
 import PacketBrokerLogo from '@assets/misc/packet-broker.svg'
 
@@ -50,6 +51,10 @@ import {
   getHomeNetworkDefaultRoutingPolicy,
   setHomeNetworkDefaultRoutingPolicy,
   deleteHomeNetworkDefaultRoutingPolicy,
+  setHomeNetworkRoutingPolicy,
+  getHomeNetworkRoutingPolicies,
+  deleteAllHomeNetworkRoutingPolicies,
+  getPacketBrokerNetworksList,
 } from '@console/store/actions/packet-broker'
 
 import {
@@ -59,6 +64,8 @@ import {
   selectListed,
   selectInfoError,
   selectHomeNetworkDefaultRoutingPolicy,
+  selectPacketBrokerHomeNetworkPoliciesStore,
+  selectPacketBrokerNetworks,
 } from '@console/store/selectors/packet-broker'
 
 import DefaultRoutingPolicyView from './default-routing-policy'
@@ -68,6 +75,7 @@ import m from './messages'
 import style from './admin-packet-broker.styl'
 
 const validationSchema = Yup.object({
+  _routing_configuration: Yup.string().oneOf(['all_networks', 'ttn', 'custom']),
   _use_default_policy: Yup.bool(),
   policy: Yup.object({
     uplink: Yup.object({}),
@@ -75,6 +83,29 @@ const validationSchema = Yup.object({
   }).when('_use_default_policy', { is: 'default', then: schema => schema.strip() }),
 })
 
+const peerWithEveryNetworkPolicy = {
+  uplink: {
+    join_request: true,
+    mac_data: true,
+    application_data: true,
+    signal_quality: true,
+    localization: true,
+  },
+  downlink: {
+    join_accept: true,
+    mac_data: true,
+    application_data: true,
+  },
+}
+
+const TTN_NET_ID = '19'
+const peerWithEveryNetwork = policy =>
+  isEqual(policy.uplink, peerWithEveryNetworkPolicy.uplink) &&
+  isEqual(policy.downlink, peerWithEveryNetworkPolicy.downlink)
+
+const onlyTtn = policies =>
+  Object.keys(policies).length === 1 && Object.keys(policies).includes(TTN_NET_ID)
+
 const PacketBroker = () => {
   const [activeTab, setActiveTab] = useState('default-routing-policy')
   const [deregisterModalVisible, setDeregisterModalVisible] = useState(false)
@@ -125,11 +156,6 @@ const PacketBroker = () => {
 
   const tabs = [
     { title: m.defaultRoutingPolicy, link: '/admin-panel/packet-broker', name: 'default' },
-    /*     {
-      title: m.defaultGatewayVisibility,
-      link: '/admin-panel/packet-broker/default-gateway-visibility',
-      name: 'default-gateway-visibility',
-    }, */
     {
       title: sharedMessages.networks,
       link: '/admin-panel/packet-broker/networks',
@@ -139,25 +165,46 @@ const PacketBroker = () => {
   ]
 
   const defaultRoutingPolicy = useSelector(selectHomeNetworkDefaultRoutingPolicy)
+  const routingPolicies = useSelector(selectPacketBrokerHomeNetworkPoliciesStore)
+  const networkList = useSelector(selectPacketBrokerNetworks)
   const initialValues = {
     _use_default_policy: isValidPolicy(defaultRoutingPolicy),
-    _routing_configuration: 'default',
+    _routing_configuration:
+      peerWithEveryNetwork(defaultRoutingPolicy) && isValidPolicy(defaultRoutingPolicy)
+        ? 'all_networks'
+        : onlyTtn(routingPolicies) && !isValidPolicy(defaultRoutingPolicy)
+        ? 'ttn'
+        : 'custom',
   }
   initialValues.policy = initialValues._use_default_policy
     ? defaultRoutingPolicy
     : { uplink: {}, downlink: {} }
-  const [rountingConfig, setRoutingConfig] = useState(initialValues._routing_configuration)
+
+  const [routingConfig, setRoutingConfig] = useState(undefined)
   const [formError, setFormError] = useState(undefined)
+
   const handleDefaultRoutingPolicySubmit = useCallback(
     async values => {
       const vals = validationSchema.cast(values)
-      const { _use_default_policy, policy } = vals
+      const { _routing_configuration, _use_default_policy, policy } = vals
+
       try {
-        if (_use_default_policy) {
+        if (_routing_configuration === 'ttn') {
+          const ids = networkList.map(network =>
+            'tenant_id' in network.id
+              ? `${network.id.net_id}/${network.id.tenant_id}`
+              : network.id.net_id,
+          )
+
+          await dispatch(attachPromise(deleteHomeNetworkDefaultRoutingPolicy()))
+          await dispatch(attachPromise(deleteAllHomeNetworkRoutingPolicies(ids)))
+          await dispatch(attachPromise(setHomeNetworkRoutingPolicy(TTN_NET_ID, policy)))
+        } else if (_use_default_policy || _routing_configuration === 'all_networks') {
           await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
         } else {
           await dispatch(attachPromise(deleteHomeNetworkDefaultRoutingPolicy()))
         }
+
         toast({
           message: m.defaultRoutingPolicySet,
           type: toast.types.SUCCESS,
@@ -166,7 +213,7 @@ const PacketBroker = () => {
         setFormError(error)
       }
     },
-    [dispatch, setFormError],
+    [dispatch, setFormError, networkList],
   )
 
   const handleRoutingConfigChange = useCallback(
@@ -176,6 +223,38 @@ const PacketBroker = () => {
     [setRoutingConfig],
   )
 
+  const handleSetPolicies = useCallback(({ setValues }, { value }) => {
+    if (value !== 'custom') {
+      return setValues(values => ({
+        ...values,
+        _routing_configuration: value,
+        policy: {
+          uplink: {
+            join_request: true,
+            mac_data: true,
+            application_data: true,
+            signal_quality: true,
+            localization: true,
+          },
+          downlink: {
+            join_accept: true,
+            mac_data: true,
+            application_data: true,
+          },
+        },
+      }))
+    }
+
+    return setValues(values => ({
+      ...values,
+      _routing_configuration: value,
+    }))
+  }, [])
+
+  const showPolicyCheckboxes = routingConfig
+    ? routingConfig === 'custom'
+    : initialValues._routing_configuration === 'custom'
+
   return (
     <Container>
       <Row>
@@ -199,7 +278,7 @@ const PacketBroker = () => {
           <Message content={m.whyNetworkPeeringTitle} component="h3" />
           <Message content={m.whyNetworkPeeringText} className={style.info} component="p" />
           <Message content={m.enbaling} className={style.info} />
-          <Message content={m.registrationStatus} component="h3" className="mt-cs-xxl" />
+          <Message content={m.setup} component="h3" className="mt-cs-xxl" />
           {showError && <ErrorNotification small content={infoError} />}
           {enabled && (
             <Row gutterWidth={48} className="mb-cs-xl">
@@ -210,7 +289,7 @@ const PacketBroker = () => {
                       [style.disabled]: !enabled || !registerEnabled,
                     })}
                   >
-                    <Message content={m.registerNetwork} component="span" />
+                    <Message content={m.enablePacketBroker} component="span" />
                     <Switch
                       onChange={handleRegisterChange}
                       checked={registered}
@@ -288,7 +367,11 @@ const PacketBroker = () => {
                 className={style.subTitle}
               />
               <RequireRequest
-                requestAction={getHomeNetworkDefaultRoutingPolicy()}
+                requestAction={[
+                  getHomeNetworkDefaultRoutingPolicy(),
+                  getHomeNetworkRoutingPolicies(),
+                  getPacketBrokerNetworksList(),
+                ]}
                 errorRenderFunction={SubViewErrorComponent}
                 spinnerProps={{ inline: true, center: true, className: 'mt-ls-s' }}
               >
@@ -302,10 +385,11 @@ const PacketBroker = () => {
                     className="mb-cs-xl"
                     name="_routing_configuration"
                     onChange={handleRoutingConfigChange}
+                    valueSetter={handleSetPolicies}
                   >
                     <Radio
                       label="Forward traffic to all networks registered in Packet Broker"
-                      value="default"
+                      value="all_networks"
                     />
                     <Radio
                       label="Forward traffic to The Things Stack Sandbox (community network) only"
@@ -313,7 +397,7 @@ const PacketBroker = () => {
                     />
                     <Radio label="Use custom routing policies" value="custom" />
                   </Form.Field>
-                  {rountingConfig === 'custom' && (
+                  {showPolicyCheckboxes && (
                     <>
                       <Tabs tabs={tabs} active={activeTab} onTabChange={setActiveTab} divider />
                       <Routes>
diff --git a/pkg/webui/console/views/admin-packet-broker/messages.js b/pkg/webui/console/views/admin-packet-broker/messages.js
index 1b77167270..9f17501e1a 100644
--- a/pkg/webui/console/views/admin-packet-broker/messages.js
+++ b/pkg/webui/console/views/admin-packet-broker/messages.js
@@ -23,9 +23,9 @@ export default defineMessages({
   whyNetworkPeeringText:
     'Since LoRaWAN uses shared spectrum, gateways receive messages from devices registered on other LoRaWAN networks. Instead of discarding this traffic, these messages can be forwarded via Packet Broker to the home network of these devices. This extends coverage of networks and allows devices to use higher data rates that reduce channel utilization and increase battery life. No sensitive data is exposed as LoRaWAN is end-to-end encrypted and integrity protected.',
   enbaling:
-    'Enable forwarding via the options below or define custom routing policies. In the Networks tab below, you can see which other networks are forwarding data to this network.',
-  registrationStatus: 'Setup',
-  registerNetwork: 'Enable Packet Broker',
+    'Enable forwarding via the options below or define custom routing policies. In the Networks tab below (visible by selecting the option "Use custom routing policies"), you can see which other networks are forwarding data to this network.',
+  setup: 'Setup',
+  enablePacketBroker: 'Enable Packet Broker',
   packetBrokerRegistrationDesc:
     'Enabling will allow other networks to send traffic to you as well as you forwarding traffic to them, based on the exact routing policy.',
   network: 'Network: {network}',

From 9fca6e6381402ccdb9b8fd6402c8160c1f8a68a6 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Wed, 18 Oct 2023 11:54:10 +0200
Subject: [PATCH 03/28] console: Separate the forms

---
 .../default-routing-policy-form/index.js      | 161 ++++++++++++++++++
 .../components/routing-policy-form/index.js   |  89 +++++-----
 .../default-routing-policy.js                 |   4 +-
 3 files changed, 210 insertions(+), 44 deletions(-)
 create mode 100644 pkg/webui/console/components/default-routing-policy-form/index.js

diff --git a/pkg/webui/console/components/default-routing-policy-form/index.js b/pkg/webui/console/components/default-routing-policy-form/index.js
new file mode 100644
index 0000000000..9a1b993ada
--- /dev/null
+++ b/pkg/webui/console/components/default-routing-policy-form/index.js
@@ -0,0 +1,161 @@
+// Copyright © 2021 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, { useState, useCallback } 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 PropTypes from '@ttn-lw/lib/prop-types'
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import policyMessages from '@console/lib/packet-broker/messages'
+
+import style from './routing-policy-form.styl'
+
+const m = defineMessages({
+  useDefaultPolicy: 'Use default routing policy for this network',
+  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])
+
+  const showPolicyCheckboxes = useDefault
+
+  return (
+    <>
+      <Row>
+        <Col md={12}>
+          <Form.Field
+            component={Radio.Group}
+            className={style.policySource}
+            name="_use_default_policy"
+            onChange={handlePolicySourceChange}
+            encode={useDefaultEncode}
+            decode={useDefaultDecode}
+          >
+            <Radio label={m.doNotUseADefaultPolicy} value="no-default" />
+            <Radio label={m.useDefaultPolicy} value="default" />
+          </Form.Field>
+        </Col>
+        {showPolicyCheckboxes && (
+          <>
+            <Col md={6} xs={12}>
+              <Message
+                content={sharedMessages.uplink}
+                component="h4"
+                className={style.directionHeader}
+              />
+              <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={policyMessages.macData}
+                description={policyMessages.macDataDesc}
+              />
+              <Form.Field
+                name="policy.uplink.application_data"
+                component={Checkbox}
+                label={policyMessages.applicationData}
+                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={style.directionHeader}
+              />
+              <Form.Field
+                name="policy.downlink.join_accept"
+                component={Checkbox}
+                label={policyMessages.joinAccept}
+                description={policyMessages.joinAcceptDesc}
+              />
+              <Form.Field
+                name="policy.downlink.mac_data"
+                component={Checkbox}
+                label={policyMessages.macData}
+                description={policyMessages.macDataAllowDesc}
+              />
+              <Form.Field
+                name="policy.downlink.application_data"
+                component={Checkbox}
+                label={policyMessages.applicationData}
+                description={policyMessages.applicationDataAllowDesc}
+              />
+            </Col>
+          </>
+        )}
+      </Row>
+    </>
+  )
+}
+
+DefaultRoutingPolicyForm.propTypes = {
+  initialValues: PropTypes.shape({
+    _use_default_policy: PropTypes.bool,
+    policy: PropTypes.shape({}),
+  }),
+}
+
+DefaultRoutingPolicyForm.defaultProps = {
+  initialValues: {
+    _use_default_policy: false,
+    policy: {
+      uplink: {
+        join_request: false,
+        mac_data: false,
+        application_data: false,
+        signal_quality: false,
+        localization: false,
+      },
+      downlink: {
+        join_accept: false,
+        mac_data: false,
+        application_data: false,
+      },
+    },
+  },
+}
+
+export default DefaultRoutingPolicyForm
diff --git a/pkg/webui/console/components/routing-policy-form/index.js b/pkg/webui/console/components/routing-policy-form/index.js
index cee2254d36..753e62e145 100644
--- a/pkg/webui/console/components/routing-policy-form/index.js
+++ b/pkg/webui/console/components/routing-policy-form/index.js
@@ -16,8 +16,10 @@ import React, { useState, useCallback } from 'react'
 import { Col, Row } from 'react-grid-system'
 import { defineMessages } from 'react-intl'
 
-import Form, { useFormContext } from '@ttn-lw/components/form'
+import Form from '@ttn-lw/components/form'
 import Checkbox from '@ttn-lw/components/checkbox'
+import SubmitBar from '@ttn-lw/components/submit-bar'
+import SubmitButton from '@ttn-lw/components/submit-button'
 import Radio from '@ttn-lw/components/radio-button'
 
 import Message from '@ttn-lw/lib/components/message'
@@ -26,6 +28,7 @@ import RoutingPolicy from '@console/components/routing-policy'
 
 import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
+import Yup from '@ttn-lw/lib/yup'
 
 import { isValidPolicy } from '@console/lib/packet-broker/utils'
 import policyMessages from '@console/lib/packet-broker/messages'
@@ -33,58 +36,54 @@ import policyMessages from '@console/lib/packet-broker/messages'
 import style from './routing-policy-form.styl'
 
 const m = defineMessages({
+  saveDefaultPolicy: 'Save default policy',
   useDefaultPolicy: 'Use default routing policy for this network',
   useSpecificPolicy: 'Use network specific routing policy',
-  doNotUseADefaultPolicy: 'Do not use a default routing policy for this network',
   doNotUseAPolicy: 'Do not use a routing policy for this network',
 })
 
+const validationSchema = Yup.object({
+  _use_default_policy: Yup.bool(),
+  policy: Yup.object({
+    uplink: Yup.object({}),
+    downlink: Yup.object({}),
+  }).when('_use_default_policy', { is: 'default', then: schema => schema.strip() }),
+})
+
 const policySourceEncode = val => val === 'default'
 const policySourceDecode = val => (val ? 'default' : 'specific')
-const useDefaultEncode = val => val === 'default'
-const useDefaultDecode = val => (val ? 'default' : 'no-default')
 
-const RoutingPolicyForm = ({ defaultPolicy, networkLevel }) => {
-  const { values } = useFormContext()
-  const [useDefault, setUseDefault] = useState(values._use_default_policy || false)
+const RoutingPolicyForm = ({ onSubmit, initialValues, error, defaultPolicy, submitMessage }) => {
+  const handleSubmit = useCallback(values => onSubmit(validationSchema.cast(values)), [onSubmit])
+  const [useDefault, setUseDefault] = useState(initialValues._use_default_policy || false)
   const handlePolicySourceChange = useCallback(setUseDefault, [setUseDefault])
   const hasDefaultPolicy = isValidPolicy(defaultPolicy)
 
-  const showDefaultPolicySheet = networkLevel && useDefault && isValidPolicy(defaultPolicy)
-  const showPolicyCheckboxes = (useDefault && !networkLevel) || (!useDefault && networkLevel)
-
+  const showDefaultPolicySheet = useDefault && isValidPolicy(defaultPolicy)
+  const showPolicyCheckboxes = !useDefault
   return (
-    <>
+    <Form
+      onSubmit={handleSubmit}
+      initialValues={initialValues}
+      error={error}
+      validationSchema={validationSchema}
+    >
       <Row>
         <Col md={12}>
-          {networkLevel ? (
-            <Form.Field
-              component={Radio.Group}
-              className={style.policySource}
-              name="_use_default_policy"
-              onChange={handlePolicySourceChange}
-              encode={policySourceEncode}
-              decode={policySourceDecode}
-            >
-              <Radio
-                label={hasDefaultPolicy ? m.useDefaultPolicy : m.doNotUseAPolicy}
-                value="default"
-              />
-              <Radio label={m.useSpecificPolicy} value="specific" />
-            </Form.Field>
-          ) : (
-            <Form.Field
-              component={Radio.Group}
-              className={style.policySource}
-              name="_use_default_policy"
-              onChange={handlePolicySourceChange}
-              encode={useDefaultEncode}
-              decode={useDefaultDecode}
-            >
-              <Radio label={m.doNotUseADefaultPolicy} value="no-default" />
-              <Radio label={m.useDefaultPolicy} value="default" />
-            </Form.Field>
-          )}
+          <Form.Field
+            component={Radio.Group}
+            className={style.policySource}
+            name="_use_default_policy"
+            onChange={handlePolicySourceChange}
+            encode={policySourceEncode}
+            decode={policySourceDecode}
+          >
+            <Radio
+              label={hasDefaultPolicy ? m.useDefaultPolicy : m.doNotUseAPolicy}
+              value="default"
+            />
+            <Radio label={m.useSpecificPolicy} value="specific" />
+          </Form.Field>
         </Col>
         {showDefaultPolicySheet && (
           <Col md={12}>
@@ -158,22 +157,28 @@ const RoutingPolicyForm = ({ defaultPolicy, networkLevel }) => {
           </>
         )}
       </Row>
-    </>
+      <SubmitBar>
+        <Form.Submit component={SubmitButton} message={submitMessage} />
+      </SubmitBar>
+    </Form>
   )
 }
 
 RoutingPolicyForm.propTypes = {
   defaultPolicy: PropTypes.routingPolicy,
+  error: PropTypes.error,
   initialValues: PropTypes.shape({
     _use_default_policy: PropTypes.bool,
     policy: PropTypes.shape({}),
   }),
-  networkLevel: PropTypes.bool,
+  onSubmit: PropTypes.func.isRequired,
+  submitMessage: PropTypes.message,
 }
 
 RoutingPolicyForm.defaultProps = {
-  networkLevel: false,
+  error: undefined,
   defaultPolicy: undefined,
+  submitMessage: m.saveDefaultPolicy,
   initialValues: {
     _use_default_policy: false,
     policy: {
diff --git a/pkg/webui/console/views/admin-packet-broker/default-routing-policy.js b/pkg/webui/console/views/admin-packet-broker/default-routing-policy.js
index 881ccbbec2..63e4c4dc72 100644
--- a/pkg/webui/console/views/admin-packet-broker/default-routing-policy.js
+++ b/pkg/webui/console/views/admin-packet-broker/default-routing-policy.js
@@ -17,7 +17,7 @@ import { Col } from 'react-grid-system'
 
 import Message from '@ttn-lw/lib/components/message'
 
-import RoutingPolicyForm from '@console/components/routing-policy-form'
+import DefaultRoutingPolicyForm from '@console/components/default-routing-policy-form'
 
 import m from './messages'
 
@@ -30,7 +30,7 @@ const DefaultRoutingPolicyView = () => (
       component="p"
       className={style.routingPolicyInformation}
     />
-    <RoutingPolicyForm />
+    <DefaultRoutingPolicyForm />
   </Col>
 )
 

From d7f44d7b4f19ba2b3d1fd6008125b830e1a352f1 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Wed, 18 Oct 2023 11:56:28 +0200
Subject: [PATCH 04/28] console: Update locales

---
 .../routing-policy-form.styl                  | 19 +++++++++++++++++++
 pkg/webui/locales/en.json                     | 10 ++++++----
 pkg/webui/locales/ja.json                     |  8 +++++---
 3 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 pkg/webui/console/components/default-routing-policy-form/routing-policy-form.styl

diff --git a/pkg/webui/console/components/default-routing-policy-form/routing-policy-form.styl b/pkg/webui/console/components/default-routing-policy-form/routing-policy-form.styl
new file mode 100644
index 0000000000..d514497e04
--- /dev/null
+++ b/pkg/webui/console/components/default-routing-policy-form/routing-policy-form.styl
@@ -0,0 +1,19 @@
+// Copyright © 2021 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.
+
+.direction-header
+  margin-bottom: $cs.xs
+
+.policy-source
+  margin-bottom: $ls.s
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 91cb74cec1..89715441a7 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -191,6 +191,8 @@
   "console.components.application-general-settings-form.index.useAlcsync": "Use Application Layer Clock Synchronization",
   "console.components.application-general-settings-form.index.adminContactDescription": "Administrative contact information for this application. Typically used to indicate who to contact with administrative questions about the application.",
   "console.components.application-general-settings-form.index.techContactDescription": "Technical contact information for this application. Typically used to indicate who to contact with technical/security questions about the application.",
+  "console.components.default-routing-policy-form.index.useDefaultPolicy": "Use default routing policy for this network",
+  "console.components.default-routing-policy-form.index.doNotUseADefaultPolicy": "Do not use a default routing policy for this network",
   "console.components.device-import-form.index.file": "File",
   "console.components.device-import-form.index.formatInfo": "Format information",
   "console.components.device-import-form.index.selectAFile": "Please select a template file",
@@ -353,9 +355,9 @@
   "console.components.pubsub-form.messages.replacePubsub": "Replace Pub/Sub",
   "console.components.pubsub-form.messages.useSecureConnection": "Use secure connection",
   "console.components.pubsub-form.messages.pubsubsDescription": "The Pub/Sub integration allows the Application Server to publish and subscribe to topics, using The Things Stack built-in MQTT client or NATS client. Learn more in our <Link>Pub/Sub guide</Link>.",
+  "console.components.routing-policy-form.index.saveDefaultPolicy": "Save default policy",
   "console.components.routing-policy-form.index.useDefaultPolicy": "Use default routing policy for this network",
   "console.components.routing-policy-form.index.useSpecificPolicy": "Use network specific routing policy",
-  "console.components.routing-policy-form.index.doNotUseADefaultPolicy": "Do not use a default routing policy for this network",
   "console.components.routing-policy-form.index.doNotUseAPolicy": "Do not use a routing policy for this network",
   "console.components.uplink-form.uplink-form.simulateUplink": "Simulate uplink",
   "console.components.uplink-form.uplink-form.payloadDescription": "The desired payload bytes of the uplink message",
@@ -681,9 +683,9 @@
   "console.views.admin-packet-broker.messages.learnMore": "Learn more",
   "console.views.admin-packet-broker.messages.whyNetworkPeeringTitle": "Why choose network peering?",
   "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "Since LoRaWAN uses shared spectrum, gateways receive messages from devices registered on other LoRaWAN networks. Instead of discarding this traffic, these messages can be forwarded via Packet Broker to the home network of these devices. This extends coverage of networks and allows devices to use higher data rates that reduce channel utilization and increase battery life. No sensitive data is exposed as LoRaWAN is end-to-end encrypted and integrity protected.",
-  "console.views.admin-packet-broker.messages.enbaling": "Enable forwarding via the options below or define custom routing policies. In the Networks tab below, you can see which other networks are forwarding data to this network.",
-  "console.views.admin-packet-broker.messages.registrationStatus": "Setup",
-  "console.views.admin-packet-broker.messages.registerNetwork": "Enable Packet Broker",
+  "console.views.admin-packet-broker.messages.enbaling": "Enable forwarding via the options below or define custom routing policies. In the Networks tab below (visible by selecting the option \"Use custom routing policies\"), you can see which other networks are forwarding data to this network.",
+  "console.views.admin-packet-broker.messages.setup": "Setup",
+  "console.views.admin-packet-broker.messages.enablePacketBroker": "Enable Packet Broker",
   "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "Enabling will allow other networks to send traffic to you as well as you forwarding traffic to them, based on the exact routing policy.",
   "console.views.admin-packet-broker.messages.network": "Network: {network}",
   "console.views.admin-packet-broker.messages.listNetwork": "List my network in Packet Broker publicly",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index 0ce757f864..0b44f43bd3 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -191,6 +191,8 @@
   "console.components.application-general-settings-form.index.useAlcsync": "LoRaアプリケーションレイヤー・クロックシンクロパッケージの使用",
   "console.components.application-general-settings-form.index.adminContactDescription": "このアプリケーションの管理者の連絡先情報。通常、アプリケーションに関する管理上の問い合わせ先を示すために使用されます。",
   "console.components.application-general-settings-form.index.techContactDescription": "このアプリケーションの技術的な連絡先情報。通常、アプリケーションに関する技術/セキュリティの質問の連絡先を示すために使用されます。",
+  "console.components.default-routing-policy-form.index.useDefaultPolicy": "",
+  "console.components.default-routing-policy-form.index.doNotUseADefaultPolicy": "",
   "console.components.device-import-form.index.file": "ファイル",
   "console.components.device-import-form.index.formatInfo": "フォーマット情報",
   "console.components.device-import-form.index.selectAFile": "テンプレートファイルを選択してください",
@@ -353,9 +355,9 @@
   "console.components.pubsub-form.messages.replacePubsub": "Pub/Subを置き換え",
   "console.components.pubsub-form.messages.useSecureConnection": "安全な接続を使用",
   "console.components.pubsub-form.messages.pubsubsDescription": "Pub/Sub統合により、The Things Stack内蔵のMQTTクライアントまたはNATSクライアントを使用して、アプリケーションサーバーがトピックを公開および購読することができます。詳しくは、<リンク>Pub/Subガイド</リンク>をご覧ください",
+  "console.components.routing-policy-form.index.saveDefaultPolicy": "",
   "console.components.routing-policy-form.index.useDefaultPolicy": "このネットワークでデフォルトのルーティングポリシーを使用",
   "console.components.routing-policy-form.index.useSpecificPolicy": "ネットワーク固有のルーティングポリシーを使用",
-  "console.components.routing-policy-form.index.doNotUseADefaultPolicy": "このネットワークでは、デフォルトのルーティングポリシーを使用しないでください",
   "console.components.routing-policy-form.index.doNotUseAPolicy": "このネットワークには、ルーティングポリシーを使用しないでください",
   "console.components.uplink-form.uplink-form.simulateUplink": "アップリンクのシミュレーション",
   "console.components.uplink-form.uplink-form.payloadDescription": "アップリンクメッセージの希望するペイロードバイト数",
@@ -682,8 +684,8 @@
   "console.views.admin-packet-broker.messages.whyNetworkPeeringTitle": "",
   "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "",
   "console.views.admin-packet-broker.messages.enbaling": "",
-  "console.views.admin-packet-broker.messages.registrationStatus": "登録状況",
-  "console.views.admin-packet-broker.messages.registerNetwork": "ネットワーク登録",
+  "console.views.admin-packet-broker.messages.setup": "",
+  "console.views.admin-packet-broker.messages.enablePacketBroker": "",
   "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "ご自宅のネットワークから、またはご自宅のネットワークへのピアリングを可能にするには、ご自宅のネットワークを登録する必要があります。これにより、お客様のネットワークがPacket Brokerに認識され、お客様のネットワークのピアリング動作を設定することができます",
   "console.views.admin-packet-broker.messages.network": "ネットワーク: {network}",
   "console.views.admin-packet-broker.messages.listNetwork": "ネットワーク公開で一覧表示",

From 5105abca231d900b6ebd893d69af9564596c5762 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Wed, 18 Oct 2023 14:25:29 +0200
Subject: [PATCH 05/28] console: Update e2e tests

---
 .../default-gateway-visibility.spec.js        | 75 -------------------
 .../packet-broker/networks.spec.js            |  1 +
 .../packet-broker/registration.spec.js        | 27 ++++---
 .../packet-broker/routing-policies.spec.js    | 68 +++++++++++++++--
 .../packet-broker/default-custom-policy.json  | 11 +++
 .../admin-packet-broker.js                    |  2 +
 .../views/admin-packet-broker/messages.js     |  4 +-
 7 files changed, 93 insertions(+), 95 deletions(-)
 delete mode 100644 cypress/e2e/console/admin-panel/packet-broker/default-gateway-visibility.spec.js
 create mode 100644 cypress/fixtures/console/packet-broker/default-custom-policy.json

diff --git a/cypress/e2e/console/admin-panel/packet-broker/default-gateway-visibility.spec.js b/cypress/e2e/console/admin-panel/packet-broker/default-gateway-visibility.spec.js
deleted file mode 100644
index c2c2e7bf74..0000000000
--- a/cypress/e2e/console/admin-panel/packet-broker/default-gateway-visibility.spec.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright © 2022 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.
-
-describe('Packet Broker routing policies', () => {
-  before(() => {
-    cy.dropAndSeedDatabase()
-  })
-
-  beforeEach(() => {
-    cy.fixture('console/packet-broker/policies-home-network.json').as('homeNetworkPolicies')
-
-    cy.intercept('/api/v3/pba/info', { fixture: 'console/packet-broker/info-registered.json' })
-
-    cy.loginConsole({ user_id: 'admin', password: 'admin' })
-  })
-
-  it('succeeds setting default gateway visibility configuration', () => {
-    cy.intercept('GET', '/api/v3/pba/home-networks/gateway-visibilities/default', {
-      statusCode: 404,
-    })
-    cy.intercept('GET', '/api/v3/pba/home-networks/policies/default', { statusCode: 404 })
-    cy.intercept('PUT', '/api/v3/pba/home-networks/gateway-visibilities/default', {}).as('putCall')
-    cy.visit(
-      `${Cypress.config('consoleRootPath')}/admin-panel/packet-broker/default-gateway-visibility`,
-    )
-
-    cy.findByLabelText('Location').check()
-    cy.findByLabelText('Antenna placement').check()
-    cy.findByLabelText('Antenna count').check()
-    cy.findByLabelText('Fine timestamps').check()
-
-    cy.findByRole('button', { name: 'Save default gateway visibility' }).click()
-
-    cy.findByTestId('error-notification').should('not.exist')
-    cy.findByTestId('toast-notification')
-      .findByText('Default gateway visibility set')
-      .should('be.visible')
-    cy.get('@putCall').should('have.property', 'state', 'Complete')
-  })
-
-  it('succeeds unsetting default gateway visibility configuration', () => {
-    cy.intercept('GET', '/api/v3/pba/home-networks/policies/default', { statusCode: 404 })
-    cy.intercept('GET', '/api/v3/pba/home-networks/gateway-visibilities/default', {
-      fixture: 'console/packet-broker/default-gateway-visibility.json',
-    })
-    cy.intercept('PUT', '/api/v3/pba/home-networks/gateway-visibilities/default', {}).as('putCall')
-    cy.visit(
-      `${Cypress.config('consoleRootPath')}/admin-panel/packet-broker/default-gateway-visibility`,
-    )
-
-    cy.findByLabelText('Location').uncheck()
-    cy.findByLabelText('Antenna placement').uncheck()
-    cy.findByLabelText('Antenna count').uncheck()
-    cy.findByLabelText('Fine timestamps').uncheck()
-
-    cy.findByRole('button', { name: 'Save default gateway visibility' }).click()
-
-    cy.findByTestId('error-notification').should('not.exist')
-    cy.findByTestId('toast-notification')
-      .findByText('Default gateway visibility set')
-      .should('be.visible')
-    cy.get('@putCall').should('have.property', 'state', 'Complete')
-  })
-})
diff --git a/cypress/e2e/console/admin-panel/packet-broker/networks.spec.js b/cypress/e2e/console/admin-panel/packet-broker/networks.spec.js
index db702ac160..d5ae5f2584 100644
--- a/cypress/e2e/console/admin-panel/packet-broker/networks.spec.js
+++ b/cypress/e2e/console/admin-panel/packet-broker/networks.spec.js
@@ -46,6 +46,7 @@ describe('Packet Broker networks', () => {
       fixture: 'console/packet-broker/policies-home-network.json',
     })
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker/networks`)
+    cy.findByLabelText('Use custom routing policies').check()
 
     const { networks } = this.networks
     const networksFiltered = networks.filter(
diff --git a/cypress/e2e/console/admin-panel/packet-broker/registration.spec.js b/cypress/e2e/console/admin-panel/packet-broker/registration.spec.js
index 5f4afc5366..9d6c906852 100644
--- a/cypress/e2e/console/admin-panel/packet-broker/registration.spec.js
+++ b/cypress/e2e/console/admin-panel/packet-broker/registration.spec.js
@@ -61,15 +61,15 @@ describe('Packet Broker registration', () => {
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
 
     cy.findByText('Packet Broker', { selector: 'h1' }).should('be.visible')
-    cy.findByText(/Packet Broker can be used to exchange traffic/).should('be.visible')
-    cy.findByText('Packet Broker documentation', { selector: 'a' }).should('be.visible')
+    cy.findByText(/Packet Broker is a service by The Things Industries/).should('be.visible')
+    cy.findByText('Packet Broker', { selector: 'a' }).should('be.visible')
     cy.findByText('Packet Broker website', { selector: 'a' }).should('be.visible')
-    cy.findByText('Register network', { selector: 'span' }).should('be.visible')
+    cy.findByText('Enable Packet Broker', { selector: 'span' }).should('be.visible')
     cy.findByTestId('switch')
       .should('be.visible')
       .and('not.be.checked')
       .and('not.have.attr', 'disabled')
-    cy.findByText(/To enable peering/).should('be.visible')
+    cy.findByText(/Enabling will allow/).should('be.visible')
 
     cy.findByText('Default routing policy').should('not.exist')
     cy.findByText('Networks').should('not.exist')
@@ -89,18 +89,21 @@ describe('Packet Broker registration', () => {
     cy.loginConsole({ user_id: 'admin', password: 'admin' })
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
 
-    cy.findByText('Register network').click()
-    cy.findByText('Register network').next().findByTestId('switch').should('be.checked')
-    cy.findByText('List network publicly')
+    cy.findByText('Enable Packet Broker').click()
+    cy.findByText('Enable Packet Broker').next().findByTestId('switch').should('be.checked')
+    cy.findByText('List my network in Packet Broker publicly')
       .should('be.visible')
       .next()
       .findByTestId('switch')
       .should('be.checked')
-    cy.findByTestId('feature-info-forwarder-enabled').should('be.visible')
-    cy.findByTestId('feature-info-home-network-enabled').should('be.visible')
-    cy.findByTestId('tabs').findByText('Default routing policy').should('be.visible')
-    cy.findByTestId('tabs').findByText('Networks').should('be.visible')
-    cy.findByLabelText('Do not use a default routing policy for this network').should('be.checked')
+    cy.findByText('Routing configuration', { selector: 'h3' }).should('be.visible')
+    cy.findByLabelText('Forward traffic to all networks registered in Packet Broker').should(
+      'exist',
+    )
+    cy.findByLabelText(
+      'Forward traffic to The Things Stack Sandbox (community network) only',
+    ).should('exist')
+    cy.findByLabelText('Use custom routing policies').should('exist')
 
     cy.findByTestId('error-notification').should('not.exist')
   })
diff --git a/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
index 9b9f519f12..460083d742 100644
--- a/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
+++ b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
@@ -32,12 +32,61 @@ describe('Packet Broker routing policies', () => {
     cy.loginConsole({ user_id: 'admin', password: 'admin' })
   })
 
-  it('succeeds setting a default routing policy', () => {
+  it('succeeds setting a "traffic to all networks" routing configuration', () => {
     cy.intercept('GET', '/api/v3/pba/home-networks/policies/default', { statusCode: 404 })
     cy.intercept('PUT', '/api/v3/pba/home-networks/policies/default', {})
+    cy.intercept('/api/v3/pba/networks*', { fixture: 'console/packet-broker/networks.json' })
+    cy.intercept('/api/v3/pba/home-networks/policies*', {
+      fixture: 'console/packet-broker/policies-home-network.json',
+    })
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
 
-    cy.findByLabelText('Use default routing policy for this network').check()
+    cy.findByLabelText('Forward traffic to all networks registered in Packet Broker').check()
+    cy.findByRole('button', { name: 'Save routing configuration' }).click()
+
+    cy.findByTestId('error-notification').should('not.exist')
+    cy.findByTestId('toast-notification')
+      .should('be.visible')
+      .findByText('Default routing configuration set')
+      .should('be.visible')
+  })
+
+  it('succeeds setting a "only ttn" routing configuration', () => {
+    cy.intercept('GET', '/api/v3/pba/home-networks/policies/default', { statusCode: 404 })
+    cy.intercept('/api/v3/pba/networks*', { fixture: 'console/packet-broker/networks.json' })
+    cy.intercept('/api/v3/pba/home-networks/policies*', {
+      fixture: 'console/packet-broker/policies-home-network.json',
+    })
+    cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/default', {})
+    cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/19', {})
+    cy.intercept('PUT', '/api/v3/pba/home-networks/policies/19', {})
+    cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
+
+    cy.findByLabelText(
+      'Forward traffic to The Things Stack Sandbox (community network) only',
+    ).check()
+    cy.findByRole('button', { name: 'Save routing configuration' }).click()
+
+    cy.findByTestId('error-notification').should('not.exist')
+    cy.findByTestId('toast-notification')
+      .should('be.visible')
+      .findByText('Default routing configuration set')
+      .should('be.visible')
+  })
+
+  it('succeeds setting a custom routing configuration with a default routing policy', () => {
+    cy.intercept('GET', '/api/v3/pba/home-networks/policies/default', {
+      fixture: 'console/packet-broker/default-policy.json',
+    })
+    cy.intercept('PUT', '/api/v3/pba/home-networks/policies/default', {})
+    cy.intercept('/api/v3/pba/networks*', { fixture: 'console/packet-broker/networks.json' })
+    cy.intercept('/api/v3/pba/home-networks/policies*', {
+      fixture: 'console/packet-broker/policies-home-network.json',
+    })
+    cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
+
+    cy.findByLabelText('Use custom routing policies').check()
+    cy.findAllByLabelText('Use default routing policy for this network').check()
 
     // Check routing policy form checkboxes.
     cy.findByText('Uplink')
@@ -56,30 +105,35 @@ describe('Packet Broker routing policies', () => {
         cy.findByLabelText('MAC data').check()
         cy.findByLabelText('Application data').check()
       })
-    cy.findByRole('button', { name: 'Save default policy' }).click()
+    cy.findByRole('button', { name: 'Save routing configuration' }).click()
 
     cy.findByTestId('error-notification').should('not.exist')
     cy.findByTestId('toast-notification')
       .should('be.visible')
-      .findByText('Default routing policy set')
+      .findByText('Default routing configuration set')
       .should('be.visible')
   })
 
   it('succeeds unsetting a default routing policy', () => {
+    cy.intercept('PUT', '/api/v3/pba/home-networks/policies/default', {})
+    cy.intercept('/api/v3/pba/networks*', { fixture: 'console/packet-broker/networks.json' })
+    cy.intercept('/api/v3/pba/home-networks/policies*', {
+      fixture: 'console/packet-broker/policies-home-network.json',
+    })
     cy.intercept('GET', '/api/v3/pba/home-networks/policies/default', {
-      fixture: 'console/packet-broker/default-policy.json',
+      fixture: 'console/packet-broker/default-custom-policy.json',
     })
     cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/default', {})
 
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
 
     cy.findByLabelText('Do not use a default routing policy for this network').check()
-    cy.findByRole('button', { name: 'Save default policy' }).click()
+    cy.findByRole('button', { name: 'Save routing configuration' }).click()
 
     cy.findByTestId('error-notification').should('not.exist')
     cy.findByTestId('toast-notification')
       .should('be.visible')
-      .findByText('Default routing policy set')
+      .findByText('Default routing configuration set')
       .should('be.visible')
   })
 
diff --git a/cypress/fixtures/console/packet-broker/default-custom-policy.json b/cypress/fixtures/console/packet-broker/default-custom-policy.json
new file mode 100644
index 0000000000..edd8728179
--- /dev/null
+++ b/cypress/fixtures/console/packet-broker/default-custom-policy.json
@@ -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 }
+}
diff --git a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
index 975b89abc1..90f619e713 100644
--- a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
+++ b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
@@ -32,6 +32,7 @@ import Form from '@ttn-lw/components/form'
 import toast from '@ttn-lw/components/toast'
 import SubmitBar from '@ttn-lw/components/submit-bar'
 import SubmitButton from '@ttn-lw/components/submit-button'
+import Notification from '@ttn-lw/components/notification'
 
 import Message from '@ttn-lw/lib/components/message'
 import RequireRequest from '@ttn-lw/lib/components/require-request'
@@ -279,6 +280,7 @@ const PacketBroker = () => {
           <Message content={m.whyNetworkPeeringText} className={style.info} component="p" />
           <Message content={m.enbaling} className={style.info} />
           <Message content={m.setup} component="h3" className="mt-cs-xxl" />
+          {!enabled && <Notification warning small content={m.packetBrokerDisabledDesc} />}
           {showError && <ErrorNotification small content={infoError} />}
           {enabled && (
             <Row gutterWidth={48} className="mb-cs-xl">
diff --git a/pkg/webui/console/views/admin-packet-broker/messages.js b/pkg/webui/console/views/admin-packet-broker/messages.js
index 9f17501e1a..f705188c89 100644
--- a/pkg/webui/console/views/admin-packet-broker/messages.js
+++ b/pkg/webui/console/views/admin-packet-broker/messages.js
@@ -25,6 +25,8 @@ export default defineMessages({
   enbaling:
     'Enable forwarding via the options below or define custom routing policies. In the Networks tab below (visible by selecting the option "Use custom routing policies"), you can see which other networks are forwarding data to this network.',
   setup: 'Setup',
+  packetBrokerDisabledDesc:
+    'The Things Stack is not set up to use Packet Broker. Please refer to the documentation link above for instructions on how to set up The Things Stack for peering with Packet Broker.',
   enablePacketBroker: 'Enable Packet Broker',
   packetBrokerRegistrationDesc:
     'Enabling will allow other networks to send traffic to you as well as you forwarding traffic to them, based on the exact routing policy.',
@@ -39,7 +41,7 @@ export default defineMessages({
     'This will hide your network. Other network administrators will not be able to see your network to configure routing policies.',
   routingPolicyInformation:
     'You can use the checkboxes below to control the default forwarding behavior of your network. You can additionally set up individual per-network routing policies via the Networks tab.',
-  defaultRoutingPolicySet: 'Default routing policy set',
+  defaultRoutingPolicySet: 'Default routing configuration set',
   routingPolicySet: 'Routing policy set',
   defaultRoutingPolicy: 'Default routing policy',
   devAddressBlock: 'Device address block',

From 487eec6ea14a57024b9fc02b2edf2153e60a45a6 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Wed, 18 Oct 2023 14:26:41 +0200
Subject: [PATCH 06/28] console: Update locales

---
 pkg/webui/locales/en.json | 3 ++-
 pkg/webui/locales/ja.json | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 89715441a7..9bf2f2f0b0 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -685,6 +685,7 @@
   "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "Since LoRaWAN uses shared spectrum, gateways receive messages from devices registered on other LoRaWAN networks. Instead of discarding this traffic, these messages can be forwarded via Packet Broker to the home network of these devices. This extends coverage of networks and allows devices to use higher data rates that reduce channel utilization and increase battery life. No sensitive data is exposed as LoRaWAN is end-to-end encrypted and integrity protected.",
   "console.views.admin-packet-broker.messages.enbaling": "Enable forwarding via the options below or define custom routing policies. In the Networks tab below (visible by selecting the option \"Use custom routing policies\"), you can see which other networks are forwarding data to this network.",
   "console.views.admin-packet-broker.messages.setup": "Setup",
+  "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "The Things Stack is not set up to use Packet Broker. Please refer to the documentation link above for instructions on how to set up The Things Stack for peering with Packet Broker.",
   "console.views.admin-packet-broker.messages.enablePacketBroker": "Enable Packet Broker",
   "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "Enabling will allow other networks to send traffic to you as well as you forwarding traffic to them, based on the exact routing policy.",
   "console.views.admin-packet-broker.messages.network": "Network: {network}",
@@ -694,7 +695,7 @@
   "console.views.admin-packet-broker.messages.confirmUnlist": "Confirm unlist",
   "console.views.admin-packet-broker.messages.Are you sure you want to unlist your network in Packet Broker?{lineBreak}This will hide your network. Other network administrators will not be able to see your network to configure routing policies.": "Are you sure you want to unlist your network in Packet Broker?{lineBreak}This will hide your network. Other network administrators will not be able to see your network to configure routing policies.",
   "console.views.admin-packet-broker.messages.routingPolicyInformation": "You can use the checkboxes below to control the default forwarding behavior of your network. You can additionally set up individual per-network routing policies via the Networks tab.",
-  "console.views.admin-packet-broker.messages.defaultRoutingPolicySet": "Default routing policy set",
+  "console.views.admin-packet-broker.messages.defaultRoutingPolicySet": "Default routing configuration set",
   "console.views.admin-packet-broker.messages.routingPolicySet": "Routing policy set",
   "console.views.admin-packet-broker.messages.defaultRoutingPolicy": "Default routing policy",
   "console.views.admin-packet-broker.messages.devAddressBlock": "Device address block",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index 0b44f43bd3..ab31ed377a 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -685,6 +685,7 @@
   "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "",
   "console.views.admin-packet-broker.messages.enbaling": "",
   "console.views.admin-packet-broker.messages.setup": "",
+  "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "",
   "console.views.admin-packet-broker.messages.enablePacketBroker": "",
   "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "ご自宅のネットワークから、またはご自宅のネットワークへのピアリングを可能にするには、ご自宅のネットワークを登録する必要があります。これにより、お客様のネットワークがPacket Brokerに認識され、お客様のネットワークのピアリング動作を設定することができます",
   "console.views.admin-packet-broker.messages.network": "ネットワーク: {network}",

From ba91eb54f904d457a92a6f930482acb2207fbddb Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Wed, 18 Oct 2023 14:46:21 +0200
Subject: [PATCH 07/28] console: Remove custom radio buttons

---
 .../default-routing-policy-form/index.js      | 193 ++++++------------
 .../admin-packet-broker.js                    |  51 ++---
 2 files changed, 86 insertions(+), 158 deletions(-)

diff --git a/pkg/webui/console/components/default-routing-policy-form/index.js b/pkg/webui/console/components/default-routing-policy-form/index.js
index 9a1b993ada..f5d50685a5 100644
--- a/pkg/webui/console/components/default-routing-policy-form/index.js
+++ b/pkg/webui/console/components/default-routing-policy-form/index.js
@@ -12,150 +12,77 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { useState, useCallback } from 'react'
+import React from 'react'
 import { Col, Row } from 'react-grid-system'
-import { defineMessages } from 'react-intl'
 
-import Form, { useFormContext } from '@ttn-lw/components/form'
+import Form 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 PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 
 import policyMessages from '@console/lib/packet-broker/messages'
 
 import style from './routing-policy-form.styl'
 
-const m = defineMessages({
-  useDefaultPolicy: 'Use default routing policy for this network',
-  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])
-
-  const showPolicyCheckboxes = useDefault
-
-  return (
-    <>
-      <Row>
-        <Col md={12}>
-          <Form.Field
-            component={Radio.Group}
-            className={style.policySource}
-            name="_use_default_policy"
-            onChange={handlePolicySourceChange}
-            encode={useDefaultEncode}
-            decode={useDefaultDecode}
-          >
-            <Radio label={m.doNotUseADefaultPolicy} value="no-default" />
-            <Radio label={m.useDefaultPolicy} value="default" />
-          </Form.Field>
-        </Col>
-        {showPolicyCheckboxes && (
-          <>
-            <Col md={6} xs={12}>
-              <Message
-                content={sharedMessages.uplink}
-                component="h4"
-                className={style.directionHeader}
-              />
-              <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={policyMessages.macData}
-                description={policyMessages.macDataDesc}
-              />
-              <Form.Field
-                name="policy.uplink.application_data"
-                component={Checkbox}
-                label={policyMessages.applicationData}
-                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={style.directionHeader}
-              />
-              <Form.Field
-                name="policy.downlink.join_accept"
-                component={Checkbox}
-                label={policyMessages.joinAccept}
-                description={policyMessages.joinAcceptDesc}
-              />
-              <Form.Field
-                name="policy.downlink.mac_data"
-                component={Checkbox}
-                label={policyMessages.macData}
-                description={policyMessages.macDataAllowDesc}
-              />
-              <Form.Field
-                name="policy.downlink.application_data"
-                component={Checkbox}
-                label={policyMessages.applicationData}
-                description={policyMessages.applicationDataAllowDesc}
-              />
-            </Col>
-          </>
-        )}
-      </Row>
-    </>
-  )
-}
-
-DefaultRoutingPolicyForm.propTypes = {
-  initialValues: PropTypes.shape({
-    _use_default_policy: PropTypes.bool,
-    policy: PropTypes.shape({}),
-  }),
-}
-
-DefaultRoutingPolicyForm.defaultProps = {
-  initialValues: {
-    _use_default_policy: false,
-    policy: {
-      uplink: {
-        join_request: false,
-        mac_data: false,
-        application_data: false,
-        signal_quality: false,
-        localization: false,
-      },
-      downlink: {
-        join_accept: false,
-        mac_data: false,
-        application_data: false,
-      },
-    },
-  },
-}
+const DefaultRoutingPolicyForm = () => (
+  <Row>
+    <Col md={6} xs={12}>
+      <Message content={sharedMessages.uplink} component="h4" className={style.directionHeader} />
+      <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={policyMessages.macData}
+        description={policyMessages.macDataDesc}
+      />
+      <Form.Field
+        name="policy.uplink.application_data"
+        component={Checkbox}
+        label={policyMessages.applicationData}
+        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={style.directionHeader} />
+      <Form.Field
+        name="policy.downlink.join_accept"
+        component={Checkbox}
+        label={policyMessages.joinAccept}
+        description={policyMessages.joinAcceptDesc}
+      />
+      <Form.Field
+        name="policy.downlink.mac_data"
+        component={Checkbox}
+        label={policyMessages.macData}
+        description={policyMessages.macDataAllowDesc}
+      />
+      <Form.Field
+        name="policy.downlink.application_data"
+        component={Checkbox}
+        label={policyMessages.applicationData}
+        description={policyMessages.applicationDataAllowDesc}
+      />
+    </Col>
+  </Row>
+)
 
 export default DefaultRoutingPolicyForm
diff --git a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
index 90f619e713..649ccfa42b 100644
--- a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
+++ b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
@@ -84,7 +84,7 @@ const validationSchema = Yup.object({
   }).when('_use_default_policy', { is: 'default', then: schema => schema.strip() }),
 })
 
-const peerWithEveryNetworkPolicy = {
+const fullyPermissiveNetworkPolicy = {
   uplink: {
     join_request: true,
     mac_data: true,
@@ -99,10 +99,25 @@ const peerWithEveryNetworkPolicy = {
   },
 }
 
+const fullyRestrictiveNetworkPolicy = {
+  uplink: {
+    join_request: false,
+    mac_data: false,
+    application_data: false,
+    signal_quality: false,
+    localization: false,
+  },
+  downlink: {
+    join_accept: false,
+    mac_data: false,
+    application_data: false,
+  },
+}
+
 const TTN_NET_ID = '19'
 const peerWithEveryNetwork = policy =>
-  isEqual(policy.uplink, peerWithEveryNetworkPolicy.uplink) &&
-  isEqual(policy.downlink, peerWithEveryNetworkPolicy.downlink)
+  isEqual(policy.uplink, fullyPermissiveNetworkPolicy.uplink) &&
+  isEqual(policy.downlink, fullyPermissiveNetworkPolicy.downlink)
 
 const onlyTtn = policies =>
   Object.keys(policies).length === 1 && Object.keys(policies).includes(TTN_NET_ID)
@@ -169,7 +184,6 @@ const PacketBroker = () => {
   const routingPolicies = useSelector(selectPacketBrokerHomeNetworkPoliciesStore)
   const networkList = useSelector(selectPacketBrokerNetworks)
   const initialValues = {
-    _use_default_policy: isValidPolicy(defaultRoutingPolicy),
     _routing_configuration:
       peerWithEveryNetwork(defaultRoutingPolicy) && isValidPolicy(defaultRoutingPolicy)
         ? 'all_networks'
@@ -177,9 +191,10 @@ const PacketBroker = () => {
         ? 'ttn'
         : 'custom',
   }
-  initialValues.policy = initialValues._use_default_policy
-    ? defaultRoutingPolicy
-    : { uplink: {}, downlink: {} }
+  initialValues.policy =
+    isValidPolicy(defaultRoutingPolicy) && !peerWithEveryNetwork(defaultRoutingPolicy)
+      ? defaultRoutingPolicy
+      : { uplink: {}, downlink: {} }
 
   const [routingConfig, setRoutingConfig] = useState(undefined)
   const [formError, setFormError] = useState(undefined)
@@ -187,7 +202,7 @@ const PacketBroker = () => {
   const handleDefaultRoutingPolicySubmit = useCallback(
     async values => {
       const vals = validationSchema.cast(values)
-      const { _routing_configuration, _use_default_policy, policy } = vals
+      const { _routing_configuration, policy } = vals
 
       try {
         if (_routing_configuration === 'ttn') {
@@ -200,10 +215,8 @@ const PacketBroker = () => {
           await dispatch(attachPromise(deleteHomeNetworkDefaultRoutingPolicy()))
           await dispatch(attachPromise(deleteAllHomeNetworkRoutingPolicies(ids)))
           await dispatch(attachPromise(setHomeNetworkRoutingPolicy(TTN_NET_ID, policy)))
-        } else if (_use_default_policy || _routing_configuration === 'all_networks') {
-          await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
         } else {
-          await dispatch(attachPromise(deleteHomeNetworkDefaultRoutingPolicy()))
+          await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
         }
 
         toast({
@@ -229,26 +242,14 @@ const PacketBroker = () => {
       return setValues(values => ({
         ...values,
         _routing_configuration: value,
-        policy: {
-          uplink: {
-            join_request: true,
-            mac_data: true,
-            application_data: true,
-            signal_quality: true,
-            localization: true,
-          },
-          downlink: {
-            join_accept: true,
-            mac_data: true,
-            application_data: true,
-          },
-        },
+        policy: fullyPermissiveNetworkPolicy,
       }))
     }
 
     return setValues(values => ({
       ...values,
       _routing_configuration: value,
+      policy: fullyRestrictiveNetworkPolicy,
     }))
   }, [])
 

From 088fcccc1e27317e1b83b2377ca0abcbb3e9010a Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Wed, 18 Oct 2023 14:53:12 +0200
Subject: [PATCH 08/28] console: Remove unnecessary request

---
 .../views/admin-packet-broker/admin-packet-broker.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
index 649ccfa42b..96fbefe0e6 100644
--- a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
+++ b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
@@ -55,7 +55,6 @@ import {
   setHomeNetworkRoutingPolicy,
   getHomeNetworkRoutingPolicies,
   deleteAllHomeNetworkRoutingPolicies,
-  getPacketBrokerNetworksList,
 } from '@console/store/actions/packet-broker'
 
 import {
@@ -66,7 +65,6 @@ import {
   selectInfoError,
   selectHomeNetworkDefaultRoutingPolicy,
   selectPacketBrokerHomeNetworkPoliciesStore,
-  selectPacketBrokerNetworks,
 } from '@console/store/selectors/packet-broker'
 
 import DefaultRoutingPolicyView from './default-routing-policy'
@@ -182,7 +180,6 @@ const PacketBroker = () => {
 
   const defaultRoutingPolicy = useSelector(selectHomeNetworkDefaultRoutingPolicy)
   const routingPolicies = useSelector(selectPacketBrokerHomeNetworkPoliciesStore)
-  const networkList = useSelector(selectPacketBrokerNetworks)
   const initialValues = {
     _routing_configuration:
       peerWithEveryNetwork(defaultRoutingPolicy) && isValidPolicy(defaultRoutingPolicy)
@@ -206,11 +203,7 @@ const PacketBroker = () => {
 
       try {
         if (_routing_configuration === 'ttn') {
-          const ids = networkList.map(network =>
-            'tenant_id' in network.id
-              ? `${network.id.net_id}/${network.id.tenant_id}`
-              : network.id.net_id,
-          )
+          const ids = Object.keys(routingPolicies)
 
           await dispatch(attachPromise(deleteHomeNetworkDefaultRoutingPolicy()))
           await dispatch(attachPromise(deleteAllHomeNetworkRoutingPolicies(ids)))
@@ -227,7 +220,7 @@ const PacketBroker = () => {
         setFormError(error)
       }
     },
-    [dispatch, setFormError, networkList],
+    [dispatch, setFormError, routingPolicies],
   )
 
   const handleRoutingConfigChange = useCallback(
@@ -373,7 +366,6 @@ const PacketBroker = () => {
                 requestAction={[
                   getHomeNetworkDefaultRoutingPolicy(),
                   getHomeNetworkRoutingPolicies(),
-                  getPacketBrokerNetworksList(),
                 ]}
                 errorRenderFunction={SubViewErrorComponent}
                 spinnerProps={{ inline: true, center: true, className: 'mt-ls-s' }}

From 7f8cb36955686504b29b66d405c050a319939556 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Wed, 18 Oct 2023 15:11:20 +0200
Subject: [PATCH 09/28] console: Update locales

---
 pkg/webui/locales/en.json | 2 --
 pkg/webui/locales/ja.json | 2 --
 2 files changed, 4 deletions(-)

diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 9bf2f2f0b0..0d57461ce6 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -191,8 +191,6 @@
   "console.components.application-general-settings-form.index.useAlcsync": "Use Application Layer Clock Synchronization",
   "console.components.application-general-settings-form.index.adminContactDescription": "Administrative contact information for this application. Typically used to indicate who to contact with administrative questions about the application.",
   "console.components.application-general-settings-form.index.techContactDescription": "Technical contact information for this application. Typically used to indicate who to contact with technical/security questions about the application.",
-  "console.components.default-routing-policy-form.index.useDefaultPolicy": "Use default routing policy for this network",
-  "console.components.default-routing-policy-form.index.doNotUseADefaultPolicy": "Do not use a default routing policy for this network",
   "console.components.device-import-form.index.file": "File",
   "console.components.device-import-form.index.formatInfo": "Format information",
   "console.components.device-import-form.index.selectAFile": "Please select a template file",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index ab31ed377a..2a9f6cdb9a 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -191,8 +191,6 @@
   "console.components.application-general-settings-form.index.useAlcsync": "LoRaアプリケーションレイヤー・クロックシンクロパッケージの使用",
   "console.components.application-general-settings-form.index.adminContactDescription": "このアプリケーションの管理者の連絡先情報。通常、アプリケーションに関する管理上の問い合わせ先を示すために使用されます。",
   "console.components.application-general-settings-form.index.techContactDescription": "このアプリケーションの技術的な連絡先情報。通常、アプリケーションに関する技術/セキュリティの質問の連絡先を示すために使用されます。",
-  "console.components.default-routing-policy-form.index.useDefaultPolicy": "",
-  "console.components.default-routing-policy-form.index.doNotUseADefaultPolicy": "",
   "console.components.device-import-form.index.file": "ファイル",
   "console.components.device-import-form.index.formatInfo": "フォーマット情報",
   "console.components.device-import-form.index.selectAFile": "テンプレートファイルを選択してください",

From 210024c094c0973f50138de036a89905fac9a92e Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Thu, 19 Oct 2023 11:36:54 +0200
Subject: [PATCH 10/28] console: Fix validation schema

---
 .../console/views/admin-packet-broker/admin-packet-broker.js   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
index 96fbefe0e6..3181192037 100644
--- a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
+++ b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
@@ -75,11 +75,10 @@ import style from './admin-packet-broker.styl'
 
 const validationSchema = Yup.object({
   _routing_configuration: Yup.string().oneOf(['all_networks', 'ttn', 'custom']),
-  _use_default_policy: Yup.bool(),
   policy: Yup.object({
     uplink: Yup.object({}),
     downlink: Yup.object({}),
-  }).when('_use_default_policy', { is: 'default', then: schema => schema.strip() }),
+  }),
 })
 
 const fullyPermissiveNetworkPolicy = {

From cf1af36fd327d4bf15a27b0bec84b70b2468bedb Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 23 Oct 2023 09:57:18 +0200
Subject: [PATCH 11/28] console: Fix e2e tests

---
 .../packet-broker/routing-policies.spec.js    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
index 460083d742..5ad026ae03 100644
--- a/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
+++ b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
@@ -59,6 +59,7 @@ describe('Packet Broker routing policies', () => {
     })
     cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/default', {})
     cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/19', {})
+    cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/19/johan', {})
     cy.intercept('PUT', '/api/v3/pba/home-networks/policies/19', {})
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
 
@@ -86,7 +87,6 @@ describe('Packet Broker routing policies', () => {
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
 
     cy.findByLabelText('Use custom routing policies').check()
-    cy.findAllByLabelText('Use default routing policy for this network').check()
 
     // Check routing policy form checkboxes.
     cy.findByText('Uplink')
@@ -127,7 +127,23 @@ describe('Packet Broker routing policies', () => {
 
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
 
-    cy.findByLabelText('Do not use a default routing policy for this network').check()
+    // Check routing policy form checkboxes.
+    cy.findByText('Uplink')
+      .parent()
+      .within(() => {
+        cy.findByLabelText('Join request').uncheck()
+        cy.findByLabelText('MAC data').uncheck()
+        cy.findByLabelText('Application data').uncheck()
+        cy.findByLabelText('Signal quality information').uncheck()
+        cy.findByLabelText('Localization information').uncheck()
+      })
+    cy.findByText('Downlink')
+      .parent()
+      .within(() => {
+        cy.findByLabelText('Join accept').uncheck()
+        cy.findByLabelText('MAC data').uncheck()
+        cy.findByLabelText('Application data').uncheck()
+      })
     cy.findByRole('button', { name: 'Save routing configuration' }).click()
 
     cy.findByTestId('error-notification').should('not.exist')

From ceded371ec5c77bcad9b9142b6571142fbc997ac Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 23 Oct 2023 16:16:06 +0200
Subject: [PATCH 12/28] console: Fix undefined and delete all policies on
 default

---
 pkg/webui/console/store/middleware/logics/packet-broker.js | 7 ++++++-
 .../views/admin-packet-broker/admin-packet-broker.js       | 6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkg/webui/console/store/middleware/logics/packet-broker.js b/pkg/webui/console/store/middleware/logics/packet-broker.js
index edb59ec395..6017934e48 100644
--- a/pkg/webui/console/store/middleware/logics/packet-broker.js
+++ b/pkg/webui/console/store/middleware/logics/packet-broker.js
@@ -263,7 +263,12 @@ const setPacketBrokerHomeNetworkPolicyLogic = createRequestLogic({
     const ids = extractPacketBrokerIdsFromCombinedId(id)
     await tts.PacketBrokerAgent.setHomeNetworkRoutingPolicy(ids.net_id, ids.tenant_id, policy)
 
-    return policy
+    const newPolicy = { home_network_id: { net_id: ids.net_id }, ...policy }
+    if ('tenant_id' in ids) {
+      newPolicy.home_network_id.tenant_id = ids.tenant_id
+    }
+
+    return newPolicy
   },
 })
 
diff --git a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
index 3181192037..90adcc0a9a 100644
--- a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
+++ b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
@@ -199,14 +199,16 @@ const PacketBroker = () => {
     async values => {
       const vals = validationSchema.cast(values)
       const { _routing_configuration, policy } = vals
+      const ids = Object.keys(routingPolicies)
 
       try {
         if (_routing_configuration === 'ttn') {
-          const ids = Object.keys(routingPolicies)
-
           await dispatch(attachPromise(deleteHomeNetworkDefaultRoutingPolicy()))
           await dispatch(attachPromise(deleteAllHomeNetworkRoutingPolicies(ids)))
           await dispatch(attachPromise(setHomeNetworkRoutingPolicy(TTN_NET_ID, policy)))
+        } else if (_routing_configuration === 'all_networks') {
+          await dispatch(attachPromise(deleteAllHomeNetworkRoutingPolicies(ids)))
+          await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
         } else {
           await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
         }

From 1761a1d7bbd8764387a9f766602554937c2f984e Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 23 Oct 2023 16:31:44 +0200
Subject: [PATCH 13/28] console: Update messages

---
 .../console/components/default-routing-policy-form/index.js | 6 +++---
 .../console/components/payload-formatters-form/index.js     | 3 +--
 .../views/admin-packet-broker/admin-packet-broker.js        | 2 +-
 pkg/webui/console/views/admin-packet-broker/messages.js     | 1 -
 pkg/webui/lib/shared-messages.js                            | 1 +
 pkg/webui/locales/en.json                                   | 4 +---
 pkg/webui/locales/ja.json                                   | 4 +---
 7 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkg/webui/console/components/default-routing-policy-form/index.js b/pkg/webui/console/components/default-routing-policy-form/index.js
index f5d50685a5..bcc1bc0cb0 100644
--- a/pkg/webui/console/components/default-routing-policy-form/index.js
+++ b/pkg/webui/console/components/default-routing-policy-form/index.js
@@ -45,7 +45,7 @@ const DefaultRoutingPolicyForm = () => (
       <Form.Field
         name="policy.uplink.application_data"
         component={Checkbox}
-        label={policyMessages.applicationData}
+        label={sharedMessages.appData}
         description={policyMessages.applicationDataDesc}
       />
       <Form.Field
@@ -66,7 +66,7 @@ const DefaultRoutingPolicyForm = () => (
       <Form.Field
         name="policy.downlink.join_accept"
         component={Checkbox}
-        label={policyMessages.joinAccept}
+        label={sharedMessages.joinAccept}
         description={policyMessages.joinAcceptDesc}
       />
       <Form.Field
@@ -78,7 +78,7 @@ const DefaultRoutingPolicyForm = () => (
       <Form.Field
         name="policy.downlink.application_data"
         component={Checkbox}
-        label={policyMessages.applicationData}
+        label={sharedMessages.appData}
         description={policyMessages.applicationDataAllowDesc}
       />
     </Col>
diff --git a/pkg/webui/console/components/payload-formatters-form/index.js b/pkg/webui/console/components/payload-formatters-form/index.js
index 3aea48e963..a7b212c8b6 100644
--- a/pkg/webui/console/components/payload-formatters-form/index.js
+++ b/pkg/webui/console/components/payload-formatters-form/index.js
@@ -56,7 +56,6 @@ const m = defineMessages({
   grpcFieldDescription: 'The address of the service to connect to',
   appFormatter: 'Use application payload formatter',
   appFormatterWarning: 'This option will affect both uplink and downlink formatter',
-  setupSubTitle: 'Setup',
   defaultFormatter:
     'Click <Link>here</Link> to modify the default payload formatter for this application. The payload formatter of this application is currently set to `{defaultFormatter}`',
   pasteRepositoryFormatter: 'Paste repository formatter',
@@ -419,7 +418,7 @@ const PayloadFormattersForm = ({
           >
             {() => (
               <>
-                <Form.SubTitle title={m.setupSubTitle} />
+                <Form.SubTitle title={sharedMessages.setupSubTitle} />
                 <Form.Field
                   name={FIELD_NAMES.SELECT}
                   title={m.formatterType}
diff --git a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
index 90adcc0a9a..b118ab1901 100644
--- a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
+++ b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
@@ -274,7 +274,7 @@ const PacketBroker = () => {
           <Message content={m.whyNetworkPeeringTitle} component="h3" />
           <Message content={m.whyNetworkPeeringText} className={style.info} component="p" />
           <Message content={m.enbaling} className={style.info} />
-          <Message content={m.setup} component="h3" className="mt-cs-xxl" />
+          <Message content={sharedMessages.setupSubTitle} component="h3" className="mt-cs-xxl" />
           {!enabled && <Notification warning small content={m.packetBrokerDisabledDesc} />}
           {showError && <ErrorNotification small content={infoError} />}
           {enabled && (
diff --git a/pkg/webui/console/views/admin-packet-broker/messages.js b/pkg/webui/console/views/admin-packet-broker/messages.js
index f705188c89..d7a09d09ad 100644
--- a/pkg/webui/console/views/admin-packet-broker/messages.js
+++ b/pkg/webui/console/views/admin-packet-broker/messages.js
@@ -24,7 +24,6 @@ export default defineMessages({
     'Since LoRaWAN uses shared spectrum, gateways receive messages from devices registered on other LoRaWAN networks. Instead of discarding this traffic, these messages can be forwarded via Packet Broker to the home network of these devices. This extends coverage of networks and allows devices to use higher data rates that reduce channel utilization and increase battery life. No sensitive data is exposed as LoRaWAN is end-to-end encrypted and integrity protected.',
   enbaling:
     'Enable forwarding via the options below or define custom routing policies. In the Networks tab below (visible by selecting the option "Use custom routing policies"), you can see which other networks are forwarding data to this network.',
-  setup: 'Setup',
   packetBrokerDisabledDesc:
     'The Things Stack is not set up to use Packet Broker. Please refer to the documentation link above for instructions on how to set up The Things Stack for peering with Packet Broker.',
   enablePacketBroker: 'Enable Packet Broker',
diff --git a/pkg/webui/lib/shared-messages.js b/pkg/webui/lib/shared-messages.js
index 7537d56f14..f6ac1a9690 100644
--- a/pkg/webui/lib/shared-messages.js
+++ b/pkg/webui/lib/shared-messages.js
@@ -459,6 +459,7 @@ export default defineMessages({
   sessions: 'Sessions',
   setLoRaCloudToken: 'Set LoRa Cloud token',
   settings: 'Settings',
+  setupSubTitle: 'Setup',
   shareGatewayInfo: 'Share gateway information',
   skipCryptoDescription: 'Skip decryption of uplink payloads and encryption of downlink payloads',
   skipCryptoPlaceholder: 'Encryption/decryption disabled',
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 0d57461ce6..f4cca16a58 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -252,7 +252,6 @@
   "console.components.gateway-api-keys-modal.index.description": "Note: After closing this window, these API keys will not be accessible for download anymore. Please make sure to download and store them now.",
   "console.components.gateway-api-keys-modal.index.downloadLns": "Download LNS key",
   "console.components.gateway-api-keys-modal.index.downloadCups": "Download CUPS key",
-  "console.components.gateway-visibility-form.index.saveDefaultGatewayVisibility": "Save default gateway visibility",
   "console.components.location-form.index.deleteAllLocations": "Delete all location data",
   "console.components.location-form.index.deleteFailure": "An error occurred and the location could not be deleted",
   "console.components.location-form.index.deleteLocation": "Remove location data",
@@ -304,7 +303,6 @@
   "console.components.payload-formatters-form.index.grpcFieldDescription": "The address of the service to connect to",
   "console.components.payload-formatters-form.index.appFormatter": "Use application payload formatter",
   "console.components.payload-formatters-form.index.appFormatterWarning": "This option will affect both uplink and downlink formatter",
-  "console.components.payload-formatters-form.index.setupSubTitle": "Setup",
   "console.components.payload-formatters-form.index.defaultFormatter": "Click <Link>here</Link> to modify the default payload formatter for this application. The payload formatter of this application is currently set to `{defaultFormatter}`",
   "console.components.payload-formatters-form.index.pasteRepositoryFormatter": "Paste repository formatter",
   "console.components.payload-formatters-form.index.pasteApplicationFormatter": "Paste application formatter",
@@ -682,7 +680,6 @@
   "console.views.admin-packet-broker.messages.whyNetworkPeeringTitle": "Why choose network peering?",
   "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "Since LoRaWAN uses shared spectrum, gateways receive messages from devices registered on other LoRaWAN networks. Instead of discarding this traffic, these messages can be forwarded via Packet Broker to the home network of these devices. This extends coverage of networks and allows devices to use higher data rates that reduce channel utilization and increase battery life. No sensitive data is exposed as LoRaWAN is end-to-end encrypted and integrity protected.",
   "console.views.admin-packet-broker.messages.enbaling": "Enable forwarding via the options below or define custom routing policies. In the Networks tab below (visible by selecting the option \"Use custom routing policies\"), you can see which other networks are forwarding data to this network.",
-  "console.views.admin-packet-broker.messages.setup": "Setup",
   "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "The Things Stack is not set up to use Packet Broker. Please refer to the documentation link above for instructions on how to set up The Things Stack for peering with Packet Broker.",
   "console.views.admin-packet-broker.messages.enablePacketBroker": "Enable Packet Broker",
   "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "Enabling will allow other networks to send traffic to you as well as you forwarding traffic to them, based on the exact routing policy.",
@@ -1387,6 +1384,7 @@
   "lib.shared-messages.sessions": "Sessions",
   "lib.shared-messages.setLoRaCloudToken": "Set LoRa Cloud token",
   "lib.shared-messages.settings": "Settings",
+  "lib.shared-messages.setupSubTitle": "Setup",
   "lib.shared-messages.shareGatewayInfo": "Share gateway information",
   "lib.shared-messages.skipCryptoDescription": "Skip decryption of uplink payloads and encryption of downlink payloads",
   "lib.shared-messages.skipCryptoPlaceholder": "Encryption/decryption disabled",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index 2a9f6cdb9a..b4d0b3fa2b 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -252,7 +252,6 @@
   "console.components.gateway-api-keys-modal.index.description": "注意：このウィンドウを閉じると、これらのAPIキーはダウンロードできなくなります。必ずダウンロードして保存してください！",
   "console.components.gateway-api-keys-modal.index.downloadLns": "LNSキーをダウンロード",
   "console.components.gateway-api-keys-modal.index.downloadCups": "CUPSキーをダウンロード",
-  "console.components.gateway-visibility-form.index.saveDefaultGatewayVisibility": "デフォルトゲートウェイの可視性を保存",
   "console.components.location-form.index.deleteAllLocations": "すべての位置情報を削除",
   "console.components.location-form.index.deleteFailure": "エラーが発生し、その場所を削除できませんでした",
   "console.components.location-form.index.deleteLocation": "場所入力を削除",
@@ -304,7 +303,6 @@
   "console.components.payload-formatters-form.index.grpcFieldDescription": "接続先サービスのアドレス",
   "console.components.payload-formatters-form.index.appFormatter": "アプリケーションペイロードフォーマッタを使用",
   "console.components.payload-formatters-form.index.appFormatterWarning": "このオプションは、アップリンクとダウンリンクの両方のフォーマッタをアプリケーションリンクのデフォルトに設定します",
-  "console.components.payload-formatters-form.index.setupSubTitle": "セットアップ",
   "console.components.payload-formatters-form.index.defaultFormatter": "<Link>ここ</Link> をクリックすると、このアプリケーションのデフォルトのペイロードフォーマッタを変更することができます。このアプリケーションのペイロードフォーマッタは現在 `{defaultFormatter}` に設定されています",
   "console.components.payload-formatters-form.index.pasteRepositoryFormatter": "リポジトリフォーマッター貼り付け",
   "console.components.payload-formatters-form.index.pasteApplicationFormatter": "アプリケーションフォーマッター貼り付け",
@@ -682,7 +680,6 @@
   "console.views.admin-packet-broker.messages.whyNetworkPeeringTitle": "",
   "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "",
   "console.views.admin-packet-broker.messages.enbaling": "",
-  "console.views.admin-packet-broker.messages.setup": "",
   "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "",
   "console.views.admin-packet-broker.messages.enablePacketBroker": "",
   "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "ご自宅のネットワークから、またはご自宅のネットワークへのピアリングを可能にするには、ご自宅のネットワークを登録する必要があります。これにより、お客様のネットワークがPacket Brokerに認識され、お客様のネットワークのピアリング動作を設定することができます",
@@ -1387,6 +1384,7 @@
   "lib.shared-messages.sessions": "",
   "lib.shared-messages.setLoRaCloudToken": "",
   "lib.shared-messages.settings": "",
+  "lib.shared-messages.setupSubTitle": "",
   "lib.shared-messages.shareGatewayInfo": "",
   "lib.shared-messages.skipCryptoDescription": "",
   "lib.shared-messages.skipCryptoPlaceholder": "",

From 838fd9c36c0d9b68818ce9baa193b507280ca266 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 23 Oct 2023 16:50:35 +0200
Subject: [PATCH 14/28] console: Remove gateway visibility

---
 .../default-gateway-visibility.js             | 73 -------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 pkg/webui/console/views/admin-packet-broker/default-gateway-visibility.js

diff --git a/pkg/webui/console/views/admin-packet-broker/default-gateway-visibility.js b/pkg/webui/console/views/admin-packet-broker/default-gateway-visibility.js
deleted file mode 100644
index ce1703ca42..0000000000
--- a/pkg/webui/console/views/admin-packet-broker/default-gateway-visibility.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright © 2022 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 } from 'react-grid-system'
-import { useSelector, useDispatch } from 'react-redux'
-
-import toast from '@ttn-lw/components/toast'
-
-import Message from '@ttn-lw/lib/components/message'
-
-import GatewayVisibilityForm from '@console/components/gateway-visibility-form'
-
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-
-import { setHomeNetworkDefaultGatewayVisibility } from '@console/store/actions/packet-broker'
-
-import { selectHomeNetworkDefaultGatewayVisibility } from '@console/store/selectors/packet-broker'
-
-import m from './messages'
-
-import style from './admin-packet-broker.styl'
-
-const DefaultGatewayVisibilityView = () => {
-  const dispatch = useDispatch()
-  const defaultGatewayVisibility = useSelector(selectHomeNetworkDefaultGatewayVisibility)
-  const initialValues = {
-    visibility: defaultGatewayVisibility.visibility || {},
-  }
-  const [formError, setFormError] = useState(undefined)
-  const handleDefaultGatewayVisibilitySubmit = useCallback(
-    async ({ visibility }) => {
-      try {
-        await dispatch(attachPromise(setHomeNetworkDefaultGatewayVisibility(visibility)))
-        toast({
-          message: m.defaultGatewayVisibilitySet,
-          type: toast.types.SUCCESS,
-        })
-      } catch (error) {
-        setFormError(error)
-      }
-    },
-    [dispatch, setFormError],
-  )
-
-  return (
-    <Col md={12}>
-      <Message
-        content={m.gatewayVisibilityInformation}
-        component="p"
-        className={style.routingPolicyInformation}
-      />
-      <GatewayVisibilityForm
-        onSubmit={handleDefaultGatewayVisibilitySubmit}
-        initialValues={initialValues}
-        error={formError}
-      />
-    </Col>
-  )
-}
-
-export default DefaultGatewayVisibilityView

From fdc9bae22a0f5c7942abd77e49bb219d3c9f137b Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 23 Oct 2023 16:53:25 +0200
Subject: [PATCH 15/28] console: Remove default gateway visibility form

---
 .../gateway-visibility-form/index.js          | 130 ------------------
 1 file changed, 130 deletions(-)
 delete mode 100644 pkg/webui/console/components/gateway-visibility-form/index.js

diff --git a/pkg/webui/console/components/gateway-visibility-form/index.js b/pkg/webui/console/components/gateway-visibility-form/index.js
deleted file mode 100644
index 3a5372f6af..0000000000
--- a/pkg/webui/console/components/gateway-visibility-form/index.js
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright © 2022 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 } from 'react'
-import { Col, Row } from 'react-grid-system'
-import { defineMessages } from 'react-intl'
-
-import Form from '@ttn-lw/components/form'
-import Checkbox from '@ttn-lw/components/checkbox'
-import SubmitBar from '@ttn-lw/components/submit-bar'
-import SubmitButton from '@ttn-lw/components/submit-button'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-import Yup from '@ttn-lw/lib/yup'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-
-import gatewayVisibilityMessages from '@console/lib/packet-broker/messages'
-
-const m = defineMessages({
-  saveDefaultGatewayVisibility: 'Save default gateway visibility',
-})
-
-const validationSchema = Yup.object({
-  visibility: Yup.object({}),
-})
-
-const GatewayVisibilityForm = ({ onSubmit, initialValues, error }) => {
-  const handleSubmit = useCallback(values => onSubmit(validationSchema.cast(values)), [onSubmit])
-
-  return (
-    <Form
-      onSubmit={handleSubmit}
-      initialValues={initialValues}
-      error={error}
-      validationSchema={validationSchema}
-    >
-      <Row>
-        <Col md={6} xs={12}>
-          <Form.Field
-            name="visibility.location"
-            component={Checkbox}
-            label={sharedMessages.location}
-          />
-          <Form.Field
-            name="visibility.antenna_placement"
-            component={Checkbox}
-            label={gatewayVisibilityMessages.gatewayAntennaPlacementLabel}
-            description={gatewayVisibilityMessages.gatewayAntennaPlacementDescription}
-          />
-          <Form.Field
-            name="visibility.antenna_count"
-            component={Checkbox}
-            label={gatewayVisibilityMessages.gatewayAntennaCountLabel}
-          />
-          <Form.Field
-            name="visibility.fine_timestamps"
-            component={Checkbox}
-            label={gatewayVisibilityMessages.gatewayFineTimestampsLabel}
-            description={gatewayVisibilityMessages.gatewayFineTimestampsDescription}
-          />
-        </Col>
-        <Col sm={6} xs={12}>
-          <Form.Field
-            name="visibility.contact_info"
-            component={Checkbox}
-            label={gatewayVisibilityMessages.gatewayContactInfoLabel}
-            description={gatewayVisibilityMessages.gatewayContactInfoDescription}
-          />
-          <Form.Field
-            name="visibility.status"
-            component={Checkbox}
-            label={gatewayVisibilityMessages.gatewayStatusLabel}
-            description={gatewayVisibilityMessages.gatewayStatusDescription}
-          />
-          <Form.Field
-            name="visibility.frequency_plan"
-            component={Checkbox}
-            label={gatewayVisibilityMessages.gatewayFreqPlanLabel}
-          />
-          <Form.Field
-            name="visibility.packet_rates"
-            component={Checkbox}
-            label={gatewayVisibilityMessages.gatewayPacketRatesLabel}
-            description={gatewayVisibilityMessages.gatewayPacketRatesDescription}
-          />
-        </Col>
-      </Row>
-      <SubmitBar>
-        <Form.Submit component={SubmitButton} message={m.saveDefaultGatewayVisibility} />
-      </SubmitBar>
-    </Form>
-  )
-}
-
-GatewayVisibilityForm.propTypes = {
-  error: PropTypes.error,
-  initialValues: PropTypes.shape({
-    visibility: PropTypes.shape({}),
-  }),
-  onSubmit: PropTypes.func.isRequired,
-}
-
-GatewayVisibilityForm.defaultProps = {
-  error: undefined,
-  initialValues: {
-    visibility: {
-      location: false,
-      antenna_placement: false,
-      antenna_count: false,
-      fine_timestamps: false,
-      contact_info: false,
-      status: false,
-      frequency_plan: false,
-      packet_rates: false,
-    },
-  },
-}
-
-export default GatewayVisibilityForm

From 14c2c8cfaf82e42a23ec0883aed7bd2bc272d264 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 23 Oct 2023 17:01:55 +0200
Subject: [PATCH 16/28] console: Update locales

---
 pkg/webui/locales/ja.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index b4d0b3fa2b..476acf5fe2 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -707,9 +707,9 @@
   "console.views.admin-packet-broker.messages.deregisterNetwork": "このネットワークの登録解除",
   "console.views.admin-packet-broker.messages.confirmDeregister": "登録解除の確認",
   "console.views.admin-packet-broker.messages.Are you sure you want to deregister your network from Packet Broker?{lineBreak}This will <b>permanently delete<.b> all routing policies and may stop traffic from flowing.{lineBreak}Traffic may still be forwarded to your network based on default routing policies configured by forwarders.": "Packet Brokerからネットワークの登録を解除してよろしいですか？ {lineBreak}すべてのルーティングポリシーが永久に削除されるため、トラフィックが流れなくなる可能性があります。{lineBreak}フォワーダが設定したデフォルトのルーティングポリシーに基づき、トラフィックがネットワークに転送される可能性はあります",
-  "console.views.admin-packet-broker.messages.defaultGatewayVisibility": "デフォルトゲートウェイの可視化",
-  "console.views.admin-packet-broker.messages.gatewayVisibilityInformation": "チェックボックスを使用して、ゲートウェイの情報を表示するように制御することができます。この情報は、登録されたネットワークだけでなく、一般にも公開されることに注意してください",
-  "console.views.admin-packet-broker.messages.defaultGatewayVisibilitySet": "デフォルトゲートウェイの可視化設定",
+  "console.views.admin-packet-broker.messages.defaultGatewayVisibility": "",
+  "console.views.admin-packet-broker.messages.gatewayVisibilityInformation": "",
+  "console.views.admin-packet-broker.messages.defaultGatewayVisibilitySet": "",
   "console.views.admin-packet-broker.messages.packetBrokerStatusPage": "Packet Broker ステータスページ",
   "console.views.application-add.index.appDescription": "アプリケーション内では、エンドデバイスとそのネットワークデータを登録、管理することができます。デバイス群を設定した後、多くの統合オプションの1つを使用して、関連データを外部サービスに渡します。<Link>Adding Applications</Link>　に関するガイドで詳しく説明しています",
   "console.views.application-integrations-lora-cloud.index.loraCloudInfoText": "LoRaWANネットワークやLoRaベースのデバイスに関連する一般的なタスクのシンプルなソリューションを可能にする付加価値の高いAPIをローラクラウドが提供します。以下からLoRaCloudのインテグレーションを設定することができます",

From e3854b49b85ecdc20f37b3c712fad936bd4b984a Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Tue, 24 Oct 2023 09:44:56 +0200
Subject: [PATCH 17/28] console: Update e2e tests

---
 .../console/admin-panel/packet-broker/routing-policies.spec.js  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
index 5ad026ae03..c4d4a9e02f 100644
--- a/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
+++ b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
@@ -35,6 +35,8 @@ describe('Packet Broker routing policies', () => {
   it('succeeds setting a "traffic to all networks" routing configuration', () => {
     cy.intercept('GET', '/api/v3/pba/home-networks/policies/default', { statusCode: 404 })
     cy.intercept('PUT', '/api/v3/pba/home-networks/policies/default', {})
+    cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/19', {})
+    cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/19/johan', {})
     cy.intercept('/api/v3/pba/networks*', { fixture: 'console/packet-broker/networks.json' })
     cy.intercept('/api/v3/pba/home-networks/policies*', {
       fixture: 'console/packet-broker/policies-home-network.json',

From 97d0b0af11f885771678364084b32f4b61eec12f Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Tue, 24 Oct 2023 11:42:18 +0200
Subject: [PATCH 18/28] console: Restore gateway visibility

---
 .../default-gateway-visibility.spec.js        |  75 ++++++++++
 .../gateway-visibility-form/index.js          | 130 ++++++++++++++++++
 .../default-gateway-visibility.js             |  73 ++++++++++
 3 files changed, 278 insertions(+)
 create mode 100644 cypress/e2e/console/admin-panel/packet-broker/default-gateway-visibility.spec.js
 create mode 100644 pkg/webui/console/components/gateway-visibility-form/index.js
 create mode 100644 pkg/webui/console/views/admin-packet-broker/default-gateway-visibility.js

diff --git a/cypress/e2e/console/admin-panel/packet-broker/default-gateway-visibility.spec.js b/cypress/e2e/console/admin-panel/packet-broker/default-gateway-visibility.spec.js
new file mode 100644
index 0000000000..c2c2e7bf74
--- /dev/null
+++ b/cypress/e2e/console/admin-panel/packet-broker/default-gateway-visibility.spec.js
@@ -0,0 +1,75 @@
+// Copyright © 2022 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.
+
+describe('Packet Broker routing policies', () => {
+  before(() => {
+    cy.dropAndSeedDatabase()
+  })
+
+  beforeEach(() => {
+    cy.fixture('console/packet-broker/policies-home-network.json').as('homeNetworkPolicies')
+
+    cy.intercept('/api/v3/pba/info', { fixture: 'console/packet-broker/info-registered.json' })
+
+    cy.loginConsole({ user_id: 'admin', password: 'admin' })
+  })
+
+  it('succeeds setting default gateway visibility configuration', () => {
+    cy.intercept('GET', '/api/v3/pba/home-networks/gateway-visibilities/default', {
+      statusCode: 404,
+    })
+    cy.intercept('GET', '/api/v3/pba/home-networks/policies/default', { statusCode: 404 })
+    cy.intercept('PUT', '/api/v3/pba/home-networks/gateway-visibilities/default', {}).as('putCall')
+    cy.visit(
+      `${Cypress.config('consoleRootPath')}/admin-panel/packet-broker/default-gateway-visibility`,
+    )
+
+    cy.findByLabelText('Location').check()
+    cy.findByLabelText('Antenna placement').check()
+    cy.findByLabelText('Antenna count').check()
+    cy.findByLabelText('Fine timestamps').check()
+
+    cy.findByRole('button', { name: 'Save default gateway visibility' }).click()
+
+    cy.findByTestId('error-notification').should('not.exist')
+    cy.findByTestId('toast-notification')
+      .findByText('Default gateway visibility set')
+      .should('be.visible')
+    cy.get('@putCall').should('have.property', 'state', 'Complete')
+  })
+
+  it('succeeds unsetting default gateway visibility configuration', () => {
+    cy.intercept('GET', '/api/v3/pba/home-networks/policies/default', { statusCode: 404 })
+    cy.intercept('GET', '/api/v3/pba/home-networks/gateway-visibilities/default', {
+      fixture: 'console/packet-broker/default-gateway-visibility.json',
+    })
+    cy.intercept('PUT', '/api/v3/pba/home-networks/gateway-visibilities/default', {}).as('putCall')
+    cy.visit(
+      `${Cypress.config('consoleRootPath')}/admin-panel/packet-broker/default-gateway-visibility`,
+    )
+
+    cy.findByLabelText('Location').uncheck()
+    cy.findByLabelText('Antenna placement').uncheck()
+    cy.findByLabelText('Antenna count').uncheck()
+    cy.findByLabelText('Fine timestamps').uncheck()
+
+    cy.findByRole('button', { name: 'Save default gateway visibility' }).click()
+
+    cy.findByTestId('error-notification').should('not.exist')
+    cy.findByTestId('toast-notification')
+      .findByText('Default gateway visibility set')
+      .should('be.visible')
+    cy.get('@putCall').should('have.property', 'state', 'Complete')
+  })
+})
diff --git a/pkg/webui/console/components/gateway-visibility-form/index.js b/pkg/webui/console/components/gateway-visibility-form/index.js
new file mode 100644
index 0000000000..535477a7ac
--- /dev/null
+++ b/pkg/webui/console/components/gateway-visibility-form/index.js
@@ -0,0 +1,130 @@
+// Copyright © 2022 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 } from 'react'
+import { Col, Row } from 'react-grid-system'
+import { defineMessages } from 'react-intl'
+
+import Form from '@ttn-lw/components/form'
+import Checkbox from '@ttn-lw/components/checkbox'
+import SubmitBar from '@ttn-lw/components/submit-bar'
+import SubmitButton from '@ttn-lw/components/submit-button'
+
+import PropTypes from '@ttn-lw/lib/prop-types'
+import Yup from '@ttn-lw/lib/yup'
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import gatewayVisibilityMessages from '@console/lib/packet-broker/messages'
+
+const m = defineMessages({
+  saveDefaultGatewayVisibility: 'Save default gateway visibility',
+})
+
+const validationSchema = Yup.object({
+  visibility: Yup.object({}),
+})
+
+const GatewayVisibilityForm = ({ onSubmit, initialValues, error }) => {
+  const handleSubmit = useCallback(values => onSubmit(validationSchema.cast(values)), [onSubmit])
+
+  return (
+    <Form
+      onSubmit={handleSubmit}
+      initialValues={initialValues}
+      error={error}
+      validationSchema={validationSchema}
+    >
+      <Row>
+        <Col md={6} xs={12}>
+          <Form.Field
+            name="visibility.location"
+            component={Checkbox}
+            label={sharedMessages.location}
+          />
+          <Form.Field
+            name="visibility.antenna_placement"
+            component={Checkbox}
+            label={gatewayVisibilityMessages.gatewayAntennaPlacementLabel}
+            description={gatewayVisibilityMessages.gatewayAntennaPlacementDescription}
+          />
+          <Form.Field
+            name="visibility.antenna_count"
+            component={Checkbox}
+            label={gatewayVisibilityMessages.gatewayAntennaCountLabel}
+          />
+          <Form.Field
+            name="visibility.fine_timestamps"
+            component={Checkbox}
+            label={gatewayVisibilityMessages.gatewayFineTimestampsLabel}
+            description={gatewayVisibilityMessages.gatewayFineTimestampsDescription}
+          />
+        </Col>
+        <Col sm={6} xs={12}>
+          <Form.Field
+            name="visibility.contact_info"
+            component={Checkbox}
+            label={sharedMessages.contactInformation}
+            description={gatewayVisibilityMessages.gatewayContactInfoDescription}
+          />
+          <Form.Field
+            name="visibility.status"
+            component={Checkbox}
+            label={sharedMessages.status}
+            description={gatewayVisibilityMessages.gatewayStatusDescription}
+          />
+          <Form.Field
+            name="visibility.frequency_plan"
+            component={Checkbox}
+            label={sharedMessages.frequencyPlan}
+          />
+          <Form.Field
+            name="visibility.packet_rates"
+            component={Checkbox}
+            label={gatewayVisibilityMessages.gatewayPacketRatesLabel}
+            description={gatewayVisibilityMessages.gatewayPacketRatesDescription}
+          />
+        </Col>
+      </Row>
+      <SubmitBar>
+        <Form.Submit component={SubmitButton} message={m.saveDefaultGatewayVisibility} />
+      </SubmitBar>
+    </Form>
+  )
+}
+
+GatewayVisibilityForm.propTypes = {
+  error: PropTypes.error,
+  initialValues: PropTypes.shape({
+    visibility: PropTypes.shape({}),
+  }),
+  onSubmit: PropTypes.func.isRequired,
+}
+
+GatewayVisibilityForm.defaultProps = {
+  error: undefined,
+  initialValues: {
+    visibility: {
+      location: false,
+      antenna_placement: false,
+      antenna_count: false,
+      fine_timestamps: false,
+      contact_info: false,
+      status: false,
+      frequency_plan: false,
+      packet_rates: false,
+    },
+  },
+}
+
+export default GatewayVisibilityForm
diff --git a/pkg/webui/console/views/admin-packet-broker/default-gateway-visibility.js b/pkg/webui/console/views/admin-packet-broker/default-gateway-visibility.js
new file mode 100644
index 0000000000..ce1703ca42
--- /dev/null
+++ b/pkg/webui/console/views/admin-packet-broker/default-gateway-visibility.js
@@ -0,0 +1,73 @@
+// Copyright © 2022 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 } from 'react-grid-system'
+import { useSelector, useDispatch } from 'react-redux'
+
+import toast from '@ttn-lw/components/toast'
+
+import Message from '@ttn-lw/lib/components/message'
+
+import GatewayVisibilityForm from '@console/components/gateway-visibility-form'
+
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
+
+import { setHomeNetworkDefaultGatewayVisibility } from '@console/store/actions/packet-broker'
+
+import { selectHomeNetworkDefaultGatewayVisibility } from '@console/store/selectors/packet-broker'
+
+import m from './messages'
+
+import style from './admin-packet-broker.styl'
+
+const DefaultGatewayVisibilityView = () => {
+  const dispatch = useDispatch()
+  const defaultGatewayVisibility = useSelector(selectHomeNetworkDefaultGatewayVisibility)
+  const initialValues = {
+    visibility: defaultGatewayVisibility.visibility || {},
+  }
+  const [formError, setFormError] = useState(undefined)
+  const handleDefaultGatewayVisibilitySubmit = useCallback(
+    async ({ visibility }) => {
+      try {
+        await dispatch(attachPromise(setHomeNetworkDefaultGatewayVisibility(visibility)))
+        toast({
+          message: m.defaultGatewayVisibilitySet,
+          type: toast.types.SUCCESS,
+        })
+      } catch (error) {
+        setFormError(error)
+      }
+    },
+    [dispatch, setFormError],
+  )
+
+  return (
+    <Col md={12}>
+      <Message
+        content={m.gatewayVisibilityInformation}
+        component="p"
+        className={style.routingPolicyInformation}
+      />
+      <GatewayVisibilityForm
+        onSubmit={handleDefaultGatewayVisibilitySubmit}
+        initialValues={initialValues}
+        error={formError}
+      />
+    </Col>
+  )
+}
+
+export default DefaultGatewayVisibilityView

From 64a0fd199b47633b10ce7d63dbf8476a54d4788b Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Tue, 24 Oct 2023 11:44:46 +0200
Subject: [PATCH 19/28] console: Separate routing configuration to include
 gateway visibility

---
 .../default-routing-policy-form/index.js      |   8 +-
 .../routing-policy-form.styl                  |  19 --
 .../payload-formatters-form/index.js          |   2 +-
 .../admin-packet-broker.js                    | 223 ++--------------
 .../views/admin-packet-broker/messages.js     |   1 +
 .../network-routing-policies.js               |   4 +-
 .../routing-configuration.js                  | 238 ++++++++++++++++++
 pkg/webui/lib/shared-messages.js              |   2 +-
 pkg/webui/locales/en.json                     |   5 +-
 pkg/webui/locales/ja.json                     |   5 +-
 10 files changed, 274 insertions(+), 233 deletions(-)
 delete mode 100644 pkg/webui/console/components/default-routing-policy-form/routing-policy-form.styl
 create mode 100644 pkg/webui/console/views/admin-packet-broker/routing-configuration.js

diff --git a/pkg/webui/console/components/default-routing-policy-form/index.js b/pkg/webui/console/components/default-routing-policy-form/index.js
index bcc1bc0cb0..fcb480bcf0 100644
--- a/pkg/webui/console/components/default-routing-policy-form/index.js
+++ b/pkg/webui/console/components/default-routing-policy-form/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// 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.
@@ -24,12 +24,10 @@ import sharedMessages from '@ttn-lw/lib/shared-messages'
 
 import policyMessages from '@console/lib/packet-broker/messages'
 
-import style from './routing-policy-form.styl'
-
 const DefaultRoutingPolicyForm = () => (
   <Row>
     <Col md={6} xs={12}>
-      <Message content={sharedMessages.uplink} component="h4" className={style.directionHeader} />
+      <Message content={sharedMessages.uplink} component="h4" className="mb-cs-xs" />
       <Form.Field
         name="policy.uplink.join_request"
         component={Checkbox}
@@ -62,7 +60,7 @@ const DefaultRoutingPolicyForm = () => (
       />
     </Col>
     <Col sm={6} xs={12}>
-      <Message content={sharedMessages.downlink} component="h4" className={style.directionHeader} />
+      <Message content={sharedMessages.downlink} component="h4" className="mb-cs-xs" />
       <Form.Field
         name="policy.downlink.join_accept"
         component={Checkbox}
diff --git a/pkg/webui/console/components/default-routing-policy-form/routing-policy-form.styl b/pkg/webui/console/components/default-routing-policy-form/routing-policy-form.styl
deleted file mode 100644
index d514497e04..0000000000
--- a/pkg/webui/console/components/default-routing-policy-form/routing-policy-form.styl
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright © 2021 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.
-
-.direction-header
-  margin-bottom: $cs.xs
-
-.policy-source
-  margin-bottom: $ls.s
diff --git a/pkg/webui/console/components/payload-formatters-form/index.js b/pkg/webui/console/components/payload-formatters-form/index.js
index a7b212c8b6..ea7ec8d788 100644
--- a/pkg/webui/console/components/payload-formatters-form/index.js
+++ b/pkg/webui/console/components/payload-formatters-form/index.js
@@ -418,7 +418,7 @@ const PayloadFormattersForm = ({
           >
             {() => (
               <>
-                <Form.SubTitle title={sharedMessages.setupSubTitle} />
+                <Form.SubTitle title={sharedMessages.setup} />
                 <Form.Field
                   name={FIELD_NAMES.SELECT}
                   title={m.formatterType}
diff --git a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
index b118ab1901..88063a0eff 100644
--- a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
+++ b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
@@ -17,7 +17,6 @@ import { Container, Col, Row } from 'react-grid-system'
 import { useSelector, useDispatch } from 'react-redux'
 import { Routes, Route } from 'react-router-dom'
 import classnames from 'classnames'
-import { isEqual } from 'lodash'
 
 import PacketBrokerLogo from '@assets/misc/packet-broker.svg'
 
@@ -27,35 +26,16 @@ import Switch from '@ttn-lw/components/switch'
 import Tabs from '@ttn-lw/components/tabs'
 import PortalledModal from '@ttn-lw/components/modal/portalled'
 import ErrorNotification from '@ttn-lw/components/error-notification'
-import Radio from '@ttn-lw/components/radio-button'
-import Form from '@ttn-lw/components/form'
-import toast from '@ttn-lw/components/toast'
-import SubmitBar from '@ttn-lw/components/submit-bar'
-import SubmitButton from '@ttn-lw/components/submit-button'
 import Notification from '@ttn-lw/components/notification'
 
 import Message from '@ttn-lw/lib/components/message'
-import RequireRequest from '@ttn-lw/lib/components/require-request'
 import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 
-import SubViewErrorComponent from '@console/views/sub-view-error'
-
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import Yup from '@ttn-lw/lib/yup'
 
-import { isNotEnabledError, isValidPolicy } from '@console/lib/packet-broker/utils'
+import { isNotEnabledError } from '@console/lib/packet-broker/utils'
 
-import {
-  registerPacketBroker,
-  deregisterPacketBroker,
-  getHomeNetworkDefaultRoutingPolicy,
-  setHomeNetworkDefaultRoutingPolicy,
-  deleteHomeNetworkDefaultRoutingPolicy,
-  setHomeNetworkRoutingPolicy,
-  getHomeNetworkRoutingPolicies,
-  deleteAllHomeNetworkRoutingPolicies,
-} from '@console/store/actions/packet-broker'
+import { registerPacketBroker, deregisterPacketBroker } from '@console/store/actions/packet-broker'
 
 import {
   selectRegistered,
@@ -63,62 +43,14 @@ import {
   selectEnabled,
   selectListed,
   selectInfoError,
-  selectHomeNetworkDefaultRoutingPolicy,
-  selectPacketBrokerHomeNetworkPoliciesStore,
 } from '@console/store/selectors/packet-broker'
 
-import DefaultRoutingPolicyView from './default-routing-policy'
-import NetworkRoutingPoliciesView from './network-routing-policies'
+import RoutingConfigurationView from './routing-configuration'
+import DefaultGatewayVisibilityView from './default-gateway-visibility'
 import m from './messages'
 
 import style from './admin-packet-broker.styl'
 
-const validationSchema = Yup.object({
-  _routing_configuration: Yup.string().oneOf(['all_networks', 'ttn', 'custom']),
-  policy: Yup.object({
-    uplink: Yup.object({}),
-    downlink: Yup.object({}),
-  }),
-})
-
-const fullyPermissiveNetworkPolicy = {
-  uplink: {
-    join_request: true,
-    mac_data: true,
-    application_data: true,
-    signal_quality: true,
-    localization: true,
-  },
-  downlink: {
-    join_accept: true,
-    mac_data: true,
-    application_data: true,
-  },
-}
-
-const fullyRestrictiveNetworkPolicy = {
-  uplink: {
-    join_request: false,
-    mac_data: false,
-    application_data: false,
-    signal_quality: false,
-    localization: false,
-  },
-  downlink: {
-    join_accept: false,
-    mac_data: false,
-    application_data: false,
-  },
-}
-
-const TTN_NET_ID = '19'
-const peerWithEveryNetwork = policy =>
-  isEqual(policy.uplink, fullyPermissiveNetworkPolicy.uplink) &&
-  isEqual(policy.downlink, fullyPermissiveNetworkPolicy.downlink)
-
-const onlyTtn = policies =>
-  Object.keys(policies).length === 1 && Object.keys(policies).includes(TTN_NET_ID)
-
 const PacketBroker = () => {
   const [activeTab, setActiveTab] = useState('default-routing-policy')
   const [deregisterModalVisible, setDeregisterModalVisible] = useState(false)
@@ -168,88 +100,17 @@ const PacketBroker = () => {
   )
 
   const tabs = [
-    { title: m.defaultRoutingPolicy, link: '/admin-panel/packet-broker', name: 'default' },
     {
-      title: sharedMessages.networks,
-      link: '/admin-panel/packet-broker/networks',
-      name: 'networks',
-      exact: false,
-    },
-  ]
-
-  const defaultRoutingPolicy = useSelector(selectHomeNetworkDefaultRoutingPolicy)
-  const routingPolicies = useSelector(selectPacketBrokerHomeNetworkPoliciesStore)
-  const initialValues = {
-    _routing_configuration:
-      peerWithEveryNetwork(defaultRoutingPolicy) && isValidPolicy(defaultRoutingPolicy)
-        ? 'all_networks'
-        : onlyTtn(routingPolicies) && !isValidPolicy(defaultRoutingPolicy)
-        ? 'ttn'
-        : 'custom',
-  }
-  initialValues.policy =
-    isValidPolicy(defaultRoutingPolicy) && !peerWithEveryNetwork(defaultRoutingPolicy)
-      ? defaultRoutingPolicy
-      : { uplink: {}, downlink: {} }
-
-  const [routingConfig, setRoutingConfig] = useState(undefined)
-  const [formError, setFormError] = useState(undefined)
-
-  const handleDefaultRoutingPolicySubmit = useCallback(
-    async values => {
-      const vals = validationSchema.cast(values)
-      const { _routing_configuration, policy } = vals
-      const ids = Object.keys(routingPolicies)
-
-      try {
-        if (_routing_configuration === 'ttn') {
-          await dispatch(attachPromise(deleteHomeNetworkDefaultRoutingPolicy()))
-          await dispatch(attachPromise(deleteAllHomeNetworkRoutingPolicies(ids)))
-          await dispatch(attachPromise(setHomeNetworkRoutingPolicy(TTN_NET_ID, policy)))
-        } else if (_routing_configuration === 'all_networks') {
-          await dispatch(attachPromise(deleteAllHomeNetworkRoutingPolicies(ids)))
-          await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
-        } else {
-          await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
-        }
-
-        toast({
-          message: m.defaultRoutingPolicySet,
-          type: toast.types.SUCCESS,
-        })
-      } catch (error) {
-        setFormError(error)
-      }
+      title: m.routingConfig,
+      link: '/admin-panel/packet-broker',
+      name: 'default',
     },
-    [dispatch, setFormError, routingPolicies],
-  )
-
-  const handleRoutingConfigChange = useCallback(
-    value => {
-      setRoutingConfig(value)
+    {
+      title: m.defaultGatewayVisibility,
+      link: '/admin-panel/packet-broker/default-gateway-visibility',
+      name: 'default-gateway-visibility',
     },
-    [setRoutingConfig],
-  )
-
-  const handleSetPolicies = useCallback(({ setValues }, { value }) => {
-    if (value !== 'custom') {
-      return setValues(values => ({
-        ...values,
-        _routing_configuration: value,
-        policy: fullyPermissiveNetworkPolicy,
-      }))
-    }
-
-    return setValues(values => ({
-      ...values,
-      _routing_configuration: value,
-      policy: fullyRestrictiveNetworkPolicy,
-    }))
-  }, [])
-
-  const showPolicyCheckboxes = routingConfig
-    ? routingConfig === 'custom'
-    : initialValues._routing_configuration === 'custom'
+  ]
 
   return (
     <Container>
@@ -274,7 +135,7 @@ const PacketBroker = () => {
           <Message content={m.whyNetworkPeeringTitle} component="h3" />
           <Message content={m.whyNetworkPeeringText} className={style.info} component="p" />
           <Message content={m.enbaling} className={style.info} />
-          <Message content={sharedMessages.setupSubTitle} component="h3" className="mt-cs-xxl" />
+          <Message content={sharedMessages.setup} component="h3" className="mt-cs-xxl" />
           {!enabled && <Notification warning small content={m.packetBrokerDisabledDesc} />}
           {showError && <ErrorNotification small content={infoError} />}
           {enabled && (
@@ -357,57 +218,13 @@ const PacketBroker = () => {
                 />
               </PortalledModal>
             </Col>
-            <Col md={12} style={{ position: 'relative' }}>
-              <Message
-                content={'Routing configuration'}
-                component="h3"
-                className={style.subTitle}
-              />
-              <RequireRequest
-                requestAction={[
-                  getHomeNetworkDefaultRoutingPolicy(),
-                  getHomeNetworkRoutingPolicies(),
-                ]}
-                errorRenderFunction={SubViewErrorComponent}
-                spinnerProps={{ inline: true, center: true, className: 'mt-ls-s' }}
-              >
-                <Form
-                  onSubmit={handleDefaultRoutingPolicySubmit}
-                  initialValues={initialValues}
-                  error={formError}
-                >
-                  <Form.Field
-                    component={Radio.Group}
-                    className="mb-cs-xl"
-                    name="_routing_configuration"
-                    onChange={handleRoutingConfigChange}
-                    valueSetter={handleSetPolicies}
-                  >
-                    <Radio
-                      label="Forward traffic to all networks registered in Packet Broker"
-                      value="all_networks"
-                    />
-                    <Radio
-                      label="Forward traffic to The Things Stack Sandbox (community network) only"
-                      value="ttn"
-                    />
-                    <Radio label="Use custom routing policies" value="custom" />
-                  </Form.Field>
-                  {showPolicyCheckboxes && (
-                    <>
-                      <Tabs tabs={tabs} active={activeTab} onTabChange={setActiveTab} divider />
-                      <Routes>
-                        <Route index Component={DefaultRoutingPolicyView} />
-                        <Route path="networks/*" Component={NetworkRoutingPoliciesView} />
-                        <Route path="*" component={GenericNotFound} />
-                      </Routes>
-                    </>
-                  )}
-                  <SubmitBar align="end">
-                    <Form.Submit component={SubmitButton} message={'Save routing configuration'} />
-                  </SubmitBar>
-                </Form>
-              </RequireRequest>
+            <Col md={12} style={{ position: 'relative' }} className="mt-cs-xxl">
+              <Tabs tabs={tabs} active={activeTab} onTabChange={setActiveTab} divider />
+              <Routes>
+                <Route index path="/*" Component={RoutingConfigurationView} />
+                <Route path="default-gateway-visibility" Component={DefaultGatewayVisibilityView} />
+                <Route path="*" component={GenericNotFound} />
+              </Routes>
             </Col>
           </>
         )}
diff --git a/pkg/webui/console/views/admin-packet-broker/messages.js b/pkg/webui/console/views/admin-packet-broker/messages.js
index d7a09d09ad..7ff2cc9fc6 100644
--- a/pkg/webui/console/views/admin-packet-broker/messages.js
+++ b/pkg/webui/console/views/admin-packet-broker/messages.js
@@ -29,6 +29,7 @@ export default defineMessages({
   enablePacketBroker: 'Enable Packet Broker',
   packetBrokerRegistrationDesc:
     'Enabling will allow other networks to send traffic to you as well as you forwarding traffic to them, based on the exact routing policy.',
+  routingConfig: 'Routing configuration',
   network: 'Network: {network}',
   listNetwork: 'List my network in Packet Broker publicly',
   listNetworkDesc:
diff --git a/pkg/webui/console/views/admin-packet-broker/network-routing-policies.js b/pkg/webui/console/views/admin-packet-broker/network-routing-policies.js
index 2ae67cfebf..5b86005446 100644
--- a/pkg/webui/console/views/admin-packet-broker/network-routing-policies.js
+++ b/pkg/webui/console/views/admin-packet-broker/network-routing-policies.js
@@ -19,12 +19,12 @@ import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 
 import PacketBrokerNetworksTable from '@console/containers/packet-broker-networks-table'
 
-import m from './messages'
+import sharedMessages from '@ttn-lw/lib/shared-messages'
 
 const NetworkRoutingPoliciesView = () => {
   useBreadcrumbs(
     'admin-panel.packet-broker.networks',
-    <Breadcrumb path={'/admin-panel/packet-broker/networks'} content={m.networks} />,
+    <Breadcrumb path={'/admin-panel/packet-broker/networks'} content={sharedMessages.networks} />,
   )
 
   return <PacketBrokerNetworksTable />
diff --git a/pkg/webui/console/views/admin-packet-broker/routing-configuration.js b/pkg/webui/console/views/admin-packet-broker/routing-configuration.js
new file mode 100644
index 0000000000..276a1bc5c5
--- /dev/null
+++ b/pkg/webui/console/views/admin-packet-broker/routing-configuration.js
@@ -0,0 +1,238 @@
+// 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 { Route, Routes } from 'react-router-dom'
+import { useDispatch, useSelector } from 'react-redux'
+import { isEqual } from 'lodash'
+
+import Form from '@ttn-lw/components/form'
+import Radio from '@ttn-lw/components/radio-button'
+import Tabs from '@ttn-lw/components/tabs'
+import SubmitBar from '@ttn-lw/components/submit-bar'
+import SubmitButton from '@ttn-lw/components/submit-button'
+import toast from '@ttn-lw/components/toast'
+
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+
+import SubViewErrorComponent from '@console/views/sub-view-error'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import Yup from '@ttn-lw/lib/yup'
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
+
+import { isValidPolicy } from '@console/lib/packet-broker/utils'
+
+import {
+  deleteAllHomeNetworkRoutingPolicies,
+  deleteHomeNetworkDefaultRoutingPolicy,
+  getHomeNetworkDefaultRoutingPolicy,
+  getHomeNetworkRoutingPolicies,
+  setHomeNetworkDefaultRoutingPolicy,
+  setHomeNetworkRoutingPolicy,
+} from '@console/store/actions/packet-broker'
+
+import {
+  selectHomeNetworkDefaultRoutingPolicy,
+  selectPacketBrokerHomeNetworkPoliciesStore,
+} from '@console/store/selectors/packet-broker'
+
+import DefaultRoutingPolicyView from './default-routing-policy'
+import NetworkRoutingPoliciesView from './network-routing-policies'
+import m from './messages'
+
+const validationSchema = Yup.object({
+  _routing_configuration: Yup.string().oneOf(['all_networks', 'ttn', 'custom']),
+  policy: Yup.object({
+    uplink: Yup.object({}),
+    downlink: Yup.object({}),
+  }),
+})
+
+const fullyPermissiveNetworkPolicy = {
+  uplink: {
+    join_request: true,
+    mac_data: true,
+    application_data: true,
+    signal_quality: true,
+    localization: true,
+  },
+  downlink: {
+    join_accept: true,
+    mac_data: true,
+    application_data: true,
+  },
+}
+
+const fullyRestrictiveNetworkPolicy = {
+  uplink: {
+    join_request: false,
+    mac_data: false,
+    application_data: false,
+    signal_quality: false,
+    localization: false,
+  },
+  downlink: {
+    join_accept: false,
+    mac_data: false,
+    application_data: false,
+  },
+}
+
+const TTN_NET_ID = '19'
+const peerWithEveryNetwork = policy =>
+  isEqual(policy.uplink, fullyPermissiveNetworkPolicy.uplink) &&
+  isEqual(policy.downlink, fullyPermissiveNetworkPolicy.downlink)
+
+const onlyTtn = policies =>
+  Object.keys(policies).length === 1 && Object.keys(policies).includes(TTN_NET_ID)
+
+const RoutingConfigurationView = () => {
+  const dispatch = useDispatch()
+  const [activeTab, setActiveTab] = useState('default-routing-policy')
+  const tabs = [
+    { title: m.defaultRoutingPolicy, link: '/admin-panel/packet-broker', name: 'default' },
+    {
+      title: sharedMessages.networks,
+      link: '/admin-panel/packet-broker/networks',
+      name: 'networks',
+      exact: false,
+    },
+  ]
+
+  const defaultRoutingPolicy = useSelector(selectHomeNetworkDefaultRoutingPolicy)
+  const routingPolicies = useSelector(selectPacketBrokerHomeNetworkPoliciesStore)
+
+  const initialValues = {
+    _routing_configuration:
+      peerWithEveryNetwork(defaultRoutingPolicy) &&
+      Object.keys(routingPolicies).length === 0 &&
+      isValidPolicy(defaultRoutingPolicy)
+        ? 'all_networks'
+        : onlyTtn(routingPolicies) && !isValidPolicy(defaultRoutingPolicy)
+        ? 'ttn'
+        : 'custom',
+  }
+  initialValues.policy = isValidPolicy(defaultRoutingPolicy)
+    ? defaultRoutingPolicy
+    : { uplink: {}, downlink: {} }
+
+  const [routingConfig, setRoutingConfig] = useState(undefined)
+  const [formError, setFormError] = useState(undefined)
+
+  const handleDefaultRoutingPolicySubmit = useCallback(
+    async values => {
+      const vals = validationSchema.cast(values)
+      const { _routing_configuration, policy } = vals
+      const ids = Object.keys(routingPolicies)
+
+      try {
+        if (_routing_configuration === 'ttn') {
+          await dispatch(attachPromise(deleteHomeNetworkDefaultRoutingPolicy()))
+          await dispatch(attachPromise(deleteAllHomeNetworkRoutingPolicies(ids)))
+          await dispatch(attachPromise(setHomeNetworkRoutingPolicy(`${TTN_NET_ID}/ttn`, policy)))
+        } else if (_routing_configuration === 'all_networks') {
+          await dispatch(attachPromise(deleteAllHomeNetworkRoutingPolicies(ids)))
+          await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
+        } else {
+          await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
+        }
+
+        toast({
+          message: m.defaultRoutingPolicySet,
+          type: toast.types.SUCCESS,
+        })
+      } catch (error) {
+        setFormError(error)
+      }
+    },
+    [dispatch, setFormError, routingPolicies],
+  )
+
+  const handleRoutingConfigChange = useCallback(
+    value => {
+      setRoutingConfig(value)
+    },
+    [setRoutingConfig],
+  )
+
+  const handleSetPolicies = useCallback(({ setValues }, { value }) => {
+    if (value !== 'custom') {
+      return setValues(values => ({
+        ...values,
+        _routing_configuration: value,
+        policy: fullyPermissiveNetworkPolicy,
+      }))
+    }
+
+    return setValues(values => ({
+      ...values,
+      _routing_configuration: value,
+      policy: fullyRestrictiveNetworkPolicy,
+    }))
+  }, [])
+
+  const showPolicyCheckboxes = routingConfig
+    ? routingConfig === 'custom'
+    : initialValues._routing_configuration === 'custom'
+
+  return (
+    <RequireRequest
+      requestAction={[getHomeNetworkDefaultRoutingPolicy(), getHomeNetworkRoutingPolicies()]}
+      errorRenderFunction={SubViewErrorComponent}
+      spinnerProps={{ inline: true, center: true, className: 'mt-ls-s' }}
+    >
+      <Form
+        onSubmit={handleDefaultRoutingPolicySubmit}
+        initialValues={initialValues}
+        error={formError}
+        className="mt-cs-l"
+      >
+        <Form.Field
+          component={Radio.Group}
+          className="mb-cs-xl"
+          name="_routing_configuration"
+          onChange={handleRoutingConfigChange}
+          valueSetter={handleSetPolicies}
+        >
+          <Radio
+            label="Forward traffic to all networks registered in Packet Broker"
+            value="all_networks"
+          />
+          <Radio
+            label="Forward traffic to The Things Stack Sandbox (community network) only"
+            value="ttn"
+          />
+          <Radio label="Use custom routing policies" value="custom" />
+        </Form.Field>
+        {showPolicyCheckboxes && (
+          <>
+            <Tabs tabs={tabs} active={activeTab} onTabChange={setActiveTab} divider />
+            <Routes>
+              <Route index Component={DefaultRoutingPolicyView} />
+              <Route path="networks/*" Component={NetworkRoutingPoliciesView} />
+              <Route path="*" component={GenericNotFound} />
+            </Routes>
+          </>
+        )}
+        <SubmitBar align="end">
+          <Form.Submit component={SubmitButton} message={'Save routing configuration'} />
+        </SubmitBar>
+      </Form>
+    </RequireRequest>
+  )
+}
+
+export default RoutingConfigurationView
diff --git a/pkg/webui/lib/shared-messages.js b/pkg/webui/lib/shared-messages.js
index f6ac1a9690..941639495f 100644
--- a/pkg/webui/lib/shared-messages.js
+++ b/pkg/webui/lib/shared-messages.js
@@ -459,7 +459,7 @@ export default defineMessages({
   sessions: 'Sessions',
   setLoRaCloudToken: 'Set LoRa Cloud token',
   settings: 'Settings',
-  setupSubTitle: 'Setup',
+  setup: 'Setup',
   shareGatewayInfo: 'Share gateway information',
   skipCryptoDescription: 'Skip decryption of uplink payloads and encryption of downlink payloads',
   skipCryptoPlaceholder: 'Encryption/decryption disabled',
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index f4cca16a58..5a759fc121 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -252,6 +252,7 @@
   "console.components.gateway-api-keys-modal.index.description": "Note: After closing this window, these API keys will not be accessible for download anymore. Please make sure to download and store them now.",
   "console.components.gateway-api-keys-modal.index.downloadLns": "Download LNS key",
   "console.components.gateway-api-keys-modal.index.downloadCups": "Download CUPS key",
+  "console.components.gateway-visibility-form.index.saveDefaultGatewayVisibility": "Save default gateway visibility",
   "console.components.location-form.index.deleteAllLocations": "Delete all location data",
   "console.components.location-form.index.deleteFailure": "An error occurred and the location could not be deleted",
   "console.components.location-form.index.deleteLocation": "Remove location data",
@@ -354,6 +355,7 @@
   "console.components.routing-policy-form.index.saveDefaultPolicy": "Save default policy",
   "console.components.routing-policy-form.index.useDefaultPolicy": "Use default routing policy for this network",
   "console.components.routing-policy-form.index.useSpecificPolicy": "Use network specific routing policy",
+  "console.components.routing-policy-form.index.doNotUseADefaultPolicy": "Do not use a default routing policy for this network",
   "console.components.routing-policy-form.index.doNotUseAPolicy": "Do not use a routing policy for this network",
   "console.components.uplink-form.uplink-form.simulateUplink": "Simulate uplink",
   "console.components.uplink-form.uplink-form.payloadDescription": "The desired payload bytes of the uplink message",
@@ -683,6 +685,7 @@
   "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "The Things Stack is not set up to use Packet Broker. Please refer to the documentation link above for instructions on how to set up The Things Stack for peering with Packet Broker.",
   "console.views.admin-packet-broker.messages.enablePacketBroker": "Enable Packet Broker",
   "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "Enabling will allow other networks to send traffic to you as well as you forwarding traffic to them, based on the exact routing policy.",
+  "console.views.admin-packet-broker.messages.routingConfig": "Routing configuration",
   "console.views.admin-packet-broker.messages.network": "Network: {network}",
   "console.views.admin-packet-broker.messages.listNetwork": "List my network in Packet Broker publicly",
   "console.views.admin-packet-broker.messages.listNetworkDesc": "Public listing will make it easier for other network operators to set up routing policies for your network. Hence public listing is generally recommended.",
@@ -1384,7 +1387,7 @@
   "lib.shared-messages.sessions": "Sessions",
   "lib.shared-messages.setLoRaCloudToken": "Set LoRa Cloud token",
   "lib.shared-messages.settings": "Settings",
-  "lib.shared-messages.setupSubTitle": "Setup",
+  "lib.shared-messages.setup": "Setup",
   "lib.shared-messages.shareGatewayInfo": "Share gateway information",
   "lib.shared-messages.skipCryptoDescription": "Skip decryption of uplink payloads and encryption of downlink payloads",
   "lib.shared-messages.skipCryptoPlaceholder": "Encryption/decryption disabled",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index 476acf5fe2..7a1e05b7e6 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -252,6 +252,7 @@
   "console.components.gateway-api-keys-modal.index.description": "注意：このウィンドウを閉じると、これらのAPIキーはダウンロードできなくなります。必ずダウンロードして保存してください！",
   "console.components.gateway-api-keys-modal.index.downloadLns": "LNSキーをダウンロード",
   "console.components.gateway-api-keys-modal.index.downloadCups": "CUPSキーをダウンロード",
+  "console.components.gateway-visibility-form.index.saveDefaultGatewayVisibility": "",
   "console.components.location-form.index.deleteAllLocations": "すべての位置情報を削除",
   "console.components.location-form.index.deleteFailure": "エラーが発生し、その場所を削除できませんでした",
   "console.components.location-form.index.deleteLocation": "場所入力を削除",
@@ -354,6 +355,7 @@
   "console.components.routing-policy-form.index.saveDefaultPolicy": "",
   "console.components.routing-policy-form.index.useDefaultPolicy": "このネットワークでデフォルトのルーティングポリシーを使用",
   "console.components.routing-policy-form.index.useSpecificPolicy": "ネットワーク固有のルーティングポリシーを使用",
+  "console.components.routing-policy-form.index.doNotUseADefaultPolicy": "",
   "console.components.routing-policy-form.index.doNotUseAPolicy": "このネットワークには、ルーティングポリシーを使用しないでください",
   "console.components.uplink-form.uplink-form.simulateUplink": "アップリンクのシミュレーション",
   "console.components.uplink-form.uplink-form.payloadDescription": "アップリンクメッセージの希望するペイロードバイト数",
@@ -683,6 +685,7 @@
   "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "",
   "console.views.admin-packet-broker.messages.enablePacketBroker": "",
   "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "ご自宅のネットワークから、またはご自宅のネットワークへのピアリングを可能にするには、ご自宅のネットワークを登録する必要があります。これにより、お客様のネットワークがPacket Brokerに認識され、お客様のネットワークのピアリング動作を設定することができます",
+  "console.views.admin-packet-broker.messages.routingConfig": "",
   "console.views.admin-packet-broker.messages.network": "ネットワーク: {network}",
   "console.views.admin-packet-broker.messages.listNetwork": "ネットワーク公開で一覧表示",
   "console.views.admin-packet-broker.messages.listNetworkDesc": "ネットワークをリストアップすることで、他のネットワーク管理者があなたのネットワークを見ることができます。これにより、他のネットワーク管理者は、あなたのネットワークでルーティングポリシーを簡単に設定することができます",
@@ -1384,7 +1387,7 @@
   "lib.shared-messages.sessions": "",
   "lib.shared-messages.setLoRaCloudToken": "",
   "lib.shared-messages.settings": "",
-  "lib.shared-messages.setupSubTitle": "",
+  "lib.shared-messages.setup": "",
   "lib.shared-messages.shareGatewayInfo": "",
   "lib.shared-messages.skipCryptoDescription": "",
   "lib.shared-messages.skipCryptoPlaceholder": "",

From 6f3da989d94c62aad1c53ebc1b0d2d4c1ed44fa6 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Tue, 24 Oct 2023 11:56:14 +0200
Subject: [PATCH 20/28] console: Update locales

---
 pkg/webui/locales/en.json | 1 -
 pkg/webui/locales/ja.json | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 5a759fc121..7e4b84560b 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -355,7 +355,6 @@
   "console.components.routing-policy-form.index.saveDefaultPolicy": "Save default policy",
   "console.components.routing-policy-form.index.useDefaultPolicy": "Use default routing policy for this network",
   "console.components.routing-policy-form.index.useSpecificPolicy": "Use network specific routing policy",
-  "console.components.routing-policy-form.index.doNotUseADefaultPolicy": "Do not use a default routing policy for this network",
   "console.components.routing-policy-form.index.doNotUseAPolicy": "Do not use a routing policy for this network",
   "console.components.uplink-form.uplink-form.simulateUplink": "Simulate uplink",
   "console.components.uplink-form.uplink-form.payloadDescription": "The desired payload bytes of the uplink message",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index 7a1e05b7e6..fd3841b888 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -355,7 +355,6 @@
   "console.components.routing-policy-form.index.saveDefaultPolicy": "",
   "console.components.routing-policy-form.index.useDefaultPolicy": "このネットワークでデフォルトのルーティングポリシーを使用",
   "console.components.routing-policy-form.index.useSpecificPolicy": "ネットワーク固有のルーティングポリシーを使用",
-  "console.components.routing-policy-form.index.doNotUseADefaultPolicy": "",
   "console.components.routing-policy-form.index.doNotUseAPolicy": "このネットワークには、ルーティングポリシーを使用しないでください",
   "console.components.uplink-form.uplink-form.simulateUplink": "アップリンクのシミュレーション",
   "console.components.uplink-form.uplink-form.payloadDescription": "アップリンクメッセージの希望するペイロードバイト数",

From 190d14e2473ef16d8b38361de391a90bd90fbc49 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Tue, 24 Oct 2023 12:08:05 +0200
Subject: [PATCH 21/28] console: Fix messages

---
 .../views/admin-packet-broker/network-routing-policy.js       | 4 ++--
 .../views/admin-packet-broker/routing-configuration.js        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/webui/console/views/admin-packet-broker/network-routing-policy.js b/pkg/webui/console/views/admin-packet-broker/network-routing-policy.js
index c7384648f8..e14446d35b 100644
--- a/pkg/webui/console/views/admin-packet-broker/network-routing-policy.js
+++ b/pkg/webui/console/views/admin-packet-broker/network-routing-policy.js
@@ -75,7 +75,7 @@ const NetworkRoutingPolicyViewInner = () => {
   useBreadcrumbs(
     'admin-panel.packet-broker.networks.single',
     <>
-      <Breadcrumb path={'/admin-panel/packet-broker/networks'} content={m.networks} />
+      <Breadcrumb path={'/admin-panel/packet-broker/networks'} content={sharedMessages.networks} />
       <Breadcrumb
         path={`/admin-panel/packet-broker/networks/${netId}${tenantId ? `/${tenantId}` : ''}`}
         content={network.name || displayId}
@@ -120,7 +120,7 @@ const NetworkRoutingPolicyViewInner = () => {
 
   const homeNetworkData = [
     {
-      header: m.networkInformation,
+      header: sharedMessages.networkInformation,
       items: [
         {
           key: m.networkId,
diff --git a/pkg/webui/console/views/admin-packet-broker/routing-configuration.js b/pkg/webui/console/views/admin-packet-broker/routing-configuration.js
index 276a1bc5c5..7d351798be 100644
--- a/pkg/webui/console/views/admin-packet-broker/routing-configuration.js
+++ b/pkg/webui/console/views/admin-packet-broker/routing-configuration.js
@@ -97,7 +97,7 @@ const peerWithEveryNetwork = policy =>
   isEqual(policy.downlink, fullyPermissiveNetworkPolicy.downlink)
 
 const onlyTtn = policies =>
-  Object.keys(policies).length === 1 && Object.keys(policies).includes(TTN_NET_ID)
+  Object.keys(policies).length === 1 && Object.keys(policies).includes(`${TTN_NET_ID}/ttn`)
 
 const RoutingConfigurationView = () => {
   const dispatch = useDispatch()

From 111613d8f7d21c600425963aa9634dc3d04a6d52 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Tue, 24 Oct 2023 12:27:32 +0200
Subject: [PATCH 22/28] console: Update e2e tests

---
 .../console/admin-panel/packet-broker/routing-policies.spec.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
index c4d4a9e02f..9ac1d46408 100644
--- a/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
+++ b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
@@ -62,7 +62,7 @@ describe('Packet Broker routing policies', () => {
     cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/default', {})
     cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/19', {})
     cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/19/johan', {})
-    cy.intercept('PUT', '/api/v3/pba/home-networks/policies/19', {})
+    cy.intercept('PUT', '/api/v3/pba/home-networks/policies/19/ttn', {})
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
 
     cy.findByLabelText(

From 5a86cfc14361bb87c9ee3074860dd5b109b3f18a Mon Sep 17 00:00:00 2001
From: Kevin Schiffer <kevin.schiffer@thethingsindustries.com>
Date: Thu, 26 Oct 2023 16:32:02 +0900
Subject: [PATCH 23/28] console: Refactor routing logic in packet broker views

---
 .../admin-packet-broker.js                    | 10 +++++----
 .../views/admin-packet-broker/index.js        |  7 ++++--
 .../network-routing-policies.js               |  7 ++++--
 .../network-routing-policy.js                 | 22 ++++++++++++++-----
 .../routing-configuration.js                  |  8 +++++--
 5 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
index 88063a0eff..04d50bcd99 100644
--- a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
+++ b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
@@ -15,7 +15,7 @@
 import React, { useCallback, useState } from 'react'
 import { Container, Col, Row } from 'react-grid-system'
 import { useSelector, useDispatch } from 'react-redux'
-import { Routes, Route } from 'react-router-dom'
+import { Routes, Route, Navigate } from 'react-router-dom'
 import classnames from 'classnames'
 
 import PacketBrokerLogo from '@assets/misc/packet-broker.svg'
@@ -69,7 +69,7 @@ const PacketBroker = () => {
     } else {
       setDeregisterModalVisible(true)
     }
-  }, [dispatch, registered, setDeregisterModalVisible])
+  }, [dispatch, registered])
 
   const handleDeregisterModalComplete = useCallback(
     approved => {
@@ -102,8 +102,9 @@ const PacketBroker = () => {
   const tabs = [
     {
       title: m.routingConfig,
-      link: '/admin-panel/packet-broker',
+      link: '/admin-panel/packet-broker/routing-configuration',
       name: 'default',
+      exact: false,
     },
     {
       title: m.defaultGatewayVisibility,
@@ -221,8 +222,9 @@ const PacketBroker = () => {
             <Col md={12} style={{ position: 'relative' }} className="mt-cs-xxl">
               <Tabs tabs={tabs} active={activeTab} onTabChange={setActiveTab} divider />
               <Routes>
-                <Route index path="/*" Component={RoutingConfigurationView} />
+                <Route path="routing-configuration/*" Component={RoutingConfigurationView} />
                 <Route path="default-gateway-visibility" Component={DefaultGatewayVisibilityView} />
+                <Route path="/" element={<Navigate to="routing-configuration" />} />
                 <Route path="*" component={GenericNotFound} />
               </Routes>
             </Col>
diff --git a/pkg/webui/console/views/admin-packet-broker/index.js b/pkg/webui/console/views/admin-packet-broker/index.js
index e5054a38b8..825c6a7ac5 100644
--- a/pkg/webui/console/views/admin-packet-broker/index.js
+++ b/pkg/webui/console/views/admin-packet-broker/index.js
@@ -36,7 +36,10 @@ import NetworkRoutingPolicy from './network-routing-policy'
 const PacketBrokerRouter = () => {
   useBreadcrumbs(
     'admin-panel.packet-broker',
-    <Breadcrumb path={'/admin-panel/packet-broker'} content={sharedMessages.packetBroker} />,
+    <Breadcrumb
+      path={'/admin-panel/packet-broker/routing-configuration'}
+      content={sharedMessages.packetBroker}
+    />,
   )
 
   return (
@@ -44,7 +47,7 @@ const PacketBrokerRouter = () => {
       <RequireRequest requestAction={getPacketBrokerInfo()}>
         <Routes>
           <Route
-            path="networks/:netId/:tenantId?"
+            path="routing-configuration/networks/:netId/:tenantId?"
             element={
               <ValidateRouteParam
                 check={{ tenantId: pathIdRegexp, netId: /^\d+$/ }}
diff --git a/pkg/webui/console/views/admin-packet-broker/network-routing-policies.js b/pkg/webui/console/views/admin-packet-broker/network-routing-policies.js
index 5b86005446..d3799fc100 100644
--- a/pkg/webui/console/views/admin-packet-broker/network-routing-policies.js
+++ b/pkg/webui/console/views/admin-packet-broker/network-routing-policies.js
@@ -23,8 +23,11 @@ import sharedMessages from '@ttn-lw/lib/shared-messages'
 
 const NetworkRoutingPoliciesView = () => {
   useBreadcrumbs(
-    'admin-panel.packet-broker.networks',
-    <Breadcrumb path={'/admin-panel/packet-broker/networks'} content={sharedMessages.networks} />,
+    'admin-panel.packet-broker.routing-configuration.networks',
+    <Breadcrumb
+      path={'/admin-panel/packet-broker/routing-configuration/networks'}
+      content={sharedMessages.networks}
+    />,
   )
 
   return <PacketBrokerNetworksTable />
diff --git a/pkg/webui/console/views/admin-packet-broker/network-routing-policy.js b/pkg/webui/console/views/admin-packet-broker/network-routing-policy.js
index e14446d35b..6f74b047ac 100644
--- a/pkg/webui/console/views/admin-packet-broker/network-routing-policy.js
+++ b/pkg/webui/console/views/admin-packet-broker/network-routing-policy.js
@@ -73,11 +73,16 @@ const NetworkRoutingPolicyViewInner = () => {
   const defaultRoutingPolicy = useSelector(selectHomeNetworkDefaultRoutingPolicy)
 
   useBreadcrumbs(
-    'admin-panel.packet-broker.networks.single',
+    'admin-panel.packet-broker.routing-configuration.networks.single',
     <>
-      <Breadcrumb path={'/admin-panel/packet-broker/networks'} content={sharedMessages.networks} />
       <Breadcrumb
-        path={`/admin-panel/packet-broker/networks/${netId}${tenantId ? `/${tenantId}` : ''}`}
+        path={'/admin-panel/packet-broker/routing-configuration/networks'}
+        content={sharedMessages.networks}
+      />
+      <Breadcrumb
+        path={`/admin-panel/packet-broker/routing-configuration/networks/${netId}${
+          tenantId ? `/${tenantId}` : ''
+        }`}
         content={network.name || displayId}
       />
     </>,
@@ -160,7 +165,11 @@ const NetworkRoutingPolicyViewInner = () => {
       <Row>
         <Col md={12}>
           <PageTitle title={m.network} values={{ network: network.name || displayId }}>
-            <Link to="/admin-panel/packet-broker/networks" secondary className={style.backLink}>
+            <Link
+              to="/admin-panel/packet-broker/routing-configuration/networks"
+              secondary
+              className={style.backLink}
+            >
               ← <Message content={m.backToAllNetworks} />
             </Link>
           </PageTitle>
@@ -228,7 +237,10 @@ const NetworkRoutingPolicyView = () => {
   const registered = useSelector(selectRegistered)
 
   return (
-    <Require condition={registered} otherwise={{ redirect: '/admin-panel/packet-broker' }}>
+    <Require
+      condition={registered}
+      otherwise={{ redirect: '/admin-panel/packet-broker/routing-configuration' }}
+    >
       <RequireRequest
         requestAction={[
           getPacketBrokerNetwork(combinedId, { fetchPolicies: true }),
diff --git a/pkg/webui/console/views/admin-packet-broker/routing-configuration.js b/pkg/webui/console/views/admin-packet-broker/routing-configuration.js
index 7d351798be..ffae70e6d4 100644
--- a/pkg/webui/console/views/admin-packet-broker/routing-configuration.js
+++ b/pkg/webui/console/views/admin-packet-broker/routing-configuration.js
@@ -103,10 +103,14 @@ const RoutingConfigurationView = () => {
   const dispatch = useDispatch()
   const [activeTab, setActiveTab] = useState('default-routing-policy')
   const tabs = [
-    { title: m.defaultRoutingPolicy, link: '/admin-panel/packet-broker', name: 'default' },
+    {
+      title: m.defaultRoutingPolicy,
+      link: '/admin-panel/packet-broker/routing-configuration',
+      name: 'default',
+    },
     {
       title: sharedMessages.networks,
-      link: '/admin-panel/packet-broker/networks',
+      link: '/admin-panel/packet-broker/routing-configuration/networks',
       name: 'networks',
       exact: false,
     },

From 866cf0262d11734fa5b9d4541a3797d8a16e9f74 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 30 Oct 2023 09:35:02 +0100
Subject: [PATCH 24/28] console: Add do not set a default policy and keep state

---
 .../default-routing-policy-form/index.js      | 153 +++++++++++-------
 .../routing-configuration.js                  |  23 +--
 pkg/webui/locales/en.json                     |  29 ++--
 pkg/webui/locales/ja.json                     |  21 ++-
 4 files changed, 128 insertions(+), 98 deletions(-)

diff --git a/pkg/webui/console/components/default-routing-policy-form/index.js b/pkg/webui/console/components/default-routing-policy-form/index.js
index fcb480bcf0..09a65bc95a 100644
--- a/pkg/webui/console/components/default-routing-policy-form/index.js
+++ b/pkg/webui/console/components/default-routing-policy-form/index.js
@@ -12,11 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
+import React, { useCallback, useState } from 'react'
 import { Col, Row } from 'react-grid-system'
+import { defineMessages } from 'react-intl'
 
-import Form from '@ttn-lw/components/form'
+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'
 
@@ -24,63 +26,94 @@ import sharedMessages from '@ttn-lw/lib/shared-messages'
 
 import policyMessages from '@console/lib/packet-broker/messages'
 
-const DefaultRoutingPolicyForm = () => (
-  <Row>
-    <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={policyMessages.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={policyMessages.macData}
-        description={policyMessages.macDataAllowDesc}
-      />
-      <Form.Field
-        name="policy.downlink.application_data"
-        component={Checkbox}
-        label={sharedMessages.appData}
-        description={policyMessages.applicationDataAllowDesc}
-      />
-    </Col>
-  </Row>
-)
+const m = defineMessages({
+  useDefaultPolicy: 'Use default routing policy for this network',
+  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={m.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={policyMessages.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={policyMessages.macData}
+              description={policyMessages.macDataAllowDesc}
+            />
+            <Form.Field
+              name="policy.downlink.application_data"
+              component={Checkbox}
+              label={sharedMessages.appData}
+              description={policyMessages.applicationDataAllowDesc}
+            />
+          </Col>
+        </>
+      )}
+    </Row>
+  )
+}
 
 export default DefaultRoutingPolicyForm
diff --git a/pkg/webui/console/views/admin-packet-broker/routing-configuration.js b/pkg/webui/console/views/admin-packet-broker/routing-configuration.js
index ffae70e6d4..3ef32841d5 100644
--- a/pkg/webui/console/views/admin-packet-broker/routing-configuration.js
+++ b/pkg/webui/console/views/admin-packet-broker/routing-configuration.js
@@ -76,21 +76,6 @@ const fullyPermissiveNetworkPolicy = {
   },
 }
 
-const fullyRestrictiveNetworkPolicy = {
-  uplink: {
-    join_request: false,
-    mac_data: false,
-    application_data: false,
-    signal_quality: false,
-    localization: false,
-  },
-  downlink: {
-    join_accept: false,
-    mac_data: false,
-    application_data: false,
-  },
-}
-
 const TTN_NET_ID = '19'
 const peerWithEveryNetwork = policy =>
   isEqual(policy.uplink, fullyPermissiveNetworkPolicy.uplink) &&
@@ -128,6 +113,7 @@ const RoutingConfigurationView = () => {
         : onlyTtn(routingPolicies) && !isValidPolicy(defaultRoutingPolicy)
         ? 'ttn'
         : 'custom',
+    _use_default_policy: isValidPolicy(defaultRoutingPolicy),
   }
   initialValues.policy = isValidPolicy(defaultRoutingPolicy)
     ? defaultRoutingPolicy
@@ -139,7 +125,7 @@ const RoutingConfigurationView = () => {
   const handleDefaultRoutingPolicySubmit = useCallback(
     async values => {
       const vals = validationSchema.cast(values)
-      const { _routing_configuration, policy } = vals
+      const { _routing_configuration, _use_default_policy, policy } = vals
       const ids = Object.keys(routingPolicies)
 
       try {
@@ -150,8 +136,10 @@ const RoutingConfigurationView = () => {
         } else if (_routing_configuration === 'all_networks') {
           await dispatch(attachPromise(deleteAllHomeNetworkRoutingPolicies(ids)))
           await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
-        } else {
+        } else if (_routing_configuration === 'custom' && _use_default_policy) {
           await dispatch(attachPromise(setHomeNetworkDefaultRoutingPolicy(policy)))
+        } else if (_routing_configuration === 'custom' && !_use_default_policy) {
+          await dispatch(attachPromise(deleteHomeNetworkDefaultRoutingPolicy()))
         }
 
         toast({
@@ -184,7 +172,6 @@ const RoutingConfigurationView = () => {
     return setValues(values => ({
       ...values,
       _routing_configuration: value,
-      policy: fullyRestrictiveNetworkPolicy,
     }))
   }, [])
 
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 7e4b84560b..3b524f73b8 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -191,6 +191,8 @@
   "console.components.application-general-settings-form.index.useAlcsync": "Use Application Layer Clock Synchronization",
   "console.components.application-general-settings-form.index.adminContactDescription": "Administrative contact information for this application. Typically used to indicate who to contact with administrative questions about the application.",
   "console.components.application-general-settings-form.index.techContactDescription": "Technical contact information for this application. Typically used to indicate who to contact with technical/security questions about the application.",
+  "console.components.default-routing-policy-form.index.useDefaultPolicy": "Use default routing policy for this network",
+  "console.components.default-routing-policy-form.index.doNotUseADefaultPolicy": "Do not use a default routing policy for this network",
   "console.components.device-import-form.index.file": "File",
   "console.components.device-import-form.index.formatInfo": "Format information",
   "console.components.device-import-form.index.selectAFile": "Please select a template file",
@@ -304,6 +306,7 @@
   "console.components.payload-formatters-form.index.grpcFieldDescription": "The address of the service to connect to",
   "console.components.payload-formatters-form.index.appFormatter": "Use application payload formatter",
   "console.components.payload-formatters-form.index.appFormatterWarning": "This option will affect both uplink and downlink formatter",
+  "console.components.payload-formatters-form.index.setupSubTitle": "Setup",
   "console.components.payload-formatters-form.index.defaultFormatter": "Click <Link>here</Link> to modify the default payload formatter for this application. The payload formatter of this application is currently set to `{defaultFormatter}`",
   "console.components.payload-formatters-form.index.pasteRepositoryFormatter": "Paste repository formatter",
   "console.components.payload-formatters-form.index.pasteApplicationFormatter": "Paste application formatter",
@@ -355,6 +358,7 @@
   "console.components.routing-policy-form.index.saveDefaultPolicy": "Save default policy",
   "console.components.routing-policy-form.index.useDefaultPolicy": "Use default routing policy for this network",
   "console.components.routing-policy-form.index.useSpecificPolicy": "Use network specific routing policy",
+  "console.components.routing-policy-form.index.doNotUseADefaultPolicy": "Do not use a default routing policy for this network",
   "console.components.routing-policy-form.index.doNotUseAPolicy": "Do not use a routing policy for this network",
   "console.components.uplink-form.uplink-form.simulateUplink": "Simulate uplink",
   "console.components.uplink-form.uplink-form.payloadDescription": "The desired payload bytes of the uplink message",
@@ -675,24 +679,26 @@
   "console.store.middleware.logics.users.errEmailValidationActionSuccess": "Validation email sent (please also check your spam folder)",
   "console.store.middleware.logics.users.errEmailValidationActionFailure": "There was an error and the validation email could not be sent.",
   "console.store.middleware.logics.users.errEmailValidationAlreadySent": "A validation email has already been sent recently to your email address. Please also check your spam folder.",
-  "console.views.admin-packet-broker.messages.packetBrokerInfoText": "Packet Broker is a service by The Things Industries to facilitate peering between LoRaWAN networks. This extends network coverage and improves overall network performance and device battery lifetime.",
+  "console.views.admin-packet-broker.messages.packetBrokerInfoText": "Packet Broker can be used to exchange traffic (peering) with other LoRaWAN networks to share coverage and improve the overall network performance.",
   "console.views.admin-packet-broker.messages.packetBrokerWebsite": "Packet Broker website",
-  "console.views.admin-packet-broker.messages.learnMore": "Learn more",
-  "console.views.admin-packet-broker.messages.whyNetworkPeeringTitle": "Why choose network peering?",
-  "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "Since LoRaWAN uses shared spectrum, gateways receive messages from devices registered on other LoRaWAN networks. Instead of discarding this traffic, these messages can be forwarded via Packet Broker to the home network of these devices. This extends coverage of networks and allows devices to use higher data rates that reduce channel utilization and increase battery life. No sensitive data is exposed as LoRaWAN is end-to-end encrypted and integrity protected.",
-  "console.views.admin-packet-broker.messages.enbaling": "Enable forwarding via the options below or define custom routing policies. In the Networks tab below (visible by selecting the option \"Use custom routing policies\"), you can see which other networks are forwarding data to this network.",
+  "console.views.admin-packet-broker.messages.registrationStatus": "Registration status",
+  "console.views.admin-packet-broker.messages.registerNetwork": "Register network",
+  "console.views.admin-packet-broker.messages.networkVisibility": "Network visibility",
+  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "To enable peering from or to your home network, it is necessary to register your network. This will make your network known to Packet Broker and enable you to configure your network's peering behavior.",
   "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "The Things Stack is not set up to use Packet Broker. Please refer to the documentation link above for instructions on how to set up The Things Stack for peering with Packet Broker.",
-  "console.views.admin-packet-broker.messages.enablePacketBroker": "Enable Packet Broker",
-  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "Enabling will allow other networks to send traffic to you as well as you forwarding traffic to them, based on the exact routing policy.",
-  "console.views.admin-packet-broker.messages.routingConfig": "Routing configuration",
+  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDisabledDesc": "The Things Stack is set up to use Packet Broker, but security settings disallow (de)registering your network here. Please contact Packet Broker to manage your registration. Refer to the documentation link above for contact information.",
   "console.views.admin-packet-broker.messages.network": "Network: {network}",
-  "console.views.admin-packet-broker.messages.listNetwork": "List my network in Packet Broker publicly",
-  "console.views.admin-packet-broker.messages.listNetworkDesc": "Public listing will make it easier for other network operators to set up routing policies for your network. Hence public listing is generally recommended.",
+  "console.views.admin-packet-broker.messages.homeNetworkEnabled": "Home network <b>enabled</b>",
+  "console.views.admin-packet-broker.messages.homeNetworkDisabled": "Home network <b>disabled</b>",
+  "console.views.admin-packet-broker.messages.forwarderEnabled": "Forwarder <b>enabled</b>",
+  "console.views.admin-packet-broker.messages.forwarderDisabled": "Forwarder <b>disabled</b>",
+  "console.views.admin-packet-broker.messages.listNetwork": "List network publicly",
+  "console.views.admin-packet-broker.messages.listNetworkDesc": "Listing your network allows other network administrators to see your network. This allows them to easily configure routing policies with your network.",
   "console.views.admin-packet-broker.messages.unlistNetwork": "Unlist this network",
   "console.views.admin-packet-broker.messages.confirmUnlist": "Confirm unlist",
   "console.views.admin-packet-broker.messages.Are you sure you want to unlist your network in Packet Broker?{lineBreak}This will hide your network. Other network administrators will not be able to see your network to configure routing policies.": "Are you sure you want to unlist your network in Packet Broker?{lineBreak}This will hide your network. Other network administrators will not be able to see your network to configure routing policies.",
   "console.views.admin-packet-broker.messages.routingPolicyInformation": "You can use the checkboxes below to control the default forwarding behavior of your network. You can additionally set up individual per-network routing policies via the Networks tab.",
-  "console.views.admin-packet-broker.messages.defaultRoutingPolicySet": "Default routing configuration set",
+  "console.views.admin-packet-broker.messages.defaultRoutingPolicySet": "Default routing policy set",
   "console.views.admin-packet-broker.messages.routingPolicySet": "Routing policy set",
   "console.views.admin-packet-broker.messages.defaultRoutingPolicy": "Default routing policy",
   "console.views.admin-packet-broker.messages.devAddressBlock": "Device address block",
@@ -1386,7 +1392,6 @@
   "lib.shared-messages.sessions": "Sessions",
   "lib.shared-messages.setLoRaCloudToken": "Set LoRa Cloud token",
   "lib.shared-messages.settings": "Settings",
-  "lib.shared-messages.setup": "Setup",
   "lib.shared-messages.shareGatewayInfo": "Share gateway information",
   "lib.shared-messages.skipCryptoDescription": "Skip decryption of uplink payloads and encryption of downlink payloads",
   "lib.shared-messages.skipCryptoPlaceholder": "Encryption/decryption disabled",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index fd3841b888..0ba556fb60 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -191,6 +191,8 @@
   "console.components.application-general-settings-form.index.useAlcsync": "LoRaアプリケーションレイヤー・クロックシンクロパッケージの使用",
   "console.components.application-general-settings-form.index.adminContactDescription": "このアプリケーションの管理者の連絡先情報。通常、アプリケーションに関する管理上の問い合わせ先を示すために使用されます。",
   "console.components.application-general-settings-form.index.techContactDescription": "このアプリケーションの技術的な連絡先情報。通常、アプリケーションに関する技術/セキュリティの質問の連絡先を示すために使用されます。",
+  "console.components.default-routing-policy-form.index.useDefaultPolicy": "",
+  "console.components.default-routing-policy-form.index.doNotUseADefaultPolicy": "",
   "console.components.device-import-form.index.file": "ファイル",
   "console.components.device-import-form.index.formatInfo": "フォーマット情報",
   "console.components.device-import-form.index.selectAFile": "テンプレートファイルを選択してください",
@@ -304,6 +306,7 @@
   "console.components.payload-formatters-form.index.grpcFieldDescription": "接続先サービスのアドレス",
   "console.components.payload-formatters-form.index.appFormatter": "アプリケーションペイロードフォーマッタを使用",
   "console.components.payload-formatters-form.index.appFormatterWarning": "このオプションは、アップリンクとダウンリンクの両方のフォーマッタをアプリケーションリンクのデフォルトに設定します",
+  "console.components.payload-formatters-form.index.setupSubTitle": "",
   "console.components.payload-formatters-form.index.defaultFormatter": "<Link>ここ</Link> をクリックすると、このアプリケーションのデフォルトのペイロードフォーマッタを変更することができます。このアプリケーションのペイロードフォーマッタは現在 `{defaultFormatter}` に設定されています",
   "console.components.payload-formatters-form.index.pasteRepositoryFormatter": "リポジトリフォーマッター貼り付け",
   "console.components.payload-formatters-form.index.pasteApplicationFormatter": "アプリケーションフォーマッター貼り付け",
@@ -355,6 +358,7 @@
   "console.components.routing-policy-form.index.saveDefaultPolicy": "",
   "console.components.routing-policy-form.index.useDefaultPolicy": "このネットワークでデフォルトのルーティングポリシーを使用",
   "console.components.routing-policy-form.index.useSpecificPolicy": "ネットワーク固有のルーティングポリシーを使用",
+  "console.components.routing-policy-form.index.doNotUseADefaultPolicy": "",
   "console.components.routing-policy-form.index.doNotUseAPolicy": "このネットワークには、ルーティングポリシーを使用しないでください",
   "console.components.uplink-form.uplink-form.simulateUplink": "アップリンクのシミュレーション",
   "console.components.uplink-form.uplink-form.payloadDescription": "アップリンクメッセージの希望するペイロードバイト数",
@@ -677,15 +681,17 @@
   "console.store.middleware.logics.users.errEmailValidationAlreadySent": "最近、あなたのメールアドレスに確認メールが送信されました。迷惑メールフォルダも確認してください。",
   "console.views.admin-packet-broker.messages.packetBrokerInfoText": "Packet Brokerは、他のLoRaWANネットワークとトラフィックを交換（ピアリング）することで、カバレッジを共有し、ネットワーク全体のパフォーマンスを向上させるために使用することができます",
   "console.views.admin-packet-broker.messages.packetBrokerWebsite": "Packer Brokerのサイト",
-  "console.views.admin-packet-broker.messages.learnMore": "",
-  "console.views.admin-packet-broker.messages.whyNetworkPeeringTitle": "",
-  "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "",
-  "console.views.admin-packet-broker.messages.enbaling": "",
-  "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "",
-  "console.views.admin-packet-broker.messages.enablePacketBroker": "",
+  "console.views.admin-packet-broker.messages.registrationStatus": "",
+  "console.views.admin-packet-broker.messages.registerNetwork": "",
+  "console.views.admin-packet-broker.messages.networkVisibility": "",
   "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "ご自宅のネットワークから、またはご自宅のネットワークへのピアリングを可能にするには、ご自宅のネットワークを登録する必要があります。これにより、お客様のネットワークがPacket Brokerに認識され、お客様のネットワークのピアリング動作を設定することができます",
-  "console.views.admin-packet-broker.messages.routingConfig": "",
+  "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "",
+  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDisabledDesc": "",
   "console.views.admin-packet-broker.messages.network": "ネットワーク: {network}",
+  "console.views.admin-packet-broker.messages.homeNetworkEnabled": "",
+  "console.views.admin-packet-broker.messages.homeNetworkDisabled": "",
+  "console.views.admin-packet-broker.messages.forwarderEnabled": "",
+  "console.views.admin-packet-broker.messages.forwarderDisabled": "",
   "console.views.admin-packet-broker.messages.listNetwork": "ネットワーク公開で一覧表示",
   "console.views.admin-packet-broker.messages.listNetworkDesc": "ネットワークをリストアップすることで、他のネットワーク管理者があなたのネットワークを見ることができます。これにより、他のネットワーク管理者は、あなたのネットワークでルーティングポリシーを簡単に設定することができます",
   "console.views.admin-packet-broker.messages.unlistNetwork": "このネットワークをアンリスト化",
@@ -1386,7 +1392,6 @@
   "lib.shared-messages.sessions": "",
   "lib.shared-messages.setLoRaCloudToken": "",
   "lib.shared-messages.settings": "",
-  "lib.shared-messages.setup": "",
   "lib.shared-messages.shareGatewayInfo": "",
   "lib.shared-messages.skipCryptoDescription": "",
   "lib.shared-messages.skipCryptoPlaceholder": "",

From ea28f015aa16107978186532b780cf68381cbad3 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 30 Oct 2023 09:40:09 +0100
Subject: [PATCH 25/28] console: Update e2e tests

---
 .../packet-broker/routing-policies.spec.js     | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
index 9ac1d46408..97a920c5d0 100644
--- a/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
+++ b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
@@ -129,23 +129,7 @@ describe('Packet Broker routing policies', () => {
 
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
 
-    // Check routing policy form checkboxes.
-    cy.findByText('Uplink')
-      .parent()
-      .within(() => {
-        cy.findByLabelText('Join request').uncheck()
-        cy.findByLabelText('MAC data').uncheck()
-        cy.findByLabelText('Application data').uncheck()
-        cy.findByLabelText('Signal quality information').uncheck()
-        cy.findByLabelText('Localization information').uncheck()
-      })
-    cy.findByText('Downlink')
-      .parent()
-      .within(() => {
-        cy.findByLabelText('Join accept').uncheck()
-        cy.findByLabelText('MAC data').uncheck()
-        cy.findByLabelText('Application data').uncheck()
-      })
+    cy.findByLabelText('Do not use a default routing policy for this network').check()
     cy.findByRole('button', { name: 'Save routing configuration' }).click()
 
     cy.findByTestId('error-notification').should('not.exist')

From 7a1a1246e7f128185313b95b290fd3a0c5c41d49 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 30 Oct 2023 11:53:09 +0100
Subject: [PATCH 26/28] console: Fix messages

---
 .../packet-broker/registration.spec.js        |  1 -
 .../default-routing-policy-form/index.js      |  3 +-
 .../components/routing-policy-form/index.js   |  3 +-
 pkg/webui/lib/shared-messages.js              |  1 +
 pkg/webui/locales/en.json                     | 30 ++++++++-----------
 pkg/webui/locales/ja.json                     | 22 ++++++--------
 6 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/cypress/e2e/console/admin-panel/packet-broker/registration.spec.js b/cypress/e2e/console/admin-panel/packet-broker/registration.spec.js
index 9d6c906852..4bfd68d939 100644
--- a/cypress/e2e/console/admin-panel/packet-broker/registration.spec.js
+++ b/cypress/e2e/console/admin-panel/packet-broker/registration.spec.js
@@ -96,7 +96,6 @@ describe('Packet Broker registration', () => {
       .next()
       .findByTestId('switch')
       .should('be.checked')
-    cy.findByText('Routing configuration', { selector: 'h3' }).should('be.visible')
     cy.findByLabelText('Forward traffic to all networks registered in Packet Broker').should(
       'exist',
     )
diff --git a/pkg/webui/console/components/default-routing-policy-form/index.js b/pkg/webui/console/components/default-routing-policy-form/index.js
index 09a65bc95a..2a85055b98 100644
--- a/pkg/webui/console/components/default-routing-policy-form/index.js
+++ b/pkg/webui/console/components/default-routing-policy-form/index.js
@@ -27,7 +27,6 @@ import sharedMessages from '@ttn-lw/lib/shared-messages'
 import policyMessages from '@console/lib/packet-broker/messages'
 
 const m = defineMessages({
-  useDefaultPolicy: 'Use default routing policy for this network',
   doNotUseADefaultPolicy: 'Do not use a default routing policy for this network',
 })
 
@@ -51,7 +50,7 @@ const DefaultRoutingPolicyForm = () => {
           decode={useDefaultDecode}
         >
           <Radio label={m.doNotUseADefaultPolicy} value="no-default" />
-          <Radio label={m.useDefaultPolicy} value="default" />
+          <Radio label={sharedMessages.useDefaultPolicy} value="default" />
         </Form.Field>
       </Col>
       {useDefault && (
diff --git a/pkg/webui/console/components/routing-policy-form/index.js b/pkg/webui/console/components/routing-policy-form/index.js
index 753e62e145..65a6ece402 100644
--- a/pkg/webui/console/components/routing-policy-form/index.js
+++ b/pkg/webui/console/components/routing-policy-form/index.js
@@ -37,7 +37,6 @@ import style from './routing-policy-form.styl'
 
 const m = defineMessages({
   saveDefaultPolicy: 'Save default policy',
-  useDefaultPolicy: 'Use default routing policy for this network',
   useSpecificPolicy: 'Use network specific routing policy',
   doNotUseAPolicy: 'Do not use a routing policy for this network',
 })
@@ -79,7 +78,7 @@ const RoutingPolicyForm = ({ onSubmit, initialValues, error, defaultPolicy, subm
             decode={policySourceDecode}
           >
             <Radio
-              label={hasDefaultPolicy ? m.useDefaultPolicy : m.doNotUseAPolicy}
+              label={hasDefaultPolicy ? sharedMessages.useDefaultPolicy : m.doNotUseAPolicy}
               value="default"
             />
             <Radio label={m.useSpecificPolicy} value="specific" />
diff --git a/pkg/webui/lib/shared-messages.js b/pkg/webui/lib/shared-messages.js
index 941639495f..dc7ec18ed5 100644
--- a/pkg/webui/lib/shared-messages.js
+++ b/pkg/webui/lib/shared-messages.js
@@ -508,6 +508,7 @@ export default defineMessages({
   uplinksReceived: 'Uplinks received',
   uploadAnImage: 'Upload an image',
   used: '{currentValue}/{maxValue} used',
+  useDefaultPolicy: 'Use default routing policy for this network',
   user: 'User',
   userAdd: 'Add user',
   userDelete: 'Delete user',
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 3b524f73b8..5ecf2a252a 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -191,7 +191,6 @@
   "console.components.application-general-settings-form.index.useAlcsync": "Use Application Layer Clock Synchronization",
   "console.components.application-general-settings-form.index.adminContactDescription": "Administrative contact information for this application. Typically used to indicate who to contact with administrative questions about the application.",
   "console.components.application-general-settings-form.index.techContactDescription": "Technical contact information for this application. Typically used to indicate who to contact with technical/security questions about the application.",
-  "console.components.default-routing-policy-form.index.useDefaultPolicy": "Use default routing policy for this network",
   "console.components.default-routing-policy-form.index.doNotUseADefaultPolicy": "Do not use a default routing policy for this network",
   "console.components.device-import-form.index.file": "File",
   "console.components.device-import-form.index.formatInfo": "Format information",
@@ -306,7 +305,6 @@
   "console.components.payload-formatters-form.index.grpcFieldDescription": "The address of the service to connect to",
   "console.components.payload-formatters-form.index.appFormatter": "Use application payload formatter",
   "console.components.payload-formatters-form.index.appFormatterWarning": "This option will affect both uplink and downlink formatter",
-  "console.components.payload-formatters-form.index.setupSubTitle": "Setup",
   "console.components.payload-formatters-form.index.defaultFormatter": "Click <Link>here</Link> to modify the default payload formatter for this application. The payload formatter of this application is currently set to `{defaultFormatter}`",
   "console.components.payload-formatters-form.index.pasteRepositoryFormatter": "Paste repository formatter",
   "console.components.payload-formatters-form.index.pasteApplicationFormatter": "Paste application formatter",
@@ -356,9 +354,7 @@
   "console.components.pubsub-form.messages.useSecureConnection": "Use secure connection",
   "console.components.pubsub-form.messages.pubsubsDescription": "The Pub/Sub integration allows the Application Server to publish and subscribe to topics, using The Things Stack built-in MQTT client or NATS client. Learn more in our <Link>Pub/Sub guide</Link>.",
   "console.components.routing-policy-form.index.saveDefaultPolicy": "Save default policy",
-  "console.components.routing-policy-form.index.useDefaultPolicy": "Use default routing policy for this network",
   "console.components.routing-policy-form.index.useSpecificPolicy": "Use network specific routing policy",
-  "console.components.routing-policy-form.index.doNotUseADefaultPolicy": "Do not use a default routing policy for this network",
   "console.components.routing-policy-form.index.doNotUseAPolicy": "Do not use a routing policy for this network",
   "console.components.uplink-form.uplink-form.simulateUplink": "Simulate uplink",
   "console.components.uplink-form.uplink-form.payloadDescription": "The desired payload bytes of the uplink message",
@@ -679,26 +675,24 @@
   "console.store.middleware.logics.users.errEmailValidationActionSuccess": "Validation email sent (please also check your spam folder)",
   "console.store.middleware.logics.users.errEmailValidationActionFailure": "There was an error and the validation email could not be sent.",
   "console.store.middleware.logics.users.errEmailValidationAlreadySent": "A validation email has already been sent recently to your email address. Please also check your spam folder.",
-  "console.views.admin-packet-broker.messages.packetBrokerInfoText": "Packet Broker can be used to exchange traffic (peering) with other LoRaWAN networks to share coverage and improve the overall network performance.",
+  "console.views.admin-packet-broker.messages.packetBrokerInfoText": "Packet Broker is a service by The Things Industries to facilitate peering between LoRaWAN networks. This extends network coverage and improves overall network performance and device battery lifetime.",
   "console.views.admin-packet-broker.messages.packetBrokerWebsite": "Packet Broker website",
-  "console.views.admin-packet-broker.messages.registrationStatus": "Registration status",
-  "console.views.admin-packet-broker.messages.registerNetwork": "Register network",
-  "console.views.admin-packet-broker.messages.networkVisibility": "Network visibility",
-  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "To enable peering from or to your home network, it is necessary to register your network. This will make your network known to Packet Broker and enable you to configure your network's peering behavior.",
+  "console.views.admin-packet-broker.messages.learnMore": "Learn more",
+  "console.views.admin-packet-broker.messages.whyNetworkPeeringTitle": "Why choose network peering?",
+  "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "Since LoRaWAN uses shared spectrum, gateways receive messages from devices registered on other LoRaWAN networks. Instead of discarding this traffic, these messages can be forwarded via Packet Broker to the home network of these devices. This extends coverage of networks and allows devices to use higher data rates that reduce channel utilization and increase battery life. No sensitive data is exposed as LoRaWAN is end-to-end encrypted and integrity protected.",
+  "console.views.admin-packet-broker.messages.enbaling": "Enable forwarding via the options below or define custom routing policies. In the Networks tab below (visible by selecting the option \"Use custom routing policies\"), you can see which other networks are forwarding data to this network.",
   "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "The Things Stack is not set up to use Packet Broker. Please refer to the documentation link above for instructions on how to set up The Things Stack for peering with Packet Broker.",
-  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDisabledDesc": "The Things Stack is set up to use Packet Broker, but security settings disallow (de)registering your network here. Please contact Packet Broker to manage your registration. Refer to the documentation link above for contact information.",
+  "console.views.admin-packet-broker.messages.enablePacketBroker": "Enable Packet Broker",
+  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "Enabling will allow other networks to send traffic to you as well as you forwarding traffic to them, based on the exact routing policy.",
+  "console.views.admin-packet-broker.messages.routingConfig": "Routing configuration",
   "console.views.admin-packet-broker.messages.network": "Network: {network}",
-  "console.views.admin-packet-broker.messages.homeNetworkEnabled": "Home network <b>enabled</b>",
-  "console.views.admin-packet-broker.messages.homeNetworkDisabled": "Home network <b>disabled</b>",
-  "console.views.admin-packet-broker.messages.forwarderEnabled": "Forwarder <b>enabled</b>",
-  "console.views.admin-packet-broker.messages.forwarderDisabled": "Forwarder <b>disabled</b>",
-  "console.views.admin-packet-broker.messages.listNetwork": "List network publicly",
-  "console.views.admin-packet-broker.messages.listNetworkDesc": "Listing your network allows other network administrators to see your network. This allows them to easily configure routing policies with your network.",
+  "console.views.admin-packet-broker.messages.listNetwork": "List my network in Packet Broker publicly",
+  "console.views.admin-packet-broker.messages.listNetworkDesc": "Public listing will make it easier for other network operators to set up routing policies for your network. Hence public listing is generally recommended.",
   "console.views.admin-packet-broker.messages.unlistNetwork": "Unlist this network",
   "console.views.admin-packet-broker.messages.confirmUnlist": "Confirm unlist",
   "console.views.admin-packet-broker.messages.Are you sure you want to unlist your network in Packet Broker?{lineBreak}This will hide your network. Other network administrators will not be able to see your network to configure routing policies.": "Are you sure you want to unlist your network in Packet Broker?{lineBreak}This will hide your network. Other network administrators will not be able to see your network to configure routing policies.",
   "console.views.admin-packet-broker.messages.routingPolicyInformation": "You can use the checkboxes below to control the default forwarding behavior of your network. You can additionally set up individual per-network routing policies via the Networks tab.",
-  "console.views.admin-packet-broker.messages.defaultRoutingPolicySet": "Default routing policy set",
+  "console.views.admin-packet-broker.messages.defaultRoutingPolicySet": "Default routing configuration set",
   "console.views.admin-packet-broker.messages.routingPolicySet": "Routing policy set",
   "console.views.admin-packet-broker.messages.defaultRoutingPolicy": "Default routing policy",
   "console.views.admin-packet-broker.messages.devAddressBlock": "Device address block",
@@ -1392,6 +1386,7 @@
   "lib.shared-messages.sessions": "Sessions",
   "lib.shared-messages.setLoRaCloudToken": "Set LoRa Cloud token",
   "lib.shared-messages.settings": "Settings",
+  "lib.shared-messages.setup": "Setup",
   "lib.shared-messages.shareGatewayInfo": "Share gateway information",
   "lib.shared-messages.skipCryptoDescription": "Skip decryption of uplink payloads and encryption of downlink payloads",
   "lib.shared-messages.skipCryptoPlaceholder": "Encryption/decryption disabled",
@@ -1440,6 +1435,7 @@
   "lib.shared-messages.uplinksReceived": "Uplinks received",
   "lib.shared-messages.uploadAnImage": "Upload an image",
   "lib.shared-messages.used": "{currentValue}/{maxValue} used",
+  "lib.shared-messages.useDefaultPolicy": "Use default routing policy for this network",
   "lib.shared-messages.user": "User",
   "lib.shared-messages.userAdd": "Add user",
   "lib.shared-messages.userDelete": "Delete user",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index 0ba556fb60..f6610e6ba0 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -191,7 +191,6 @@
   "console.components.application-general-settings-form.index.useAlcsync": "LoRaアプリケーションレイヤー・クロックシンクロパッケージの使用",
   "console.components.application-general-settings-form.index.adminContactDescription": "このアプリケーションの管理者の連絡先情報。通常、アプリケーションに関する管理上の問い合わせ先を示すために使用されます。",
   "console.components.application-general-settings-form.index.techContactDescription": "このアプリケーションの技術的な連絡先情報。通常、アプリケーションに関する技術/セキュリティの質問の連絡先を示すために使用されます。",
-  "console.components.default-routing-policy-form.index.useDefaultPolicy": "",
   "console.components.default-routing-policy-form.index.doNotUseADefaultPolicy": "",
   "console.components.device-import-form.index.file": "ファイル",
   "console.components.device-import-form.index.formatInfo": "フォーマット情報",
@@ -306,7 +305,6 @@
   "console.components.payload-formatters-form.index.grpcFieldDescription": "接続先サービスのアドレス",
   "console.components.payload-formatters-form.index.appFormatter": "アプリケーションペイロードフォーマッタを使用",
   "console.components.payload-formatters-form.index.appFormatterWarning": "このオプションは、アップリンクとダウンリンクの両方のフォーマッタをアプリケーションリンクのデフォルトに設定します",
-  "console.components.payload-formatters-form.index.setupSubTitle": "",
   "console.components.payload-formatters-form.index.defaultFormatter": "<Link>ここ</Link> をクリックすると、このアプリケーションのデフォルトのペイロードフォーマッタを変更することができます。このアプリケーションのペイロードフォーマッタは現在 `{defaultFormatter}` に設定されています",
   "console.components.payload-formatters-form.index.pasteRepositoryFormatter": "リポジトリフォーマッター貼り付け",
   "console.components.payload-formatters-form.index.pasteApplicationFormatter": "アプリケーションフォーマッター貼り付け",
@@ -356,9 +354,7 @@
   "console.components.pubsub-form.messages.useSecureConnection": "安全な接続を使用",
   "console.components.pubsub-form.messages.pubsubsDescription": "Pub/Sub統合により、The Things Stack内蔵のMQTTクライアントまたはNATSクライアントを使用して、アプリケーションサーバーがトピックを公開および購読することができます。詳しくは、<リンク>Pub/Subガイド</リンク>をご覧ください",
   "console.components.routing-policy-form.index.saveDefaultPolicy": "",
-  "console.components.routing-policy-form.index.useDefaultPolicy": "このネットワークでデフォルトのルーティングポリシーを使用",
   "console.components.routing-policy-form.index.useSpecificPolicy": "ネットワーク固有のルーティングポリシーを使用",
-  "console.components.routing-policy-form.index.doNotUseADefaultPolicy": "",
   "console.components.routing-policy-form.index.doNotUseAPolicy": "このネットワークには、ルーティングポリシーを使用しないでください",
   "console.components.uplink-form.uplink-form.simulateUplink": "アップリンクのシミュレーション",
   "console.components.uplink-form.uplink-form.payloadDescription": "アップリンクメッセージの希望するペイロードバイト数",
@@ -681,17 +677,15 @@
   "console.store.middleware.logics.users.errEmailValidationAlreadySent": "最近、あなたのメールアドレスに確認メールが送信されました。迷惑メールフォルダも確認してください。",
   "console.views.admin-packet-broker.messages.packetBrokerInfoText": "Packet Brokerは、他のLoRaWANネットワークとトラフィックを交換（ピアリング）することで、カバレッジを共有し、ネットワーク全体のパフォーマンスを向上させるために使用することができます",
   "console.views.admin-packet-broker.messages.packetBrokerWebsite": "Packer Brokerのサイト",
-  "console.views.admin-packet-broker.messages.registrationStatus": "",
-  "console.views.admin-packet-broker.messages.registerNetwork": "",
-  "console.views.admin-packet-broker.messages.networkVisibility": "",
-  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "ご自宅のネットワークから、またはご自宅のネットワークへのピアリングを可能にするには、ご自宅のネットワークを登録する必要があります。これにより、お客様のネットワークがPacket Brokerに認識され、お客様のネットワークのピアリング動作を設定することができます",
+  "console.views.admin-packet-broker.messages.learnMore": "",
+  "console.views.admin-packet-broker.messages.whyNetworkPeeringTitle": "",
+  "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "",
+  "console.views.admin-packet-broker.messages.enbaling": "",
   "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "",
-  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDisabledDesc": "",
+  "console.views.admin-packet-broker.messages.enablePacketBroker": "",
+  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "ご自宅のネットワークから、またはご自宅のネットワークへのピアリングを可能にするには、ご自宅のネットワークを登録する必要があります。これにより、お客様のネットワークがPacket Brokerに認識され、お客様のネットワークのピアリング動作を設定することができます",
+  "console.views.admin-packet-broker.messages.routingConfig": "",
   "console.views.admin-packet-broker.messages.network": "ネットワーク: {network}",
-  "console.views.admin-packet-broker.messages.homeNetworkEnabled": "",
-  "console.views.admin-packet-broker.messages.homeNetworkDisabled": "",
-  "console.views.admin-packet-broker.messages.forwarderEnabled": "",
-  "console.views.admin-packet-broker.messages.forwarderDisabled": "",
   "console.views.admin-packet-broker.messages.listNetwork": "ネットワーク公開で一覧表示",
   "console.views.admin-packet-broker.messages.listNetworkDesc": "ネットワークをリストアップすることで、他のネットワーク管理者があなたのネットワークを見ることができます。これにより、他のネットワーク管理者は、あなたのネットワークでルーティングポリシーを簡単に設定することができます",
   "console.views.admin-packet-broker.messages.unlistNetwork": "このネットワークをアンリスト化",
@@ -1392,6 +1386,7 @@
   "lib.shared-messages.sessions": "",
   "lib.shared-messages.setLoRaCloudToken": "",
   "lib.shared-messages.settings": "",
+  "lib.shared-messages.setup": "",
   "lib.shared-messages.shareGatewayInfo": "",
   "lib.shared-messages.skipCryptoDescription": "",
   "lib.shared-messages.skipCryptoPlaceholder": "",
@@ -1440,6 +1435,7 @@
   "lib.shared-messages.uplinksReceived": "",
   "lib.shared-messages.uploadAnImage": "",
   "lib.shared-messages.used": "",
+  "lib.shared-messages.useDefaultPolicy": "",
   "lib.shared-messages.user": "",
   "lib.shared-messages.userAdd": "",
   "lib.shared-messages.userDelete": "",

From 0b2401b352031d34e3e1e2f7102e4f7f4b1f8d93 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 30 Oct 2023 13:04:21 +0100
Subject: [PATCH 27/28] console: Update routes

---
 .../packet-broker/networks.spec.js            |  12 +-
 .../packet-broker/routing-policies.spec.js    |  18 +-
 .../default-routing-policy-form/index.js      |   4 +-
 .../console/views/device-overview/index.js    |   6 +-
 pkg/webui/locales/ja.json                     | 291 +++++++++---------
 5 files changed, 176 insertions(+), 155 deletions(-)

diff --git a/cypress/e2e/console/admin-panel/packet-broker/networks.spec.js b/cypress/e2e/console/admin-panel/packet-broker/networks.spec.js
index d5ae5f2584..e3a83f2526 100644
--- a/cypress/e2e/console/admin-panel/packet-broker/networks.spec.js
+++ b/cypress/e2e/console/admin-panel/packet-broker/networks.spec.js
@@ -45,7 +45,11 @@ describe('Packet Broker networks', () => {
     cy.intercept('/api/v3/pba/home-networks/policies*', {
       fixture: 'console/packet-broker/policies-home-network.json',
     })
-    cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker/networks`)
+    cy.visit(
+      `${Cypress.config(
+        'consoleRootPath',
+      )}/admin-panel/packet-broker/routing-configuration/networks`,
+    )
     cy.findByLabelText('Use custom routing policies').check()
 
     const { networks } = this.networks
@@ -74,7 +78,11 @@ describe('Packet Broker networks', () => {
       n => n.forwarder_id.net_id === 19 && n.forwarder_id.tenant_id === 'johan',
     )
 
-    cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker/networks/19/johan`)
+    cy.visit(
+      `${Cypress.config(
+        'consoleRootPath',
+      )}/admin-panel/packet-broker/routing-configuration/networks/19/johan`,
+    )
 
     cy.findAllByText(`${network.id.net_id.toString(16).padStart(6, '0')}/${network.id.tenant_id}`)
     cy.findByText(
diff --git a/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
index 97a920c5d0..be0fee18a5 100644
--- a/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
+++ b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
@@ -149,7 +149,11 @@ describe('Packet Broker routing policies', () => {
     })
     cy.intercept('PUT', '/api/v3/pba/home-networks/policies/19', {})
 
-    cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker/networks/19`)
+    cy.visit(
+      `${Cypress.config(
+        'consoleRootPath',
+      )}/admin-panel/packet-broker/routing-configuration/networks/19`,
+    )
 
     // Check routing policy form checkboxes.
     cy.findByLabelText('Use network specific routing policy').check()
@@ -194,7 +198,11 @@ describe('Packet Broker routing policies', () => {
     })
     cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/19', {})
 
-    cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker/networks/19`)
+    cy.visit(
+      `${Cypress.config(
+        'consoleRootPath',
+      )}/admin-panel/packet-broker/routing-configuration/networks/19`,
+    )
 
     cy.findByLabelText('Do not use a routing policy for this network').check()
     cy.findByRole('button', { name: 'Save routing policy' }).click()
@@ -217,7 +225,11 @@ describe('Packet Broker routing policies', () => {
     })
     cy.intercept('DELETE', '/api/v3/pba/home-networks/policies/19', {})
 
-    cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker/networks/19`)
+    cy.visit(
+      `${Cypress.config(
+        'consoleRootPath',
+      )}/admin-panel/packet-broker/routing-configuration/networks/19`,
+    )
 
     cy.findByLabelText('Use default routing policy for this network').check()
     cy.findByRole('button', { name: 'Save routing policy' }).click()
diff --git a/pkg/webui/console/components/default-routing-policy-form/index.js b/pkg/webui/console/components/default-routing-policy-form/index.js
index 2a85055b98..ce33d11b2a 100644
--- a/pkg/webui/console/components/default-routing-policy-form/index.js
+++ b/pkg/webui/console/components/default-routing-policy-form/index.js
@@ -66,7 +66,7 @@ const DefaultRoutingPolicyForm = () => {
             <Form.Field
               name="policy.uplink.mac_data"
               component={Checkbox}
-              label={policyMessages.macData}
+              label={sharedMessages.macData}
               description={policyMessages.macDataDesc}
             />
             <Form.Field
@@ -99,7 +99,7 @@ const DefaultRoutingPolicyForm = () => {
             <Form.Field
               name="policy.downlink.mac_data"
               component={Checkbox}
-              label={policyMessages.macData}
+              label={sharedMessages.macData}
               description={policyMessages.macDataAllowDesc}
             />
             <Form.Field
diff --git a/pkg/webui/console/views/device-overview/index.js b/pkg/webui/console/views/device-overview/index.js
index 72878bd8a2..0dee3a2de8 100644
--- a/pkg/webui/console/views/device-overview/index.js
+++ b/pkg/webui/console/views/device-overview/index.js
@@ -265,7 +265,7 @@ const DeviceInfo = ({ frequencyPlans, device, onExport }) => {
                   },
             }}
             onApprove={onExport}
-            message={m.macData}
+            message={sharedMessages.macData}
             type="button"
             icon="file_download"
           />
@@ -307,14 +307,14 @@ const DeviceOverview = () => {
 
         if (!('mac_state' in result)) {
           toast({
-            title: m.macData,
+            title: sharedMessages.macData,
             message: m.macStateError,
             type: toast.types.ERROR,
           })
         }
       } catch {
         toast({
-          title: m.macData,
+          title: sharedMessages.macData,
           message: m.macStateError,
           type: toast.types.ERROR,
         })
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index 3be8a8bee2..dd3232267b 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -247,7 +247,7 @@
   "console.components.events.messages.eventUnavailable": "このイベントはもう利用できません。メモリを節約するために切り捨てられたのでしょう",
   "console.components.events.messages.verboseStream": "冗長ストリーム",
   "console.components.events.messages.confirmedUplink": "アップリンク確認済み",
-  "console.components.events.previews.shared.json-payload.index.invalid": "無効なJSON",
+  "console.components.events.previews.shared.json-payload.index.invalid": "",
   "console.components.gateway-api-keys-modal.index.modalTitle": "ダウンロードゲートウェイAPIキー",
   "console.components.gateway-api-keys-modal.index.buttonMessage": "キーをダウンロードしました",
   "console.components.gateway-api-keys-modal.index.description": "注意：このウィンドウを閉じると、これらのAPIキーはダウンロードできなくなります。必ずダウンロードして保存してください！",
@@ -418,7 +418,7 @@
   "console.containers.deployment-component-status.index.versionInfo": "デプロイメント",
   "console.containers.deployment-component-status.index.statusPage": "ステータスページに移動します",
   "console.containers.deployment-component-status.index.seeChangelog": "変更履歴を見る",
-  "console.containers.dev-addr-input.index.devAddrFetchingFailure": "エラーが発生し、エンドデバイスのアドレスを生成できませんでした",
+  "console.containers.dev-addr-input.index.devAddrFetchingFailure": "",
   "console.containers.dev-eui-component.index.unknownError": "",
   "console.containers.device-importer.messages.proceed": "エンドデバイスリストへ進む",
   "console.containers.device-importer.messages.retry": "ゼロからやり直す",
@@ -475,34 +475,34 @@
   "console.containers.device-onboarding-form.messages.resetQRCodeData": "QRコードデータをリセット",
   "console.containers.device-onboarding-form.messages.resetConfirm": "本当にQRコードデータを破棄していいのですか？スキャンした端末は登録されず、フォームがリセットされま",
   "console.containers.device-onboarding-form.messages.scanSuccess": "QRコードの読み取りが成功しました",
-  "console.containers.device-onboarding-form.provisioning-form-section.claiming-form-section.validation-schema.validateCode": "クレーム認証コードは数字と文字のみで構成されている必要があります",
-  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.advancedSectionTitle": "高度なアクティベーション、LoRaWANクラス、クラスタの設定を表示します",
-  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.classA": "なし（クラスAのみ）",
-  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.classB": "クラスB（ビーコン）",
-  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.classC": "クラスC（連続使用）",
-  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.classBandC": "クラスBとクラスC",
-  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.skipJsRegistration": "ジョインサーバーでの登録をスキップ",
-  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.multicastClassCapabilities": "マルチキャスト・ダウンリンク用LoRaWANクラス",
-  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.register": "手動で登録",
+  "console.containers.device-onboarding-form.provisioning-form-section.claiming-form-section.validation-schema.validateCode": "",
+  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.advancedSectionTitle": "",
+  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.classA": "",
+  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.classB": "",
+  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.classC": "",
+  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.classBandC": "",
+  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.skipJsRegistration": "",
+  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.multicastClassCapabilities": "",
+  "console.containers.device-onboarding-form.type-form-section.manual-form-section.advanced-settings-section.register": "",
   "console.containers.device-onboarding-form.warning-tooltip.desiredDescription": "The network will use a different <i>desired</i> value of <code>{value}</code> for this property.",
   "console.containers.device-onboarding-form.warning-tooltip.sessionDescription": "ABP 装置は、セッションと MAC 設定でパーソナライズされます。これらのMAC設定は現在のパラメータとみなされ、ここで入力された設定と正確に一致しなければなりません。ネットワークサーバーは、LoRaWAN MACコマンドでMAC状態を希望する状態に変更するために希望するパラメータを使用します。エンドデバイスを登録した後に、一般設定ページを使用して希望する設定を更新することができます",
   "console.containers.device-payload-formatters.messages.defaultFormatter": "<Link>こちら</Link> をクリックすると、このアプリケーションのデフォルトのペイロードフォーマッターを変更できます",
   "console.containers.device-payload-formatters.messages.mayNotViewLink": "このアプリケーションのリンク情報を表示することは許可されていません。これには、このアプリケーションのデフォルトのペイロードフォーマッタを見ることも含まれます",
-  "console.containers.device-profile-section.device-card.device-card.productWebsite": "製品ウェブサイト",
-  "console.containers.device-profile-section.device-card.device-card.dataSheet": "データシート",
-  "console.containers.device-profile-section.device-card.device-card.classA": "クラスA",
-  "console.containers.device-profile-section.device-card.device-card.classB": "クラスB",
-  "console.containers.device-profile-section.device-card.device-card.classC": "クラスC",
+  "console.containers.device-profile-section.device-card.device-card.productWebsite": "",
+  "console.containers.device-profile-section.device-card.device-card.dataSheet": "",
+  "console.containers.device-profile-section.device-card.device-card.classA": "",
+  "console.containers.device-profile-section.device-card.device-card.classB": "",
+  "console.containers.device-profile-section.device-card.device-card.classC": "",
   "console.containers.device-profile-section.device-selection.band-select.index.title": "プロフィール（リージョン）",
-  "console.containers.device-profile-section.device-selection.brand-select.brand-select.title": "エンドデバイスのブランド",
-  "console.containers.device-profile-section.device-selection.brand-select.brand-select.noOptionsMessage": "該当するブランドはありません",
-  "console.containers.device-profile-section.device-selection.fw-version-select.fw-version-select.title": "ファームウェアのバージョン",
-  "console.containers.device-profile-section.device-selection.hw-version-select.hw-version-select.title": "ハードウェアのバージョン",
-  "console.containers.device-profile-section.device-selection.model-select.model-select.noOptionsMessage": "該当する機種がありません",
+  "console.containers.device-profile-section.device-selection.brand-select.brand-select.title": "",
+  "console.containers.device-profile-section.device-selection.brand-select.brand-select.noOptionsMessage": "",
+  "console.containers.device-profile-section.device-selection.fw-version-select.fw-version-select.title": "",
+  "console.containers.device-profile-section.device-selection.hw-version-select.hw-version-select.title": "",
+  "console.containers.device-profile-section.device-selection.model-select.model-select.noOptionsMessage": "",
   "console.containers.device-profile-section.hints.other-hint.hintTitle": "お客様のエンドデバイスはすぐに追加されます！",
   "console.containers.device-profile-section.hints.other-hint.hintMessage": "申し訳ありませんが、あなたのデバイスはまだLoRaWANデバイスリポジトリの一部ではありません。エンドデバイスの製造元が提供する情報（製品のデータシートなど）を使用して、上記のenter end device specifics manuallyオプションを使用することができます。また、デバイスの追加に関するドキュメントも参照してください",
-  "console.containers.device-profile-section.hints.progress-hint.hintMessage": "あなたの正確なエンドデバイスを見つけることができませんか？　ここで助けを得て、上のオプションでエンドデバイスの仕様を手動で入力してみてください。",
-  "console.containers.device-profile-section.hints.progress-hint.hintNoSupportMessage": "あなたの正確なエンドデバイスを見つけることができませんか？　上のオプションでエンドデバイスの仕様を手動で入力してみてください",
+  "console.containers.device-profile-section.hints.progress-hint.hintMessage": "",
+  "console.containers.device-profile-section.hints.progress-hint.hintNoSupportMessage": "",
   "console.containers.device-template-format-select.index.title": "ファイルフォーマット",
   "console.containers.device-template-format-select.index.warning": "エンドデバイスのテンプレートフォーマットが利用できません",
   "console.containers.device-title-section.device-title-section.uplinkDownlinkTooltip": "前回のフレームカウンタリセット以降、このエンドデバイスの送信アップリンクと受信ダウンリンクの数です",
@@ -519,17 +519,17 @@
   "console.containers.gateway-connection.gateway-connection.connectedTooltip": "このゲートウェイはゲートウェイサーバーに接続されていますが、ネットワークはまだゲートウェイからのアクティビティ（アップリンクやステータスメッセージの送信）を登録していません",
   "console.containers.gateway-connection.gateway-connection.otherClusterTooltip": "このゲートウェイは、このクラスタのメッセージを処理しない外部のゲートウェイサーバーに接続されています。そのため、このゲートウェイからのアクティビティを見ることはできません",
   "console.containers.gateway-connection.gateway-connection.messageCountTooltip": "最後の（再）接続以降、このゲートウェイの受信アップリンクと送信ダウンリンクの量です。ゲートウェイの種類によっては、頻繁に再接続するため、カウンタがリセットされることに注意してください",
-  "console.containers.gateway-location-form.gateway-location-form.updateLocationFromStatus": "ステータスメッセージから更新",
-  "console.containers.gateway-location-form.gateway-location-form.updateLocationFromStatusDescription": "受信ステータスメッセージに基づいて、このゲートウェイの位置を更新します",
-  "console.containers.gateway-location-form.gateway-location-form.setGatewayLocation": "ゲートウェイアンテナ位置の設定",
-  "console.containers.gateway-location-form.gateway-location-form.locationSource": "位置情報ソース",
-  "console.containers.gateway-location-form.gateway-location-form.locationPrivacy": "位置情報プライバシー",
-  "console.containers.gateway-location-form.gateway-location-form.placement": "配置",
-  "console.containers.gateway-location-form.gateway-location-form.indoor": "屋内",
-  "console.containers.gateway-location-form.gateway-location-form.outdoor": "屋外",
-  "console.containers.gateway-location-form.gateway-location-form.locationFromStatusMessage": "ステータスメッセージから自動的に位置情報を設定",
-  "console.containers.gateway-location-form.gateway-location-form.setLocationManually": "位置情報を手動で設定",
-  "console.containers.gateway-location-form.gateway-location-form.noLocationSetInfo": "このゲートウェイには位置情報が設定されていません",
+  "console.containers.gateway-location-form.gateway-location-form.updateLocationFromStatus": "",
+  "console.containers.gateway-location-form.gateway-location-form.updateLocationFromStatusDescription": "",
+  "console.containers.gateway-location-form.gateway-location-form.setGatewayLocation": "",
+  "console.containers.gateway-location-form.gateway-location-form.locationSource": "",
+  "console.containers.gateway-location-form.gateway-location-form.locationPrivacy": "",
+  "console.containers.gateway-location-form.gateway-location-form.placement": "",
+  "console.containers.gateway-location-form.gateway-location-form.indoor": "",
+  "console.containers.gateway-location-form.gateway-location-form.outdoor": "",
+  "console.containers.gateway-location-form.gateway-location-form.locationFromStatusMessage": "",
+  "console.containers.gateway-location-form.gateway-location-form.setLocationManually": "",
+  "console.containers.gateway-location-form.gateway-location-form.noLocationSetInfo": "",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-registration-form-section.index.requireAuthenticatedConnectionDescription": "{packetBrokerURL}など、他のネットワーク参加者が見ることができる情報を選択します",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-registration-form-section.index.shareGatewayInfoDescription": "ゲートウェイが{loraBasicStationURL}で駆動している場合など、このオプションを選択します",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-registration-form-section.validation-schema.validateEntry": "",
@@ -562,36 +562,36 @@
   "console.containers.move-away-modal.move-away-modal.modalMessage": "本当にこのままでよいのですか？あなたの現在の変更はまだ保存されていません",
   "console.containers.network-information-container.index.openSourceInfo": "現在、The Things Stack Open Sourceを使用しています。The Things Stack Cloudを使用することで、さらなる機能を利用できます。",
   "console.containers.network-information-container.index.plansButton": "The Things Stack Cloudを始めましょう",
-  "console.containers.network-information-container.registry-totals.applicationsUsed": "使用アプリケーション",
-  "console.containers.network-information-container.registry-totals.gatewaysUsed": "使用ゲートウェイ",
-  "console.containers.network-information-container.registry-totals.registeredUsers": "登録ユーザー",
-  "console.containers.network-information-container.registry-totals.endDevicesAdded": "エンドデバイスの追加",
-  "console.containers.organization-form.form.orgDescPlaceholder": "新しい組織の説明",
-  "console.containers.organization-form.form.orgDescDescription": "組織の説明（任意）。組織に関するメモを保存するためにも使用できます",
-  "console.containers.organization-form.form.orgIdPlaceholder": "my-new-organization",
-  "console.containers.organization-form.form.orgNamePlaceholder": "私の新組織",
-  "console.containers.organization-form.form.adminContactDescription": "この組織の管理者連絡先情報。通常、組織に関する管理的な質問をするべき連絡先を示すために使用されます。",
-  "console.containers.organization-form.form.techContactDescription": "この組織の技術連絡先情報。通常、組織に関する技術/セキュリティの質問をするべき連絡先を示すために使用されます。",
-  "console.containers.organization-form.update.deleteOrg": "組織を削除",
-  "console.containers.organization-form.update.updateSuccess": "組織が更新されました",
-  "console.containers.organization-form.update.deleteSuccess": "削除された組織",
+  "console.containers.network-information-container.registry-totals.applicationsUsed": "",
+  "console.containers.network-information-container.registry-totals.gatewaysUsed": "",
+  "console.containers.network-information-container.registry-totals.registeredUsers": "",
+  "console.containers.network-information-container.registry-totals.endDevicesAdded": "",
+  "console.containers.organization-form.form.orgDescPlaceholder": "",
+  "console.containers.organization-form.form.orgDescDescription": "",
+  "console.containers.organization-form.form.orgIdPlaceholder": "",
+  "console.containers.organization-form.form.orgNamePlaceholder": "",
+  "console.containers.organization-form.form.adminContactDescription": "",
+  "console.containers.organization-form.form.techContactDescription": "",
+  "console.containers.organization-form.update.deleteOrg": "",
+  "console.containers.organization-form.update.updateSuccess": "",
+  "console.containers.organization-form.update.deleteSuccess": "",
   "console.containers.organizations-table.index.restoreSuccess": "復元された組織",
   "console.containers.organizations-table.index.restoreFail": "エラーが発生し、組織を復元することができませんでした",
   "console.containers.organizations-table.index.purgeSuccess": "パージされた組織",
   "console.containers.organizations-table.index.purgeFail": "エラーが発生したため、組織をパージすることができませんでした",
-  "console.containers.owners-select.owners-select.title": "所有者",
-  "console.containers.owners-select.owners-select.warning": "エラーが発生し、組織の一覧を表示できませんでした",
+  "console.containers.owners-select.owners-select.title": "",
+  "console.containers.owners-select.owners-select.warning": "",
   "console.containers.packet-broker-networks-table.index.nonDefaultPolicies": "デフォルトでないポリシーを持つネットワーク",
   "console.containers.packet-broker-networks-table.index.search": "テナントID、テナント名で検索",
   "console.containers.packet-broker-networks-table.index.forwarderPolicy": "私たちに対する彼らのルーティングポリシー",
   "console.containers.packet-broker-networks-table.index.homeNetworkPolicy": "それらに対する当社のルーティングポリシー",
   "console.containers.pubsub-formats-select.index.warning": "Pub/Subフォーマットが無効です",
   "console.containers.pubsubs-table.index.host": "サーバーホスト",
-  "console.containers.user-data-form.edit.deleteWarning": "これにより、このアカウントは永久に削除され、再登録のためにユーザーIDおよび電子メールがロックされます。このユーザーが所有し、他の協力者がいない関連エンティティ（ゲートウェイ、アプリケーション、エンドデバイスなど）は接続不能となり、同じIDまたはEUIを持つエンティティを再び登録することはできなくなります。このようなエンティティを継続して使用する場合は、必ず新しいコラボレーターを割り当ててください",
-  "console.containers.user-data-form.edit.purgeWarning": "これにより、このアカウントは永久に削除されます。このユーザーが所有し、他の協力者がいない関連エンティティ（ゲートウェイ、アプリケーション、エンドデバイスなど）は接続不能となり、同じIDまたはEUIを持つエンティティを再び登録することはできなくなります。このようなエンティティの使用を継続する場合は、必ず新しい共同作業者を割り当ててください",
-  "console.containers.user-data-form.edit.deleteConfirmMessage": "確認のため、このユーザーのユーザーIDを入力してください",
-  "console.containers.user-data-form.edit.updateSuccess": "ユーザーが更新しました",
-  "console.containers.user-data-form.edit.deleteSuccess": "ユーザー削除",
+  "console.containers.user-data-form.edit.deleteWarning": "",
+  "console.containers.user-data-form.edit.purgeWarning": "",
+  "console.containers.user-data-form.edit.deleteConfirmMessage": "",
+  "console.containers.user-data-form.edit.updateSuccess": "",
+  "console.containers.user-data-form.edit.deleteSuccess": "",
   "console.containers.users-table.index.invite": "ユーザーを招待",
   "console.containers.users-table.index.revokeInvitation": "この招待を取り消し",
   "console.containers.users-table.index.sentAt": "送信済み",
@@ -669,49 +669,49 @@
   "console.lib.packet-broker.messages.gatewayStatusDescription": "ゲートウェイがオンラインかオフラインかを表示します",
   "console.lib.packet-broker.messages.gatewayPacketRatesLabel": "パケットレート",
   "console.lib.packet-broker.messages.gatewayPacketRatesDescription": "受信・送信パケットレート",
-  "console.store.middleware.logics.packet-broker.unauthenticatedErrorTitle": "オーソライズできません",
-  "console.store.middleware.logics.packet-broker.unauthenticatedErrorMessage": "コンソールは、Packet Brokerエージェントへのリクエストを認証することができません。The Things StackのPacket Broker機能が正しく設定されていることを確認してください。上記のドキュメントを参照することで、より詳細なガイダンスが得られます",
-  "console.store.middleware.logics.users.errEmailValidationActionSuccess": "確認メールが送信されました（迷惑メールフォルダも確認してください）",
-  "console.store.middleware.logics.users.errEmailValidationActionFailure": "エラーが発生し、確認メールを送信できませんでした。",
-  "console.store.middleware.logics.users.errEmailValidationAlreadySent": "最近、あなたのメールアドレスに確認メールが送信されました。迷惑メールフォルダも確認してください。",
-  "console.views.admin-packet-broker.messages.packetBrokerInfoText": "Packet Brokerは、他のLoRaWANネットワークとトラフィックを交換（ピアリング）することで、カバレッジを共有し、ネットワーク全体のパフォーマンスを向上させるために使用することができます",
-  "console.views.admin-packet-broker.messages.packetBrokerWebsite": "Packer Brokerのサイト",
+  "console.store.middleware.logics.packet-broker.unauthenticatedErrorTitle": "",
+  "console.store.middleware.logics.packet-broker.unauthenticatedErrorMessage": "",
+  "console.store.middleware.logics.users.errEmailValidationActionSuccess": "",
+  "console.store.middleware.logics.users.errEmailValidationActionFailure": "",
+  "console.store.middleware.logics.users.errEmailValidationAlreadySent": "",
+  "console.views.admin-packet-broker.messages.packetBrokerInfoText": "",
+  "console.views.admin-packet-broker.messages.packetBrokerWebsite": "",
   "console.views.admin-packet-broker.messages.learnMore": "",
   "console.views.admin-packet-broker.messages.whyNetworkPeeringTitle": "",
   "console.views.admin-packet-broker.messages.whyNetworkPeeringText": "",
   "console.views.admin-packet-broker.messages.enbaling": "",
   "console.views.admin-packet-broker.messages.packetBrokerDisabledDesc": "",
   "console.views.admin-packet-broker.messages.enablePacketBroker": "",
-  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "ご自宅のネットワークから、またはご自宅のネットワークへのピアリングを可能にするには、ご自宅のネットワークを登録する必要があります。これにより、お客様のネットワークがPacket Brokerに認識され、お客様のネットワークのピアリング動作を設定することができます",
+  "console.views.admin-packet-broker.messages.packetBrokerRegistrationDesc": "",
   "console.views.admin-packet-broker.messages.routingConfig": "",
-  "console.views.admin-packet-broker.messages.network": "ネットワーク: {network}",
-  "console.views.admin-packet-broker.messages.listNetwork": "ネットワーク公開で一覧表示",
-  "console.views.admin-packet-broker.messages.listNetworkDesc": "ネットワークをリストアップすることで、他のネットワーク管理者があなたのネットワークを見ることができます。これにより、他のネットワーク管理者は、あなたのネットワークでルーティングポリシーを簡単に設定することができます",
-  "console.views.admin-packet-broker.messages.unlistNetwork": "このネットワークをアンリスト化",
-  "console.views.admin-packet-broker.messages.confirmUnlist": "アンリストを確認",
-  "console.views.admin-packet-broker.messages.Are you sure you want to unlist your network in Packet Broker?{lineBreak}This will hide your network. Other network administrators will not be able to see your network to configure routing policies.": "PacketBrokerに登録されていないネットワークは、本当に登録されていないのでしょうか？他のネットワーク管理者は、ルーティングポリシーを設定するためにあなたのネットワークを見ることができなくなります",
-  "console.views.admin-packet-broker.messages.routingPolicyInformation": "以下のチェックボックスを使用して、ネットワークのデフォルトの転送動作を制御することができます。さらに、［ネットワーク］タブでネットワークごとのルーティングポリシーを個別に設定することもできます",
-  "console.views.admin-packet-broker.messages.defaultRoutingPolicySet": "デフォルトのルーティングポリシー設定",
-  "console.views.admin-packet-broker.messages.routingPolicySet": "ルーティングポリシーセット",
-  "console.views.admin-packet-broker.messages.defaultRoutingPolicy": "既定のルーティングポリシー",
-  "console.views.admin-packet-broker.messages.devAddressBlock": "デバイスアドレスブロック",
-  "console.views.admin-packet-broker.messages.devAddressBlocks": "デバイスアドレスブロック",
-  "console.views.admin-packet-broker.messages.lastPolicyChange": "最後の方針変更",
-  "console.views.admin-packet-broker.messages.networkId": "ネットワークID",
-  "console.views.admin-packet-broker.messages.routingPolicyFromThisNetwork": "このネットワークの当社に対するルーティングポリシー",
-  "console.views.admin-packet-broker.messages.routingPolicyToThisNetwork": "このネットワークに対するルーティングポリシーを設定します",
-  "console.views.admin-packet-broker.messages.saveRoutingPolicy": "ルーティングポリシーの保存",
-  "console.views.admin-packet-broker.messages.noPolicySet": "ポリシーはまだ決まっていません",
-  "console.views.admin-packet-broker.messages.prefixes": "プレフィクス",
-  "console.views.admin-packet-broker.messages.homeNetworkClusterId": "ホームネットワーククラスターID",
-  "console.views.admin-packet-broker.messages.backToAllNetworks": "すべてのネットワークへ戻る",
-  "console.views.admin-packet-broker.messages.deregisterNetwork": "このネットワークの登録解除",
-  "console.views.admin-packet-broker.messages.confirmDeregister": "登録解除の確認",
-  "console.views.admin-packet-broker.messages.Are you sure you want to deregister your network from Packet Broker?{lineBreak}This will <b>permanently delete<.b> all routing policies and may stop traffic from flowing.{lineBreak}Traffic may still be forwarded to your network based on default routing policies configured by forwarders.": "Packet Brokerからネットワークの登録を解除してよろしいですか？ {lineBreak}すべてのルーティングポリシーが永久に削除されるため、トラフィックが流れなくなる可能性があります。{lineBreak}フォワーダが設定したデフォルトのルーティングポリシーに基づき、トラフィックがネットワークに転送される可能性はあります",
+  "console.views.admin-packet-broker.messages.network": "",
+  "console.views.admin-packet-broker.messages.listNetwork": "",
+  "console.views.admin-packet-broker.messages.listNetworkDesc": "",
+  "console.views.admin-packet-broker.messages.unlistNetwork": "",
+  "console.views.admin-packet-broker.messages.confirmUnlist": "",
+  "console.views.admin-packet-broker.messages.Are you sure you want to unlist your network in Packet Broker?{lineBreak}This will hide your network. Other network administrators will not be able to see your network to configure routing policies.": "",
+  "console.views.admin-packet-broker.messages.routingPolicyInformation": "",
+  "console.views.admin-packet-broker.messages.defaultRoutingPolicySet": "",
+  "console.views.admin-packet-broker.messages.routingPolicySet": "",
+  "console.views.admin-packet-broker.messages.defaultRoutingPolicy": "",
+  "console.views.admin-packet-broker.messages.devAddressBlock": "",
+  "console.views.admin-packet-broker.messages.devAddressBlocks": "",
+  "console.views.admin-packet-broker.messages.lastPolicyChange": "",
+  "console.views.admin-packet-broker.messages.networkId": "",
+  "console.views.admin-packet-broker.messages.routingPolicyFromThisNetwork": "",
+  "console.views.admin-packet-broker.messages.routingPolicyToThisNetwork": "",
+  "console.views.admin-packet-broker.messages.saveRoutingPolicy": "",
+  "console.views.admin-packet-broker.messages.noPolicySet": "",
+  "console.views.admin-packet-broker.messages.prefixes": "",
+  "console.views.admin-packet-broker.messages.homeNetworkClusterId": "",
+  "console.views.admin-packet-broker.messages.backToAllNetworks": "",
+  "console.views.admin-packet-broker.messages.deregisterNetwork": "",
+  "console.views.admin-packet-broker.messages.confirmDeregister": "",
+  "console.views.admin-packet-broker.messages.Are you sure you want to deregister your network from Packet Broker?{lineBreak}This will <b>permanently delete<.b> all routing policies and may stop traffic from flowing.{lineBreak}Traffic may still be forwarded to your network based on default routing policies configured by forwarders.": "",
   "console.views.admin-packet-broker.messages.defaultGatewayVisibility": "",
   "console.views.admin-packet-broker.messages.gatewayVisibilityInformation": "",
   "console.views.admin-packet-broker.messages.defaultGatewayVisibilitySet": "",
-  "console.views.admin-packet-broker.messages.packetBrokerStatusPage": "Packet Broker ステータスページ",
+  "console.views.admin-packet-broker.messages.packetBrokerStatusPage": "",
   "console.views.application-add.index.appDescription": "アプリケーション内では、エンドデバイスとそのネットワークデータを登録、管理することができます。デバイス群を設定した後、多くの統合オプションの1つを使用して、関連データを外部サービスに渡します。<Link>Adding Applications</Link>　に関するガイドで詳しく説明しています",
   "console.views.application-integrations-lora-cloud.index.loraCloudInfoText": "LoRaWANネットワークやLoRaベースのデバイスに関連する一般的なタスクのシンプルなソリューションを可能にする付加価値の高いAPIをローラクラウドが提供します。以下からLoRaCloudのインテグレーションを設定することができます",
   "console.views.application-integrations-lora-cloud.index.officialLoRaCloudDocumentation": "オフィシャル LoRa Cloud ドキュメンテーション",
@@ -741,40 +741,40 @@
   "console.views.device-general-settings.application-server-form.index.include": "ペイロード暗号の強制",
   "console.views.device-general-settings.application-server-form.index.default": "アプリケーションのデフォルトを使用",
   "console.views.device-general-settings.application-server-form.index.skipCryptoTitle": "ペイロード暗号の上書き",
-  "console.views.device-general-settings.identity-server-form.index.unclaimAndDeleteDevice": "エンドデバイスのアンクレームと削除",
-  "console.views.device-general-settings.identity-server-form.index.deleteDevice": "エンドデバイスの削除",
-  "console.views.device-general-settings.identity-server-form.index.deleteWarning": "{deviceId} \"を削除してよろしいでしょうか？この操作は元に戻すことができず、終了したデバイスIDを再利用することはできません",
-  "console.views.device-general-settings.messages.isTitle": "ベーシック",
-  "console.views.device-general-settings.messages.isDescription": "説明、クラスタ情報、メタデータ",
-  "console.views.device-general-settings.messages.isDescriptionMissing": "アイデンティティサーバーは利用できません",
-  "console.views.device-general-settings.messages.asTitle": "アプリケーションレイヤー",
-  "console.views.device-general-settings.messages.asDescription": "アプリケーションレイヤーの動作とセッション",
-  "console.views.device-general-settings.messages.asDescriptionMissing": "アプリケーションサーバーは利用できません",
-  "console.views.device-general-settings.messages.asDescriptionOTAA": "参加したOTAAエンドデバイスのキーのみがアプリケーションサーバに保存されます",
-  "console.views.device-general-settings.messages.jsTitle": "Join設定",
-  "console.views.device-general-settings.messages.jsDescription": "エンドデバイスのアクティベーションのためのルートキーとネットワーク設定",
-  "console.views.device-general-settings.messages.jsDescriptionMissing": "Joinサーバーは利用できません",
-  "console.views.device-general-settings.messages.jsDescriptionOTAA": "ABP/マルチキャストのエンドデバイスはJoinサーバーに保存されません",
-  "console.views.device-general-settings.messages.nsTitle": "ネットワークレイヤー",
-  "console.views.device-general-settings.messages.nsDescription": "LoRaWANネットワーク層の設定、動作、セッション",
-  "console.views.device-general-settings.messages.nsDescriptionMissing": "ネットワークサーバーは利用できません",
-  "console.views.device-general-settings.messages.deleteSuccess": "エンドデバイス削除",
-  "console.views.device-general-settings.messages.deleteFailure": "エラーが発生し、エンドデバイスを削除できませんでした",
-  "console.views.device-general-settings.messages.activationModeUnknown": "ネットワークサーバーが利用できないため、アクティベーションモードが不明です",
-  "console.views.device-general-settings.messages.notInCluster": "このクラスタに登録されていません",
-  "console.views.device-general-settings.messages.updateSuccess": "エンドデバイスの更新",
-  "console.views.device-general-settings.messages.keysResetWarning": "エンドデバイスのキーの閲覧は禁止されていますが、上書きは許可されています",
-  "console.views.device-general-settings.messages.unclaimFailure": "エラーが発生し、エンドデバイスをアンクレイムして削除することができませんでした",
-  "console.views.device-general-settings.messages.validateSessionKey": "{field}は0以外の値でなければなりません",
-  "console.views.device-general-settings.messages.resetUsedDevNonces": "使用したDevNoncesをリセット",
-  "console.views.device-general-settings.messages.resetUsedDevNoncesModal": "{break}{break}使用済みDevNoncesをリセットすると、過去のNoncesを使用したリプレイアタックが可能になります。エンドデバイスのNVRAMをリセットしていない限り、このオプションは使用しないでください",
-  "console.views.device-general-settings.messages.resetSuccess": "中古DevNoncesリセット",
-  "console.views.device-general-settings.messages.resetFailure": "エラーが発生し、使用中のDevNoncesをリセットすることができませんでした",
-  "console.views.device-general-settings.network-server-form.index.resetTitle": "セッションおよびMAC状態のリセット",
-  "console.views.device-general-settings.network-server-form.index.resetButtonTitle": "セッションとMACの状態をリセット",
-  "console.views.device-general-settings.network-server-form.index.resetSuccess": "エンドデバイスのリセット",
-  "console.views.device-general-settings.network-server-form.index.resetFailure": "エラーが発生し、エンドデバイスのセッションとMACの状態をリセットすることができませんでした",
-  "console.views.device-general-settings.network-server-form.index.modalMessage": "このエンドデバイスのセッションコンテキストとMACの状態をリセットしていいですか？　これにより、以下のような影響があります：<ul><li>For <OTAADocLink>OTAA</OTAADocLink>-activated end devices <b>all session and MAC data is wiped and the end device MUST rejoin</b></li><li>For <ABPDocLink>ABP</ABPDocLink>-activated end devices, session keys, device address and downlink queue are preserved, while <b>the MAC state is reset</b></li></ul>",
+  "console.views.device-general-settings.identity-server-form.index.unclaimAndDeleteDevice": "",
+  "console.views.device-general-settings.identity-server-form.index.deleteDevice": "",
+  "console.views.device-general-settings.identity-server-form.index.deleteWarning": "",
+  "console.views.device-general-settings.messages.isTitle": "",
+  "console.views.device-general-settings.messages.isDescription": "",
+  "console.views.device-general-settings.messages.isDescriptionMissing": "",
+  "console.views.device-general-settings.messages.asTitle": "",
+  "console.views.device-general-settings.messages.asDescription": "",
+  "console.views.device-general-settings.messages.asDescriptionMissing": "",
+  "console.views.device-general-settings.messages.asDescriptionOTAA": "",
+  "console.views.device-general-settings.messages.jsTitle": "",
+  "console.views.device-general-settings.messages.jsDescription": "",
+  "console.views.device-general-settings.messages.jsDescriptionMissing": "",
+  "console.views.device-general-settings.messages.jsDescriptionOTAA": "",
+  "console.views.device-general-settings.messages.nsTitle": "",
+  "console.views.device-general-settings.messages.nsDescription": "",
+  "console.views.device-general-settings.messages.nsDescriptionMissing": "",
+  "console.views.device-general-settings.messages.deleteSuccess": "",
+  "console.views.device-general-settings.messages.deleteFailure": "",
+  "console.views.device-general-settings.messages.activationModeUnknown": "",
+  "console.views.device-general-settings.messages.notInCluster": "",
+  "console.views.device-general-settings.messages.updateSuccess": "",
+  "console.views.device-general-settings.messages.keysResetWarning": "",
+  "console.views.device-general-settings.messages.unclaimFailure": "",
+  "console.views.device-general-settings.messages.validateSessionKey": "",
+  "console.views.device-general-settings.messages.resetUsedDevNonces": "",
+  "console.views.device-general-settings.messages.resetUsedDevNoncesModal": "",
+  "console.views.device-general-settings.messages.resetSuccess": "",
+  "console.views.device-general-settings.messages.resetFailure": "",
+  "console.views.device-general-settings.network-server-form.index.resetTitle": "",
+  "console.views.device-general-settings.network-server-form.index.resetButtonTitle": "",
+  "console.views.device-general-settings.network-server-form.index.resetSuccess": "",
+  "console.views.device-general-settings.network-server-form.index.resetFailure": "",
+  "console.views.device-general-settings.network-server-form.index.modalMessage": "",
   "console.views.device-import.index.noTemplatesTitle": "エンドデバイスのテンプレートは見つかりませんでした",
   "console.views.device-import.index.noTemplates": "現在、エンドデバイステンプレートは設定されていません。デバイス一括インポート機能を利用するために、エンドデバイステンプレートを設定してください。詳細については、ドキュメントを参照してください",
   "console.views.device-location.index.locationInfoTitle": "エンドデバイスの位置設定の把握",
@@ -794,17 +794,17 @@
   "console.views.device-overview.index.noSession": "このデバイスは、まだネットワークに参加していません",
   "console.views.gateway-add.index.gtwOnboardingDescription": "ゲートウェイを登録して、近くのエンドデバイスとネットワーク間のデータトラフィックを可能にします。{break}（ブレイク 詳しくは、<Link>Adding Gateways</Link>　のガイドをご覧ください",
   "console.views.gateway-data.index.gtwData": "ゲートウェイデータ",
-  "console.views.gateway-general-settings.messages.basicTitle": "基本設定",
-  "console.views.gateway-general-settings.messages.basicDescription": "一般的な設定、ゲートウェイの更新、メタデータ",
-  "console.views.gateway-general-settings.messages.lorawanDescription": "LoRaWANネットワークレイヤー設定",
-  "console.views.gateway-general-settings.messages.updateSuccess": "ゲートウェイ更新",
-  "console.views.gateway-general-settings.messages.deleteSuccess": "ゲートウェイ削除",
-  "console.views.gateway-general-settings.messages.deleteFailure": "ゲートウェイ削除エラー",
-  "console.views.gateway-general-settings.messages.deleteGateway": "ゲートウェイの削除",
-  "console.views.gateway-general-settings.messages.modalWarning": "{gtwName}を削除してよろしいでしょうか？このアクションは元に戻すことができず、ゲートウェイIDを再利用することができなくなります",
-  "console.views.gateway-general-settings.messages.disablePacketBrokerForwarding": "このゲートウェイから受信したアップリンクメッセージをPacket Brokerに転送しないようにします",
-  "console.views.gateway-general-settings.messages.adminContactDescription": "このゲートウェイの管理連絡先情報。通常、ゲートウェイに関する管理的な質問をする人を指すために使用されます。",
-  "console.views.gateway-general-settings.messages.techContactDescription": "このゲートウェイの技術連絡先情報。通常、ゲートウェイに関する技術的/セキュリティ的な質問をする人を指すために使用されます。",
+  "console.views.gateway-general-settings.messages.basicTitle": "",
+  "console.views.gateway-general-settings.messages.basicDescription": "",
+  "console.views.gateway-general-settings.messages.lorawanDescription": "",
+  "console.views.gateway-general-settings.messages.updateSuccess": "",
+  "console.views.gateway-general-settings.messages.deleteSuccess": "",
+  "console.views.gateway-general-settings.messages.deleteFailure": "",
+  "console.views.gateway-general-settings.messages.deleteGateway": "",
+  "console.views.gateway-general-settings.messages.modalWarning": "",
+  "console.views.gateway-general-settings.messages.disablePacketBrokerForwarding": "",
+  "console.views.gateway-general-settings.messages.adminContactDescription": "",
+  "console.views.gateway-general-settings.messages.techContactDescription": "",
   "console.views.gateway-overview.index.downloadGlobalConf": "global_conf.json のダウンロード",
   "console.views.gateway-overview.index.globalConf": "グローバル設定",
   "console.views.gateway-overview.index.globalConfFailed": "global_conf.json のダウンロードに失敗しました",
@@ -812,22 +812,22 @@
   "console.views.gateway-overview.index.globalConfUnavailable": "周波数プランのないゲートウェイでは利用できません",
   "console.views.organization-add.index.orgDescription": "組織は、複数のユーザーをグループ化し、そのユーザーに対して集合的な権利を割り当てるために使用されます。組織は、アプリケーションやゲートウェイのコラボレーターとして設定することができます。これにより、ユーザーのグループに対して、エンティティに対する権利の付与や取り消しを簡単に行うことができます。詳しくは、<Link>Organization Management</Link>のガイドをご覧ください",
   "console.views.organization-data.index.orgData": "組織のデータ",
-  "console.views.overview.help-link.needHelp": "ヘルプが必要ですか？私たちの{documentationLink}または{supportLink}をご覧ください",
-  "console.views.overview.help-link.needHelpShort": "ヘルプが必要ですか？私たちの{link}を参照してください",
-  "console.views.overview.index.createApplication": "アプリケーションの作成",
-  "console.views.overview.index.createGateway": "ゲートウェイの登録",
-  "console.views.overview.index.gotoApplications": "アプリケーションへ移動",
-  "console.views.overview.index.gotoGateways": "ゲートウェイへ移動",
-  "console.views.overview.index.welcome": "コンソールへようこそ！",
-  "console.views.overview.index.welcomeBack": "おかえりなさい、{userName}! 👋",
-  "console.views.overview.index.getStarted": "アプリケーションを作成したり、ゲートウェイを登録することで、すぐに始めることができます",
-  "console.views.overview.index.continueWorking": "アプリケーションやゲートウェイへの誘導を行います",
-  "console.views.overview.index.componentStatus": "コンポーネントの状況",
-  "console.views.overview.index.versionInfo": "バージョン情報",
+  "console.views.overview.help-link.needHelp": "",
+  "console.views.overview.help-link.needHelpShort": "",
+  "console.views.overview.index.createApplication": "",
+  "console.views.overview.index.createGateway": "",
+  "console.views.overview.index.gotoApplications": "",
+  "console.views.overview.index.gotoGateways": "",
+  "console.views.overview.index.welcome": "",
+  "console.views.overview.index.welcomeBack": "",
+  "console.views.overview.index.getStarted": "",
+  "console.views.overview.index.continueWorking": "",
+  "console.views.overview.index.componentStatus": "",
+  "console.views.overview.index.versionInfo": "",
   "containers.collaborator-form.index.collaboratorIdPlaceholder": "コラボレーターを選択するために入力してください",
   "containers.collaborator-select.index.setYourself": "自分自身を{name}として設定する",
   "containers.fetch-table.index.errorMessage": "エラーが発生し、{entity, select, applications {applications} organizations {organizations} keys {API keys} collaborators {collaborators} devices {end devices} gateways {gateways} users {users} webhooks {webhooks} other {entities}}のリストを表示できませんでした。",
-  "lib.components.date-time.relative.justNow": "ただ今",
+  "lib.components.date-time.relative.justNow": "",
   "lib.components.init.initializing": "初期化中...",
   "lib.components.with-auth.errTooFewRights": "あなたのアカウントは、コンソールを使用するための十分な権利を持っていません",
   "lib.components.with-auth.errTooFewRightsTitle": "不十分な権利",
@@ -1386,6 +1386,7 @@
   "lib.shared-messages.sessions": "セッション",
   "lib.shared-messages.setLoRaCloudToken": "",
   "lib.shared-messages.settings": "設定",
+  "lib.shared-messages.setup": "",
   "lib.shared-messages.shareGatewayInfo": "ゲートウェイ情報を共有",
   "lib.shared-messages.skipCryptoDescription": "アップリンクペイロードの復号化とダウンリンクペイロードの暗号化をスキップします",
   "lib.shared-messages.skipCryptoPlaceholder": "暗号化/復号化無効",

From 1e87d83cc3204dd12962cd1626aa7231d594b0b8 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 30 Oct 2023 14:13:55 +0100
Subject: [PATCH 28/28] console: Fix messages

---
 pkg/webui/console/views/device-overview/index.js | 8 ++++----
 pkg/webui/locales/en.json                        | 2 +-
 pkg/webui/locales/ja.json                        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/webui/console/views/device-overview/index.js b/pkg/webui/console/views/device-overview/index.js
index 0dee3a2de8..5cbc43ecf4 100644
--- a/pkg/webui/console/views/device-overview/index.js
+++ b/pkg/webui/console/views/device-overview/index.js
@@ -60,7 +60,7 @@ const m = defineMessages({
   keysNotExposed: 'Keys are not exposed',
   failedAccessOtherHostDevice:
     'The end device you attempted to visit is registered on a different cluster and needs to be accessed using its host Console.',
-  macData: 'Download MAC data',
+  downloadMacData: 'Download MAC data',
   sensitiveDataWarning:
     'The MAC data can contain sensitive information such as session keys that can be used to decrypt messages. <b>Do not share this information publicly</b>.',
   noSessionWarning:
@@ -265,7 +265,7 @@ const DeviceInfo = ({ frequencyPlans, device, onExport }) => {
                   },
             }}
             onApprove={onExport}
-            message={sharedMessages.macData}
+            message={m.downloadMacData}
             type="button"
             icon="file_download"
           />
@@ -307,14 +307,14 @@ const DeviceOverview = () => {
 
         if (!('mac_state' in result)) {
           toast({
-            title: sharedMessages.macData,
+            title: m.downloadMacData,
             message: m.macStateError,
             type: toast.types.ERROR,
           })
         }
       } catch {
         toast({
-          title: sharedMessages.macData,
+          title: m.downloadMacData,
           message: m.macStateError,
           type: toast.types.ERROR,
         })
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 20bcf2234f..4ea7546a91 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -786,7 +786,7 @@
   "console.views.device-overview.index.latestData": "Latest data",
   "console.views.device-overview.index.keysNotExposed": "Keys are not exposed",
   "console.views.device-overview.index.failedAccessOtherHostDevice": "The end device you attempted to visit is registered on a different cluster and needs to be accessed using its host Console.",
-  "console.views.device-overview.index.macData": "Download MAC data",
+  "console.views.device-overview.index.downloadMacData": "Download MAC data",
   "console.views.device-overview.index.sensitiveDataWarning": "The MAC data can contain sensitive information such as session keys that can be used to decrypt messages. <b>Do not share this information publicly</b>.",
   "console.views.device-overview.index.noSessionWarning": "The end device is currently not connected to the network (no active session). The MAC data will hence only contain the current MAC settings.",
   "console.views.device-overview.index.macStateError": "There was an error and MAC state could not be included in the MAC data.",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index dd3232267b..355d8b7b6d 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -786,7 +786,7 @@
   "console.views.device-overview.index.latestData": "最新データ",
   "console.views.device-overview.index.keysNotExposed": "キーは露出していません",
   "console.views.device-overview.index.failedAccessOtherHostDevice": "アクセスしようとしたエンドデバイスは別のクラスタに登録されているため、そのホストコンソールを使用してアクセスする必要があります",
-  "console.views.device-overview.index.macData": "",
+  "console.views.device-overview.index.downloadMacData": "",
   "console.views.device-overview.index.sensitiveDataWarning": "MACデータには、メッセージの復号化に使用できるセッションキーなどの機密情報が含まれていることがあります。この情報を一般に公開しないでください！",
   "console.views.device-overview.index.noSessionWarning": "エンドデバイスは現在ネットワークに接続されていない（アクティブセッションがない）。そのため、MACデータには、現在のMAC設定のみが含まれます",
   "console.views.device-overview.index.macStateError": "エラーが発生し、MAC状態をMACデータに含めることができませんでした",