diff --git a/src/app/components/tanstak-table/MonitoringDropDown.tsx b/src/app/components/tanstak-table/MonitoringDropDown.tsx index 24b5bc0..f18b4b3 100644 --- a/src/app/components/tanstak-table/MonitoringDropDown.tsx +++ b/src/app/components/tanstak-table/MonitoringDropDown.tsx @@ -49,7 +49,6 @@ export function MonitoringDropDown({ file }: { }, [dropdownRef, setIsOpen, isOpen]); useEffect(() => { - console.log(file); if (file.status) { setCurrentMonitoringStatus(file.status === 'ACTIVE' ? 'without-monitoring' : 'without-monitoring'); } diff --git a/src/app/components/tanstak-table/TanstakTable.tsx b/src/app/components/tanstak-table/TanstakTable.tsx index ed59e3d..b9ef430 100644 --- a/src/app/components/tanstak-table/TanstakTable.tsx +++ b/src/app/components/tanstak-table/TanstakTable.tsx @@ -25,6 +25,7 @@ import { FileMonitoringModalWindow } from '@/app/ui/modal-windows/file-monitorin import { FileTypeIcon } from '@/app/components/FileTypeIcon'; import { fetchReferralUserStats } from '@/app/actions/referralsActions'; import { MonitoringDropDown } from '@/app/components/tanstak-table/MonitoringDropDown'; +import { useUserProfile } from '@/app/hooks/react-query/useUserDataInfo'; type FileType = 'image' | 'video' | 'audio'; @@ -582,7 +583,7 @@ export default function TanstakFilesTable({ fileType }: { fileType: string }) { } return result; - }, [tableData, typeFilter, dateFilter]); + }, [tableData, typeFilter, dateFilter]); //tut useEffect(() => { const currentPageRows = table.getRowModel().rows; diff --git a/src/app/ui/dashboard/new/dashboard-user-files.tsx b/src/app/ui/dashboard/new/dashboard-user-files.tsx index 09ff25b..6445c6e 100644 --- a/src/app/ui/dashboard/new/dashboard-user-files.tsx +++ b/src/app/ui/dashboard/new/dashboard-user-files.tsx @@ -8,6 +8,7 @@ import { convertBytes } from '@/app/lib/convertBytes'; import { useTranslations } from 'next-intl'; import { useClickOutside } from '@/app/hooks/useClickOutside'; import Link from 'next/link'; +import { getSessionData } from '@/app/actions/session'; type FileItem = { id: string; diff --git a/src/app/ui/header/userMenuButton.tsx b/src/app/ui/header/userMenuButton.tsx index 35d9ce6..5cbda6e 100644 --- a/src/app/ui/header/userMenuButton.tsx +++ b/src/app/ui/header/userMenuButton.tsx @@ -6,12 +6,14 @@ import Link from 'next/link'; import { logout } from '@/app/actions/auth'; import { useTranslations } from 'next-intl'; import { useUserProfile } from '@/app/hooks/react-query/useUserDataInfo'; +import { useQueryClient } from '@tanstack/react-query'; export default function UserMenuButton() { const [isOpen, setIsOpen] = useState(false); const menuRef = useRef(null); const t = useTranslations("Global"); const { data: userData, isLoading, isError, error } = useUserProfile(); + const queryClient = useQueryClient(); useClickOutside( menuRef, @@ -84,9 +86,10 @@ export default function UserMenuButton() { { + onClick={async (e) => { e.preventDefault(); - logout(); + queryClient.clear(); + await logout(); }} > diff --git a/src/app/ui/navigation/nav-links.tsx b/src/app/ui/navigation/nav-links.tsx index 1fd1be0..df0b5b9 100644 --- a/src/app/ui/navigation/nav-links.tsx +++ b/src/app/ui/navigation/nav-links.tsx @@ -12,7 +12,7 @@ import { useSideMenuStore } from '@/app/stores/sideMenuStore'; import { useRef } from 'react'; import { useClickOutside } from '@/app/hooks/useClickOutside'; import { fetchReferralUserStats } from '@/app/actions/referralsActions'; -import { useQuery } from '@tanstack/react-query'; +import { useQuery, useQueryClient } from '@tanstack/react-query'; import { env } from 'process'; import { getBuildData } from '@/app/actions/action'; @@ -81,6 +81,7 @@ export default function NavLinks() { const setMenuState = useSideMenuStore(s => s.setValue); const menuState = useSideMenuStore(s => s.value); const links = navigation; + const queryClient = useQueryClient(); const sideMenuRef = useRef(null) useClickOutside( @@ -162,10 +163,11 @@ export default function NavLinks() { key={t('exit')} href='/login' className="flex nav-link" - onClick={(e) => { + onClick={async (e) => { e.preventDefault(); setMenuState(false); - logout(); + queryClient.clear(); + await logout(); }} > diff --git a/src/app/ui/settings/company-users-setting-panel.tsx b/src/app/ui/settings/company-users-setting-panel.tsx index 3ac5c0b..7ddc54b 100644 --- a/src/app/ui/settings/company-users-setting-panel.tsx +++ b/src/app/ui/settings/company-users-setting-panel.tsx @@ -3,8 +3,6 @@ import styles from '@/app/styles/module/login.module.scss'; import { useTranslations } from 'next-intl'; import { useActionState, useEffect, useRef, useState, ChangeEvent } from 'react'; -import { getUserData } from '@/app/actions/action'; -import { useQuery } from '@tanstack/react-query'; import { companyUserRegistration } from '@/app/actions/companyActions'; import { CompanyUserRegistrationFormState } from '@/app/actions/companyActions'; import { SignupFormSchema } from '@/app/actions/definitions'; diff --git a/src/app/ui/settings/personal-data-settings.tsx b/src/app/ui/settings/personal-data-settings.tsx index 37cd0c1..a81dbfd 100644 --- a/src/app/ui/settings/personal-data-settings.tsx +++ b/src/app/ui/settings/personal-data-settings.tsx @@ -2,8 +2,6 @@ import { useTranslations } from 'next-intl'; import { useActionState, useState, useEffect } from 'react'; -import { getUserData } from '@/app/actions/action'; -import { useQuery } from '@tanstack/react-query'; import { useUserProfile } from '@/app/hooks/react-query/useUserDataInfo'; export default function PersonalDataSettings() { diff --git a/src/app/ui/settings/subscription-settings.tsx b/src/app/ui/settings/subscription-settings.tsx index beaef02..f280eb6 100644 --- a/src/app/ui/settings/subscription-settings.tsx +++ b/src/app/ui/settings/subscription-settings.tsx @@ -1,8 +1,6 @@ 'use client' import { useTranslations } from 'next-intl'; -import { getUserData } from '@/app/actions/action'; -import { useQuery } from '@tanstack/react-query'; import { convertBytes } from '@/app/lib/convertBytes'; import { useUserProfile } from '@/app/hooks/react-query/useUserDataInfo';