Merge pull request #188 from stephb9959/main

[WIFI-13031] Add support for radius endpoints
Telecominfraproject · Oct 17, 2023 · c2a9f90 · c2a9f90
2 parents c3486c8 + ebc6e34
commit c2a9f90
Show file tree

Hide file tree

Showing 12 changed files with 1,237 additions and 1,237 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wlan-cloud-owprov-ui",
-  "version": "2.11.0(57)",
+  "version": "2.11.0(59)",
   "description": "",
   "main": "index.tsx",
   "scripts": {

diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
diff --git a/src/components/Modals/Resources/CreateModal/index.tsx b/src/components/Modals/Resources/CreateModal/index.tsx
@@ -82,7 +82,7 @@ const CreateResourceModal: React.FC<Props> = ({ refresh, entityId, isVenue = fal
                   value="interface.ssid.openroaming"
                   hidden={!getRadiusEndpoints.data || getRadiusEndpoints.data.length === 0}
                 >
-                  Open Roaming SSID
+                  OpenRoaming SSID
                 </option>
                 <option value="interface.ssid.radius">interface.ssid.radius</option>
                 <option value="interface.tunnel">interface.tunnel</option>

diff --git a/src/hooks/Network/RadiusEndpoints.ts b/src/hooks/Network/RadiusEndpoints.ts
@@ -20,7 +20,7 @@ export type RadiusEndpointServer = {
 
 export type RadsecServer = {
   /**
-   * It should be the ID of a google orion account OR the certificate ID of the global reach account
+   * It should be the ID of a google orion account OR the certificate ID of the GlobalReach account
    * If not empty, only Weight needs to be populated
    * If empty, all fields need to be populated
    */

diff --git a/src/pages/OpenRoamingPage/index.tsx b/src/pages/OpenRoamingPage/index.tsx
@@ -19,7 +19,7 @@ const OpenRoamingPage = () => {
   return (
     <Tabs>
       <TabList>
-        <Tab _selected={tabStyle}>Global Reach</Tab>
+        <Tab _selected={tabStyle}>GlobalReach</Tab>
         <Tab _selected={tabStyle}>Google Orion</Tab>
       </TabList>
       <TabPanels>

diff --git a/src/pages/SystemConfigurationPage/RadiusEndpoints/CreateModal/DetailsStep.tsx b/src/pages/SystemConfigurationPage/RadiusEndpoints/CreateModal/DetailsStep.tsx
@@ -108,7 +108,7 @@ const CreateRadiusEndpointDetailsStep = ({ formRef, finishStep, orionAccounts, g
     }
 
     if (globalReachAccounts.length > 0) {
-      options.push({ value: 'globalreach', label: 'Global Reach' });
+      options.push({ value: 'globalreach', label: 'GlobalReach' });
     }
 
     return options;

diff --git a/...pages/SystemConfigurationPage/RadiusEndpoints/CreateModal/GlobalReach/GlobalReachStep.tsx b/...pages/SystemConfigurationPage/RadiusEndpoints/CreateModal/GlobalReach/GlobalReachStep.tsx
@@ -55,7 +55,7 @@ const CreateRadiusEndpointGlobalReachStep = ({ formRef, finishStep, accounts }:
       {({ isSubmitting }) => (
         <Box>
           <Heading mb={4} size="md" textDecoration="underline">
-            What Global Reach account would like to use?
+            What GlobalReach account would like to use?
           </Heading>
           <Select
             mb={2}

diff --git a/src/pages/SystemConfigurationPage/RadiusEndpoints/RadiusEndpointSummary.tsx b/src/pages/SystemConfigurationPage/RadiusEndpoints/RadiusEndpointSummary.tsx
@@ -4,7 +4,7 @@ import { RadiusEndpoint } from 'hooks/Network/RadiusEndpoints';
 
 const prettyTypes = {
   orion: 'Google Orion',
-  globalreach: 'Global Reach',
+  globalreach: 'GlobalReach',
   generic: 'Generic',
   radsec: 'RadSec',
 } as const;

diff --git a/src/pages/SystemConfigurationPage/RadiusEndpoints/ViewDetailsModal/EndpointDisplay.tsx b/src/pages/SystemConfigurationPage/RadiusEndpoints/ViewDetailsModal/EndpointDisplay.tsx
@@ -15,7 +15,7 @@ const secondColProps = {} as const;
 
 const prettyTypes = {
   orion: 'Google Orion',
-  globalreach: 'Global Reach',
+  globalreach: 'GlobalReach',
   generic: 'Generic',
   radsec: 'RadSec',
 } as const;

diff --git a/...s/SystemConfigurationPage/RadiusEndpoints/ViewDetailsModal/GlobalReachEndpointDetails.tsx b/...s/SystemConfigurationPage/RadiusEndpoints/ViewDetailsModal/GlobalReachEndpointDetails.tsx
@@ -22,7 +22,7 @@ const GlobalReachEndpointDetails = ({ endpoint }: Props) => {
   return (
     <Box mt={2}>
       <Heading size="md" textDecoration="underline">
-        Global Reach Certificate
+        GlobalReach Certificate
       </Heading>{' '}
       {certificate ? (
         <Box>

diff --git a/src/router/routes.tsx b/src/router/routes.tsx
@@ -128,8 +128,8 @@ const routes: Route[] = [
         id: 'system-globalroaming',
         authorized: ['root', 'partner', 'admin', 'csr', 'system'],
         path: '/openRoaming',
-        name: 'RAW-Open Roaming',
-        label: 'Open Roaming',
+        name: 'RAW-OpenRoaming',
+        label: 'OpenRoaming',
         component: OpenRoamingPage,
       },
       {