fix: unclickable menu items (#394)

lunary-ai · Jun 25, 2024 · 3194b87 · 3194b87
1 parent 27be2f8
commit 3194b87
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 24 deletions.
diff --git a/packages/frontend/components/layout/Sidebar.tsx b/packages/frontend/components/layout/Sidebar.tsx
@@ -59,7 +59,6 @@ import { useEffect, useState } from "react"
 import { ResourceName, hasAccess, hasReadAccess, serializeLogic } from "shared"
 import config from "@/utils/config"
 import { useViews } from "@/utils/dataHooks/views"
-import { useLocalStorage } from "@mantine/hooks"
 
 function NavbarLink({
   icon: Icon,
@@ -126,8 +125,7 @@ export default function Sidebar() {
   const { projects, isLoading: loading, insert } = useProjects()
   const { views } = useViews()
 
-  const { colorScheme, setColorScheme, clearColorScheme } =
-    useMantineColorScheme({})
+  const { colorScheme, setColorScheme } = useMantineColorScheme({})
 
   const [createProjectLoading, setCreateProjectLoading] = useState(false)
 

diff --git a/packages/frontend/components/layout/index.tsx b/packages/frontend/components/layout/index.tsx
@@ -15,6 +15,11 @@ import UpgradeModal from "./UpgradeModal"
 
 export default function Layout({ children }: { children: ReactNode }) {
   const router = useRouter()
+  const { user } = useUser()
+  const { org } = useOrg()
+
+  const colorScheme = useComputedColorScheme()
+  const { isSignedIn } = useAuth()
 
   const isAuthPage = !![
     "/login",
@@ -35,8 +40,6 @@ export default function Layout({ children }: { children: ReactNode }) {
 
   const isPublicPage = isLLMCallPage
 
-  const { isSignedIn } = useAuth()
-
   useEffect(() => {
     if (isMaintenanceMode) {
       router.push("/maintenance")
@@ -53,14 +56,9 @@ export default function Layout({ children }: { children: ReactNode }) {
       return
     }
   }, [isSignedIn])
-  const { user } = useUser()
-  const { org } = useOrg()
-  const { project } = useProject()
 
   const isPromptPage = router.pathname.startsWith("/prompt")
 
-  const colorScheme = useComputedColorScheme()
-
   useEffect(() => {
     if (user) {
       analytics.identify(user.id, {

diff --git a/packages/frontend/pages/logs/index.tsx b/packages/frontend/pages/logs/index.tsx
@@ -9,7 +9,6 @@ import {
   Group,
   Loader,
   Menu,
-  SegmentedControl,
   Stack,
   Text,
 } from "@mantine/core"
@@ -32,17 +31,13 @@ import {
   IconBrandOpenai,
   IconDotsVertical,
   IconFileExport,
-  IconListTree,
-  IconMessages,
-  IconFilter,
-  IconSquaresDiagonal,
   IconLayersIntersect,
   IconTrash,
   IconCopy,
 } from "@tabler/icons-react"
 
 import { NextSeo } from "next-seo"
-import { use, useContext, useEffect, useState } from "react"
+import { useContext, useEffect, useMemo, useState } from "react"
 
 import { ChatReplay } from "@/components/blocks/RunChat"
 import RunInputOutput from "@/components/blocks/RunInputOutput"
@@ -232,24 +227,30 @@ export default function Logs() {
     }
   }, [selectedRun?.projectId])
 
-  useDidUpdate(() => {
-    let serialized = serializeLogic(filters)
-
-    if (typeof serialized === "string") {
-      setSerializedChecks(serialized)
+  const fullUrlPath = useMemo(() => {
+    let serializedString = serializeLogic(filters)
 
+    if (typeof serializedString === "string") {
       if (viewId) {
-        serialized += `&view=${viewId}`
+        serializedString += `&view=${viewId}`
       }
 
       if (selectedRunId) {
-        serialized += `&selected=${selectedRunId}`
+        serializedString += `&selected=${selectedRunId}`
       }
 
-      router.replace(`/logs?${serialized}`)
+      console.log(`serialized: ${serializedString}`)
     }
+
+    return serializedString
   }, [filters, viewId, selectedRunId])
 
+  useDidUpdate(() => {
+    if (typeof fullUrlPath === "string") {
+      router.replace(`/logs?${fullUrlPath}`)
+    }
+  }, [fullUrlPath])
+
   // Ensure the 'type' filter is always the first filter and re-add it if it was removed
   useEffect(() => {
     const typeFilter = filters.find((filter) => filter.id === "type")