Skip to content

Commit

Permalink
Use labmda functions
Browse files Browse the repository at this point in the history
  • Loading branch information
Eddasol committed Nov 29, 2023
1 parent 034e0cb commit 1da5966
Show file tree
Hide file tree
Showing 49 changed files with 91 additions and 101 deletions.
2 changes: 1 addition & 1 deletion frontend/src/components/Alerts/AlertsBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ interface AlertProps {
dismissAlert: () => void
}

export function AlertBanner({ children, dismissAlert }: AlertProps) {
export const AlertBanner = ({ children, dismissAlert }: AlertProps) => {
return (
<>
<StyledCard variant="danger" style={{ boxShadow: tokens.elevation.raised }}>
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/Alerts/FailedMissionAlert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -37,7 +37,7 @@ function FailedMission({ missions }: MissionsProps) {
)
}

function SeveralFailedMissions({ missions }: MissionsProps) {
const SeveralFailedMissions = ({ missions }: MissionsProps) => {
const { TranslateText } = useLanguageContext()
const navigate = useNavigate()
const goToHistory = () => {
Expand All @@ -53,7 +53,7 @@ function SeveralFailedMissions({ missions }: MissionsProps) {
)
}

export function FailedMissionAlertContent({ missions }: MissionsProps) {
export const FailedMissionAlertContent = ({ missions }: MissionsProps) => {
return (
<Indent>
<MissionStatusDisplay status={MissionStatus.Failed} />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Alerts/FailedRequestAlert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<StyledDiv>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -41,7 +41,7 @@ export function MissionControlButtons({ mission }: MissionProps) {
)
}

function OngoingMissionButton({ mission }: MissionProps) {
const OngoingMissionButton = ({ mission }: MissionProps) => {
const { TranslateText } = useLanguageContext()
const { updateMissionState } = useMissionControlContext()

Expand Down Expand Up @@ -70,7 +70,7 @@ function OngoingMissionButton({ mission }: MissionProps) {
)
}

function PausedMissionButton({ mission }: MissionProps) {
const PausedMissionButton = ({ mission }: MissionProps) => {
const { TranslateText } = useLanguageContext()
const { updateMissionState } = useMissionControlContext()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<boolean>(false)
const anchorRef = useRef<HTMLButtonElement>(null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ interface MissionsProps {
missions: Mission[]
}

function FailedMission({ mission }: MissionProps) {
const FailedMission = ({ mission }: MissionProps) => {
const { TranslateText } = useLanguageContext()
let navigate = useNavigate()
const goToMission = () => {
Expand All @@ -58,7 +58,7 @@ function FailedMission({ mission }: MissionProps) {
)
}

function SeveralFailedMissions({ missions }: MissionsProps) {
const SeveralFailedMissions = ({ missions }: MissionsProps) => {
const { TranslateText } = useLanguageContext()
let navigate = useNavigate()
const goToHistory = () => {
Expand All @@ -74,7 +74,7 @@ function SeveralFailedMissions({ missions }: MissionsProps) {
)
}

export function FailedMissionAlertDisplay() {
export const FailedMissionAlertDisplay = () => {
const [recentFailedMissions, setRecentFailedMissions] = useState<Mission[]>([])
const { registerEvent, connectionReady } = useSignalRContext()
const { installationCode } = useInstallationContext()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<number>(0)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ interface MissionProps {
mission: Mission
}

export function MissionRobotDisplay({ mission }: MissionProps) {
export const MissionRobotDisplay = ({ mission }: MissionProps) => {
const { TranslateText } = useLanguageContext()
return (
<StyledRobotDisplay>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const MissionStatusIcon = ({ status }: StatusProps) => {
return <Icon name={Icons.Failed} style={{ color: tokens.colors.interactive.danger__resting.hex }} />
}

export function MissionStatusDisplay({ status }: StatusProps) {
export const MissionStatusDisplay = ({ status }: StatusProps) => {
const { TranslateText } = useLanguageContext()
return (
<StyledStatusIcon>
Expand All @@ -52,7 +52,7 @@ export function MissionStatusDisplay({ status }: StatusProps) {
)
}

export function MissionStatusDisplayWithHeader({ status }: StatusProps) {
export const MissionStatusDisplayWithHeader = ({ status }: StatusProps) => {
const { TranslateText } = useLanguageContext()
return (
<StyledStatusDisplay>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ enum StatusColors {
SafeZone = '#FF0000',
}

export function RobotStatusChip({ status }: StatusProps) {
export const RobotStatusChip = ({ status }: StatusProps) => {
const { TranslateText } = useLanguageContext()
const { safeZoneStatus } = useSafeZoneContext()

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Header/LanguageSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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()
Expand Down Expand Up @@ -81,7 +81,7 @@ export const AssetSelectionPage = () => {
)
}

function InstallationPicker() {
const InstallationPicker = () => {
const { installationName, switchInstallation } = useInstallationContext()
const { TranslateText } = useLanguageContext()
const [allPlantsMap, setAllPlantsMap] = useState<Map<string, string>>(new Map())
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Pages/FlotillaSite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<>
<InstallationProvider>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Pages/FrontPage/FrontPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const MissionsContent = styled.div`
gap: 2rem;
`

export function FrontPage() {
export const FrontPage = () => {
return (
<>
<Header page={'root'} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ export const OngoingMissionView = (): JSX.Element => {
)
}, [ongoingMissions, installationCode])

const ongoingMissionCards = ongingMissionsToDisplay.map(function (mission, index) {
return <OngoingMissionCard key={index} mission={mission} />
})
const ongoingMissionCards = ongingMissionsToDisplay.map((mission, index) => (
<OngoingMissionCard key={index} mission={mission} />
))

return (
<StyledOngoingMissionView>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}`
Expand Down Expand Up @@ -83,7 +83,7 @@ export function RobotStatusCard({ robot }: RobotProps) {
)
}

export function RobotStatusCardPlaceholder() {
export const RobotStatusCardPlaceholder = () => {
const { TranslateText } = useLanguageContext()
return (
<StyledCard style={{ boxShadow: tokens.elevation.raised }}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
})
)
Expand All @@ -51,9 +51,7 @@ export function RobotStatusSection() {
}, [enabledRobots, installationCode, switchSafeZoneStatus])

const getRobotDisplay = () => {
return robots.map(function (robot) {
return <RobotStatusCard key={robot.id} robot={robot} />
})
return robots.map((robot) => <RobotStatusCard key={robot.id} robot={robot} />)
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Pages/InspectionPage/DeckCards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Inspection[]>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export interface DeckMissionCount {
}
}

export function InspectionSection() {
export const InspectionSection = () => {
const { installationCode } = useInstallationContext()
const [deckMissions, setDeckMissions] = useState<DeckMissionType>({})
const [selectedDeck, setSelectedDeck] = useState<Deck>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<boolean>(false)
Expand Down Expand Up @@ -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<CondensedMissionDefinition[]>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ interface MissionDefinitionHeaderProps {
missionDefinition: CondensedMissionDefinition
}

export function MissionDefinitionHeader({ missionDefinition }: MissionDefinitionHeaderProps) {
export const MissionDefinitionHeader = ({ missionDefinition }: MissionDefinitionHeaderProps) => {
return (
<StyledDict.HeaderSection>
<StyledDict.TitleSection>
Expand Down
Loading

0 comments on commit 1da5966

Please sign in to comment.