Skip to content

Commit

Permalink
Capitalise signalR event labels
Browse files Browse the repository at this point in the history
  • Loading branch information
andchiind committed Nov 7, 2023
1 parent 201e3b2 commit 1e82885
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion backend/api/Services/MissionDefinitionService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public async Task<MissionDefinition> Update(MissionDefinition missionDefinition)

var entry = _context.Update(missionDefinition);
await _context.SaveChangesAsync();
_ = _signalRService.SendMessageAsync("mission definition updated", new CondensedMissionDefinitionResponse(missionDefinition));
_ = _signalRService.SendMessageAsync("Mission definition updated", new CondensedMissionDefinitionResponse(missionDefinition));
return entry.Entity;
}

Expand Down
8 changes: 4 additions & 4 deletions backend/api/Services/MissionRunService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public async Task<MissionRun> Create(MissionRun missionRun)

await _context.MissionRuns.AddAsync(missionRun);
await _context.SaveChangesAsync();
_ = _signalRService.SendMessageAsync("mission run created", missionRun);
_ = _signalRService.SendMessageAsync("Mission run created", missionRun);

var args = new MissionRunCreatedEventArgs(missionRun.Id);
OnMissionRunCreated(args);
Expand Down Expand Up @@ -126,7 +126,7 @@ public async Task<MissionRun> Update(MissionRun missionRun)
{
var entry = _context.Update(missionRun);
await _context.SaveChangesAsync();
_ = _signalRService.SendMessageAsync("mission run updated", missionRun);
_ = _signalRService.SendMessageAsync("Mission run updated", missionRun);
return entry.Entity;
}

Expand All @@ -141,7 +141,7 @@ public async Task<MissionRun> Update(MissionRun missionRun)

_context.MissionRuns.Remove(missionRun);
await _context.SaveChangesAsync();
_ = _signalRService.SendMessageAsync("mission run deleted", missionRun);
_ = _signalRService.SendMessageAsync("Mission run deleted", missionRun);

return missionRun;
}
Expand Down Expand Up @@ -355,7 +355,7 @@ MissionStatus missionStatus
await Update(missionRun);

if (missionRun.Status == MissionStatus.Failed)
_ = _signalRService.SendMessageAsync("mission run failed", missionRun);
_ = _signalRService.SendMessageAsync("Mission run failed", missionRun);
return missionRun;
}

Expand Down
6 changes: 3 additions & 3 deletions backend/api/Services/RobotService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public async Task<Robot> CreateFromQuery(CreateRobotQuery robotQuery)
_context.Entry(robotModel).State = EntityState.Unchanged;
await _context.Robots.AddAsync(newRobot);
await _context.SaveChangesAsync();
_ = _signalRService.SendMessageAsync("robot list updated", GetEnabledRobotsWithSubModels());
_ = _signalRService.SendMessageAsync("Robot list updated", GetEnabledRobotsWithSubModels());
return newRobot;
}
throw new DbUpdateException("Could not create new robot in database as robot model does not exist");
Expand Down Expand Up @@ -85,7 +85,7 @@ public async Task<Robot> Update(Robot robot)
{
var entry = _context.Update(robot);
await _context.SaveChangesAsync();
_ = _signalRService.SendMessageAsync("robot list updated", GetEnabledRobotsWithSubModels());
_ = _signalRService.SendMessageAsync("Robot list updated", GetEnabledRobotsWithSubModels());
return entry.Entity;
}

Expand All @@ -96,7 +96,7 @@ public async Task<Robot> Update(Robot robot)

_context.Robots.Remove(robot);
await _context.SaveChangesAsync();
_ = _signalRService.SendMessageAsync("robot list updated", GetEnabledRobotsWithSubModels());
_ = _signalRService.SendMessageAsync("Robot list updated", GetEnabledRobotsWithSubModels());
return robot;
}

Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/Contexts/MissionListsContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const useMissions = (): MissionsResult => {

useEffect(() => {
if (connectionReady) {
registerEvent('mission run created', (username: string, message: string) => {
registerEvent('Mission run created', (username: string, message: string) => {
const newMission: Mission = JSON.parse(message)
if (missionQueue.find((m) => m.id === newMission.id))
setMissionQueue((oldQueue) => [...oldQueue, newMission])
Expand All @@ -57,7 +57,7 @@ export const useMissions = (): MissionsResult => {
return [...missionQueueCopy]
})
})
registerEvent('mission run updated', (username: string, message: string) => {
registerEvent('Mission run updated', (username: string, message: string) => {
let updatedMission: Mission = JSON.parse(message)
// This conversion translates from the enum as a number to an enum as a string
updatedMission.status = Object.values(MissionStatus)[updatedMission.status as unknown as number]
Expand Down Expand Up @@ -95,7 +95,7 @@ export const useMissions = (): MissionsResult => {
return oldQueueCopy
})
})
registerEvent('mission run deleted', (username: string, message: string) => {
registerEvent('Mission run deleted', (username: string, message: string) => {
let deletedMission: Mission = JSON.parse(message)
setOngoingMissions((missions) => {
const ongoingIndex = missions.findIndex((m) => m.id === deletedMission.id)
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Contexts/RobotContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const RobotProvider: FC<Props> = ({ children }) => {

useEffect(() => {
if (connectionReady) {
registerEvent('robot list updated', (username: string, message: string) => {
registerEvent('Robot list updated', (username: string, message: string) => {
let newRobotList: Robot[] = JSON.parse(message)
newRobotList = newRobotList.map((r) => {
r.status = Object.values(RobotStatus)[r.status as unknown as number]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export function FailedMissionAlertView() {
// Register a signalR event handler that listens for new failed missions
useEffect(() => {
if (connectionReady)
registerEvent('mission run failed', (username: string, message: string) => {
registerEvent('Mission run failed', (username: string, message: string) => {
setNewFailedMission(JSON.parse(message))
console.log(JSON.parse(message))
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export function InspectionSection({

useEffect(() => {
if (connectionReady) {
registerEvent('mission definition updated', (username: string, message: string) => {
registerEvent('Mission definition updated', (username: string, message: string) => {
const mDef: CondensedMissionDefinition = JSON.parse(message)
if (!mDef.area) return
const relevantDeck = mDef.area.deckName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ export function MissionDefinitionPage() {

useEffect(() => {
if (connectionReady) {
registerEvent('mission definition updated', (username: string, message: string) => {
registerEvent('Mission definition updated', (username: string, message: string) => {
const missionDefinition: CondensedMissionDefinition = JSON.parse(message)
missionDefinition.sourceType =
Object.values(SourceType)[missionDefinition.sourceType as unknown as number]
Expand Down

0 comments on commit 1e82885

Please sign in to comment.