diff --git a/src/components/DeviceListTable/Table/index.js b/src/components/DeviceListTable/Table/index.js
index 58cbbef..10713dd 100644
--- a/src/components/DeviceListTable/Table/index.js
+++ b/src/components/DeviceListTable/Table/index.js
@@ -27,6 +27,7 @@ import ReactTooltip from 'react-tooltip';
import { v4 as createUuid } from 'uuid';
import { cleanBytesString } from 'utils/helper';
import { DeviceBadge, LoadingButton } from 'ucentral-libs';
+import ReactCountryFlag from 'react-country-flag';
import styles from './index.module.scss';
const DeviceListTable = ({
@@ -324,11 +325,18 @@ const DeviceListTable = ({
ipAddress: (item) => (
|
- {item.ipAddress}
+ {item.locale !== '' && item.ipAddress !== '' && (
+
+ )}
+ {` ${item.ipAddress}`}
|
diff --git a/src/components/InterfaceStatistics/LatestStatisticsModal.js b/src/components/InterfaceStatistics/LatestStatisticsModal.js
index 89a0b61..5b510f3 100644
--- a/src/components/InterfaceStatistics/LatestStatisticsModal.js
+++ b/src/components/InterfaceStatistics/LatestStatisticsModal.js
@@ -5,7 +5,7 @@ import { cilX } from '@coreui/icons';
import PropTypes from 'prop-types';
import { useTranslation } from 'react-i18next';
import axiosInstance from 'utils/axiosInstance';
-import { useAuth, useDevice } from 'ucentral-libs';
+import { useAuth, useDevice, CopyToClipboardButton } from 'ucentral-libs';
const LatestStatisticsModal = ({ show, toggle }) => {
const { t } = useTranslation();
@@ -51,6 +51,13 @@ const LatestStatisticsModal = ({ show, toggle }) => {
+
+
+
{JSON.stringify(latestStats, null, 2)}
diff --git a/src/components/WifiAnalysis/WifiAnalysis.js b/src/components/WifiAnalysis/WifiAnalysis.js
index 159c02b..81030f1 100644
--- a/src/components/WifiAnalysis/WifiAnalysis.js
+++ b/src/components/WifiAnalysis/WifiAnalysis.js
@@ -23,7 +23,7 @@ const WifiAnalysisTable = ({ t, data, loading }) => {
};
const columns = [
{ key: 'radio', label: '#', _style: { width: '1%' } },
- { key: 'bssid', label: 'BSSID', _style: { width: '1%' } },
+ { key: 'station', label: 'Station ID', _style: { width: '1%' } },
{ key: 'vendor', label: t('wifi_analysis.vendor'), _style: { width: '15%' }, sorter: false },
{ key: 'mode', label: t('wifi_analysis.mode'), _style: { width: '1%' }, sorter: false },
{ key: 'ssid', label: 'SSID', _style: { width: '15%' } },
@@ -84,12 +84,12 @@ const WifiAnalysisTable = ({ t, data, loading }) => {
sorter
sorterValue={{ column: 'radio', asc: true }}
scopedSlots={{
- bssid: (item) => (
+ station: (item) => (
- {item.bssid}
+ {item.station}
|
),
radio: (item) => {item.radio.radio} | ,
diff --git a/src/components/WifiAnalysis/index.js b/src/components/WifiAnalysis/index.js
index 62a2a50..6bfc948 100644
--- a/src/components/WifiAnalysis/index.js
+++ b/src/components/WifiAnalysis/index.js
@@ -152,7 +152,7 @@ const WifiAnalysis = () => {
const data = {
radio: radioInfo,
...extractIp(stat.data, association.bssid),
- bssid: association.bssid,
+ station: association.station,
ssid: ssid.ssid,
rssi: association.rssi ? parseDbm(association.rssi) : '-',
mode: ssid.mode,
diff --git a/src/pages/DevicePage/Details.js b/src/pages/DevicePage/Details.js
index 52d9a57..88d4b17 100644
--- a/src/pages/DevicePage/Details.js
+++ b/src/pages/DevicePage/Details.js
@@ -15,12 +15,17 @@ import {
import CIcon from '@coreui/icons-react';
import { cilSync } from '@coreui/icons';
import { prettyDate } from 'utils/helper';
-import { CopyToClipboardButton, HideTextButton } from 'ucentral-libs';
+import { CopyToClipboardButton, HideTextButton, useAuth } from 'ucentral-libs';
+import { getCountryFromLocale } from 'utils/countries';
+import ReactCountryFlag from 'react-country-flag';
+import axiosInstance from 'utils/axiosInstance';
import styles from './index.module.scss';
const DeviceDetails = ({ t, loading, getData, status, deviceConfig, lastStats }) => {
const [showPassword, setShowPassword] = useState(false);
+ const [subName, setSubName] = useState('');
+ const { currentToken, endpoints } = useAuth();
const toggleShowPassword = () => {
setShowPassword(!showPassword);
@@ -32,21 +37,51 @@ const DeviceDetails = ({ t, loading, getData, status, deviceConfig, lastStats })
return showPassword ? password : '******';
};
- const displayExtra = (key, value, extraData) => {
- if (!extraData || !extraData[key]) return value;
+ const getSubData = async (subId) => {
+ const options = {
+ headers: {
+ Accept: 'application/json',
+ Authorization: `Bearer ${currentToken}`,
+ },
+ };
- if (!localStorage.getItem('owprov-ui') || key === 'owner') return extraData[key].name;
+ axiosInstance
+ .get(`${endpoints.owsec}/api/v1/subuser/${subId}`, options)
+ .then((response) => setSubName(response.data.name ?? ''))
+ .catch(() => setSubName(''));
+ };
+
+ const getSubscriber = () => {
+ if (!deviceConfig?.subscriber || deviceConfig.subscriber === '') return '';
+ getSubData(deviceConfig.subscriber);
return (
- {extraData[key].name}
+ {subName !== '' ? subName : deviceConfig.subscriber}
+
+ );
+ };
+
+ const displayExtra = (key, value, extraData) => {
+ if (!extraData || !extraData[key]) return value;
+
+ if (!localStorage.getItem('owprov-ui')) return extraData[key].name;
+
+ return (
+
+ {!extraData || !extraData[key] ? value : extraData[key].name}
);
};
@@ -99,13 +134,13 @@ const DeviceDetails = ({ t, loading, getData, status, deviceConfig, lastStats })
/>
- {t('configuration.owner')}:
+ {t('inventory.subscriber')}:
- {deviceConfig?.owner}
+ {getSubscriber()}
- {t('common.mac')}:
+ MAC:
{deviceConfig?.macAddress}
@@ -117,25 +152,16 @@ const DeviceDetails = ({ t, loading, getData, status, deviceConfig, lastStats })
{deviceConfig?.deviceType}
-
- {deviceConfig?.venue?.substring(0, 3) === 'ent'
- ? t('entity.entity')
- : t('inventory.venue')}
- :
-
+ {t('entity.entity')}:
- {deviceConfig?.venue?.substring(0, 3) === 'ent'
+ {deviceConfig?.entity !== ''
? displayExtra(
'entity',
deviceConfig?.venue?.slice(4),
deviceConfig?.extendedInfo,
)
- : displayExtra(
- 'venue',
- deviceConfig?.venue?.slice(4),
- deviceConfig?.extendedInfo,
- )}
+ : ''}
{t('common.manufacturer')}:
@@ -149,6 +175,37 @@ const DeviceDetails = ({ t, loading, getData, status, deviceConfig, lastStats })
{prettyDate(deviceConfig?.createdTimestamp)}
+
+ {t('inventory.venue')}:
+
+
+ {deviceConfig?.venue !== ''
+ ? displayExtra('venue', deviceConfig?.venue?.slice(4), deviceConfig?.extendedInfo)
+ : ''}
+
+
+ Locale:
+
+
+ {deviceConfig?.locale !== '' && (
+
+ )}
+ {' '}
+ {deviceConfig?.locale && deviceConfig?.locale !== ''
+ ? `${deviceConfig.locale} - `
+ : 'Unknown'}
+ {getCountryFromLocale(deviceConfig?.locale ?? '')}
+
+
+ {t('common.modified')}:
+
+
+ {prettyDate(deviceConfig?.modified)}
+
{t('configuration.location')}:
diff --git a/src/utils/countries.js b/src/utils/countries.js
new file mode 100644
index 0000000..7314e11
--- /dev/null
+++ b/src/utils/countries.js
@@ -0,0 +1,253 @@
+export const COUNTRY_LIST = [
+ { value: 'US', label: 'United States' },
+ { value: 'CA', label: 'Canada' },
+ { value: 'AF', label: 'Afghanistan' },
+ { value: 'AX', label: 'Aland Islands' },
+ { value: 'AL', label: 'Albania' },
+ { value: 'DZ', label: 'Algeria' },
+ { value: 'AS', label: 'American Samoa' },
+ { value: 'AD', label: 'Andorra' },
+ { value: 'AO', label: 'Angola' },
+ { value: 'AI', label: 'Anguilla' },
+ { value: 'AQ', label: 'Antarctica' },
+ { value: 'AG', label: 'Antigua And Barbuda' },
+ { value: 'AR', label: 'Argentina' },
+ { value: 'AM', label: 'Armenia' },
+ { value: 'AN', label: 'Netherlands Antilles' },
+ { value: 'AW', label: 'Aruba' },
+ { value: 'AU', label: 'Australia' },
+ { value: 'AT', label: 'Austria' },
+ { value: 'AZ', label: 'Azerbaijan' },
+ { value: 'BS', label: 'Bahamas' },
+ { value: 'BH', label: 'Bahrain' },
+ { value: 'BD', label: 'Bangladesh' },
+ { value: 'BB', label: 'Barbados' },
+ { value: 'BY', label: 'Belarus' },
+ { value: 'BE', label: 'Belgium' },
+ { value: 'BZ', label: 'Belize' },
+ { value: 'BJ', label: 'Benin' },
+ { value: 'BM', label: 'Bermuda' },
+ { value: 'BT', label: 'Bhutan' },
+ { value: 'BO', label: 'Bolivia' },
+ { value: 'BA', label: 'Bosnia And Herzegovina' },
+ { value: 'BW', label: 'Botswana' },
+ { value: 'BV', label: 'Bouvet Island' },
+ { value: 'BR', label: 'Brazil' },
+ { value: 'IO', label: 'British Indian Ocean Territory' },
+ { value: 'BN', label: 'Brunei Darussalam' },
+ { value: 'BG', label: 'Bulgaria' },
+ { value: 'BF', label: 'Burkina Faso' },
+ { value: 'BI', label: 'Burundi' },
+ { value: 'KH', label: 'Cambodia' },
+ { value: 'CM', label: 'Cameroon' },
+ { value: 'CA', label: 'Canada' },
+ { value: 'CV', label: 'Cape Verde' },
+ { value: 'KY', label: 'Cayman Islands' },
+ { value: 'CF', label: 'Central African Republic' },
+ { value: 'TD', label: 'Chad' },
+ { value: 'CL', label: 'Chile' },
+ { value: 'CN', label: 'China' },
+ { value: 'CX', label: 'Christmas Island' },
+ { value: 'CC', label: 'Cocos (Keeling) Islands' },
+ { value: 'CO', label: 'Colombia' },
+ { value: 'KM', label: 'Comoros' },
+ { value: 'CG', label: 'Congo' },
+ { value: 'CD', label: 'Congo, Democratic Republic' },
+ { value: 'CK', label: 'Cook Islands' },
+ { value: 'CR', label: 'Costa Rica' },
+ { value: 'CI', label: "Cote D'Ivoire" },
+ { value: 'HR', label: 'Croatia' },
+ { value: 'CU', label: 'Cuba' },
+ { value: 'CY', label: 'Cyprus' },
+ { value: 'CZ', label: 'Czech Republic' },
+ { value: 'DK', label: 'Denmark' },
+ { value: 'DJ', label: 'Djibouti' },
+ { value: 'DM', label: 'Dominica' },
+ { value: 'DO', label: 'Dominican Republic' },
+ { value: 'EC', label: 'Ecuador' },
+ { value: 'EG', label: 'Egypt' },
+ { value: 'SV', label: 'El Salvador' },
+ { value: 'GQ', label: 'Equatorial Guinea' },
+ { value: 'ER', label: 'Eritrea' },
+ { value: 'EE', label: 'Estonia' },
+ { value: 'ET', label: 'Ethiopia' },
+ { value: 'FK', label: 'Falkland Islands (Malvinas)' },
+ { value: 'FO', label: 'Faroe Islands' },
+ { value: 'FJ', label: 'Fiji' },
+ { value: 'FI', label: 'Finland' },
+ { value: 'FR', label: 'France' },
+ { value: 'GF', label: 'French Guiana' },
+ { value: 'PF', label: 'French Polynesia' },
+ { value: 'TF', label: 'French Southern Territories' },
+ { value: 'GA', label: 'Gabon' },
+ { value: 'GM', label: 'Gambia' },
+ { value: 'GE', label: 'Georgia' },
+ { value: 'DE', label: 'Germany' },
+ { value: 'GH', label: 'Ghana' },
+ { value: 'GI', label: 'Gibraltar' },
+ { value: 'GR', label: 'Greece' },
+ { value: 'GL', label: 'Greenland' },
+ { value: 'GD', label: 'Grenada' },
+ { value: 'GP', label: 'Guadeloupe' },
+ { value: 'GU', label: 'Guam' },
+ { value: 'GT', label: 'Guatemala' },
+ { value: 'GG', label: 'Guernsey' },
+ { value: 'GN', label: 'Guinea' },
+ { value: 'GW', label: 'Guinea-Bissau' },
+ { value: 'GY', label: 'Guyana' },
+ { value: 'HT', label: 'Haiti' },
+ { value: 'HM', label: 'Heard Island & Mcdonald Islands' },
+ { value: 'VA', label: 'Holy See (Vatican City State)' },
+ { value: 'HN', label: 'Honduras' },
+ { value: 'HK', label: 'Hong Kong' },
+ { value: 'HU', label: 'Hungary' },
+ { value: 'IS', label: 'Iceland' },
+ { value: 'IN', label: 'India' },
+ { value: 'ID', label: 'Indonesia' },
+ { value: 'IR', label: 'Iran, Islamic Republic Of' },
+ { value: 'IQ', label: 'Iraq' },
+ { value: 'IE', label: 'Ireland' },
+ { value: 'IM', label: 'Isle Of Man' },
+ { value: 'IL', label: 'Israel' },
+ { value: 'IT', label: 'Italy' },
+ { value: 'JM', label: 'Jamaica' },
+ { value: 'JP', label: 'Japan' },
+ { value: 'JE', label: 'Jersey' },
+ { value: 'JO', label: 'Jordan' },
+ { value: 'KZ', label: 'Kazakhstan' },
+ { value: 'KE', label: 'Kenya' },
+ { value: 'KI', label: 'Kiribati' },
+ { value: 'KR', label: 'Korea' },
+ { value: 'KW', label: 'Kuwait' },
+ { value: 'KG', label: 'Kyrgyzstan' },
+ { value: 'LA', label: "Lao People's Democratic Republic" },
+ { value: 'LV', label: 'Latvia' },
+ { value: 'LB', label: 'Lebanon' },
+ { value: 'LS', label: 'Lesotho' },
+ { value: 'LR', label: 'Liberia' },
+ { value: 'LY', label: 'Libyan Arab Jamahiriya' },
+ { value: 'LI', label: 'Liechtenstein' },
+ { value: 'LT', label: 'Lithuania' },
+ { value: 'LU', label: 'Luxembourg' },
+ { value: 'MO', label: 'Macao' },
+ { value: 'MK', label: 'Macedonia' },
+ { value: 'MG', label: 'Madagascar' },
+ { value: 'MW', label: 'Malawi' },
+ { value: 'MY', label: 'Malaysia' },
+ { value: 'MV', label: 'Maldives' },
+ { value: 'ML', label: 'Mali' },
+ { value: 'MT', label: 'Malta' },
+ { value: 'MH', label: 'Marshall Islands' },
+ { value: 'MQ', label: 'Martinique' },
+ { value: 'MR', label: 'Mauritania' },
+ { value: 'MU', label: 'Mauritius' },
+ { value: 'YT', label: 'Mayotte' },
+ { value: 'MX', label: 'Mexico' },
+ { value: 'FM', label: 'Micronesia, Federated States Of' },
+ { value: 'MD', label: 'Moldova' },
+ { value: 'MC', label: 'Monaco' },
+ { value: 'MN', label: 'Mongolia' },
+ { value: 'ME', label: 'Montenegro' },
+ { value: 'MS', label: 'Montserrat' },
+ { value: 'MA', label: 'Morocco' },
+ { value: 'MZ', label: 'Mozambique' },
+ { value: 'MM', label: 'Myanmar' },
+ { value: 'NA', label: 'Namibia' },
+ { value: 'NR', label: 'Nauru' },
+ { value: 'NP', label: 'Nepal' },
+ { value: 'NL', label: 'Netherlands' },
+ { value: 'AN', label: 'Netherlands Antilles' },
+ { value: 'NC', label: 'New Caledonia' },
+ { value: 'NZ', label: 'New Zealand' },
+ { value: 'NI', label: 'Nicaragua' },
+ { value: 'NE', label: 'Niger' },
+ { value: 'NG', label: 'Nigeria' },
+ { value: 'NU', label: 'Niue' },
+ { value: 'NF', label: 'Norfolk Island' },
+ { value: 'MP', label: 'Northern Mariana Islands' },
+ { value: 'NO', label: 'Norway' },
+ { value: 'OM', label: 'Oman' },
+ { value: 'PK', label: 'Pakistan' },
+ { value: 'PW', label: 'Palau' },
+ { value: 'PS', label: 'Palestinian Territory, Occupied' },
+ { value: 'PA', label: 'Panama' },
+ { value: 'PG', label: 'Papua New Guinea' },
+ { value: 'PY', label: 'Paraguay' },
+ { value: 'PE', label: 'Peru' },
+ { value: 'PH', label: 'Philippines' },
+ { value: 'PN', label: 'Pitcairn' },
+ { value: 'PL', label: 'Poland' },
+ { value: 'PT', label: 'Portugal' },
+ { value: 'PR', label: 'Puerto Rico' },
+ { value: 'QA', label: 'Qatar' },
+ { value: 'RE', label: 'Reunion' },
+ { value: 'RO', label: 'Romania' },
+ { value: 'RU', label: 'Russian Federation' },
+ { value: 'RW', label: 'Rwanda' },
+ { value: 'BL', label: 'Saint Barthelemy' },
+ { value: 'SH', label: 'Saint Helena' },
+ { value: 'KN', label: 'Saint Kitts And Nevis' },
+ { value: 'LC', label: 'Saint Lucia' },
+ { value: 'MF', label: 'Saint Martin' },
+ { value: 'PM', label: 'Saint Pierre And Miquelon' },
+ { value: 'VC', label: 'Saint Vincent And Grenadines' },
+ { value: 'WS', label: 'Samoa' },
+ { value: 'SM', label: 'San Marino' },
+ { value: 'ST', label: 'Sao Tome And Principe' },
+ { value: 'SA', label: 'Saudi Arabia' },
+ { value: 'SN', label: 'Senegal' },
+ { value: 'RS', label: 'Serbia' },
+ { value: 'SC', label: 'Seychelles' },
+ { value: 'SL', label: 'Sierra Leone' },
+ { value: 'SG', label: 'Singapore' },
+ { value: 'SK', label: 'Slovakia' },
+ { value: 'SI', label: 'Slovenia' },
+ { value: 'SB', label: 'Solomon Islands' },
+ { value: 'SO', label: 'Somalia' },
+ { value: 'ZA', label: 'South Africa' },
+ { value: 'GS', label: 'South Georgia And Sandwich Isl.' },
+ { value: 'ES', label: 'Spain' },
+ { value: 'LK', label: 'Sri Lanka' },
+ { value: 'SD', label: 'Sudan' },
+ { value: 'SR', label: 'Surilabel' },
+ { value: 'SJ', label: 'Svalbard And Jan Mayen' },
+ { value: 'SZ', label: 'Swaziland' },
+ { value: 'SE', label: 'Sweden' },
+ { value: 'CH', label: 'Switzerland' },
+ { value: 'SY', label: 'Syrian Arab Republic' },
+ { value: 'TW', label: 'Taiwan' },
+ { value: 'TJ', label: 'Tajikistan' },
+ { value: 'TZ', label: 'Tanzania' },
+ { value: 'TH', label: 'Thailand' },
+ { value: 'TL', label: 'Timor-Leste' },
+ { value: 'TG', label: 'Togo' },
+ { value: 'TK', label: 'Tokelau' },
+ { value: 'TO', label: 'Tonga' },
+ { value: 'TT', label: 'Trinidad And Tobago' },
+ { value: 'TN', label: 'Tunisia' },
+ { value: 'TR', label: 'Turkey' },
+ { value: 'TM', label: 'Turkmenistan' },
+ { value: 'TC', label: 'Turks And Caicos Islands' },
+ { value: 'TV', label: 'Tuvalu' },
+ { value: 'UG', label: 'Uganda' },
+ { value: 'UA', label: 'Ukraine' },
+ { value: 'AE', label: 'United Arab Emirates' },
+ { value: 'GB', label: 'United Kingdom' },
+ { value: 'US', label: 'United States' },
+ { value: 'UM', label: 'United States Outlying Islands' },
+ { value: 'UY', label: 'Uruguay' },
+ { value: 'UZ', label: 'Uzbekistan' },
+ { value: 'VU', label: 'Vanuatu' },
+ { value: 'VE', label: 'Venezuela' },
+ { value: 'VN', label: 'Viet Nam' },
+ { value: 'VG', label: 'Virgin Islands, British' },
+ { value: 'VI', label: 'Virgin Islands, U.S.' },
+ { value: 'WF', label: 'Wallis And Futuna' },
+ { value: 'EH', label: 'Western Sahara' },
+ { value: 'YE', label: 'Yemen' },
+ { value: 'ZM', label: 'Zambia' },
+ { value: 'ZW', label: 'Zimbabwe' },
+];
+
+export const getCountryFromLocale = (locale) =>
+ COUNTRY_LIST.find((country) => country.value === locale)?.label ?? '';