From e068ac0dd98eb5874c6bddf4842c2bcfc1714b5f Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Fri, 1 Dec 2023 16:02:50 -0800
Subject: [PATCH] Fixed insights report.

---
 package.json                                     |  2 +-
 src/app/(main)/reports/insights/InsightsTable.js |  4 ++--
 src/components/hooks/useFormat.ts                | 10 +++++-----
 src/pages/api/reports/insights.ts                |  2 +-
 src/queries/analytics/reports/getInsights.ts     |  5 +++--
 yarn.lock                                        |  8 ++++----
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index ba85fb3e..addfebdf 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "npm-run-all": "^4.1.5",
     "prisma": "5.6.0",
     "react": "^18.2.0",
-    "react-basics": "^0.109.0",
+    "react-basics": "^0.110.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.4",
diff --git a/src/app/(main)/reports/insights/InsightsTable.js b/src/app/(main)/reports/insights/InsightsTable.js
index 05d38042..4194fee8 100644
--- a/src/app/(main)/reports/insights/InsightsTable.js
+++ b/src/app/(main)/reports/insights/InsightsTable.js
@@ -37,10 +37,10 @@ export function InsightsTable() {
         width="100px"
         alignment="end"
       >
-        {row => row.visitors.toLocaleString()}
+        {row => row?.visitors?.toLocaleString()}
       </GridColumn>
       <GridColumn name="views" label={formatMessage(labels.views)} width="100px" alignment="end">
-        {row => row.views.toLocaleString()}
+        {row => row?.views?.toLocaleString()}
       </GridColumn>
     </GridTable>
   );
diff --git a/src/components/hooks/useFormat.ts b/src/components/hooks/useFormat.ts
index c1160162..f804eb72 100644
--- a/src/components/hooks/useFormat.ts
+++ b/src/components/hooks/useFormat.ts
@@ -9,23 +9,23 @@ export function useFormat() {
   const { locale } = useLocale();
   const countryNames = useCountryNames(locale);
 
-  const formatBrowser = (value: string) => {
+  const formatBrowser = (value: string): string => {
     return BROWSERS[value] || value;
   };
 
-  const formatCountry = (value: string) => {
+  const formatCountry = (value: string): string => {
     return countryNames[value] || value;
   };
 
-  const formatRegion = (value: string) => {
+  const formatRegion = (value: string): string => {
     return regions[value] ? regions[value] : value;
   };
 
-  const formatDevice = (value: string) => {
+  const formatDevice = (value: string): string => {
     return formatMessage(labels[value] || labels.unknown);
   };
 
-  const formatValue = (value: string, type: string) => {
+  const formatValue = (value: string, type: string): string => {
     switch (type) {
       case 'browser':
         return formatBrowser(value);
diff --git a/src/pages/api/reports/insights.ts b/src/pages/api/reports/insights.ts
index 4344422a..c70d218e 100644
--- a/src/pages/api/reports/insights.ts
+++ b/src/pages/api/reports/insights.ts
@@ -55,7 +55,7 @@ const schema = {
   }),
 };
 
-function convertFilters(filters) {
+function convertFilters(filters: any[]) {
   return filters.reduce((obj, { name, ...value }) => {
     obj[name] = value;
 
diff --git a/src/queries/analytics/reports/getInsights.ts b/src/queries/analytics/reports/getInsights.ts
index a5b1b773..282ed755 100644
--- a/src/queries/analytics/reports/getInsights.ts
+++ b/src/queries/analytics/reports/getInsights.ts
@@ -86,8 +86,9 @@ async function clickhouseQuery(
   ).then(a => {
     return Object.values(a).map(a => {
       return {
-        x: a.x,
-        y: Number(a.y),
+        ...a,
+        views: Number(a.views),
+        visitors: Number(a.visitors),
       };
     });
   });
diff --git a/yarn.lock b/yarn.lock
index 1e405135..6584c9ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7476,10 +7476,10 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-basics@^0.109.0:
-  version "0.109.0"
-  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.109.0.tgz#9c1f41ebf6abbcf67f7dd11a16a7fb5e3aedd38d"
-  integrity sha512-n955CwqIeQ/sTMxxvbtYpWtBWS07Rg39zrNKeUYN/JoCIq0YbbZiZDALAhh1Out+qsIe62NoOFA7JtHzk1EkHQ==
+react-basics@^0.110.0:
+  version "0.110.0"
+  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.110.0.tgz#7b7689edcb96b973528abc91b964345edc6e000a"
+  integrity sha512-3XQx5hR0zTuEAxDDHyaqS2GfXOowb0Lri8ay65kjGUd7RmvdpnIr62MsrAwo62rtTwtzRzsJXHJCR5CKQ/D3rQ==
   dependencies:
     "@react-spring/web" "^9.7.3"
     classnames "^2.3.1"