fix(analytics): properly show current wk number

Author: nicholaschiang

components/analytics/index.tsx

@@ -6,7 +6,7 @@ import { AnalyticsRes } from 'pages/api/orgs/[id]/analytics';
 
 import { useOrg } from 'lib/context/org';
 
-import { formatRate, sameWeek } from './utils';
+import { formatRate } from './utils';
 import Graph from './graph';
 
 interface LinkProps {
@@ -47,7 +47,15 @@ function Card<T extends Record<string, number> & { week: number }>({
 }: CardProps<T>): JSX.Element {
   const num = useMemo(() => {
     if (!data || !content) return undefined;
-    const today = data.find((d) => sameWeek(new Date(d.week), new Date()));
+    console.log('Finding current week date...', data);
+    const today = data.find((d) => {
+      const now = new Date();
+      const monday = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+      monday.setDate(monday.getDate() - 7 - monday.getDay() + 1);
+      return monday.valueOf() === new Date(d.week).valueOf();
+    });
+    console.log('Found current week date:', today);
+    console.log('Accessing data:', content[0].dataKey);
     return today ? today[content[0].dataKey] : 0;
   }, [data, content]);
 
@@ -104,7 +112,7 @@ function Card<T extends Record<string, number> & { week: number }>({
         }
 
         h2.loading {
-          width: 100px;
+          width: 50px;
         }
 
         .header h3 {

components/analytics/utils.ts

@@ -1,13 +1,3 @@
-// TODO: This starts the week on Mondays (by adding one to the `setDate` call),
-// but our calendar and availability select both start the week on Sundays.
-export function sameWeek(a: Date, b: Date): boolean {
-  const awk = new Date(a.getFullYear(), a.getMonth(), a.getDate());
-  const bwk = new Date(b.getFullYear(), b.getMonth(), b.getDate());
-  awk.setDate(awk.getDate() - awk.getDay() + 1);
-  bwk.setDate(bwk.getDate() - bwk.getDay() + 1);
-  return awk.valueOf() === bwk.valueOf();
-}
-
 export function toFixed(num: number, fixed: number): string {
   const regex = new RegExp(`^-?\\d+(?:.\\d{0,${fixed}})?`);
   const match = regex.exec(num.toString());