Merge remote-tracking branch 'origin/dev' into dev

src/components/hooks/queries/useTeamWebsites.ts

@@ -4,7 +4,7 @@ import useModified from '../useModified';
 
 export function useTeamWebsites(teamId: string) {
   const { get } = useApi();
-  const { modified } = useModified(`teams:websites`);
+  const { modified } = useModified(`websites`);
 
   return useFilterQuery({
     queryKey: ['teams:websites', { teamId, modified }],

src/components/hooks/useFormat.ts

@@ -1,5 +1,5 @@
 import useMessages from './useMessages';
-import { BROWSERS } from 'lib/constants';
+import { BROWSERS, OS_NAMES } from 'lib/constants';
 import useLocale from './useLocale';
 import useCountryNames from './useCountryNames';
 import regions from '../../../public/iso-3166-2.json';
@@ -9,10 +9,18 @@ export function useFormat() {
   const { locale } = useLocale();
   const countryNames = useCountryNames(locale);
 
+  const formatOS = (value: string): string => {
+    return OS_NAMES[value] || value;
+  };
+
   const formatBrowser = (value: string): string => {
     return BROWSERS[value] || value;
   };
 
+  const formatDevice = (value: string): string => {
+    return formatMessage(labels[value] || labels.unknown);
+  };
+
   const formatCountry = (value: string): string => {
     return countryNames[value] || value;
   };
@@ -26,28 +34,26 @@ export function useFormat() {
     return countryNames[country] ? `${value}, ${countryNames[country]}` : value;
   };
 
-  const formatDevice = (value: string): string => {
-    return formatMessage(labels[value] || labels.unknown);
-  };
-
   const formatValue = (value: string, type: string, data?: { [key: string]: any }): string => {
     switch (type) {
+      case 'os':
+        return formatOS(value);
       case 'browser':
         return formatBrowser(value);
+      case 'device':
+        return formatDevice(value);
       case 'country':
         return formatCountry(value);
       case 'region':
         return formatRegion(value);
       case 'city':
         return formatCity(value, data?.country);
-      case 'device':
-        return formatDevice(value);
       default:
         return value;
     }
   };
 
-  return { formatBrowser, formatCountry, formatRegion, formatDevice, formatValue };
+  return { formatOS, formatBrowser, formatDevice, formatCountry, formatRegion, formatValue };
 }
 
 export default useFormat;

src/components/metrics/OSTable.tsx

@@ -1,19 +1,14 @@
 import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import FilterLink from 'components/common/FilterLink';
-import { useMessages } from 'components/hooks';
+import { useMessages, useFormat } from 'components/hooks';
-
-const names = {
-  'Mac OS': 'macOS',
-  'Chrome OS': 'ChromeOS',
-  'Sun OS': 'SunOS',
-};
 
 export function OSTable(props: MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
+  const { formatOS } = useFormat();
 
   function renderLink({ x: os }) {
     return (
-      <FilterLink id="os" value={names[os] || os}>
+      <FilterLink id="os" value={os} label={formatOS(os)}>
         <img
           src={`${process.env.basePath || ''}/images/os/${
             os?.toLowerCase().replaceAll(/\W/g, '-') || 'unknown'

src/lib/constants.ts

@@ -249,6 +249,14 @@ export const DESKTOP_OS = [
 
 export const MOBILE_OS = ['Amazon OS', 'Android OS', 'BlackBerry OS', 'iOS', 'Windows Mobile'];
 
+export const OS_NAMES = {
+  'Android OS': 'Android',
+  'Chrome OS': 'ChromeOS',
+  'Mac OS': 'macOS',
+  'Sun OS': 'SunOS',
+  'Windows 10': 'Windows 10/11',
+};
+
 export const BROWSERS = {
   android: 'Android',
   aol: 'AOL',

yarn.lock

@@ -1740,7 +1740,7 @@
   resolved "https://registry.yarnpkg.com/@netlify/node-cookies/-/node-cookies-0.1.0.tgz#dda912ba618527695cf519fafa221c5e6777c612"
   integrity sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==
 
-"@netlify/plugin-nextjs@^4.27.3":
+"@netlify/plugin-nextjs@^4.41.3":
   version "4.41.3"
   resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-4.41.3.tgz#f8274526147f652438cc6790b6819ca15d441dd3"
   integrity sha512-l8TB61u7A1ZF22QpoyZtresSUsHOJGP9DatECnqlNab3lG8id1kz9Pso+nZVOznWOm98o7w51k2+TIf52x+DBQ==