console,account: Resolve issues after message deduplication

TheThingsNetwork · Oct 24, 2023 · 84e5f8c · 84e5f8c
1 parent e1b0bc2
commit 84e5f8c
Show file tree

Hide file tree

Showing 7 changed files with 488 additions and 486 deletions.
diff --git a/pkg/webui/console/components/routing-policy-form/index.js b/pkg/webui/console/components/routing-policy-form/index.js
@@ -132,7 +132,7 @@ const RoutingPolicyForm = ({
               <Form.Field
                 name="policy.uplink.mac_data"
                 component={Checkbox}
-                label={policyMessages.macData}
+                label={sharedMessages.macData}
                 description={policyMessages.macDataDesc}
               />
               <Form.Field
@@ -169,7 +169,7 @@ const RoutingPolicyForm = ({
               <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/components/routing-policy/sheet.js b/pkg/webui/console/components/routing-policy/sheet.js
@@ -65,7 +65,7 @@ const RoutingPolicySheet = ({ policy }) => {
         />
         <RoutingPolicy
           enabled={uplink.mac_data}
-          message={m.macData}
+          message={sharedMessages.macData}
           positiveMessage={m.forwardsMacData}
           negativeMessage={m.doesNotForwardMacData}
         />
@@ -98,7 +98,7 @@ const RoutingPolicySheet = ({ policy }) => {
         />
         <RoutingPolicy
           enabled={downlink.mac_data}
-          message={m.macData}
+          message={sharedMessages.macData}
           positiveMessage={m.allowsMacData}
           negativeMessage={m.doesNotAllowMacData}
         />

diff --git a/pkg/webui/console/lib/packet-broker/messages.js b/pkg/webui/console/lib/packet-broker/messages.js
@@ -22,7 +22,6 @@ export default defineMessages({
   joinRequestDesc: 'Forward join-request messages',
   localizationInformation: 'Localization  information',
   localizationInformationDesc: 'Forward gateway location, RSSI, SNR and fine timestamp',
-  macData: 'MAC data',
   macDataAllowDesc: 'Allow downlink messages with FPort of 0',
   macDataDesc: 'Forward uplink messages with FPort 0',
   signalQualityInformation: 'Signal quality information',

diff --git a/pkg/webui/console/views/admin-panel/index.js b/pkg/webui/console/views/admin-panel/index.js
@@ -40,21 +40,23 @@ import {
 } from '@console/lib/feature-checks'
 
 const m = defineMessages({
-  adminPanel: 'Admin panel',
   userManagement: 'User management',
   globalNetworkSettings: 'Global network settings',
   peeringSettings: 'Peering settings',
 })
 
 const AdminPanel = () => {
-  useBreadcrumbs('admin-panel', <Breadcrumb path="/admin-panel" content={m.adminPanel} />)
+  useBreadcrumbs(
+    'admin-panel',
+    <Breadcrumb path="/admin-panel" content={sharedMessages.adminPanel} />,
+  )
   const showUserManagement = useSelector(state => checkFromState(mayManageUsers, state))
   const showPacketBroker = useSelector(state => checkFromState(mayConfigurePacketBroker, state))
 
   return (
     <Require featureCheck={mayPerformAdminActions} otherwise={{ redirect: '/' }}>
       <Breadcrumbs />
-      <IntlHelmet title={m.adminPanel} />
+      <IntlHelmet title={sharedMessages.adminPanel} />
       <PanelView>
         <PanelView.Item
           title={sharedMessages.networkInformation}

diff --git a/pkg/webui/lib/shared-messages.js b/pkg/webui/lib/shared-messages.js
@@ -332,6 +332,7 @@ export default defineMessages({
   lorawanInformation: 'LoRaWAN information',
   lorawanOptions: 'LoRaWAN options',
   lorawanPhyVersionDescription: 'The LoRaWAN PHY version of the end device',
+  macData: 'MAC data',
   macSettingsError:
     'There was an error and the default MAC settings for the <code>{freqPlan}</code> frequency plan could not be loaded',
   macVersion: 'LoRaWAN version',

diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
@@ -640,7 +640,6 @@
   "console.lib.packet-broker.messages.joinRequestDesc": "Forward join-request messages",
   "console.lib.packet-broker.messages.localizationInformation": "Localization  information",
   "console.lib.packet-broker.messages.localizationInformationDesc": "Forward gateway location, RSSI, SNR and fine timestamp",
-  "console.lib.packet-broker.messages.macData": "MAC data",
   "console.lib.packet-broker.messages.macDataAllowDesc": "Allow downlink messages with FPort of 0",
   "console.lib.packet-broker.messages.macDataDesc": "Forward uplink messages with FPort 0",
   "console.lib.packet-broker.messages.signalQualityInformation": "Signal quality information",
@@ -1269,6 +1268,7 @@
   "lib.shared-messages.lorawanInformation": "LoRaWAN information",
   "lib.shared-messages.lorawanOptions": "LoRaWAN options",
   "lib.shared-messages.lorawanPhyVersionDescription": "The LoRaWAN PHY version of the end device",
+  "lib.shared-messages.macData": "MAC data",
   "lib.shared-messages.macSettingsError": "There was an error and the default MAC settings for the <code>{freqPlan}</code> frequency plan could not be loaded",
   "lib.shared-messages.macVersion": "LoRaWAN version",
   "lib.shared-messages.messageTypes": "Message types",