[hasura] fix: thread delete and user permissions duplicate

apps/hasura/metadata/databases/masterbots/tables/public_user.yaml

@@ -141,23 +141,6 @@ select_permissions:
         - username
       filter: {}
     comment: ""
-  - role: moderator
-    permission:
-      columns:
-        - date_joined
-        - email
-        - get_free_month
-        - is_blocked
-        - is_verified
-        - last_login
-        - pro_user_subscription_id
-        - profile_picture
-        - role
-        - slug
-        - user_id
-        - username
-      filter: {}
-    comment: ""
   - role: user
     permission:
       columns:

apps/masterbots.ai/app/(browse)/[category]/page.tsx

@@ -15,10 +15,10 @@ export default async function BrowseCategoryPage({
 
   return (
     <div className="w-full max-w-screen-lg pb-10 mx-auto">
-      <BrowseCategoryTabs
+      {/* <BrowseCategoryTabs
         initialCategory={params.category}
         categories={categories}
-      />
+      /> */}
       <BrowseSearchInput />
       <BrowseList />
     </div>

apps/masterbots.ai/components/layout/sidebar/sidebar-link.tsx

@@ -3,6 +3,7 @@
 import { Checkbox } from "@/components/ui/checkbox"
 import { IconCaretRight } from '@/components/ui/icons'
 import { useSidebar } from '@/lib/hooks/use-sidebar'
+import { urlBuilders } from '@/lib/url'
 import { cn } from '@/lib/utils'
 import { Category, Chatbot } from 'mb-genql'
 import { toSlug } from 'mb-lib'
@@ -20,7 +21,7 @@ interface SidebarLinkProps {
 export default function SidebarLink({ category, isFilterMode, page }: SidebarLinkProps) {
   const router = useRouter()
   const pathname = usePathname()
-  const isBrowse = !pathname.includes('/c') && !pathname.includes('/u')
+  const isBrowse = !/^\/(?:c|u)(?:\/|$)/.test(pathname)
   const { slug } = useParams()
 
   const {
@@ -53,13 +54,17 @@ export default function SidebarLink({ category, isFilterMode, page }: SidebarLin
           navigateTo({
             page,
             slug: typeof slug === 'string' ? slug : undefined,
-            categoryName: toSlug(category.name.toLowerCase())
+            categoryName: toSlug(category.name.toLowerCase()),
+            isBrowse
           })
 
-        } else {
+        }
+        else {
+          setActiveChatbot(null)
           navigateTo({
             page,
             slug: typeof slug === 'string' ? slug : undefined,
+            isBrowse
           })
         }
         return newCategory
@@ -138,21 +143,22 @@ export default function SidebarLink({ category, isFilterMode, page }: SidebarLin
 
   return (
     <div className={cn('flex flex-col mb-2')}>
-      <a
-        href="#"
-        //  href={page === 'profile' ? `/u/${slug}/t/${toSlug(category.name)}` :`/c/${toSlug(category.name)}`}
+      <button
+        role="menuitem"
+        aria-expanded={isActive}
+        aria-controls={`category-${category.name}`}
         className={cn(
-          'flex items-center p-2 cursor-pointer',
+          'flex items-center p-2 w-full text-left',
           isActive && 'bg-gray-200 dark:bg-mirage',
           page === 'profile' && 'pl-6'
         )}
         onClick={(e) => {
-          e.preventDefault();
+          e.stopPropagation();
           handleClickCategory(e);
         }}
       >
         {categoryContent}
-      </a>
+      </button>
       {childrenContent}
     </div>
   )
@@ -177,7 +183,7 @@ const ChatbotComponent: React.FC<ChatbotComponentProps> = React.memo(function Ch
 }) {
   const { selectedChatbots, toggleChatbotSelection, navigateTo } = useSidebar()
   const pathname = usePathname()
-  const isBrowse = !pathname.includes('/c') && !pathname.includes('/u')
+  const isBrowse = !/^\/(?:c|u)(?:\/|$)/.test(pathname)
   const { slug } = useParams()
 
   const handleChatbotClick = useCallback((e: React.MouseEvent) => {
@@ -188,7 +194,8 @@ const ChatbotComponent: React.FC<ChatbotComponentProps> = React.memo(function Ch
         page,
         slug: slug as string,
         categoryName: toSlug(category.name.toLowerCase()),
-        chatbotName: chatbot.name.toLowerCase()
+        chatbotName: chatbot.name.toLowerCase(),
+        isBrowse
       })
     }
   }, [chatbot, setActiveChatbot, isFilterMode])
@@ -206,7 +213,7 @@ const ChatbotComponent: React.FC<ChatbotComponentProps> = React.memo(function Ch
       className={cn(
         'flex items-center p-2 w-full',
         isActive && 'bg-blue-100 dark:bg-blue-900',
-        'hover:bg-gray-100 dark:hover:bg-gray-800'
+        'hover:bg-gray-100 dark:hover:bg-gray-800',
       )}
     >
       {isFilterMode && (
@@ -228,7 +235,7 @@ const ChatbotComponent: React.FC<ChatbotComponentProps> = React.memo(function Ch
     </div>
   ) : (
     <Link
-      href={page === 'profile' ? `/u/${slug}/t/${toSlug(category.name)}/${chatbot.name.toLowerCase()}` : `/c/${toSlug(category.name)}/${chatbot.name.toLowerCase()}`}
+      href={page === 'profile' ? urlBuilders.userChatbotUrl({ slug: slug as string, category: category.name, chatbot: chatbot.name }) : `/c/${toSlug(category.name)}/${chatbot.name.toLowerCase()}`}
       className={cn(
         'flex items-center p-2 w-full',
         isActive && 'bg-blue-100 dark:bg-blue-900',

apps/masterbots.ai/components/layout/sidebar/sidebar-responsive.tsx

@@ -1,16 +1,11 @@
 import { Sidebar } from '@/components/layout/sidebar/sidebar';
-// import { ChatHistory } from '@/components/chat-history'
 
 export function ResponsiveSidebar() {
   return (
     <Sidebar className="peer absolute inset-y-0 z-30 border-r bg-muted
     transition-all
     -translate-x-full duration-500 ease-in-out
     data-[state=open]:translate-x-0 data-[state=closed]:lg:translate-x-0
-    w-[300px] lg:w-[250px] xl:w-[300px]">
-      {/* <SidebarCategoryGeneral /> */}
-      {/* <h3>Chat history</h3> */}
-      {/* <ChatHistory userId={session.user.id} /> */}
-    </Sidebar>
+    w-[300px] lg:w-[250px] xl:w-[300px]"/>
   )
 }

apps/masterbots.ai/components/layout/sidebar/sidebar.tsx

@@ -5,10 +5,25 @@ import { SidebarHeader } from '@/components/layout/sidebar/sidebar-header'
 import { useSidebar } from '@/lib/hooks/use-sidebar'
 import { cn } from '@/lib/utils'
 import React from 'react'
+import { usePathname } from 'next/navigation'
+import { useThread } from '@/lib/hooks/use-thread'
 
 export function Sidebar({ className }: React.ComponentProps<'div'>) {
   const { isSidebarOpen, isLoading } = useSidebar()
+  const prevPathRef = React.useRef(usePathname());
+  const pathname = usePathname();
+  const {  setActiveThread, setIsOpenPopup } = useThread()
+  const rootAndChatRegex = /^\/(?:c)?$/;
 
+  React.useEffect(() => {
+    if (rootAndChatRegex.test(pathname)) {
+      setActiveThread(null);
+      setIsOpenPopup(false);
+    }
+    prevPathRef.current = pathname;
+  }, [pathname]);
+
+
   if (isLoading) return null
 
   return (

apps/masterbots.ai/components/routes/browse/browse-list-item.tsx

@@ -36,6 +36,8 @@ import Image from 'next/image'
 import { useRouter } from 'next/navigation'
 import React from 'react'
 import { ChatOptions } from '../chat/chat-options'
+import { urlBuilders } from '@/lib/url'
+
 
 let initialUrl: string | null = null
 
@@ -139,7 +141,7 @@ export default function BrowseListItem({
     e.preventDefault()
     e.stopPropagation()
     if (thread?.user?.slug) {
-      router.push(`/u/${thread?.user?.slug}/t`)
+      router.push(urlBuilders.userProfileUrl({ userSlug: thread.user.slug }))
     }
   }
 

apps/masterbots.ai/components/routes/browse/browse-list.tsx

@@ -41,12 +41,12 @@ export default function BrowseList() {
   const [filteredThreads, setFilteredThreads] = React.useState<Thread[]>([])
   const [loading, setLoading] = React.useState<boolean>(false)
   const [count, setCount] = React.useState<number>(0)
-  const { selectedCategories, selectedChatbots } = useSidebar()
+  const { selectedCategories, selectedChatbots, activeCategory, activeChatbot } = useSidebar()
 
   const fetchThreads = async ({
     categoriesId,
     chatbotsId,
-    keyword
+    keyword,
   }: {
     categoriesId: number[]
     chatbotsId: number[]
@@ -55,10 +55,17 @@ export default function BrowseList() {
     setLoading(true) // ? Seting loading before fetch
     try {
       const threads = await getBrowseThreads({
-        categoriesId,
-        chatbotsId,
-        keyword,
-        limit: PAGE_SIZE
+        ...(activeCategory !== null || activeChatbot !== null
+          ? {
+            categoryId: activeCategory,
+            chatbotName: activeChatbot?.name,
+          }
+          : {
+            categoriesId,
+            chatbotsId,
+            keyword,
+          }),
+        limit: PAGE_SIZE,
       })
       setThreads(threads)
       setFilteredThreads(threads)
@@ -108,12 +115,8 @@ export default function BrowseList() {
       categoriesId: selectedCategories,
       chatbotsId: selectedChatbots
     })
+  }, [selectedCategories, selectedChatbots, activeCategory, activeChatbot])
 
-    console.log({
-      selectedCategories,
-      selectedChatbots
-    })
-  }, [selectedCategories, selectedChatbots])
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: <explanation>
   React.useEffect(() => {

apps/masterbots.ai/components/routes/chat/chat-accordion.tsx

@@ -1,8 +1,10 @@
 //* Component for displaying a collapsible chat thread accordion
 
 import { useThread } from '@/lib/hooks/use-thread'
+import { urlBuilders } from '@/lib/url'
 import { ChevronDown } from 'lucide-react'
 import type { Thread } from 'mb-genql'
+import { useParams, usePathname, useRouter } from 'next/navigation'
 import React from 'react'
 
 export const ChatAccordion = ({
@@ -42,8 +44,13 @@ export const ChatAccordion = ({
     isOpenPopup
   } = useThread()
 
+  const pathname = usePathname()
+  const params = useParams()
+  const router = useRouter();
+
   //* Sets the initial open state based on defaultState prop
   const initialState = defaultState
+  const profilePage = /^\/u\/[^/]+\/t(?:\/|$)/.test(pathname)
 
   const [open, setOpen] = React.useState(initialState)
   const isMainThread = !isOpenPopup
@@ -52,12 +59,24 @@ export const ChatAccordion = ({
   const handleClick = (e: React.MouseEvent) => {
     e.stopPropagation()
 
-    if (isMainThread && thread) {
+    if (isMainThread && thread && !profilePage) {
       //* Main thread click - open modal
       setActiveThread(thread)
       setIsOpenPopup(true)
     } else {
       //* Sub-conversation click - toggle accordion
+      if (profilePage) {
+        setIsOpenPopup(false)
+        setActiveThread(null)
+        const category = thread?.chatbot?.categories[0]?.category?.name
+        const chatbot = thread?.chatbot?.name
+        const slug = params.slug;
+        if (!category || !chatbot || !slug) {
+          console.error('Missing required navigation parameters');
+          return;
+        }
+        router.push(urlBuilders.threadUrl({ slug: slug as string, category, chatbot, threadId: thread?.threadId }))
+      }
       toggle()
     }
   }

apps/masterbots.ai/components/routes/thread/thread-component.tsx

@@ -37,12 +37,9 @@ import { useScroll } from '@/lib/hooks/use-scroll'
 import { useThread } from '@/lib/hooks/use-thread'
 import { useThreadVisibility } from '@/lib/hooks/use-thread-visibility'
 import type { Thread } from 'mb-genql'
-import { toSlug } from 'mb-lib'
-import { redirect, useParams, usePathname } from 'next/navigation'
 import { useRef } from 'react'
 import { AdminModeApprove } from '../chat/admin-mode-approve'
 import { ChatOptions } from '../chat/chat-options'
-
 export default function ThreadComponent({
   thread,
   loadMore,
@@ -60,8 +57,6 @@ export default function ThreadComponent({
   const contentRef = useRef<HTMLDivElement>(null)
   const { isNewResponse } = useThread()
   const { isAdminMode } = useThreadVisibility()
-  const pathname = usePathname()
-  const params = useParams()
 
   const { isNearBottom, scrollToTop } = useScroll({
     containerRef: contentRef,
@@ -74,22 +69,8 @@ export default function ThreadComponent({
   })
 
   const threadId = thread.threadId
-
   const handleAccordionToggle = () => {
-
-    if (pathname.includes('u') && pathname.includes('t')) {
-      const category = thread?.chatbot?.categories[0]?.category?.name
-      const chatbot = thread?.chatbot?.name
-      const slug = params.slug;
-
-      if (!category || !chatbot || !slug) {
-        console.error('Missing required navigation parameters');
-        return scrollToTop();
-      }
-      redirect(`/u/${slug}/t/${toSlug(category)}/${toSlug(chatbot)}/${thread.threadId}`)
-    } else {
-      scrollToTop()
-    }
+    scrollToTop()
   }
   return (
     <li ref={threadRef}>