Merge pull request #2485 from Thorium-Sim/develop

Release
Thorium-Sim · Aug 3, 2019 · fc051ea · fc051ea
2 parents a275573 + 860616c
commit fc051ea
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 11 deletions.
diff --git a/client/src/components/generic/SoundPlayer.js b/client/src/components/generic/SoundPlayer.js
@@ -63,6 +63,7 @@ function downMixBuffer(buffer, channel) {
 }
 
 export function playSound(opts) {
+  if (!opts.asset) return;
   removeSound(opts.id, true);
   opts.id = opts.id || uuid.v4();
   const volume = opts.muted ? 0 : opts.volume || 1;

diff --git a/client/src/components/views/DamageControl/damageControl.js b/client/src/components/views/DamageControl/damageControl.js
@@ -241,7 +241,7 @@ class DamageControl extends Component {
           return {
             ...t,
             className: systemClasses(t),
-            actve: selectedSystem === t.id,
+            active: selectedSystem === t.id,
             type: "task",
             onClick: () => this.selectSystem(t.id),
             children: (

diff --git a/client/src/components/views/DamageControl/reportView/taskReport.js b/client/src/components/views/DamageControl/reportView/taskReport.js
@@ -4,7 +4,7 @@ import gql from "graphql-tag.macro";
 import { Button } from "helpers/reactstrap";
 
 const ReportViewTask = ({ system, stepDamage }) => {
-  const task = system.tasks.find(t => !t.verified);
+  const task = system.tasks.find(t => !t.verified) || {};
   if (stepDamage) {
     // Get the first task that isn't verified;
     const stepCount = system.tasks.findIndex(t => t.id === task.id) + 1;

diff --git a/client/src/components/views/JumpDrive/powerLine.js b/client/src/components/views/JumpDrive/powerLine.js
@@ -26,7 +26,7 @@ const PowerLine = ({
   const [measureRef, { left, width }] = useMeasure();
   const playEffect = useSoundEffect();
   React.useEffect(() => {
-    if (power) {
+    if (power || power === 0) {
       setStoredPower(power);
     }
   }, [power]);

diff --git a/client/src/components/views/Tasks/tasks.js b/client/src/components/views/Tasks/tasks.js
@@ -198,7 +198,9 @@ class Tasks extends Component {
               />
             </h3>
             <Card>
-              <CardBlock>{task && task.instructions}</CardBlock>
+              <CardBlock style={{ whiteSpace: "pre-line" }}>
+                {task && task.instructions}
+              </CardBlock>
             </Card>
             <div style={{ display: "flex", justifyContent: "space-between" }}>
               <Mutation

diff --git a/client/src/helpers/graphqlClient.js b/client/src/helpers/graphqlClient.js
@@ -10,7 +10,7 @@ import { FLIGHTS_QUERY } from "../containers/FlightDirector/Welcome/Welcome";
 import { getClientId } from "helpers/getClientId";
 import { setContext } from "apollo-link-context";
 
-import * as Sentry from "@sentry/browser";
+// import * as Sentry from "@sentry/browser";
 
 const hostname = window.location.hostname;
 
@@ -23,12 +23,12 @@ const wsLink = ApolloLink.from([
         console.log(
           `[Subscription Error]: Message: ${message}, Location: ${locations}, Path: ${path}`
         );
-        Sentry.captureException(error);
+        // Sentry.captureException(error);
       });
 
     if (networkError) {
       console.log(`[Network error]: ${networkError}`);
-      Sentry.captureException(networkError);
+      // Sentry.captureException(networkError);
     }
     if (response) response.errors = null;
   }),

diff --git a/server/src/events/flight.js b/server/src/events/flight.js
@@ -25,7 +25,8 @@ export const aspectList = [
   "commandLine",
   "triggerGroups",
   "interfaces",
-  "tasks"
+  "tasks",
+  "taskReports"
 ];
 
 export function addAspects(template, sim, data = App) {

diff --git a/server/src/events/macro.js b/server/src/events/macro.js
@@ -33,7 +33,9 @@ App.on("updateMacroActions", ({ id, actions }) => {
 });
 App.on("triggerMacroAction", ({ macroId, simulatorId }) => {
   const macro = App.macros.find(s => s.id === macroId);
-
+  if (!macro) {
+    return;
+  }
   // Don't allow a macro to trigger itself
   const macros = macro.actions.filter(a => {
     const args = typeof a.args === "string" ? JSON.parse(a.args) : a.args;

diff --git a/server/src/events/tasks.js b/server/src/events/tasks.js
@@ -8,7 +8,8 @@ App.on("addTask", ({ taskInput, simulatorId }) => {
   const task = new Classes.Task(input);
   App.tasks.push(task);
   // Execute the pre-macros
-  taskInput.preMacros.length > 0 &&
+  taskInput.preMacros &&
+    taskInput.preMacros.length > 0 &&
     App.handleEvent(
       { simulatorId: task.simulatorId, macros: taskInput.preMacros },
       "triggerMacros"

diff --git a/server/src/tasks/internalComm.js b/server/src/tasks/internalComm.js
@@ -65,12 +65,16 @@ export default [
       const station = simulator.stations.find(s =>
         s.cards.find(c => c.component === "CommInternal")
       );
+      const idRegex = /.{8}-.{4}-.{4}-.{4}-.{12}/gi;
+
       const room = App.rooms.find(r => r.id === roomId);
       const deck = App.decks.find(d => d.id === (room ? room.deckId : roomId));
       const decks = App.decks.find(d => d.simulatorId === simulator.id);
       const randomDeck = randomFromList(decks);
       const location =
-        !room && !deck
+        roomId && !roomId.match(idRegex)
+          ? roomId
+          : !room && !deck
           ? `Deck ${randomDeck ? randomDeck.number : 1}`
           : room
           ? `${room.name}, Deck ${deck.number}`