fix issue during last debug

TogetherCrew · Dec 1, 2023 · 82d4dc3 · 82d4dc3
1 parent e039aa2
commit 82d4dc3
Show file tree

Hide file tree

Showing 10 changed files with 99 additions and 57 deletions.
diff --git a/src/components/communitySettings/platform/TcDisconnectPlatform.tsx b/src/components/communitySettings/platform/TcDisconnectPlatform.tsx
@@ -66,11 +66,18 @@ function TcDisconnectPlatform({ platform }: TcDisconnectPlatformProps) {
           </div>
           <div className="flex flex-col md:flex-row justify-between space-y-4 md:space-y-0 md:space-x-5 pb-8 md:py-12">
             <div className="shadow-xl rounded-md px-4 py-6 space-y-4">
-              <TcText text={'Disconnect and delete data'} variant="body1" />
+              <TcText
+                text={'Disconnect and delete data'}
+                variant="body1"
+                fontWeight="bold"
+              />
               <TcText
                 className="text-left"
                 text={
-                  'Importing activities and members will be stopped. Historical activities will be deleted.'
+                  <span>
+                    Importing activities and members will be stopped. Historical
+                    activities <b>will be deleted.</b>
+                  </span>
                 }
                 variant="body2"
               />
@@ -81,11 +88,18 @@ function TcDisconnectPlatform({ platform }: TcDisconnectPlatformProps) {
               />
             </div>
             <div className="shadow-xl rounded-md px-4 py-6 space-y-4">
-              <TcText text={'Disconnect only'} variant="body1" />
+              <TcText
+                text={'Disconnect only'}
+                variant="body1"
+                fontWeight="bold"
+              />
               <TcText
                 className="text-left"
                 text={
-                  'Importing activities and members will be stopped. Historical activities will not be affected.'
+                  <span>
+                    Importing activities and members will be stopped. Historical
+                    activities <b>will not be affected.</b>
+                  </span>
                 }
                 variant="body2"
               />

diff --git a/src/components/communitySettings/platform/TcPeriodRange.tsx b/src/components/communitySettings/platform/TcPeriodRange.tsx
@@ -42,7 +42,6 @@ function TcPeriodRange({ handleSelectedDate, activePeriod }: ITcPeriodRange) {
       return '1Y';
     }
   };
-  console.log(findDefaultPeriod());
 
   const [selected, setSelected] = useState<PeriodValue>('Last 35 days');
 

diff --git a/src/components/communitySettings/platform/TcPlatform.tsx b/src/components/communitySettings/platform/TcPlatform.tsx
@@ -67,15 +67,17 @@ function TcPlatform({ platformName = 'Discord' }: TcPlatformProps) {
 
   const handlePatchCommunity = async () => {
     try {
-      await patchPlatformById({
+      const data = await patchPlatformById({
         id,
         metadata: {
           selectedChannels: currentTrueIDs,
           period: platfromAnalyzerDate,
           analyzerStartedAt: new Date().toISOString(),
         },
       });
-      setOpenConfirmDialog(true);
+      if (data) {
+        setOpenConfirmDialog(true);
+      }
       await fetchPlatform();
     } catch (error) {}
   };

diff --git a/src/components/pages/pageIndex/ActiveMemberComposition.tsx b/src/components/pages/pageIndex/ActiveMemberComposition.tsx
@@ -17,6 +17,7 @@ const ActiveMemberComposition = () => {
   useEffect(() => {
     let endDate: moment.Moment = moment().subtract(1, 'day');
     let startDate: moment.Moment = moment(endDate).subtract(7, 'days');
+
     const platformId = community?.platforms[0];
 
     if (platformId) {

diff --git a/src/components/pages/statistics/memberBreakdowns/activeMembers/ActiveMemberBreakdown.tsx b/src/components/pages/statistics/memberBreakdowns/activeMembers/ActiveMemberBreakdown.tsx
@@ -6,6 +6,7 @@ import CustomTable from '../CustomTable';
 import {
   Column,
   IActivityCompositionOptions,
+  ICommunity,
 } from '../../../../../utils/interfaces';
 import CustomPagination from '../CustomPagination';
 import CustomButton from '../../../../global/CustomButton';
@@ -17,6 +18,7 @@ import {
   downloadCSVFile,
 } from '../../../../../helpers/csvHelper';
 import router from 'next/router';
+import { useToken } from '../../../../../context/TokenContext';
 
 const columns: Column[] = [
   { id: 'username', label: 'Name' },
@@ -36,6 +38,7 @@ const options: IActivityCompositionOptions[] = [
 
 export default function ActiveMemberBreakdown() {
   const { getActiveMemberCompositionTable } = useAppStore();
+  const { community } = useToken();
 
   const tableTopRef = useRef<HTMLDivElement>(null);
 
@@ -59,8 +62,7 @@ export default function ActiveMemberBreakdown() {
     totalResults: 0,
     totalPages: 0,
   });
-  const user = StorageService.readLocalStorage<IUser>('user');
-  const guild = user?.guild;
+  const platformId = community?.platforms[0];
 
   const handlePageChange = (selectedPage: number) => {
     setPage(selectedPage);
@@ -70,13 +72,13 @@ export default function ActiveMemberBreakdown() {
   };
 
   useEffect(() => {
-    if (!guild) {
+    if (!platformId) {
       return;
     }
     setLoading(true);
     const fetchData = async () => {
       const res = await getActiveMemberCompositionTable(
-        guild.guildId,
+        platformId,
         activityComposition,
         roles,
         username,
@@ -149,15 +151,15 @@ export default function ActiveMemberBreakdown() {
   };
 
   const handleDownloadCSV = async () => {
-    if (!guild) {
+    if (!platformId) {
       return;
     }
 
     try {
       const limit = fetchedData.totalResults;
 
       const { results } = await getActiveMemberCompositionTable(
-        guild.guildId,
+        platformId,
         activityComposition,
         roles,
         username,

diff --git a/...s/memberBreakdowns/disengagedMembersComposition/DisengagedMembersCompositionBreakdown.tsx b/...s/memberBreakdowns/disengagedMembersComposition/DisengagedMembersCompositionBreakdown.tsx
@@ -17,6 +17,7 @@ import {
   downloadCSVFile,
 } from '../../../../../helpers/csvHelper';
 import router from 'next/router';
+import { useToken } from '../../../../../context/TokenContext';
 
 const columns: Column[] = [
   { id: 'username', label: 'Name' },
@@ -47,6 +48,7 @@ const options: IActivityCompositionOptions[] = [
 
 export default function DisengagedMembersCompositionBreakdown() {
   const { getDisengagedMembersCompositionTable } = useAppStore();
+  const { community } = useToken();
 
   const tableTopRef = useRef<HTMLDivElement>(null);
 
@@ -70,8 +72,8 @@ export default function DisengagedMembersCompositionBreakdown() {
     totalResults: 0,
     totalPages: 0,
   });
-  const user = StorageService.readLocalStorage<IUser>('user');
-  const guild = user?.guild;
+
+  const platformId = community?.platforms[0];
 
   const handlePageChange = (selectedPage: number) => {
     setPage(selectedPage);
@@ -81,13 +83,13 @@ export default function DisengagedMembersCompositionBreakdown() {
   };
 
   useEffect(() => {
-    if (!guild) {
+    if (!platformId) {
       return;
     }
     setLoading(true);
     const fetchData = async () => {
       const res = await getDisengagedMembersCompositionTable(
-        guild.guildId,
+        platformId,
         disengagedComposition,
         roles,
         username,
@@ -160,15 +162,15 @@ export default function DisengagedMembersCompositionBreakdown() {
   };
 
   const handleDownloadCSV = async () => {
-    if (!guild) {
+    if (!platformId) {
       return;
     }
 
     try {
       const limit = fetchedData.totalResults;
 
       const { results } = await getDisengagedMembersCompositionTable(
-        guild.guildId,
+        platformId,
         disengagedComposition,
         roles,
         username,

diff --git a/...onents/pages/statistics/memberBreakdowns/onboardingMembers/OnboardingMembersBreakdown.tsx b/...onents/pages/statistics/memberBreakdowns/onboardingMembers/OnboardingMembersBreakdown.tsx
@@ -17,6 +17,7 @@ import {
   downloadCSVFile,
 } from '../../../../../helpers/csvHelper';
 import router from 'next/router';
+import { useToken } from '../../../../../context/TokenContext';
 
 const columns: Column[] = [
   { id: 'username', label: 'Name' },
@@ -35,6 +36,7 @@ const options: IActivityCompositionOptions[] = [
 
 export default function OnboardingMembersBreakdown() {
   const { getOnboardingMemberCompositionTable } = useAppStore();
+  const { community } = useToken();
 
   const tableTopRef = useRef<HTMLDivElement>(null);
 
@@ -58,8 +60,8 @@ export default function OnboardingMembersBreakdown() {
     totalResults: 0,
     totalPages: 0,
   });
-  const user = StorageService.readLocalStorage<IUser>('user');
-  const guild = user?.guild;
+
+  const platformId = community?.platforms[0];
 
   const handlePageChange = (selectedPage: number) => {
     setPage(selectedPage);
@@ -69,13 +71,13 @@ export default function OnboardingMembersBreakdown() {
   };
 
   useEffect(() => {
-    if (!guild) {
+    if (!platformId) {
       return;
     }
     setLoading(true);
     const fetchData = async () => {
       const res = await getOnboardingMemberCompositionTable(
-        guild.guildId,
+        platformId,
         onboardingComposition,
         roles,
         username,
@@ -147,15 +149,15 @@ export default function OnboardingMembersBreakdown() {
   };
 
   const handleDownloadCSV = async () => {
-    if (!guild) {
+    if (!platformId) {
       return;
     }
 
     try {
       const limit = fetchedData.totalResults;
 
       const { results } = await getOnboardingMemberCompositionTable(
-        guild.guildId,
+        platformId,
         onboardingComposition,
         roles,
         username,

diff --git a/src/context/TokenContext.tsx b/src/context/TokenContext.tsx
@@ -1,9 +1,9 @@
-'use client';
 import React, {
   useState,
   useContext,
   createContext,
   useEffect,
+  useRef,
   ReactNode,
 } from 'react';
 import { StorageService } from '../services/StorageService';
@@ -31,15 +31,18 @@ export const TokenProvider: React.FC<TokenProviderProps> = ({ children }) => {
   const [token, setToken] = useState<IToken | null>(null);
   const [community, setCommunity] = useState<ICommunity | null>(null);
 
-  let intervalId: string | number | NodeJS.Timer | undefined;
+  // Use useRef to persist the interval ID across renders
+  const intervalIdRef = useRef<NodeJS.Timer | null>(null);
 
   useEffect(() => {
     const storedToken = StorageService.readLocalStorage<IToken>('user');
     const storedCommunity =
       StorageService.readLocalStorage<ICommunity>('community');
+
     if (storedToken) {
       setToken(storedToken);
     }
+
     if (storedCommunity) {
       setCommunity(storedCommunity);
     }
@@ -61,14 +64,18 @@ export const TokenProvider: React.FC<TokenProviderProps> = ({ children }) => {
       } catch (error) {
         console.error('Error fetching community:', error);
         StorageService.removeLocalStorage('community');
-        clearInterval(intervalId);
+        if (intervalIdRef.current) {
+          clearInterval(intervalIdRef.current);
+        }
       }
     };
 
-    intervalId = setInterval(fetchAndUpdateCommunity, 5000);
+    intervalIdRef.current = setInterval(fetchAndUpdateCommunity, 5000);
 
     return () => {
-      clearInterval(intervalId);
+      if (intervalIdRef.current) {
+        clearInterval(intervalIdRef.current);
+      }
     };
   }, []);
 
@@ -77,9 +84,35 @@ export const TokenProvider: React.FC<TokenProviderProps> = ({ children }) => {
     setToken(newToken);
   };
 
-  const updateCommunity = (newCommunity: ICommunity) => {
-    StorageService.writeLocalStorage<ICommunity>('community', newCommunity);
+  const updateCommunity = async (newCommunity: ICommunity) => {
+    // Clear the existing interval
+    if (intervalIdRef.current) {
+      clearInterval(intervalIdRef.current);
+    }
+
+    // Update the community and reset the interval
     setCommunity(newCommunity);
+    StorageService.writeLocalStorage<ICommunity>('community', newCommunity);
+
+    // Restart the interval
+    intervalIdRef.current = setInterval(async () => {
+      try {
+        const updatedCommunity = await retrieveCommunityById(newCommunity.id);
+        if (updatedCommunity) {
+          setCommunity(updatedCommunity);
+          StorageService.writeLocalStorage<ICommunity>(
+            'community',
+            updatedCommunity
+          );
+        }
+      } catch (error) {
+        console.error('Error fetching community:', error);
+        StorageService.removeLocalStorage('community');
+        if (intervalIdRef.current) {
+          clearInterval(intervalIdRef.current);
+        }
+      }
+    }, 5000);
   };
 
   const clearToken = () => {
-Original file line number
+Diff line change
@@ Expand Up @@
           return '1Y';
         }
       };
-      console.log(findDefaultPeriod());
       const [selected, setSelected] = useState<PeriodValue>('Last 35 days');
@@ Expand Down @@