From 0c04caf5b3ad7dbbf909ddef0364e37666e46385 Mon Sep 17 00:00:00 2001
From: Dimitri POSTOLOV <dmytropostolov@gmail.com>
Date: Mon, 21 Oct 2024 14:24:34 +0300
Subject: [PATCH] [hive/app] remove `use client` comments, remove
 `globalThis.window` checks (#5004)

---
 .../web/app/src/components/ui/accordion.tsx   |  2 --
 .../app/src/components/ui/alert-dialog.tsx    |  2 --
 .../web/app/src/components/ui/calendar.tsx    |  2 --
 .../web/app/src/components/ui/command.tsx     |  2 --
 packages/web/app/src/components/ui/dialog.tsx |  2 --
 .../web/app/src/components/ui/hover-card.tsx  |  2 --
 packages/web/app/src/components/ui/label.tsx  |  2 --
 .../web/app/src/components/ui/popover.tsx     |  2 --
 .../web/app/src/components/ui/radio-group.tsx |  2 --
 .../web/app/src/components/ui/scroll-area.tsx |  2 --
 packages/web/app/src/components/ui/switch.tsx |  2 --
 .../web/app/src/components/ui/toaster.tsx     |  2 --
 .../app/src/config/supertokens/frontend.ts    |  6 +++---
 packages/web/app/src/env/read.ts              | 13 +-----------
 packages/web/app/src/router.tsx               | 20 +++++++++----------
 15 files changed, 13 insertions(+), 50 deletions(-)

diff --git a/packages/web/app/src/components/ui/accordion.tsx b/packages/web/app/src/components/ui/accordion.tsx
index 5464ff8e2..b2b2fe2b8 100644
--- a/packages/web/app/src/components/ui/accordion.tsx
+++ b/packages/web/app/src/components/ui/accordion.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 import { ChevronDown } from 'lucide-react';
 import { cn } from '@/lib/utils';
diff --git a/packages/web/app/src/components/ui/alert-dialog.tsx b/packages/web/app/src/components/ui/alert-dialog.tsx
index c72fd7069..8c2ddfd9b 100644
--- a/packages/web/app/src/components/ui/alert-dialog.tsx
+++ b/packages/web/app/src/components/ui/alert-dialog.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 import { buttonVariants } from '@/components/ui/button';
 import { cn } from '@/lib/utils';
diff --git a/packages/web/app/src/components/ui/calendar.tsx b/packages/web/app/src/components/ui/calendar.tsx
index 86deedd7d..52c6f2376 100644
--- a/packages/web/app/src/components/ui/calendar.tsx
+++ b/packages/web/app/src/components/ui/calendar.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 import { DayPicker } from 'react-day-picker';
 import { cn } from '@/lib/utils';
diff --git a/packages/web/app/src/components/ui/command.tsx b/packages/web/app/src/components/ui/command.tsx
index 6202457f0..bb0133607 100644
--- a/packages/web/app/src/components/ui/command.tsx
+++ b/packages/web/app/src/components/ui/command.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 import { Command as CommandPrimitive } from 'cmdk';
 import { Search } from 'lucide-react';
diff --git a/packages/web/app/src/components/ui/dialog.tsx b/packages/web/app/src/components/ui/dialog.tsx
index b193260f2..d718fdd08 100644
--- a/packages/web/app/src/components/ui/dialog.tsx
+++ b/packages/web/app/src/components/ui/dialog.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 import { X } from 'lucide-react';
 import { cn } from '@/lib/utils';
diff --git a/packages/web/app/src/components/ui/hover-card.tsx b/packages/web/app/src/components/ui/hover-card.tsx
index b3e595cf6..bf671dc13 100644
--- a/packages/web/app/src/components/ui/hover-card.tsx
+++ b/packages/web/app/src/components/ui/hover-card.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 import { cn } from '@/lib/utils';
 import * as HoverCardPrimitive from '@radix-ui/react-hover-card';
diff --git a/packages/web/app/src/components/ui/label.tsx b/packages/web/app/src/components/ui/label.tsx
index daa5734e0..a35980ff3 100644
--- a/packages/web/app/src/components/ui/label.tsx
+++ b/packages/web/app/src/components/ui/label.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 import { cva, type VariantProps } from 'class-variance-authority';
 import { cn } from '@/lib/utils';
diff --git a/packages/web/app/src/components/ui/popover.tsx b/packages/web/app/src/components/ui/popover.tsx
index 3c211d767..aa238dc2a 100644
--- a/packages/web/app/src/components/ui/popover.tsx
+++ b/packages/web/app/src/components/ui/popover.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 import { cn } from '@/lib/utils';
 import * as PopoverPrimitive from '@radix-ui/react-popover';
diff --git a/packages/web/app/src/components/ui/radio-group.tsx b/packages/web/app/src/components/ui/radio-group.tsx
index ff0d9fbbf..62487fdfe 100644
--- a/packages/web/app/src/components/ui/radio-group.tsx
+++ b/packages/web/app/src/components/ui/radio-group.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 import { Circle } from 'lucide-react';
 import { cn } from '@/lib/utils';
diff --git a/packages/web/app/src/components/ui/scroll-area.tsx b/packages/web/app/src/components/ui/scroll-area.tsx
index 8e98664f1..705765d05 100644
--- a/packages/web/app/src/components/ui/scroll-area.tsx
+++ b/packages/web/app/src/components/ui/scroll-area.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 import { cn } from '@/lib/utils';
 import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';
diff --git a/packages/web/app/src/components/ui/switch.tsx b/packages/web/app/src/components/ui/switch.tsx
index 104306123..e43f83962 100644
--- a/packages/web/app/src/components/ui/switch.tsx
+++ b/packages/web/app/src/components/ui/switch.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 import { cn } from '@/lib/utils';
 import * as SwitchPrimitives from '@radix-ui/react-switch';
diff --git a/packages/web/app/src/components/ui/toaster.tsx b/packages/web/app/src/components/ui/toaster.tsx
index bc59517d0..04eee4be6 100644
--- a/packages/web/app/src/components/ui/toaster.tsx
+++ b/packages/web/app/src/components/ui/toaster.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import {
   Toast,
   ToastClose,
diff --git a/packages/web/app/src/config/supertokens/frontend.ts b/packages/web/app/src/config/supertokens/frontend.ts
index 0f36dbbaa..cc9f8990e 100644
--- a/packages/web/app/src/config/supertokens/frontend.ts
+++ b/packages/web/app/src/config/supertokens/frontend.ts
@@ -23,18 +23,18 @@ export const frontendConfig = () => {
   if (
     env.auth.okta !== null &&
     (env.auth.okta.hidden === false ||
-      globalThis.window?.location.pathname === '/auth/callback/okta' ||
+      window.location.pathname === '/auth/callback/okta' ||
       // Until we support the Okta Integration Network (OIN)
       // We want to hide the log in with Okta button on the hosted platform by default to not confuse people
       // We only want to show it conditionally in order to verify the integration is working for the OIN application process.
       (env.auth.okta.hidden === true &&
         // Only show Okta via query parameter
-        new URLSearchParams(globalThis.window?.location.search ?? '').get('show_okta') === '1'))
+        new URLSearchParams(window.location.search ?? '').get('show_okta') === '1'))
   ) {
     providers.push(ThirdPartyEmailPasswordReact.Okta.init());
   }
 
-  const url = new URL(globalThis.window.location.toString());
+  const url = new URL(window.location.toString());
 
   if (
     env.auth.oidc === true && // Open ID Connect linked to organization
diff --git a/packages/web/app/src/env/read.ts b/packages/web/app/src/env/read.ts
index addfe6095..9dca42663 100644
--- a/packages/web/app/src/env/read.ts
+++ b/packages/web/app/src/env/read.ts
@@ -1,14 +1,3 @@
-function isBrowser() {
-  // eslint-disable-next-line no-restricted-syntax
-  return Boolean(
-    typeof window !== 'undefined' && '__ENV' in window && window['__ENV'] !== undefined,
-  );
-}
-
 export function getAllEnv(): Record<string, string | undefined> {
-  if (isBrowser()) {
-    return (window as any)['__ENV'] ?? {};
-  }
-
-  throw new Error('getAllEnv should only be called in the browser');
+  return (window as any).__ENV ?? {};
 }
diff --git a/packages/web/app/src/router.tsx b/packages/web/app/src/router.tsx
index 8456ac496..3bdb53439 100644
--- a/packages/web/app/src/router.tsx
+++ b/packages/web/app/src/router.tsx
@@ -70,17 +70,15 @@ import { TargetInsightsOperationPage } from './pages/target-insights-operation';
 import { TargetLaboratoryPage } from './pages/target-laboratory';
 import { TargetSettingsPage } from './pages/target-settings';
 
-if (globalThis.window) {
-  SuperTokens.init(frontendConfig());
-  if (env.sentry) {
-    init({
-      dsn: env.sentry.dsn,
-      enabled: true,
-      dist: 'webapp',
-      release: env.release,
-      environment: env.environment,
-    });
-  }
+SuperTokens.init(frontendConfig());
+if (env.sentry) {
+  init({
+    dsn: env.sentry.dsn,
+    enabled: true,
+    dist: 'webapp',
+    release: env.release,
+    environment: env.environment,
+  });
 }
 
 const queryClient = new QueryClient();