GitHub/trunk-server
1
0
Fork 0
mirror of https://github.com/openmhz/trunk-server.git synced 2026-11-13 17:27:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

make sure it can handle Call ID on the URL

Browse Source
This commit is contained in:
Luke Berndt
2023-01-18 09:31:25 -05:00
parent 9403b5f596
commit 9aac474099
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/src/Call/CallPlayer.js
View File

@@ -34,6 +34,9 @@ const socket = io(process.env.REACT_APP_BACKEND_SERVER);
function CallPlayer(props) { function CallPlayer(props) {
const { shortName } = useParams(); const { shortName } = useParams();
const loadCallId = props.loadCallId;
const callsData = props.callsData;
const { ref: loadOlderRef, inView: loadOlderInView } = useInView({ const { ref: loadOlderRef, inView: loadOlderInView } = useInView({
/* Optional options */ /* Optional options */
threshold: 0.5 threshold: 0.5
@@ -42,21 +45,21 @@ function CallPlayer(props) {
/* Optional options */ /* Optional options */
threshold: 0.5 threshold: 0.5
}); });
const { data: groupsData, isSuccess: isGroupsSuccess } = useGetGroupsQuery(shortName); const { data: groupsData, isSuccess: isGroupsSuccess } = useGetGroupsQuery(shortName);
const { data: talkgroupsData, isSuccess: isTalkgroupsSuccess } = useGetTalkgroupsQuery(shortName); const { data: talkgroupsData, isSuccess: isTalkgroupsSuccess } = useGetTalkgroupsQuery(shortName);
const callsData = props.callsData;
const [autoPlay, setAutoPlay] = useState(true); const [autoPlay, setAutoPlay] = useState(true);
const [currentCall, setCurrentCall] = useState(false); const [currentCall, setCurrentCall] = useState(false);
const [isPlaying, setIsPlaying] = useState(false); const [isPlaying, setIsPlaying] = useState(false);
const [loadCallId, setLoadCallId] = useState(false);
const filterType = useSelector((state) => state.callPlayer.filterType); const filterType = useSelector((state) => state.callPlayer.filterType);
const filterGroupId = useSelector((state) => state.callPlayer.filterGroupId); const filterGroupId = useSelector((state) => state.callPlayer.filterGroupId);
const filterTalkgroups = useSelector((state) => state.callPlayer.filterTalkgroups); const filterTalkgroups = useSelector((state) => state.callPlayer.filterTalkgroups);
const filterStarred = useSelector((state) => state.callPlayer.filterStarred);
const filterDate = useSelector((state) => state.callPlayer.filterDate);
const live = useSelector((state) => state.callPlayer.live);
const navigate = useNavigate(); const navigate = useNavigate();
@@ -121,15 +124,15 @@ function CallPlayer(props) {
dispatch(getOlderCalls({})); dispatch(getOlderCalls({}));
} }
}, [loadOlderInView]); }, [loadOlderInView]);
/*
useEffect(() => { useEffect(() => {
if ( loadCallId && callsData) { if ( loadCallId && callsData && !currentCall) {
const call = callsData.entities[loadCallId]; const call = callsData.entities[loadCallId];
if (call) { if (call) {
setCurrentCall(call); setCurrentCall(call);
} }
} }
}, [callsData])*/ }, [loadCallId, callsData])
useLayoutEffect( () => { useLayoutEffect( () => {
const scrollAmount = parseInt(positionRef.current.clientHeight) - parseInt(pageYOffset.current); const scrollAmount = parseInt(positionRef.current.clientHeight) - parseInt(pageYOffset.current);

2
frontend/src/Call/Calls.js
View File

@@ -398,7 +398,7 @@ function Calls(props) {
</Menu.Menu> </Menu.Menu>
</Menu> </Menu>
<CallPlayer callsData={callsData} /> <CallPlayer callsData={callsData} loadCallId={loadCallId}/>
</div> </div>
); );