Remove anys and type assertions (#405)

template/app/src/admin/dashboards/users/DropdownEditDelete.tsx

@@ -4,14 +4,19 @@ import { cn } from '../../../client/cn';
 const DropdownDefault = () => {
   const [dropdownOpen, setDropdownOpen] = useState(false);
 
-  const trigger = useRef<any>(null);
-  const dropdown = useRef<any>(null);
+  const trigger = useRef<HTMLButtonElement>(null); // 
+  const dropdown = useRef<HTMLDivElement>(null);
 
   // close on click outside
   useEffect(() => {
     const clickHandler = ({ target }: MouseEvent) => {
-      if (!dropdown.current) return;
-      if (!dropdownOpen || dropdown.current.contains(target) || trigger.current.contains(target)) return;
+      if (!dropdown.current || !trigger.current) return;
+      if (
+        !dropdownOpen || 
+        dropdown.current.contains(target as Node) || 
+        trigger.current.contains(target as Node)
+      ) return;
+
       setDropdownOpen(false);
     };
     document.addEventListener('click', clickHandler);

template/app/src/admin/layout/Sidebar.tsx

@@ -13,8 +13,8 @@ const Sidebar = ({ sidebarOpen, setSidebarOpen }: SidebarProps) => {
   const location = useLocation();
   const { pathname } = location;
 
-  const trigger = useRef<any>(null);
-  const sidebar = useRef<any>(null);
+  const trigger = useRef<HTMLButtonElement>(null);
+  const sidebar = useRef<HTMLElement | null>(null);
 
   const storedSidebarExpanded = localStorage.getItem('sidebar-expanded');
   const [sidebarExpanded, setSidebarExpanded] = useState(
@@ -25,7 +25,7 @@ const Sidebar = ({ sidebarOpen, setSidebarOpen }: SidebarProps) => {
   useEffect(() => {
     const clickHandler = ({ target }: MouseEvent) => {
       if (!sidebar.current || !trigger.current) return;
-      if (!sidebarOpen || sidebar.current.contains(target) || trigger.current.contains(target)) return;
+      if (!sidebarOpen || sidebar.current.contains(target as Node) || trigger.current.contains(target as Node)) return;
       setSidebarOpen(false);
     };
     document.addEventListener('click', clickHandler);

template/app/src/analytics/providers/googleAnalyticsUtils.ts

@@ -1,17 +1,23 @@
-import { BetaAnalyticsDataClient } from '@google-analytics/data';
+import { BetaAnalyticsDataClient, protos } from '@google-analytics/data';
 
 const CLIENT_EMAIL = process.env.GOOGLE_ANALYTICS_CLIENT_EMAIL;
 const PRIVATE_KEY = Buffer.from(process.env.GOOGLE_ANALYTICS_PRIVATE_KEY!, 'base64').toString('utf-8');
 const PROPERTY_ID = process.env.GOOGLE_ANALYTICS_PROPERTY_ID;
 
-const analyticsDataClient = new BetaAnalyticsDataClient({
+const analyticsDataClient: BetaAnalyticsDataClient = new BetaAnalyticsDataClient({
   credentials: {
-    client_email: CLIENT_EMAIL,
+    client_email: CLIENT_EMAIL!,
     private_key: PRIVATE_KEY,
   },
 });
 
-export async function getSources() {
+type GAResponseRow = protos.google.analytics.data.v1beta.IRow;
+type ActiveUsersPerReferrer = {
+  source: string | undefined;
+  visitors: string | undefined;
+};
+
+export async function getSources(): Promise<ActiveUsersPerReferrer[]> {
   const [response] = await analyticsDataClient.runReport({
     property: `properties/${PROPERTY_ID}`,
     dateRanges: [
@@ -33,34 +39,35 @@ export async function getSources() {
     ],
   });
 
-  let activeUsersPerReferrer: any[] = [];
+  let activeUsersPerReferrer: ActiveUsersPerReferrer[] = [];
   if (response?.rows) {
-    activeUsersPerReferrer = response.rows.map((row) => {
+    activeUsersPerReferrer = response.rows.map((row: GAResponseRow) => {
       if (row.dimensionValues && row.metricValues) {
         return {
           source: row.dimensionValues[0].value,
           visitors: row.metricValues[0].value,
         };
       }
-    });
+    }).filter(Boolean) as ActiveUsersPerReferrer[];
+
   } else {
     throw new Error('No response from Google Analytics');
   }
 
   return activeUsersPerReferrer;
 }
 
-export async function getDailyPageViews() {
-  const totalViews = await getTotalPageViews();
-  const prevDayViewsChangePercent = await getPrevDayViewsChangePercent();
+export async function getDailyPageViews(): Promise<{ totalViews: number; prevDayViewsChangePercent: string }> {
+  const totalViews: number = await getTotalPageViews();
+  const prevDayViewsChangePercent: string = await getPrevDayViewsChangePercent();
 
   return {
     totalViews,
     prevDayViewsChangePercent,
   };
 }
 
-async function getTotalPageViews() {
+async function getTotalPageViews(): Promise<number> {
   const [response] = await analyticsDataClient.runReport({
     property: `properties/${PROPERTY_ID}`,
     dateRanges: [
@@ -75,17 +82,20 @@ async function getTotalPageViews() {
       },
     ],
   });
+
   let totalViews = 0;
-  if (response?.rows) {
-    // @ts-ignore
-    totalViews = parseInt(response.rows[0].metricValues[0].value);
+  if (response.rows) {
+
+    const value = response.rows?.[0]?.metricValues?.[0]?.value;
+    totalViews = value ? parseInt(value) : 0;
+
   } else {
     throw new Error('No response from Google Analytics');
   }
   return totalViews;
 }
 
-async function getPrevDayViewsChangePercent() {
+async function getPrevDayViewsChangePercent(): Promise<string> {
   const [response] = await analyticsDataClient.runReport({
     property: `properties/${PROPERTY_ID}`,
 
@@ -115,26 +125,22 @@ async function getPrevDayViewsChangePercent() {
     ],
   });
 
-  let viewsFromYesterday;
-  let viewsFromDayBeforeYesterday;
+  let viewsFromYesterday: number | undefined;
+  let viewsFromDayBeforeYesterday: number | undefined;
 
   if (response?.rows && response.rows.length === 2) {
     // @ts-ignore
-    viewsFromYesterday = response.rows[0].metricValues[0].value;
+    viewsFromYesterday = parseInt(response.rows[0].metricValues[0].value);
     // @ts-ignore
-    viewsFromDayBeforeYesterday = response.rows[1].metricValues[0].value;
-
-    if (viewsFromYesterday && viewsFromDayBeforeYesterday) {
-      viewsFromYesterday = parseInt(viewsFromYesterday);
-      viewsFromDayBeforeYesterday = parseInt(viewsFromDayBeforeYesterday);
-      if (viewsFromYesterday === 0 || viewsFromDayBeforeYesterday === 0) {
-        return '0';
-      }
-      console.table({ viewsFromYesterday, viewsFromDayBeforeYesterday });
+    viewsFromDayBeforeYesterday = parseInt(response.rows[1].metricValues[0].value);
 
-      const change = ((viewsFromYesterday - viewsFromDayBeforeYesterday) / viewsFromDayBeforeYesterday) * 100;
-      return change.toFixed(0);
+    if (viewsFromYesterday === 0 || viewsFromDayBeforeYesterday === 0) {
+      return '0';
     }
+    console.table({ viewsFromYesterday, viewsFromDayBeforeYesterday });
+
+    const change = ((viewsFromYesterday - viewsFromDayBeforeYesterday) / viewsFromDayBeforeYesterday) * 100;
+    return change.toFixed(0);
   } else {
     return '0';
   }

template/app/src/client/components/cookie-consent/Config.ts

@@ -2,7 +2,7 @@ import type { CookieConsentConfig } from 'vanilla-cookieconsent';
 
 declare global {
   interface Window {
-    dataLayer: any;
+    dataLayer: Array<Record<string, unknown>>;
   }
 }
 
@@ -64,7 +64,7 @@ const getConfig = () => {
                 }
                 window.dataLayer = window.dataLayer || [];
                 function gtag(..._args: unknown[]) {
-                  (window.dataLayer as Array<any>).push(arguments);
+                  (window.dataLayer as Array<unknown>).push(arguments);
                 }
                 gtag('js', new Date());
                 gtag('config', GA_ANALYTICS_ID);

template/app/src/user/DropdownUser.tsx

@@ -5,17 +5,17 @@ import { UserMenuItems } from './UserMenuItems';
 import { cn } from '../client/cn';
 
 const DropdownUser = ({ user }: { user: Partial<User> }) => {
-  const [dropdownOpen, setDropdownOpen] = useState(false);
+  const [dropdownOpen, setDropdownOpen] = useState <Boolean>(false);
 
-  const trigger = useRef<any>(null);
-  const dropdown = useRef<any>(null);
+  const trigger = useRef<HTMLButtonElement | null>(null);
+  const dropdown = useRef<HTMLDivElement | null >(null);
 
   const toggleDropdown = () => setDropdownOpen((prev) => !prev);
 
   useEffect(() => {
     const clickHandler = ({ target }: MouseEvent) => {
-      if (!dropdown.current) return;
-      if (!dropdownOpen || dropdown.current.contains(target) || trigger.current.contains(target)) {
+      if (!dropdown.current || !trigger.current) return;
+      if (!dropdownOpen || dropdown.current.contains(target as Node) || trigger.current.contains(target as Node)) {
         return;
       }
       setDropdownOpen(false);

template/app/src/user/UserMenuItems.tsx

@@ -5,7 +5,9 @@ import { MdOutlineSpaceDashboard } from 'react-icons/md';
 import { TfiDashboard } from 'react-icons/tfi';
 import { cn } from '../client/cn';
 
-export const UserMenuItems = ({ user, setMobileMenuOpen }: { user?: Partial<User>; setMobileMenuOpen?: any }) => {
+type SetMobileMenuOpen = (open: boolean) => void;
+
+export const UserMenuItems = ({ user, setMobileMenuOpen }: { user?: Partial<User>; setMobileMenuOpen?: SetMobileMenuOpen }) => {
   const path = window.location.pathname;
   const landingPagePath = routes.LandingPageRoute.to;
   const adminDashboardPath = routes.AdminRoute.to;