Merge branch 'main' into dependencies

openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/procedures/calendar.py

@@ -21,7 +21,7 @@
 )  # => {"name":"Mine", "color":"#4287f5", "scope":"DEFAULT", "updated_at":1698763720728596964}
 
 now = datetime.now(timezone.utc)
-start = datetime(now.year, now.month, now.day, now.hour + 1, 30, 00, 00, timezone.utc)
+start = now + timedelta(hours=1)
 stop = start + timedelta(hours=1)  # Stop plus 1hr
 act = create_timeline_activity("Mine", kind="reserve", start=start, stop=stop)
 print(act)  # =>

openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-dataextractor/src/tools/DataExtractor/DataExtractor.vue

@@ -426,7 +426,11 @@ export default {
       this.saveDefaultConfig(this.currentConfig)
     },
     cmdOrTlm: function () {
-      this.saveDefaultConfig(this.currentConfig)
+      if (this.items.length === 0) { // just to prevent the save from happening twice
+        this.saveDefaultConfig(this.currentConfig)
+      } else {
+        this.items = []
+      }
     },
     items: {
       handler: function () {

openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-packetviewer/src/tools/PacketViewer/PacketViewer.vue

@@ -50,6 +50,9 @@
       <v-data-table
         :search="search"
         :headers="headers"
+        :header-props="{
+          style: 'width: 50%',
+        }"
         :items="rows"
         :custom-filter="filter"
         :sort-by="sortBy"

openc3-cosmos-init/plugins/packages/openc3-vue-common/src/components/Openc3Screen.vue

@@ -308,10 +308,13 @@ export default {
     },
     computedStyle() {
       let style = {}
+      // note down what the width was in case it was set to AUTO, because absolute positioning will lose that
+      const origWidth = this.width || this.$refs.bar?.clientWidth
       if (this.floated) {
         style['position'] = 'absolute'
         style['top'] = this.top + 'px'
         style['left'] = this.left + 'px'
+        style['width'] = origWidth + 'px'
       }
       return style
     },

openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/Widget.js

@@ -81,8 +81,11 @@ export default {
         this.applyStyleSetting(setting)
       })
 
-      // If nothing has yet defined a width then we add flex to the style
-      if (this.appliedStyle['width'] === undefined) {
+      // If nothing has yet defined a width or height then we add flex to the style
+      if (
+        this.appliedStyle['width'] === undefined &&
+        this.appliedStyle['height'] === undefined
+      ) {
         // This flex allows for alignment in our widgets
         // The value of '0 10 100%' was achieved through trial and error
         // The larger flex-shrink value was critical for success

openc3/lib/openc3/operators/microservice_operator.rb

@@ -43,6 +43,7 @@ def initialize
       @changed_microservices = {}
       @removed_microservices = {}
       @shard = ENV['OPENC3_SHARD'] || 0
+      @shard = @shard.to_i
     end
 
     def convert_microservice_to_process_definition(microservice_name, microservice_config)