From b0476ee0c62a6a3843dc3966328ee8b366c2ad1e Mon Sep 17 00:00:00 2001
From: Stef Lewandowski <stef@stef.io>
Date: Tue, 26 Nov 2024 16:36:35 +0000
Subject: [PATCH] fix: minor sonar issues

---
 .../AppComponents/Chat/ui/codeblock.tsx       |  6 +-
 .../AppComponents/Chat/user-or-login.tsx      | 22 +++----
 .../FeedbackForms/ModerationFeedbackForm.tsx  | 62 +++++++++----------
 .../GenerationInputAndText.tsx                |  4 +-
 .../ContextProviders/AnalyticsProvider.tsx    | 11 ++--
 5 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx b/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx
index 1633f7d0c..fc4fcfa01 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx
@@ -18,11 +18,11 @@ interface Props {
   value: string;
 }
 
-interface languageMap {
+interface LanguageMap {
   [key: string]: string | undefined;
 }
 
-const programmingLanguages: languageMap = {
+const programmingLanguages: LanguageMap = {
   javascript: ".js",
   python: ".py",
   java: ".java",
@@ -65,7 +65,7 @@ const CodeBlock: FC<Props> = memo(({ language, value }) => {
     if (typeof window === "undefined") {
       return;
     }
-    const fileExtension = programmingLanguages[language] || ".file";
+    const fileExtension = programmingLanguages[language] ?? ".file";
     const suggestedFileName = `file-${generateRandomString(
       3,
       true,
diff --git a/apps/nextjs/src/components/AppComponents/Chat/user-or-login.tsx b/apps/nextjs/src/components/AppComponents/Chat/user-or-login.tsx
index 940a8f76d..f1cd37291 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/user-or-login.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/user-or-login.tsx
@@ -10,17 +10,15 @@ export function UserOrLogin() {
     return <></>;
   }
   return (
-    <>
-      <div className="flex items-center sm:ml-8">
-        <SignedIn>
-          <UserButton />
-        </SignedIn>
-        <SignedOut>
-          <Button variant="link" asChild className="-ml-7">
-            <Link href="/sign-in?callbackUrl=/">Log in</Link>
-          </Button>
-        </SignedOut>
-      </div>
-    </>
+    <div className="flex items-center sm:ml-8">
+      <SignedIn>
+        <UserButton />
+      </SignedIn>
+      <SignedOut>
+        <Button variant="link" asChild className="-ml-7">
+          <Link href="/sign-in?callbackUrl=/">Log in</Link>
+        </Button>
+      </SignedOut>
+    </div>
   );
 }
diff --git a/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx b/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx
index 22366e46a..e5a072be0 100644
--- a/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx
+++ b/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx
@@ -46,39 +46,35 @@ export const ModerationFeedbackForm = ({
         />
       </div>
       <Dialog.Close />
-      <>
-        <div className="flex flex-col gap-8">
-          <Dialog.Title>
-            <span className="font-bold">Guidance required</span>
-          </Dialog.Title>
-          <Dialog.Description>
-            <span>
-              Contains{" "}
-              {moderation.categories
-                .map(moderationSlugToDescription)
-                .join(", ")}
-              . Check content carefully. If you have feedback on this guidance,
-              please provide details below.
-            </span>
-          </Dialog.Description>
-        </div>
-        <form onSubmit={onSubmit}>
-          <Textarea
-            className="min-h-30 w-full resize-none rounded border border-gray-600 bg-transparent px-10 py-[0.6rem] text-base placeholder-gray-700 focus-within:outline-none"
-            onChange={(e) => setComment(e.target.value)}
-            value={comment}
-            placeholder="Your feedback"
-          />
-        </form>
-        <div className="flex w-full justify-between gap-7">
-          <ChatButton variant="text-link" onClick={closeModal}>
-            Back to lesson
-          </ChatButton>
-          <ChatButton variant="primary" onClick={onSubmit} disabled={!isValid}>
-            Submit feedback
-          </ChatButton>
-        </div>
-      </>
+      <div className="flex flex-col gap-8">
+        <Dialog.Title>
+          <span className="font-bold">Guidance required</span>
+        </Dialog.Title>
+        <Dialog.Description>
+          <span>
+            Contains{" "}
+            {moderation.categories.map(moderationSlugToDescription).join(", ")}.
+            Check content carefully. If you have feedback on this guidance,
+            please provide details below.
+          </span>
+        </Dialog.Description>
+      </div>
+      <form onSubmit={onSubmit}>
+        <Textarea
+          className="min-h-30 w-full resize-none rounded border border-gray-600 bg-transparent px-10 py-[0.6rem] text-base placeholder-gray-700 focus-within:outline-none"
+          onChange={(e) => setComment(e.target.value)}
+          value={comment}
+          placeholder="Your feedback"
+        />
+      </form>
+      <div className="flex w-full justify-between gap-7">
+        <ChatButton variant="text-link" onClick={closeModal}>
+          Back to lesson
+        </ChatButton>
+        <ChatButton variant="primary" onClick={onSubmit} disabled={!isValid}>
+          Submit feedback
+        </ChatButton>
+      </div>
     </div>
   );
 };
diff --git a/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationInputAndText.tsx b/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationInputAndText.tsx
index 23e2b08be..d42e514fc 100644
--- a/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationInputAndText.tsx
+++ b/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationInputAndText.tsx
@@ -23,10 +23,10 @@ function GenerationInputAndText({
    * instead of on every key-press. It also allows for undoing on closing "edit
    * mode" by setting inputValue back to answer.value
    */
-  const [inputValue, setInputValue] = useState(item.value || "");
+  const [inputValue, setInputValue] = useState(item.value ?? "");
 
   useEffect(() => {
-    setInputValue(item.value || "");
+    setInputValue(item.value ?? "");
   }, [item.value]);
 
   return (
diff --git a/apps/nextjs/src/components/ContextProviders/AnalyticsProvider.tsx b/apps/nextjs/src/components/ContextProviders/AnalyticsProvider.tsx
index 20a0efeaa..82bf37e70 100644
--- a/apps/nextjs/src/components/ContextProviders/AnalyticsProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/AnalyticsProvider.tsx
@@ -133,9 +133,9 @@ export const AnalyticsProvider: React.FC<AnalyticsProviderProps> = ({
   avoOptions,
   bootstrappedFeatures,
 }) => {
-  const [hubspotScriptLoaded, setHubspotScriptLoadedFn] = useState(false);
-  const setHubspotScriptLoaded = useCallback(() => {
-    setHubspotScriptLoadedFn(true);
+  const [hubspotScriptLoaded, setHubspotScriptLoaded] = useState(false);
+  const setHubspotScriptLoadedOnce = useCallback(() => {
+    setHubspotScriptLoaded(true);
   }, []);
 
   /**
@@ -285,7 +285,10 @@ export const AnalyticsProvider: React.FC<AnalyticsProviderProps> = ({
   return (
     <analyticsContext.Provider value={analytics}>
       {children}
-      <HubspotLoader consent={hubspotConsent} onLoad={setHubspotScriptLoaded} />
+      <HubspotLoader
+        consent={hubspotConsent}
+        onLoad={setHubspotScriptLoadedOnce}
+      />
     </analyticsContext.Provider>
   );
 };