thi-sjsu-project/theia
0
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

feat: video footage now properly syncs up with the history page.

Browse Source
This commit is contained in:
Perfect1076 2024-05-31 16:04:53 +02:00
parent 6830ac9ac5
commit 8b5c4b0b20
2 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/components/Element/Complex/MapThreatInfoElement.tsx
View File

@ -1,8 +1,10 @@
import { useEffect } from 'react';
import { useAppDispatch } from 'src/redux/hooks';
import { useAppDispatch, useAppSelector } from 'src/redux/hooks';
import { updateElement } from 'src/redux/slices/minimapSlice';
import type { InformationElement } from 'src/types/element';
import { capitalizeFirstLetter as cfl } from 'src/utils/helpers';
import {getElementsInGaze, getGazesAndKeys } from 'src/redux/slices/gazeSlice';
import { getCommunication, updateCommunication } from 'src/redux/slices/communicationSlice';
type Props = {
element: InformationElement;
@ -12,7 +14,9 @@ type Props = {
const M_HEIGHT = 60;
const MapThreatInfoElement = ({ element, inGaze }: Props) => {
const communications = useAppSelector(getCommunication);
const dispatch = useAppDispatch();
const gazesAndKeys = useAppSelector(getGazesAndKeys);
// could also fetch messages from redux
// provided there is a conversation number
const { title, message, collapsed, h, w, size, escalate, deescalate } =
@ -25,6 +29,27 @@ const MapThreatInfoElement = ({ element, inGaze }: Props) => {
target = 'missile';
}
useEffect(() => {
for(let gk of gazesAndKeys){
if(gk.keyPress === "1"){
if(element === undefined || gk.elemsInGaze[0] === undefined){
break;
}
if(element.id == gk.elemsInGaze[0].id && element.type == 'information'){
console.log(element);
dispatch(updateCommunication({
...communications,
//@ts-ignore
activeConversationId: element.message.conversationId,
}));
}
}
}
}, [gazesAndKeys]);
useEffect(() => {
// react to deescalation
if (deescalate) {

40
src/components/Widget/ListWidget.tsx
View File

@ -14,6 +14,7 @@ import {
} from 'src/redux/slices/conversationSlice';
import { getAllElements } from 'src/redux/slices/minimapSlice';
type ListWidgetProps = {
widget: Widget;
};
@ -81,26 +82,25 @@ const ListWidget = ({ widget }: ListWidgetProps) => {
useEffect(() => {
for(let gk of gazesAndKeys){
if(gk.keyPress === "1"){
for(let element of allElements){
if(element === undefined || gk.elemsInGaze[0] === undefined){
break;
}
if(element.id == gk.elemsInGaze[0].id && element.type == 'information'){
console.log(element);
dispatch(updateCommunication({
//@ts-ignore
activeConversationId: element.conversationId,
activeElementId: element.id
}));
}
}
}
}
}, [gazesAndKeys]);
// useEffect(() => {
// for(let gk of gazesAndKeys){
// if(gk.keyPress === "1"){
// for(let element of allElements){
// if(element === undefined || gk.elemsInGaze[0] === undefined){
// break;
// }
// if(element.id == gk.elemsInGaze[0].id && element.type == 'information'){
// console.log(element);
// dispatch(updateCommunication({
// //@ts-ignore
// activeConversationId: element.conversationId,
// activeElementId: element.id
// }));
// }
// }
// }
// }
// }, [gazesAndKeys]);
useEffect(() => {
// change selected element in list of arrow up or arrow down