From a41753b574728c982c2249f8729e80494a768a81 Mon Sep 17 00:00:00 2001 From: talksik Date: Sat, 7 May 2022 13:31:30 -0500 Subject: [PATCH] prop only changing with new object...should have knowne --- packages/api/services/line.service.ts | 2 -- packages/api/sockets/index.ts | 6 +++--- .../desktop/src/controller/lineDataProvider.tsx | 2 ++ .../desktop/src/pages/terminal/details/index.tsx | 16 ++++++++++------ packages/desktop/src/pages/terminal/index.tsx | 6 ++---- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/packages/api/services/line.service.ts b/packages/api/services/line.service.ts index 1069733..bcfa195 100644 --- a/packages/api/services/line.service.ts +++ b/packages/api/services/line.service.ts @@ -131,8 +131,6 @@ export class LineService { updateSet ); - console.log(updateRes); - return updateRes; } diff --git a/packages/api/sockets/index.ts b/packages/api/sockets/index.ts index 363609d..49e7678 100644 --- a/packages/api/sockets/index.ts +++ b/packages/api/sockets/index.ts @@ -123,10 +123,10 @@ export default function InitializeWs(io: any) { LineMemberState.TUNED ); } else { - // just updates the - await LineService.updateLineMemberVisitDate( + await LineService.updateLineMemberState( req.lineId, - userInfo.userId + userInfo.userId, + LineMemberState.INBOX ); } diff --git a/packages/desktop/src/controller/lineDataProvider.tsx b/packages/desktop/src/controller/lineDataProvider.tsx index 84fc062..22edc10 100644 --- a/packages/desktop/src/controller/lineDataProvider.tsx +++ b/packages/desktop/src/controller/lineDataProvider.tsx @@ -344,10 +344,12 @@ export function LineDataProvider({ children }) { // ?just do simple synchronous axios/fetch in useEffect and manage isLoading ourselves? const { data: basicUserLinesData } = useUserLines(); + // ! passing in the same data of the query passes reference so changes that happen in socketHandler impact react query cache const { linesMap, ...handlers } = useSocketHandler( basicUserLinesData?.data?.masterLines ); + // avoid children rendering if they don't have the ws to make individual calls with if (!$ws) { return attempting to connect you for the here and now...; } diff --git a/packages/desktop/src/pages/terminal/details/index.tsx b/packages/desktop/src/pages/terminal/details/index.tsx index b165b42..020fcc2 100644 --- a/packages/desktop/src/pages/terminal/details/index.tsx +++ b/packages/desktop/src/pages/terminal/details/index.tsx @@ -21,7 +21,7 @@ export default function LineDetailsTerminal({ const isUserToggleTuned = useMemo( () => selectedLine?.currentUserMember?.state === LineMemberState.TUNED, - [selectedLine.currentUserMember] + [selectedLine] ); // seeing if I am in the list of broadcasters @@ -34,10 +34,6 @@ export default function LineDetailsTerminal({ [userDetails, selectedLine] ); - useEffect(() => { - console.log(selectedLine?.currentUserMember); - }, [selectedLine]); - return ( <>
@@ -88,7 +84,15 @@ export default function LineDetailsTerminal({ isUserToggleTuned ? "bg-gray-800 text-white" : "text-black" }`} onClick={() => - handleTuneToLine(selectedLine.lineDetails._id.toString(), true) + isUserToggleTuned + ? handleTuneToLine( + selectedLine.lineDetails._id.toString(), + false + ) + : handleTuneToLine( + selectedLine.lineDetails._id.toString(), + true + ) } > diff --git a/packages/desktop/src/pages/terminal/index.tsx b/packages/desktop/src/pages/terminal/index.tsx index 20df6e0..6e9fe28 100644 --- a/packages/desktop/src/pages/terminal/index.tsx +++ b/packages/desktop/src/pages/terminal/index.tsx @@ -30,7 +30,7 @@ export default function NirvanaTerminal() { useEffect(() => { console.log("change/update in lines map"); - console.log(linesMap); + // console.log(linesMap); }, [linesMap]); const allLines: MasterLineData[] = useMemo(() => { @@ -114,8 +114,6 @@ export default function NirvanaTerminal() { const foundSelectedLine = linesMap[selectedLineId]; - console.log(foundSelectedLine); - // on mount of this, we want to temporarily tune into the line if we are not already tuned in...which would happen if we toggle tuned in if ( !foundSelectedLine.tunedInMemberIds?.includes( @@ -125,7 +123,7 @@ export default function NirvanaTerminal() { handleTuneToLine(selectedLineId, false); } - return foundSelectedLine; + return { ...foundSelectedLine }; } return undefined;