merge master

BallAerospace · Nov 23, 2021 · 52fa032 · 52fa032
2 parents 8d6a283 + 0373c4b
commit 52fa032
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 22 deletions.
diff --git a/compose.yaml b/compose.yaml
@@ -21,7 +21,7 @@ version: "3.5"
 
 services:
   cosmos-minio:
-    image: "minio/minio:RELEASE.2021-10-27T16-29-42Z"
+    image: "minio/minio:RELEASE.2021-06-17T00-10-46Z"
     volumes:
       - "cosmos-minio-v:/data"
     command: ["server", "/data"]

diff --git a/cosmos-cmd-tlm-api/app/channels/limits_events_channel.rb b/cosmos-cmd-tlm-api/app/channels/limits_events_channel.rb
@@ -25,8 +25,11 @@ def subscribed
   end
 
   def unsubscribed
-    @broadcasters[uuid].kill
-    @broadcasters[uuid] = nil
-    @broadcasters.delete(uuid)
+    if @broadcasters[uuid]
+      stop_stream_from uuid
+      @broadcasters[uuid].kill
+      @broadcasters[uuid] = nil
+      @broadcasters.delete(uuid)
+    end
   end
 end
diff --git a/cosmos-cmd-tlm-api/app/channels/messages_channel.rb b/cosmos-cmd-tlm-api/app/channels/messages_channel.rb
@@ -25,8 +25,11 @@ def subscribed
   end
 
   def unsubscribed
-    @broadcasters[uuid].kill
-    @broadcasters[uuid] = nil
-    @broadcasters.delete(uuid)
+    if @broadcasters[uuid]
+      stop_stream_from uuid
+      @broadcasters[uuid].kill
+      @broadcasters[uuid] = nil
+      @broadcasters.delete(uuid)
+    end
   end
 end
diff --git a/cosmos-cmd-tlm-api/app/channels/notifications_channel.rb b/cosmos-cmd-tlm-api/app/channels/notifications_channel.rb
@@ -25,8 +25,11 @@ def subscribed
   end
 
   def unsubscribed
-    @broadcasters[uuid].kill
-    @broadcasters[uuid] = nil
-    @broadcasters.delete(uuid)
+    if @broadcasters[uuid]
+      stop_stream_from uuid
+      @broadcasters[uuid].kill
+      @broadcasters[uuid] = nil
+      @broadcasters.delete(uuid)
+    end
   end
 end
diff --git a/cosmos-cmd-tlm-api/app/channels/streaming_channel.rb b/cosmos-cmd-tlm-api/app/channels/streaming_channel.rb
@@ -29,8 +29,8 @@ def unsubscribed
       stop_stream_from uuid
       @broadcasters[uuid].kill
       @broadcasters[uuid] = nil
+      @broadcasters.delete(uuid)
     end
-    @broadcasters.delete(uuid)
   end
 
   # data holds the following keys:

diff --git a/cosmos-cmd-tlm-api/app/channels/timeline_events_channel.rb b/cosmos-cmd-tlm-api/app/channels/timeline_events_channel.rb
@@ -25,8 +25,11 @@ def subscribed
   end
 
   def unsubscribed
-    @broadcasters[uuid].kill
-    @broadcasters[uuid] = nil
-    @broadcasters.delete(uuid)
+    if @broadcasters[uuid]
+      stop_stream_from uuid
+      @broadcasters[uuid].kill
+      @broadcasters[uuid] = nil
+      @broadcasters.delete(uuid)
+    end
   end
 end
diff --git a/cosmos-init/plugins/cosmosc2-tool-base/src/components/ClockFooter.vue b/cosmos-init/plugins/cosmosc2-tool-base/src/components/ClockFooter.vue
@@ -80,7 +80,7 @@ export default {
     return {
       localDate: new Date(),
       displayLocal: localStorage.clock_zone === 'local',
-      display24h: !localStorage.clozk_12h,
+      display24h: !localStorage.clock_12h,
       dateMode: localStorage.clock_dateMode || 'monthFirst',
       intervalCount: 0,
       showMenu: false,

diff --git a/cosmos-init/plugins/cosmosc2-tool-base/src/components/ScopeSelector.vue b/cosmos-init/plugins/cosmosc2-tool-base/src/components/ScopeSelector.vue
@@ -47,5 +47,10 @@ export default {
       if (val.length === 1 || (!this.scope && val.length)) this.scope = val[0]
     },
   },
+  created: function () {
+    if (localStorage.scope == null) {
+      localStorage.scope = 'DEFAULT'
+    }
+  },
 }
 </script>
diff --git a/cosmos-init/plugins/packages/cosmosc2-demo/targets/INST/target.txt b/cosmos-init/plugins/packages/cosmosc2-demo/targets/INST/target.txt
@@ -23,10 +23,6 @@ IGNORE_ITEM CCSDSSEQFLAGS
 IGNORE_ITEM CCSDSSEQCNT
 IGNORE_ITEM CCSDSLENGTH
 
-IGNORE_ITEM RECEIVED_COUNT
-IGNORE_ITEM RECEIVED_TIMESECONDS
-IGNORE_ITEM RECEIVED_TIMEFORMATTED
-
 # Explicitly define command and telemetry files
 # If not given then all the files in cmd/tlm will be processed in
 # alphabetical order

diff --git a/cosmos-init/plugins/packages/cosmosc2-tool-common/src/components/Graph.vue b/cosmos-init/plugins/packages/cosmosc2-tool-common/src/components/Graph.vue
@@ -443,7 +443,7 @@ export default {
       valueTypes: ['CONVERTED', 'RAW'],
       active: true,
       expand: true,
-      fullWidth: true,
+      fullWidth: false,
       fullHeight: true,
       graph: null,
       editGraph: false,

diff --git a/...it/plugins/packages/cosmosc2-tool-limitsmonitor/src/tools/LimitsMonitor/LimitsControl.vue b/...it/plugins/packages/cosmosc2-tool-limitsmonitor/src/tools/LimitsMonitor/LimitsControl.vue
@@ -116,10 +116,10 @@
                 <span class="font-weight-black"> {{ item }} </span>
                 <v-spacer />
                 <v-btn
+                  @click="restoreItem(item, index)"
                   small
                   icon
-                  @click="restoreItem(item, index)"
-                  data-test="delete-ignored-item"
+                  :data-test="`remove-ignore-${index}`"
                 >
                   <v-icon> mdi-delete </v-icon>
                 </v-btn>

diff --git a/cypress/cypress/integration/tools/TlmGrapher.spec.js b/cypress/cypress/integration/tools/TlmGrapher.spec.js
@@ -159,6 +159,10 @@ describe('TlmGrapher', () => {
 
   it('shrinks and expands a graph width', () => {
     aliasWidthHeight()
+    cy.get('#gridItem0').within(() => {
+      cy.get('[data-test=expandWidth]').click({ force: true })
+    })
+    checkWidthHeight('eq', 1, 'eq', 1)
     cy.get('#gridItem0').within(() => {
       cy.contains('Graph 0')
       cy.get('[data-test=collapseWidth]').click({ force: true })