mirror of
https://github.com/openmhz/trunk-server.git
synced 2026-11-16 10:47:32 -05:00
formatting
This commit is contained in:
@@ -1,20 +1,15 @@
|
|||||||
import React, { useEffect, useLayoutEffect, useState, useRef } from "react";
|
import React, { useEffect, useState, useRef } from "react";
|
||||||
import { Link, useLocation, useParams, useNavigate } from 'react-router-dom';
|
import { useParams } from 'react-router-dom';
|
||||||
|
|
||||||
import MediaPlayer from "./components/MediaPlayer";
|
import MediaPlayer from "./components/MediaPlayer";
|
||||||
|
|
||||||
import SupportModal from "./components/SupportModal";
|
import SupportModal from "./components/SupportModal";
|
||||||
|
|
||||||
import CallInfo from "./components/CallInfo";
|
import CallInfo from "./components/CallInfo";
|
||||||
import ListCalls from "./components/ListCalls";
|
import ListCalls from "./components/ListCalls";
|
||||||
import { useSelector, useDispatch } from 'react-redux'
|
import { useDispatch } from 'react-redux'
|
||||||
import { setLive, setFilter,setDateFilter } from "../features/callPlayer/callPlayerSlice";
|
import { getOlderCalls, getNewerCalls } from "../features/calls/callsSlice";
|
||||||
import { getCalls, getOlderCalls, getNewerCalls, addCall } from "../features/calls/callsSlice";
|
|
||||||
import { useGetGroupsQuery, useGetTalkgroupsQuery } from '../features/api/apiSlice'
|
import { useGetGroupsQuery, useGetTalkgroupsQuery } from '../features/api/apiSlice'
|
||||||
import { useInView } from 'react-intersection-observer';
|
import { useInView } from 'react-intersection-observer';
|
||||||
import {
|
import {
|
||||||
Container,
|
Container,
|
||||||
Label,
|
|
||||||
Rail,
|
Rail,
|
||||||
Sticky,
|
Sticky,
|
||||||
Menu,
|
Menu,
|
||||||
@@ -46,31 +41,21 @@ function CallPlayer(props) {
|
|||||||
/* Optional options */
|
/* Optional options */
|
||||||
threshold: 0.5
|
threshold: 0.5
|
||||||
});
|
});
|
||||||
|
|
||||||
const { data: groupsData, isSuccess: isGroupsSuccess } = useGetGroupsQuery(shortName);
|
|
||||||
const { data: talkgroupsData, isSuccess: isTalkgroupsSuccess } = useGetTalkgroupsQuery(shortName);
|
const { data: talkgroupsData, isSuccess: isTalkgroupsSuccess } = useGetTalkgroupsQuery(shortName);
|
||||||
|
|
||||||
|
|
||||||
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 {callLink,callDownload,callTweet} = useCallLink(currentCall)
|
const {callLink,callDownload,callTweet} = useCallLink(currentCall)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
const positionRef = useRef(); // lets us get the Y Scroll offset for the Call List
|
const positionRef = useRef(); // lets us get the Y Scroll offset for the Call List
|
||||||
const shouldPlayAddCallRef = useRef(); // we need to do this to make the current value of isPlaying available in the socket message callback
|
const shouldPlayAddCallRef = useRef(); // we need to do this to make the current value of isPlaying available in the socket message callback
|
||||||
shouldPlayAddCallRef.current = (!isPlaying && autoPlay)?true:false;
|
shouldPlayAddCallRef.current = (!isPlaying && autoPlay)?true:false;
|
||||||
|
|
||||||
|
|
||||||
let currentCallId = false;
|
let currentCallId = false;
|
||||||
|
|
||||||
|
|
||||||
if (currentCall) {
|
if (currentCall) {
|
||||||
currentCallId = currentCall._id;
|
currentCallId = currentCall._id;
|
||||||
}
|
}
|
||||||
@@ -79,7 +64,6 @@ function CallPlayer(props) {
|
|||||||
setIsPlaying(playing);
|
setIsPlaying(playing);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const handleAutoPlay = (currentAutoPlay) => {
|
const handleAutoPlay = (currentAutoPlay) => {
|
||||||
setAutoPlay(!currentAutoPlay);
|
setAutoPlay(!currentAutoPlay);
|
||||||
}
|
}
|
||||||
@@ -89,7 +73,6 @@ function CallPlayer(props) {
|
|||||||
setIsPlaying(true);
|
setIsPlaying(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const callEnded = () => {
|
const callEnded = () => {
|
||||||
if (callsData) {
|
if (callsData) {
|
||||||
const currentIndex = callsData.ids.findIndex(callId => callId === currentCallId);
|
const currentIndex = callsData.ids.findIndex(callId => callId === currentCallId);
|
||||||
@@ -136,8 +119,6 @@ function CallPlayer(props) {
|
|||||||
}, [selectCallId, callsData])
|
}, [selectCallId, callsData])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div ref={positionRef}>
|
<div ref={positionRef}>
|
||||||
<Container className="main" >
|
<Container className="main" >
|
||||||
|
|||||||
@@ -1,17 +1,14 @@
|
|||||||
import React, { useEffect, useLayoutEffect, useState, useRef } from "react";
|
import React, { useEffect, useLayoutEffect, useState, useRef } from "react";
|
||||||
import { Link, useLocation, useParams, useNavigate } from 'react-router-dom';
|
import { Link, useLocation, useParams, useNavigate } from 'react-router-dom';
|
||||||
|
|
||||||
import FilterModal from "./components/FilterModal";
|
import FilterModal from "./components/FilterModal";
|
||||||
import GroupModal from "./components/GroupModal";
|
import GroupModal from "./components/GroupModal";
|
||||||
|
|
||||||
import CalendarModal from "./components/CalendarModal";
|
import CalendarModal from "./components/CalendarModal";
|
||||||
import CallPlayer from "./CallPlayer";
|
import CallPlayer from "./CallPlayer";
|
||||||
|
|
||||||
import { useSelector, useDispatch } from 'react-redux'
|
import { useSelector, useDispatch } from 'react-redux'
|
||||||
import { setLive, setFilter,setDateFilter } from "../features/callPlayer/callPlayerSlice";
|
import { setLive, setFilter,setDateFilter } from "../features/callPlayer/callPlayerSlice";
|
||||||
import { getCalls, getOlderCalls, getNewerCalls, addCall } from "../features/calls/callsSlice";
|
import { getCalls, addCall } from "../features/calls/callsSlice";
|
||||||
import { useGetGroupsQuery, useGetTalkgroupsQuery } from '../features/api/apiSlice'
|
import { useGetGroupsQuery, useGetTalkgroupsQuery } from '../features/api/apiSlice'
|
||||||
import { useInView } from 'react-intersection-observer';
|
|
||||||
import {
|
import {
|
||||||
Container,
|
Container,
|
||||||
Label,
|
Label,
|
||||||
@@ -38,8 +35,6 @@ function Calls(props) {
|
|||||||
|
|
||||||
const { data: groupsData, isSuccess: isGroupsSuccess } = useGetGroupsQuery(shortName);
|
const { data: groupsData, isSuccess: isGroupsSuccess } = useGetGroupsQuery(shortName);
|
||||||
const { loading: callsLoading, data: callsData } = useSelector((state) => state.calls);
|
const { loading: callsLoading, data: callsData } = useSelector((state) => state.calls);
|
||||||
const { data: talkgroupsData, isSuccess: isTalkgroupsSuccess } = useGetTalkgroupsQuery(shortName);
|
|
||||||
|
|
||||||
|
|
||||||
const [autoPlay, setAutoPlay] = useState(true);
|
const [autoPlay, setAutoPlay] = useState(true);
|
||||||
const [currentCall, setCurrentCall] = useState(false);
|
const [currentCall, setCurrentCall] = useState(false);
|
||||||
@@ -84,11 +79,7 @@ function Calls(props) {
|
|||||||
const handleFilterToggle = () => setFilterVisible(!filterVisible);
|
const handleFilterToggle = () => setFilterVisible(!filterVisible);
|
||||||
const handleCalendarToggle = () => setCalendarVisible(!calendarVisible);
|
const handleCalendarToggle = () => setCalendarVisible(!calendarVisible);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const getFilterDescription = () => {
|
const getFilterDescription = () => {
|
||||||
|
|
||||||
let filter = { type: 'all', code: "", filterStarred: false };
|
let filter = { type: 'all', code: "", filterStarred: false };
|
||||||
|
|
||||||
switch (filterType) {
|
switch (filterType) {
|
||||||
@@ -179,9 +170,7 @@ function Calls(props) {
|
|||||||
if (!live) {
|
if (!live) {
|
||||||
dispatch(setDateFilter(false));
|
dispatch(setDateFilter(false));
|
||||||
dispatch(setLive(true));
|
dispatch(setLive(true));
|
||||||
setCurrentCall(false);
|
|
||||||
dispatch(getCalls({}));
|
dispatch(getCalls({}));
|
||||||
|
|
||||||
startSocket();
|
startSocket();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -191,7 +180,6 @@ function Calls(props) {
|
|||||||
|
|
||||||
if (didUpdate) {
|
if (didUpdate) {
|
||||||
dispatch(setLive(false));
|
dispatch(setLive(false));
|
||||||
setCurrentCall(false);
|
|
||||||
stopSocket();
|
stopSocket();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -202,10 +190,6 @@ function Calls(props) {
|
|||||||
|
|
||||||
const handleFilterClose = (didUpdate) => {
|
const handleFilterClose = (didUpdate) => {
|
||||||
setFilterVisible(!filterVisible);
|
setFilterVisible(!filterVisible);
|
||||||
|
|
||||||
if (didUpdate) {
|
|
||||||
setCurrentCall(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -265,9 +249,6 @@ function Calls(props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setStateFromUri();
|
setStateFromUri();
|
||||||
return () => {
|
return () => {
|
||||||
@@ -335,8 +316,6 @@ function Calls(props) {
|
|||||||
archiveLabel = filterDateObj.toLocaleDateString() + " " + filterDateObj.toLocaleTimeString()
|
archiveLabel = filterDateObj.toLocaleDateString() + " " + filterDateObj.toLocaleTimeString()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const archive = process.env.REACT_APP_ARCHIVE_DAYS
|
const archive = process.env.REACT_APP_ARCHIVE_DAYS
|
||||||
|
|
||||||
let filterLabel = "All"
|
let filterLabel = "All"
|
||||||
@@ -396,9 +375,7 @@ function Calls(props) {
|
|||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
</Menu.Menu>
|
</Menu.Menu>
|
||||||
</Menu>
|
</Menu>
|
||||||
|
|
||||||
<CallPlayer callsData={callsData} selectCallId={selectCallId} />
|
<CallPlayer callsData={callsData} selectCallId={selectCallId} />
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user