Merge pull request #83 from Telecominfraproject/bugfix/NETEXP-783

bugfix/NETEXP-783: AP table uses baseMacAddress and manufacturer
2025-10-30 02:12:39 +00:00 · 2020-12-14 22:30:34 -05:00
parent 26c11502e3 85ef801831
commit 017a3de539
3 changed files with 6 additions and 8 deletions
--- a/app/containers/Network/containers/AccessPointDetails/index.js
+++ b/app/containers/Network/containers/AccessPointDetails/index.js
@@ -42,16 +42,14 @@ const GET_EQUIPMENT = gql`
          details
        }
      }
+      baseMacAddress
+      manufacturer
      status {
        firmware {
          detailsJSON
        }
        protocol {
          detailsJSON
-          details {
-            reportedMacAddr
-            manufacturer
-          }
        }
        radioUtilization {
          detailsJSON
--- a/app/containers/Network/containers/AccessPoints/index.js
+++ b/app/containers/Network/containers/AccessPoints/index.js
@@ -59,12 +59,12 @@ const accessPointsTableColumns = [
  },
  {
    title: 'MAC',
-    dataIndex: ['status', 'protocol', 'details', 'reportedMacAddr'],
+    dataIndex: 'baseMacAddress',
    render: renderTableCell,
  },
  {
    title: 'MANUFACTURER',
-    dataIndex: ['status', 'protocol', 'details', 'manufacturer'],
+    dataIndex: 'manufacturer',
    render: renderTableCell,
  },
  {
--- a/app/graphql/queries.js
+++ b/app/graphql/queries.js
@@ -42,12 +42,12 @@ export const FILTER_EQUIPMENT = gql`
        profile {
          name
        }
+        baseMacAddress
+        manufacturer
        status {
          protocol {
            details {
              reportedIpV4Addr
-              reportedMacAddr
-              manufacturer
            }
          }
          osPerformance {