console: Fix undefined and delete all policies on default

TheThingsNetwork · Oct 23, 2023 · ceded37 · ceded37
1 parent cf1af36
commit ceded37
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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)))
         }