format mission id and improve default val

tacetvenari · Mar 20, 2023 · 0d66740 · 0d66740
1 parent 71f784b
commit 0d66740
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/dashboard/src/AirTaskingOrderCard.jsx b/dashboard/src/AirTaskingOrderCard.jsx
@@ -119,12 +119,12 @@ MissionStatus.propTypes = {
 
 export default function AirTaskingOrderCard({msnData}){
   const {intel} = msnData
-  const {msn_id: msnId} = intel
+  const {msn_id: msnId = "unk"} = intel
 
   return (
     <Card px={4} py={2}>
       <Stack spacing={6}>
-        <Heading size="lg">{`Mission ${msnId}`}</Heading>
+        <Heading size="lg">{`Mission ${msnId.toUpperCase()}`}</Heading>
         <MissionStatus states={msnData} />
         <MissionMeta intel={intel}/>
       </Stack>

diff --git a/msn-data-server/msn-data-server.py b/msn-data-server/msn-data-server.py
@@ -33,15 +33,11 @@ def do_GET(self):
                 data = {}
                 shopData = json.load(file)
 
-                # If not intel, delete msn meta data
-                if SHOP != "intel":
-                    del shopData['msn_id']
-                    del shopData['msn_takeoff']
-                    del shopData['msn_return']
-                    del shopData['msn_platform']
-                    del shopData['msn_target']
-
-                data[SHOP] = shopData
+                # If not intel, strip msn meta data
+                if SHOP == "intel":
+                    data[SHOP] = shopData
+                else:
+                    data[SHOP] = {key:shopData[key] for key in shopData if key == 'status'}
 
                 self._set_headers()
                 self.wfile.write(json.dumps(data).encode('utf-8'))