From 1da5966f4442e4c33d13b127ad7cf532cb9bae95 Mon Sep 17 00:00:00 2001 From: Eddasol Date: Thu, 23 Nov 2023 09:46:53 +0100 Subject: [PATCH] Use labmda functions --- .../src/components/Alerts/AlertsBanner.tsx | 2 +- .../components/Alerts/FailedMissionAlert.tsx | 6 +++--- .../components/Alerts/FailedRequestAlert.tsx | 2 +- .../MissionButtons/MissionControlButtons.tsx | 6 +++--- .../MissionButtons/MissionRestartButton.tsx | 2 +- .../FailedMissionAlertDisplay.tsx | 6 +++--- .../MissionProgressDisplay.tsx | 2 +- .../MissionDisplays/MissionRobotDisplay.tsx | 2 +- .../MissionDisplays/MissionStatusDisplay.tsx | 4 ++-- .../Displays/RobotDisplays/RobotImage.tsx | 2 +- .../RobotDisplays/RobotStatusChip.tsx | 2 +- frontend/src/components/Header/Header.tsx | 2 +- .../components/Header/LanguageSelector.tsx | 2 +- .../AssetSelectionPage/AssetSelectionPage.tsx | 14 ++++++------- .../src/components/Pages/FlotillaSite.tsx | 2 +- .../components/Pages/FrontPage/FrontPage.tsx | 2 +- .../MissionOverview/MissionQueueCard.tsx | 6 +++--- .../MissionOverview/OngoingMissionView.tsx | 6 +++--- .../FrontPage/RobotCards/RobotStatusCard.tsx | 4 ++-- .../RobotCards/RobotStatusSection.tsx | 8 +++----- .../Pages/InspectionPage/DeckCards.tsx | 2 +- .../InspectionPage/InspectionOverview.tsx | 2 +- .../InspectionPage/InspectionSection.tsx | 2 +- .../Pages/InspectionPage/InspectionTable.tsx | 4 ++-- .../InspectionPage/InspectionUtilities.tsx | 2 +- .../MissionDefinitionHeader.tsx | 2 +- .../MissionDefinitionPage.tsx | 10 +++++----- .../MissionHistoryPage/FilterSection.tsx | 2 +- .../HistoricMissionCard.tsx | 4 ++-- .../MissionHistoryPage/MissionHistoryPage.tsx | 2 +- .../MissionHistoryPage/MissionHistoryView.tsx | 10 +++++----- .../MapPosition/MissionMapView.tsx | 4 ++-- .../MissionHeader/MissionHeader.tsx | 8 ++------ .../Pages/MissionPage/MissionPage.tsx | 2 +- .../Pages/MissionPage/StatusReason.tsx | 2 +- .../TaskOverview/TaskStatusDisplay.tsx | 2 +- .../MissionPage/TaskOverview/TaskTable.tsx | 2 +- .../VideoStream/FullScreenVideo.tsx | 2 +- .../VideoStream/VideoPlayerOvenPlayer.tsx | 2 +- .../VideoStream/VideoPlayerSimple.tsx | 2 +- .../VideoStream/VideoStreamCards.tsx | 2 +- .../VideoStream/VideoStreamWindow.tsx | 20 +++++++++---------- .../Pages/RobotPage/AreaMapView.tsx | 2 +- .../Pages/RobotPage/LocalizationSection.tsx | 2 +- .../Pages/RobotPage/RobotArmMovement.tsx | 2 +- .../components/Pages/RobotPage/RobotPage.tsx | 2 +- frontend/src/config.ts | 2 +- frontend/src/utils/BackButton.tsx | 2 +- frontend/src/utils/MapMarkers.tsx | 8 +++----- 49 files changed, 91 insertions(+), 101 deletions(-) diff --git a/frontend/src/components/Alerts/AlertsBanner.tsx b/frontend/src/components/Alerts/AlertsBanner.tsx index 6f5517b51..2acde9a34 100644 --- a/frontend/src/components/Alerts/AlertsBanner.tsx +++ b/frontend/src/components/Alerts/AlertsBanner.tsx @@ -26,7 +26,7 @@ interface AlertProps { dismissAlert: () => void } -export function AlertBanner({ children, dismissAlert }: AlertProps) { +export const AlertBanner = ({ children, dismissAlert }: AlertProps) => { return ( <> diff --git a/frontend/src/components/Alerts/FailedMissionAlert.tsx b/frontend/src/components/Alerts/FailedMissionAlert.tsx index c612d1ba3..a95223a87 100644 --- a/frontend/src/components/Alerts/FailedMissionAlert.tsx +++ b/frontend/src/components/Alerts/FailedMissionAlert.tsx @@ -20,7 +20,7 @@ interface MissionsProps { missions: Mission[] } -function FailedMission({ missions }: MissionsProps) { +const FailedMission = ({ missions }: MissionsProps) => { const mission = missions[0] const { TranslateText } = useLanguageContext() const navigate = useNavigate() @@ -37,7 +37,7 @@ function FailedMission({ missions }: MissionsProps) { ) } -function SeveralFailedMissions({ missions }: MissionsProps) { +const SeveralFailedMissions = ({ missions }: MissionsProps) => { const { TranslateText } = useLanguageContext() const navigate = useNavigate() const goToHistory = () => { @@ -53,7 +53,7 @@ function SeveralFailedMissions({ missions }: MissionsProps) { ) } -export function FailedMissionAlertContent({ missions }: MissionsProps) { +export const FailedMissionAlertContent = ({ missions }: MissionsProps) => { return ( diff --git a/frontend/src/components/Alerts/FailedRequestAlert.tsx b/frontend/src/components/Alerts/FailedRequestAlert.tsx index b98c39ee3..4551de6f8 100644 --- a/frontend/src/components/Alerts/FailedRequestAlert.tsx +++ b/frontend/src/components/Alerts/FailedRequestAlert.tsx @@ -18,7 +18,7 @@ const Indent = styled.div` padding: 0px 9px; ` -export function FailedRequestAlertContent({ message }: { message: string }) { +export const FailedRequestAlertContent = ({ message }: { message: string }) => { const { TranslateText } = useLanguageContext() return ( diff --git a/frontend/src/components/Displays/MissionButtons/MissionControlButtons.tsx b/frontend/src/components/Displays/MissionButtons/MissionControlButtons.tsx index c691609c1..af8750f52 100644 --- a/frontend/src/components/Displays/MissionButtons/MissionControlButtons.tsx +++ b/frontend/src/components/Displays/MissionButtons/MissionControlButtons.tsx @@ -24,7 +24,7 @@ const ButtonText = styled.div` align-items: center; ` -export function MissionControlButtons({ mission }: MissionProps) { +export const MissionControlButtons = ({ mission }: MissionProps) => { const { missionControlState } = useMissionControlContext() return ( @@ -41,7 +41,7 @@ export function MissionControlButtons({ mission }: MissionProps) { ) } -function OngoingMissionButton({ mission }: MissionProps) { +const OngoingMissionButton = ({ mission }: MissionProps) => { const { TranslateText } = useLanguageContext() const { updateMissionState } = useMissionControlContext() @@ -70,7 +70,7 @@ function OngoingMissionButton({ mission }: MissionProps) { ) } -function PausedMissionButton({ mission }: MissionProps) { +const PausedMissionButton = ({ mission }: MissionProps) => { const { TranslateText } = useLanguageContext() const { updateMissionState } = useMissionControlContext() diff --git a/frontend/src/components/Displays/MissionButtons/MissionRestartButton.tsx b/frontend/src/components/Displays/MissionButtons/MissionRestartButton.tsx index b10124b45..87b144127 100644 --- a/frontend/src/components/Displays/MissionButtons/MissionRestartButton.tsx +++ b/frontend/src/components/Displays/MissionButtons/MissionRestartButton.tsx @@ -25,7 +25,7 @@ export enum ReRunOptions { ReRunFailed, } -export function MissionRestartButton({ mission }: MissionProps) { +export const MissionRestartButton = ({ mission }: MissionProps) => { const { TranslateText } = useLanguageContext() const [isOpen, setIsOpen] = useState(false) const anchorRef = useRef(null) diff --git a/frontend/src/components/Displays/MissionDisplays/FailedMissionAlertDisplay.tsx b/frontend/src/components/Displays/MissionDisplays/FailedMissionAlertDisplay.tsx index 1a9074f71..76019107c 100644 --- a/frontend/src/components/Displays/MissionDisplays/FailedMissionAlertDisplay.tsx +++ b/frontend/src/components/Displays/MissionDisplays/FailedMissionAlertDisplay.tsx @@ -42,7 +42,7 @@ interface MissionsProps { missions: Mission[] } -function FailedMission({ mission }: MissionProps) { +const FailedMission = ({ mission }: MissionProps) => { const { TranslateText } = useLanguageContext() let navigate = useNavigate() const goToMission = () => { @@ -58,7 +58,7 @@ function FailedMission({ mission }: MissionProps) { ) } -function SeveralFailedMissions({ missions }: MissionsProps) { +const SeveralFailedMissions = ({ missions }: MissionsProps) => { const { TranslateText } = useLanguageContext() let navigate = useNavigate() const goToHistory = () => { @@ -74,7 +74,7 @@ function SeveralFailedMissions({ missions }: MissionsProps) { ) } -export function FailedMissionAlertDisplay() { +export const FailedMissionAlertDisplay = () => { const [recentFailedMissions, setRecentFailedMissions] = useState([]) const { registerEvent, connectionReady } = useSignalRContext() const { installationCode } = useInstallationContext() diff --git a/frontend/src/components/Displays/MissionDisplays/MissionProgressDisplay.tsx b/frontend/src/components/Displays/MissionDisplays/MissionProgressDisplay.tsx index 909c3f65b..cb5e9fdb0 100644 --- a/frontend/src/components/Displays/MissionDisplays/MissionProgressDisplay.tsx +++ b/frontend/src/components/Displays/MissionDisplays/MissionProgressDisplay.tsx @@ -15,7 +15,7 @@ interface MissionProps { mission: Mission } -export function MissionProgressDisplay({ mission }: MissionProps) { +export const MissionProgressDisplay = ({ mission }: MissionProps) => { const { TranslateText } = useLanguageContext() const [completedTasks, setCompletedTasks] = useState(0) diff --git a/frontend/src/components/Displays/MissionDisplays/MissionRobotDisplay.tsx b/frontend/src/components/Displays/MissionDisplays/MissionRobotDisplay.tsx index 4733b8982..0f686fe82 100644 --- a/frontend/src/components/Displays/MissionDisplays/MissionRobotDisplay.tsx +++ b/frontend/src/components/Displays/MissionDisplays/MissionRobotDisplay.tsx @@ -14,7 +14,7 @@ interface MissionProps { mission: Mission } -export function MissionRobotDisplay({ mission }: MissionProps) { +export const MissionRobotDisplay = ({ mission }: MissionProps) => { const { TranslateText } = useLanguageContext() return ( diff --git a/frontend/src/components/Displays/MissionDisplays/MissionStatusDisplay.tsx b/frontend/src/components/Displays/MissionDisplays/MissionStatusDisplay.tsx index 66ee6dfcf..1e0c0dd21 100644 --- a/frontend/src/components/Displays/MissionDisplays/MissionStatusDisplay.tsx +++ b/frontend/src/components/Displays/MissionDisplays/MissionStatusDisplay.tsx @@ -42,7 +42,7 @@ export const MissionStatusIcon = ({ status }: StatusProps) => { return } -export function MissionStatusDisplay({ status }: StatusProps) { +export const MissionStatusDisplay = ({ status }: StatusProps) => { const { TranslateText } = useLanguageContext() return ( @@ -52,7 +52,7 @@ export function MissionStatusDisplay({ status }: StatusProps) { ) } -export function MissionStatusDisplayWithHeader({ status }: StatusProps) { +export const MissionStatusDisplayWithHeader = ({ status }: StatusProps) => { const { TranslateText } = useLanguageContext() return ( diff --git a/frontend/src/components/Displays/RobotDisplays/RobotImage.tsx b/frontend/src/components/Displays/RobotDisplays/RobotImage.tsx index ee6d2acde..e0b40a72e 100644 --- a/frontend/src/components/Displays/RobotDisplays/RobotImage.tsx +++ b/frontend/src/components/Displays/RobotDisplays/RobotImage.tsx @@ -26,7 +26,7 @@ const StyledIcon = styled(Icon)` color: #6f6f6f; ` -export function RobotImage({ robotType, height = '200px' }: TypeProps) { +export const RobotImage = ({ robotType, height = '200px' }: TypeProps) => { var robotImage switch (robotType) { case RobotType.TaurobInspector: { diff --git a/frontend/src/components/Displays/RobotDisplays/RobotStatusChip.tsx b/frontend/src/components/Displays/RobotDisplays/RobotStatusChip.tsx index c9cf3543b..58e1cdfc9 100644 --- a/frontend/src/components/Displays/RobotDisplays/RobotStatusChip.tsx +++ b/frontend/src/components/Displays/RobotDisplays/RobotStatusChip.tsx @@ -16,7 +16,7 @@ enum StatusColors { SafeZone = '#FF0000', } -export function RobotStatusChip({ status }: StatusProps) { +export const RobotStatusChip = ({ status }: StatusProps) => { const { TranslateText } = useLanguageContext() const { safeZoneStatus } = useSafeZoneContext() diff --git a/frontend/src/components/Header/Header.tsx b/frontend/src/components/Header/Header.tsx index f0b18c1db..cdb80b865 100644 --- a/frontend/src/components/Header/Header.tsx +++ b/frontend/src/components/Header/Header.tsx @@ -37,7 +37,7 @@ const StyledAlertList = styled.div` gap: 0.5rem; ` -export function Header({ page }: { page: string }) { +export const Header = ({ page }: { page: string }) => { const { alerts } = useAlertContext() const { installationName } = useInstallationContext() return ( diff --git a/frontend/src/components/Header/LanguageSelector.tsx b/frontend/src/components/Header/LanguageSelector.tsx index 48bbb1e2b..c59f7f5bc 100644 --- a/frontend/src/components/Header/LanguageSelector.tsx +++ b/frontend/src/components/Header/LanguageSelector.tsx @@ -38,7 +38,7 @@ const VerticalBar = styled(Divider)` margin: 13px 3px 1px 3px; ` -export function SelectLanguage() { +export const SelectLanguage = () => { const { language, switchLanguage } = useLanguageContext() const handleLanguageChange = (selectedLanguage: string) => { switchLanguage(selectedLanguage) diff --git a/frontend/src/components/Pages/AssetSelectionPage/AssetSelectionPage.tsx b/frontend/src/components/Pages/AssetSelectionPage/AssetSelectionPage.tsx index 0b379ffc1..31a4921c9 100644 --- a/frontend/src/components/Pages/AssetSelectionPage/AssetSelectionPage.tsx +++ b/frontend/src/components/Pages/AssetSelectionPage/AssetSelectionPage.tsx @@ -17,12 +17,6 @@ const Centered = styled.div` flex-direction: column; align-items: center; ` - -function handleLogin(instance: IPublicClientApplication) { - instance.loginRedirect(loginRequest).catch((e) => { - console.error(e) - }) -} const StyledTopBarContent = styled(TopBar.CustomContent)` display: grid; grid-template-columns: minmax(50px, 265px) auto; @@ -45,6 +39,12 @@ const RowContainer = styled.div` margin-top: 50px; ` +const handleLogin = (instance: IPublicClientApplication) => { + instance.loginRedirect(loginRequest).catch((e) => { + console.error(e) + }) +} + export const AssetSelectionPage = () => { const isAuthenticated = useIsAuthenticated() const { instance } = useMsal() @@ -81,7 +81,7 @@ export const AssetSelectionPage = () => { ) } -function InstallationPicker() { +const InstallationPicker = () => { const { installationName, switchInstallation } = useInstallationContext() const { TranslateText } = useLanguageContext() const [allPlantsMap, setAllPlantsMap] = useState>(new Map()) diff --git a/frontend/src/components/Pages/FlotillaSite.tsx b/frontend/src/components/Pages/FlotillaSite.tsx index 431d8fda5..26aa46be0 100644 --- a/frontend/src/components/Pages/FlotillaSite.tsx +++ b/frontend/src/components/Pages/FlotillaSite.tsx @@ -13,7 +13,7 @@ import { SignalRProvider } from 'components/Contexts/SignalRContext' import { MissionsProvider } from 'components/Contexts/MissionListsContext' import { RobotProvider } from 'components/Contexts/RobotContext' -export function FlotillaSite() { +export const FlotillaSite = () => { return ( <> diff --git a/frontend/src/components/Pages/FrontPage/FrontPage.tsx b/frontend/src/components/Pages/FrontPage/FrontPage.tsx index 237a608ef..8d8baedf7 100644 --- a/frontend/src/components/Pages/FrontPage/FrontPage.tsx +++ b/frontend/src/components/Pages/FrontPage/FrontPage.tsx @@ -27,7 +27,7 @@ const MissionsContent = styled.div` gap: 2rem; ` -export function FrontPage() { +export const FrontPage = () => { return ( <>
diff --git a/frontend/src/components/Pages/FrontPage/MissionOverview/MissionQueueCard.tsx b/frontend/src/components/Pages/FrontPage/MissionOverview/MissionQueueCard.tsx index 89b8bc3f0..1ba3aacfe 100644 --- a/frontend/src/components/Pages/FrontPage/MissionOverview/MissionQueueCard.tsx +++ b/frontend/src/components/Pages/FrontPage/MissionOverview/MissionQueueCard.tsx @@ -124,12 +124,12 @@ export const MissionQueueCard = ({ order, mission, onDeleteMission }: MissionQue ) } -function RemoveMissionDialog({ +const RemoveMissionDialog = ({ confirmDeleteDialogOpen, mission, setConfirmDeleteDialogOpen, onDeleteMission, -}: RemoveMissionDialogProps) { +}: RemoveMissionDialogProps) => { const { TranslateText } = useLanguageContext() return ( @@ -167,7 +167,7 @@ function RemoveMissionDialog({ ) } -function MissionDurationDisplay({ mission }: MissionDisplayProps) { +const MissionDurationDisplay = ({ mission }: MissionDisplayProps) => { const { TranslateText } = useLanguageContext() const translateEstimatedDuration = TranslateText('Estimated duration') const translateH = TranslateText('h') diff --git a/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionView.tsx b/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionView.tsx index 11989b217..7401fe6b0 100644 --- a/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionView.tsx +++ b/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionView.tsx @@ -52,9 +52,9 @@ export const OngoingMissionView = (): JSX.Element => { ) }, [ongoingMissions, installationCode]) - const ongoingMissionCards = ongingMissionsToDisplay.map(function (mission, index) { - return - }) + const ongoingMissionCards = ongingMissionsToDisplay.map((mission, index) => ( + + )) return ( diff --git a/frontend/src/components/Pages/FrontPage/RobotCards/RobotStatusCard.tsx b/frontend/src/components/Pages/FrontPage/RobotCards/RobotStatusCard.tsx index e13cd210d..9454c5503 100644 --- a/frontend/src/components/Pages/FrontPage/RobotCards/RobotStatusCard.tsx +++ b/frontend/src/components/Pages/FrontPage/RobotCards/RobotStatusCard.tsx @@ -47,7 +47,7 @@ const StyledPadding = styled.div` padding: 8px; ` -export function RobotStatusCard({ robot }: RobotProps) { +export const RobotStatusCard = ({ robot }: RobotProps) => { let navigate = useNavigate() const goToRobot = () => { const path = `${config.FRONTEND_BASE_ROUTE}/robot/${robot.id}` @@ -83,7 +83,7 @@ export function RobotStatusCard({ robot }: RobotProps) { ) } -export function RobotStatusCardPlaceholder() { +export const RobotStatusCardPlaceholder = () => { const { TranslateText } = useLanguageContext() return ( diff --git a/frontend/src/components/Pages/FrontPage/RobotCards/RobotStatusSection.tsx b/frontend/src/components/Pages/FrontPage/RobotCards/RobotStatusSection.tsx index 97ef735a7..0b2737eb5 100644 --- a/frontend/src/components/Pages/FrontPage/RobotCards/RobotStatusSection.tsx +++ b/frontend/src/components/Pages/FrontPage/RobotCards/RobotStatusSection.tsx @@ -19,7 +19,7 @@ const RobotView = styled.div` gap: 1rem; ` -export function RobotStatusSection() { +export const RobotStatusSection = () => { const { TranslateText } = useLanguageContext() const { installationCode } = useInstallationContext() const { enabledRobots } = useRobotContext() @@ -34,7 +34,7 @@ export function RobotStatusSection() { return sortedRobots } const relevantRobots = sortRobotsByStatus( - enabledRobots.filter(function (robot) { + enabledRobots.filter((robot) => { return robot.currentInstallation.toLocaleLowerCase() === installationCode.toLocaleLowerCase() }) ) @@ -51,9 +51,7 @@ export function RobotStatusSection() { }, [enabledRobots, installationCode, switchSafeZoneStatus]) const getRobotDisplay = () => { - return robots.map(function (robot) { - return - }) + return robots.map((robot) => ) } return ( diff --git a/frontend/src/components/Pages/InspectionPage/DeckCards.tsx b/frontend/src/components/Pages/InspectionPage/DeckCards.tsx index 618af6feb..bd179e57f 100644 --- a/frontend/src/components/Pages/InspectionPage/DeckCards.tsx +++ b/frontend/src/components/Pages/InspectionPage/DeckCards.tsx @@ -98,7 +98,7 @@ const DeckCard = ({ deckData, deckName, setSelectedDeck, selectedDeck, handleSch ) } -export function DeckCards({ deckMissions, setSelectedDeck, selectedDeck, handleScheduleAll }: IDeckCardProps) { +export const DeckCards = ({ deckMissions, setSelectedDeck, selectedDeck, handleScheduleAll }: IDeckCardProps) => { const { TranslateText } = useLanguageContext() return ( diff --git a/frontend/src/components/Pages/InspectionPage/InspectionOverview.tsx b/frontend/src/components/Pages/InspectionPage/InspectionOverview.tsx index 9d5968842..aceb668c6 100644 --- a/frontend/src/components/Pages/InspectionPage/InspectionOverview.tsx +++ b/frontend/src/components/Pages/InspectionPage/InspectionOverview.tsx @@ -30,7 +30,7 @@ const StyledView = styled.div` align-items: flex-start; ` -export function InspectionOverviewSection() { +export const InspectionOverviewSection = () => { const { TranslateText } = useLanguageContext() const [activeTab, setActiveTab] = useState(0) const [allMissions, setAllMissions] = useState() diff --git a/frontend/src/components/Pages/InspectionPage/InspectionSection.tsx b/frontend/src/components/Pages/InspectionPage/InspectionSection.tsx index b0d21c7f1..2067c8e18 100644 --- a/frontend/src/components/Pages/InspectionPage/InspectionSection.tsx +++ b/frontend/src/components/Pages/InspectionPage/InspectionSection.tsx @@ -34,7 +34,7 @@ export interface DeckMissionCount { } } -export function InspectionSection() { +export const InspectionSection = () => { const { installationCode } = useInstallationContext() const [deckMissions, setDeckMissions] = useState({}) const [selectedDeck, setSelectedDeck] = useState() diff --git a/frontend/src/components/Pages/InspectionPage/InspectionTable.tsx b/frontend/src/components/Pages/InspectionPage/InspectionTable.tsx index 2db5e00a9..a91a5878a 100644 --- a/frontend/src/components/Pages/InspectionPage/InspectionTable.tsx +++ b/frontend/src/components/Pages/InspectionPage/InspectionTable.tsx @@ -193,7 +193,7 @@ const InspectionRow = ({ inspection, openDialog, setMissions, openScheduledDialo const columns = ['Status', 'Name', 'Description', 'Area', 'Last completed', 'Deadline', 'Add to queue'] -export function InspectionTable({ deck, inspections, openDialog, setSelectedMissions }: IProps) { +export const InspectionTable = ({ deck, inspections, openDialog, setSelectedMissions }: IProps) => { const { TranslateText } = useLanguageContext() const navigate = useNavigate() const [isScheduledDialogOpen, setIsScheduledDialogOpen] = useState(false) @@ -245,7 +245,7 @@ export function InspectionTable({ deck, inspections, openDialog, setSelectedMiss ) } -export function AllInspectionsTable({ inspections }: ITableProps) { +export const AllInspectionsTable = ({ inspections }: ITableProps) => { const { TranslateText } = useLanguageContext() const { ongoingMissions, missionQueue } = useMissionsContext() const [selectedMissions, setSelectedMissions] = useState() diff --git a/frontend/src/components/Pages/InspectionPage/InspectionUtilities.tsx b/frontend/src/components/Pages/InspectionPage/InspectionUtilities.tsx index e8dea0694..0cde56f98 100644 --- a/frontend/src/components/Pages/InspectionPage/InspectionUtilities.tsx +++ b/frontend/src/components/Pages/InspectionPage/InspectionUtilities.tsx @@ -137,7 +137,7 @@ interface ICardMissionInformationProps { inspections: Inspection[] } -export function CardMissionInformation({ deckName, inspections }: ICardMissionInformationProps) { +export const CardMissionInformation = ({ deckName, inspections }: ICardMissionInformationProps) => { const { TranslateText } = useLanguageContext() var colorsCount: DeckMissionCount = { diff --git a/frontend/src/components/Pages/MissionDefinitionPage/MissionDefinitionHeader/MissionDefinitionHeader.tsx b/frontend/src/components/Pages/MissionDefinitionPage/MissionDefinitionHeader/MissionDefinitionHeader.tsx index 2cc985ea3..b5e42d3b9 100644 --- a/frontend/src/components/Pages/MissionDefinitionPage/MissionDefinitionHeader/MissionDefinitionHeader.tsx +++ b/frontend/src/components/Pages/MissionDefinitionPage/MissionDefinitionHeader/MissionDefinitionHeader.tsx @@ -5,7 +5,7 @@ interface MissionDefinitionHeaderProps { missionDefinition: CondensedMissionDefinition } -export function MissionDefinitionHeader({ missionDefinition }: MissionDefinitionHeaderProps) { +export const MissionDefinitionHeader = ({ missionDefinition }: MissionDefinitionHeaderProps) => { return ( diff --git a/frontend/src/components/Pages/MissionDefinitionPage/MissionDefinitionPage.tsx b/frontend/src/components/Pages/MissionDefinitionPage/MissionDefinitionPage.tsx index 6e0f6c86a..df9dd7b46 100644 --- a/frontend/src/components/Pages/MissionDefinitionPage/MissionDefinitionPage.tsx +++ b/frontend/src/components/Pages/MissionDefinitionPage/MissionDefinitionPage.tsx @@ -14,7 +14,7 @@ import { Icons } from 'utils/icons' import { tokens } from '@equinor/eds-tokens' import { StyledDict } from './MissionDefinitionStyledComponents' -function MetadataItem({ title, content, onEdit }: { title: string; content: any; onEdit?: () => void }) { +const MetadataItem = ({ title, content, onEdit }: { title: string; content: any; onEdit?: () => void }) => { return ( @@ -45,7 +45,7 @@ interface IMissionDefinitionPageBodyProps { updateMissionDefinition: (missionDefinition: CondensedMissionDefinition) => void } -function MissionDefinitionPageBody({ missionDefinition, updateMissionDefinition }: IMissionDefinitionPageBodyProps) { +const MissionDefinitionPageBody = ({ missionDefinition, updateMissionDefinition }: IMissionDefinitionPageBodyProps) => { const { TranslateText } = useLanguageContext() const [isEditDialogOpen, setIsEditDialogOpen] = useState(false) const [selectedField, setSelectedField] = useState('') @@ -132,12 +132,12 @@ interface IMissionDefinitionEditDialogProps { updateMissionDefinition: (missionDefinition: CondensedMissionDefinition) => void } -function MissionDefinitionEditDialog({ +const MissionDefinitionEditDialog = ({ missionDefinition, updateMissionDefinition, fieldName, closeEditDialog, -}: IMissionDefinitionEditDialogProps) { +}: IMissionDefinitionEditDialogProps) => { const defaultMissionDefinitionForm: MissionDefinitionUpdateForm = { comment: missionDefinition.comment, inspectionFrequency: missionDefinition.inspectionFrequency, @@ -249,7 +249,7 @@ function MissionDefinitionEditDialog({ ) } -export function MissionDefinitionPage() { +export const MissionDefinitionPage = () => { const { missionId } = useParams() const { registerEvent, connectionReady } = useSignalRContext() const [selectedMissionDefinition, setSelectedMissionDefinition] = useState() diff --git a/frontend/src/components/Pages/MissionHistoryPage/FilterSection.tsx b/frontend/src/components/Pages/MissionHistoryPage/FilterSection.tsx index ef1006ce6..1107696dd 100644 --- a/frontend/src/components/Pages/MissionHistoryPage/FilterSection.tsx +++ b/frontend/src/components/Pages/MissionHistoryPage/FilterSection.tsx @@ -35,7 +35,7 @@ const StyledDialog = styled(Card)` right: 175px; ` -export function FilterSection() { +export const FilterSection = () => { const { TranslateText } = useLanguageContext() const { filterFunctions, filterState } = useMissionFilterContext() const [isFilteringDialogOpen, setIsFilteringDialogOpen] = useState(false) diff --git a/frontend/src/components/Pages/MissionHistoryPage/HistoricMissionCard.tsx b/frontend/src/components/Pages/MissionHistoryPage/HistoricMissionCard.tsx index 659954972..7e908e5c1 100644 --- a/frontend/src/components/Pages/MissionHistoryPage/HistoricMissionCard.tsx +++ b/frontend/src/components/Pages/MissionHistoryPage/HistoricMissionCard.tsx @@ -14,7 +14,7 @@ interface MissionProps { mission: Mission } -function MissionEndTimeDisplay({ mission }: MissionProps) { +const MissionEndTimeDisplay = ({ mission }: MissionProps) => { return ( <> {mission.endTime ? ( @@ -26,7 +26,7 @@ function MissionEndTimeDisplay({ mission }: MissionProps) { ) } -export function HistoricMissionCard({ index, mission }: IndexedMissionProps) { +export const HistoricMissionCard = ({ index, mission }: IndexedMissionProps) => { let navigate = useNavigate() const routeChange = () => { const path = `${config.FRONTEND_BASE_ROUTE}/mission/${mission.id}` diff --git a/frontend/src/components/Pages/MissionHistoryPage/MissionHistoryPage.tsx b/frontend/src/components/Pages/MissionHistoryPage/MissionHistoryPage.tsx index a8e759faf..41ddbd600 100644 --- a/frontend/src/components/Pages/MissionHistoryPage/MissionHistoryPage.tsx +++ b/frontend/src/components/Pages/MissionHistoryPage/MissionHistoryPage.tsx @@ -16,7 +16,7 @@ export type RefreshProps = { refreshInterval: number } -export function MissionHistoryPage() { +export const MissionHistoryPage = () => { const refreshInterval = 1000 return ( diff --git a/frontend/src/components/Pages/MissionHistoryPage/MissionHistoryView.tsx b/frontend/src/components/Pages/MissionHistoryPage/MissionHistoryView.tsx index 72408b100..ff1ea0594 100644 --- a/frontend/src/components/Pages/MissionHistoryPage/MissionHistoryView.tsx +++ b/frontend/src/components/Pages/MissionHistoryPage/MissionHistoryView.tsx @@ -37,7 +37,7 @@ const ActiveFilterList = styled.div` min-height: 24px; ` -function flatten(filters: IFilterState) { +const flatten = (filters: IFilterState) => { const allFilters = [] for (const [filterName, filterValue] of Object.entries(filters)) { allFilters.push({ name: filterName, value: filterValue }) @@ -45,7 +45,7 @@ function flatten(filters: IFilterState) { return allFilters } -export function MissionHistoryView({ refreshInterval }: RefreshProps) { +export const MissionHistoryView = ({ refreshInterval }: RefreshProps) => { const { TranslateText } = useLanguageContext() const { page, switchPage, filterState, filterIsSet, filterFunctions, filterError, clearFilterError } = useMissionFilterContext() @@ -132,9 +132,9 @@ export function MissionHistoryView({ refreshInterval }: RefreshProps) { return () => clearInterval(id) }, [refreshInterval, updateFilteredMissions, page]) - const missionsDisplay = filteredMissions.map(function (mission, index) { - return - }) + const missionsDisplay = filteredMissions.map((mission, index) => ( + + )) const PaginationComponent = () => { return ( diff --git a/frontend/src/components/Pages/MissionPage/MapPosition/MissionMapView.tsx b/frontend/src/components/Pages/MissionPage/MapPosition/MissionMapView.tsx index 225e9c74e..0026aaf51 100644 --- a/frontend/src/components/Pages/MissionPage/MapPosition/MissionMapView.tsx +++ b/frontend/src/components/Pages/MissionPage/MapPosition/MissionMapView.tsx @@ -38,7 +38,7 @@ const SyledContainer = styled.div` max-width: 100%; ` -export function MissionMapView({ mission }: MissionProps) { +export const MissionMapView = ({ mission }: MissionProps) => { const [mapCanvas, setMapCanvas] = useState(document.createElement('canvas')) const [mapImage, setMapImage] = useState(document.createElement('img')) const [mapContext, setMapContext] = useState() @@ -67,7 +67,7 @@ export function MissionMapView({ mission }: MissionProps) { } const findCurrentTaskOrder = useCallback(() => { - mission.tasks.forEach(function (task) { + mission.tasks.forEach((task) => { if (task.status === TaskStatus.InProgress || task.status === TaskStatus.Paused) { setCurrentTaskOrder(task.taskOrder) } diff --git a/frontend/src/components/Pages/MissionPage/MissionHeader/MissionHeader.tsx b/frontend/src/components/Pages/MissionPage/MissionHeader/MissionHeader.tsx index ffd64736c..5399deecc 100644 --- a/frontend/src/components/Pages/MissionPage/MissionHeader/MissionHeader.tsx +++ b/frontend/src/components/Pages/MissionPage/MissionHeader/MissionHeader.tsx @@ -37,7 +37,7 @@ const InfoSection = styled.div` gap: 1.2rem; ` -function HeaderText(text: string) { +const HeaderText = (text: string) => { return ( {text} @@ -93,11 +93,7 @@ const startUsedAndRemainingTime = ( return { startTime, startDate, usedTime, remainingTime } } -interface MissionHeaderProps { - mission: Mission -} - -export function MissionHeader({ mission }: MissionHeaderProps) { +export const MissionHeader = ({ mission }: { mission: Mission }) => { const { TranslateText } = useLanguageContext() const barToMillibar = 1000 const isMissionCompleted = mission.endTime ? true : false diff --git a/frontend/src/components/Pages/MissionPage/MissionPage.tsx b/frontend/src/components/Pages/MissionPage/MissionPage.tsx index fc5574bbe..ad263c9ce 100644 --- a/frontend/src/components/Pages/MissionPage/MissionPage.tsx +++ b/frontend/src/components/Pages/MissionPage/MissionPage.tsx @@ -33,7 +33,7 @@ const VideoStreamSection = styled.div` gap: 1rem; ` -export function MissionPage() { +export const MissionPage = () => { const { missionId } = useParams() const [videoStreams, setVideoStreams] = useState([]) const [selectedMission, setSelectedMission] = useState() diff --git a/frontend/src/components/Pages/MissionPage/StatusReason.tsx b/frontend/src/components/Pages/MissionPage/StatusReason.tsx index 3ffe361a1..57d3e826b 100644 --- a/frontend/src/components/Pages/MissionPage/StatusReason.tsx +++ b/frontend/src/components/Pages/MissionPage/StatusReason.tsx @@ -13,7 +13,7 @@ interface MissionProps { mission: Mission } -export function StatusReason({ mission }: MissionProps) { +export const StatusReason = ({ mission }: MissionProps) => { if (!mission.statusReason) return <> var warningLevel: 'default' | 'info' | 'warning' | 'danger' = 'info' diff --git a/frontend/src/components/Pages/MissionPage/TaskOverview/TaskStatusDisplay.tsx b/frontend/src/components/Pages/MissionPage/TaskOverview/TaskStatusDisplay.tsx index 7a5a1874b..9264d4bcf 100644 --- a/frontend/src/components/Pages/MissionPage/TaskOverview/TaskStatusDisplay.tsx +++ b/frontend/src/components/Pages/MissionPage/TaskOverview/TaskStatusDisplay.tsx @@ -36,7 +36,7 @@ const TaskStatusIcon = ({ status }: StatusProps) => { return } -export function TaskStatusDisplay({ status }: StatusProps) { +export const TaskStatusDisplay = ({ status }: StatusProps) => { const { TranslateText } = useLanguageContext() return ( diff --git a/frontend/src/components/Pages/MissionPage/TaskOverview/TaskTable.tsx b/frontend/src/components/Pages/MissionPage/TaskOverview/TaskTable.tsx index fe15f4e77..324efcab0 100644 --- a/frontend/src/components/Pages/MissionPage/TaskOverview/TaskTable.tsx +++ b/frontend/src/components/Pages/MissionPage/TaskOverview/TaskTable.tsx @@ -16,7 +16,7 @@ interface MissionProps { mission?: Mission } -export function TaskTable({ mission }: MissionProps) { +export const TaskTable = ({ mission }: MissionProps) => { const { TranslateText } = useLanguageContext() const rows = mission && mission.tasks.length > 0 ? RenderTasks(mission.tasks) : <> return ( diff --git a/frontend/src/components/Pages/MissionPage/VideoStream/FullScreenVideo.tsx b/frontend/src/components/Pages/MissionPage/VideoStream/FullScreenVideo.tsx index a3e1a68a1..bda3442ec 100644 --- a/frontend/src/components/Pages/MissionPage/VideoStream/FullScreenVideo.tsx +++ b/frontend/src/components/Pages/MissionPage/VideoStream/FullScreenVideo.tsx @@ -47,7 +47,7 @@ interface IFullScreenVideoStreamCardProps { toggleFullScreenMode: VoidFunction } -export function FullScreenVideoStreamCard({ videoStream, toggleFullScreenMode }: IFullScreenVideoStreamCardProps) { +export const FullScreenVideoStreamCard = ({ videoStream, toggleFullScreenMode }: IFullScreenVideoStreamCardProps) => { const cardWidth = () => { const availableInnerHeight = window.innerHeight - 9 * 16 const availableInnerWidth = window.innerWidth - 2 * 16 diff --git a/frontend/src/components/Pages/MissionPage/VideoStream/VideoPlayerOvenPlayer.tsx b/frontend/src/components/Pages/MissionPage/VideoStream/VideoPlayerOvenPlayer.tsx index 69540c0e5..9c5fccb18 100644 --- a/frontend/src/components/Pages/MissionPage/VideoStream/VideoPlayerOvenPlayer.tsx +++ b/frontend/src/components/Pages/MissionPage/VideoStream/VideoPlayerOvenPlayer.tsx @@ -11,7 +11,7 @@ interface IVideoPlayerProps { } // TODO: Video player is not used at the moment, commented out for now -export function VideoPlayerOvenPlayer({ videoStream }: IVideoPlayerProps) { +export const VideoPlayerOvenPlayer = ({ videoStream }: IVideoPlayerProps) => { useEffect(() => { // const aspectRatio = videoStream.shouldRotate270Clockwise ? '9:16' : '16:9' switch (videoStream.type) { diff --git a/frontend/src/components/Pages/MissionPage/VideoStream/VideoPlayerSimple.tsx b/frontend/src/components/Pages/MissionPage/VideoStream/VideoPlayerSimple.tsx index 8fb9d3bd5..8da14bfdb 100644 --- a/frontend/src/components/Pages/MissionPage/VideoStream/VideoPlayerSimple.tsx +++ b/frontend/src/components/Pages/MissionPage/VideoStream/VideoPlayerSimple.tsx @@ -4,6 +4,6 @@ interface IVideoPlayerProps { videoStream: VideoStream } -export function VideoPlayerSimple({ videoStream }: IVideoPlayerProps) { +export const VideoPlayerSimple = ({ videoStream }: IVideoPlayerProps) => { return {videoStream.name } diff --git a/frontend/src/components/Pages/MissionPage/VideoStream/VideoStreamCards.tsx b/frontend/src/components/Pages/MissionPage/VideoStream/VideoStreamCards.tsx index edd149567..02d9d7d79 100644 --- a/frontend/src/components/Pages/MissionPage/VideoStream/VideoStreamCards.tsx +++ b/frontend/src/components/Pages/MissionPage/VideoStream/VideoStreamCards.tsx @@ -43,7 +43,7 @@ interface IVideoStreamCardProps { setFullScreenStream: Function } -export function VideoStreamCard({ videoStream, toggleFullScreenMode, setFullScreenStream }: IVideoStreamCardProps) { +export const VideoStreamCard = ({ videoStream, toggleFullScreenMode, setFullScreenStream }: IVideoStreamCardProps) => { const turnOnFullScreen = () => { setFullScreenStream(videoStream) toggleFullScreenMode() diff --git a/frontend/src/components/Pages/MissionPage/VideoStream/VideoStreamWindow.tsx b/frontend/src/components/Pages/MissionPage/VideoStream/VideoStreamWindow.tsx index 4776edeaf..aa7a5c96e 100644 --- a/frontend/src/components/Pages/MissionPage/VideoStream/VideoStreamWindow.tsx +++ b/frontend/src/components/Pages/MissionPage/VideoStream/VideoStreamWindow.tsx @@ -27,7 +27,7 @@ interface VideoStreamWindowProps { videoStreams: VideoStream[] } -export function VideoStreamWindow({ videoStreams }: VideoStreamWindowProps) { +export const VideoStreamWindow = ({ videoStreams }: VideoStreamWindowProps) => { const { TranslateText } = useLanguageContext() const [fullScreenMode, setFullScreenMode] = useState(false) const [fullScreenStream, setFullScreenStream] = useState() @@ -40,16 +40,14 @@ export function VideoStreamWindow({ videoStreams }: VideoStreamWindowProps) { toggleFullScreenMode() } - const videoCards = videoStreams.map(function (videoStream, index) { - return ( - - ) - }) + const videoCards = videoStreams.map((videoStream, index) => ( + + )) const videoStream = fullScreenStream return ( diff --git a/frontend/src/components/Pages/RobotPage/AreaMapView.tsx b/frontend/src/components/Pages/RobotPage/AreaMapView.tsx index c5feb9cc3..51c9fe845 100644 --- a/frontend/src/components/Pages/RobotPage/AreaMapView.tsx +++ b/frontend/src/components/Pages/RobotPage/AreaMapView.tsx @@ -43,7 +43,7 @@ const StyledMapCompass = styled.div` align-items: end; ` -export function AreaMapView({ area, localizationPose, setLocalizationPose }: AreaProps) { +export const AreaMapView = ({ area, localizationPose, setLocalizationPose }: AreaProps) => { const { TranslateText } = useLanguageContext() const [mapCanvas, setMapCanvas] = useState(document.createElement('canvas')) const [mapImage, setMapImage] = useState(document.createElement('img')) diff --git a/frontend/src/components/Pages/RobotPage/LocalizationSection.tsx b/frontend/src/components/Pages/RobotPage/LocalizationSection.tsx index 6aec22ebb..519dd369b 100644 --- a/frontend/src/components/Pages/RobotPage/LocalizationSection.tsx +++ b/frontend/src/components/Pages/RobotPage/LocalizationSection.tsx @@ -7,7 +7,7 @@ interface RobotProps { robot: Robot } -export function LocalizationSection({ robot }: RobotProps) { +export const LocalizationSection = ({ robot }: RobotProps) => { const { TranslateText } = useLanguageContext() return ( <> diff --git a/frontend/src/components/Pages/RobotPage/RobotArmMovement.tsx b/frontend/src/components/Pages/RobotPage/RobotArmMovement.tsx index 02c7fdcf6..8437ece58 100644 --- a/frontend/src/components/Pages/RobotPage/RobotArmMovement.tsx +++ b/frontend/src/components/Pages/RobotPage/RobotArmMovement.tsx @@ -19,7 +19,7 @@ const StyledButton = styled.div` margintop: auto; ` -export function MoveRobotArm({ robot, armPosition, isRobotAvailable }: RobotProps) { +export const MoveRobotArm = ({ robot, armPosition, isRobotAvailable }: RobotProps) => { const { TranslateText } = useLanguageContext() const [feedback, setFeedback] = useState('') const [usable, setUsable] = useState(!!isRobotAvailable) diff --git a/frontend/src/components/Pages/RobotPage/RobotPage.tsx b/frontend/src/components/Pages/RobotPage/RobotPage.tsx index 1242e97a2..75f8d14d1 100644 --- a/frontend/src/components/Pages/RobotPage/RobotPage.tsx +++ b/frontend/src/components/Pages/RobotPage/RobotPage.tsx @@ -44,7 +44,7 @@ const VerticalContent = styled.div<{ $alignItems?: string }>` ` const updateSiteTimer = 1000 -export function RobotPage() { +export const RobotPage = () => { const { TranslateText } = useLanguageContext() const { robotId } = useParams() const [selectedRobot, setSelectedRobot] = useState() diff --git a/frontend/src/config.ts b/frontend/src/config.ts index d88de9ba3..5831dd1b4 100644 --- a/frontend/src/config.ts +++ b/frontend/src/config.ts @@ -1,6 +1,6 @@ const globalVars = window as any -function getEnvVariable(name: string): string { +const getEnvVariable = (name: string): string => { const value = process.env[name] if (value === undefined) { console.warn('Environment variable named "' + name + '" undefined. Attempting to use global variable.') diff --git a/frontend/src/utils/BackButton.tsx b/frontend/src/utils/BackButton.tsx index a87d0832c..37a166793 100644 --- a/frontend/src/utils/BackButton.tsx +++ b/frontend/src/utils/BackButton.tsx @@ -9,7 +9,7 @@ const StyledButton = styled(Button)` align-items: baseline; ` -export function BackButton() { +export const BackButton = () => { const { TranslateText } = useLanguageContext() let navigate = useNavigate() return ( diff --git a/frontend/src/utils/MapMarkers.tsx b/frontend/src/utils/MapMarkers.tsx index c7e3cce36..cea3b5daa 100644 --- a/frontend/src/utils/MapMarkers.tsx +++ b/frontend/src/utils/MapMarkers.tsx @@ -21,7 +21,7 @@ export const placeTagsInMap = (mission: Mission, map: HTMLCanvasElement, current } const orderedTasks = orderTasksByDrawOrder(mission.tasks, currentTaskOrder, maxTaskOrder) - orderedTasks.forEach(function (task) { + orderedTasks.forEach((task) => { if (task.inspectionTarget) { const pixelPosition = calculateObjectPixelPosition(mission.map!, task.inspectionTarget) // Workaround for current bug in echo @@ -68,7 +68,7 @@ const calculateObjectPixelPosition = (mapMetadata: MapMetadata, objectPosition: } const orderTasksByDrawOrder = (tasks: Task[], currentTaskOrder: number, maxTaskOrder: number) => { - let tasksWithDrawOrder = tasks.map(function (task) { + let tasksWithDrawOrder = tasks.map((task) => { var drawOrder if (task.taskOrder === currentTaskOrder) { drawOrder = maxTaskOrder @@ -81,9 +81,7 @@ const orderTasksByDrawOrder = (tasks: Task[], currentTaskOrder: number, maxTaskO }) tasksWithDrawOrder.sort((a, b) => a.drawOrder - b.drawOrder) - return tasksWithDrawOrder.map(function (taskWithDrawOrder) { - return taskWithDrawOrder.task - }) + return tasksWithDrawOrder.map((taskWithDrawOrder) => taskWithDrawOrder.task) } const calculateNavigatorAngle = (currentRobotPose: Pose) => {