Merge pull request #210 from stephb9959/main

[WIFI-13380] Cybertan model images
Telecominfraproject · Feb 6, 2024 · 7b0d43c · 7b0d43c
2 parents 61f8b69 + 7c64fb7
commit 7b0d43c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "3.0.1(6)",
+  "version": "3.0.2(1)",
   "description": "",
   "private": true,
   "main": "index.tsx",

diff --git a/public/devices/cybertan_eww631-a1.png b/public/devices/cybertan_eww631-a1.png
diff --git a/public/devices/cybertan_eww631-b1.png b/public/devices/cybertan_eww631-b1.png
diff --git a/public/devices/cybertan_skf224-c1.png b/public/devices/cybertan_skf224-c1.png
diff --git a/src/pages/Device/Summary.tsx b/src/pages/Device/Summary.tsx
@@ -65,12 +65,6 @@ const DeviceSummary = ({ serialNumber }: Props) => {
   const getDeviceCompatible = () => {
     if (!getDevice.data?.compatible) return undefined;
 
-    if (!getDevice.data?.compatible.includes('-')) return getDevice.data?.compatible;
-
-    const split = getDevice.data?.compatible.split('-');
-
-    if (split[split.length - 1]?.length === 2) return split[0]?.trim();
-
     return getDevice.data?.compatible;
   };
 
@@ -129,7 +123,7 @@ const DeviceSummary = ({ serialNumber }: Props) => {
               <Heading size="sm">{t('controller.stats.load')}:</Heading>
             </GridItem>
             <GridItem colSpan={1}>
-              {getStats.data?.unit?.load?.map((l) => `${l.toFixed(2)}`).join(' | ') ?? ''}
+              {getStats.data?.unit?.load ? getStats.data?.unit.load.map((l) => `${l.toFixed(2)}`).join(' | ') : ''}
             </GridItem>
             <GridItem colSpan={1} alignContent="center" alignItems="center">
               <Heading size="sm">{t('controller.devices.localtime')}:</Heading>
@@ -180,7 +174,7 @@ const DeviceSummary = ({ serialNumber }: Props) => {
             </GridItem>
             <GridItem colSpan={1}>
               {getStatus.data?.connectReason && getStatus.data?.connectReason.length > 0
-                ? uppercaseFirstLetter(getStatus.data.connectReason)
+                ? uppercaseFirstLetter(getStatus.data?.connectReason)
                 : '-'}
             </GridItem>
           </Grid>