openc3 7.2.1 → 7.3.0

data/lib/openc3/utilities/script.rb

@@ -25,33 +25,69 @@ require 'openc3/tools/test_runner/test'
 OpenC3.require_file 'openc3/utilities/store'
 
 class Script < OpenC3::TargetFile
+  # Script lifecycle states and the transitions allowed from each state
+  LIFECYCLE_STATES = %w(development review approved)
+  LIFECYCLE_TRANSITIONS = {
+    'development' => %w(review approved),
+    'review' => %w(development approved),
+    'approved' => %w(review development),
+  }
+
   def self.all(scope, target = nil)
     super(scope, nil, target: target) # No path matchers
   end
 
+  # Split off the '*' that indicates a file is modified on the server
+  def self.strip_modified(name)
+    name.split('*')[0]
+  end
+  private_class_method :strip_modified
+
   def self.lock(scope, name, username)
-    name = name.split('*')[0] # Split '*' that indicates modified
-    OpenC3::Store.hset("#{scope}__script-locks", name, username)
+    OpenC3::Store.hset("#{scope}__script-locks", strip_modified(name), username)
   end
 
   def self.unlock(scope, name)
-    name = name.split('*')[0] # Split '*' that indicates modified
-    OpenC3::Store.hdel("#{scope}__script-locks", name)
+    OpenC3::Store.hdel("#{scope}__script-locks", strip_modified(name))
   end
 
   def self.locked?(scope, name)
-    name = name.split('*')[0] # Split '*' that indicates modified
-    locked_by = OpenC3::Store.hget("#{scope}__script-locks", name)
+    locked_by = OpenC3::Store.hget("#{scope}__script-locks", strip_modified(name))
     locked_by ||= false
     locked_by
   end
 
   def self.get_breakpoints(scope, name)
-    breakpoints = OpenC3::Store.hget("#{scope}__script-breakpoints", name.split('*')[0]) # Split '*' that indicates modified
+    breakpoints = OpenC3::Store.hget("#{scope}__script-breakpoints", strip_modified(name))
     return JSON.parse(breakpoints, allow_nan: true, create_additions: true) if breakpoints
     []
   end
 
+  def self.temp_file?(name)
+    strip_modified(name).start_with?("#{TEMP_FOLDER}/")
+  end
+
+  def self.lifecycle_enabled?
+    defined?(::VersionStore) && ::VersionStore.enabled?
+  end
+
+  def self.lifecycle(scope, name)
+    return { 'state' => 'development', 'history' => [] } if temp_file?(name)
+    return { 'state' => 'development', 'history' => [] } unless lifecycle_enabled?
+    ::VersionStore.lifecycle(scope: scope, name: strip_modified(name))
+  end
+
+  # current: the caller-known current state; pass it to avoid a redundant git
+  # read when the controller has already fetched it for transition validation.
+  def self.set_lifecycle(scope, name, state, username, comment, current: nil)
+    raise "Cannot set lifecycle on temporary files" if temp_file?(name)
+    raise "Script lifecycle requires the version history store" unless lifecycle_enabled?
+    name = strip_modified(name)
+    current ||= lifecycle(scope, name)['state']
+    ::VersionStore.set_lifecycle(scope: scope, name: name, from: current, to: state,
+                                 username: username, comment: comment)
+  end
+
   def self.process_suite(name, contents, new_process: true, username: nil, scope:)
     python = false
     python = true if File.extname(name) == '.py'
@@ -189,7 +225,6 @@ class Script < OpenC3::TargetFile
   def self.delete_temp(scope)
     files = super(scope)
     files.each do |name|
-      # Remove any breakpoints associated with the temp files
       OpenC3::Store.hdel("#{scope}__script-breakpoints", "#{TEMP_FOLDER}/#{File.basename(name)}")
     end
   end
@@ -208,13 +243,14 @@ class Script < OpenC3::TargetFile
     user_full_name = nil,
     username = nil,
     line_no = nil,
-    end_line_no = nil
+    end_line_no = nil,
+    python_venv = nil
   )
     # Verify the script exists before spawning a run. Without this check a run
     # is started and the missing file only surfaces as a runtime error inside
     # the spawned process. Returning nil lets the caller return a 404.
     return nil unless Script.body(scope, name)
-    RunningScript.spawn(scope, name, suite_runner, disconnect, environment, user_full_name, username, line_no, end_line_no)
+    RunningScript.spawn(scope, name, suite_runner, disconnect, environment, user_full_name, username, line_no, end_line_no, python_venv)
   end
 
   def self.instrumented(filename, text)

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '7.2.1'
+OPENC3_VERSION = '7.3.0'
 module OpenC3
   module Version
     MAJOR = '7'
-    MINOR = '2'
-    PATCH = '1'
+    MINOR = '3'
+    PATCH = '0'
     OTHER = ''
-    BUILD = 'c0b096796e3070340b34bc4368c21f3972ede7a4'
+    BUILD = 'ec6ac203728234fada5e3a2ecab59fba8a94b935'
   end
-  VERSION = '7.2.1'
-  GEM_VERSION = '7.2.1'
+  VERSION = '7.3.0'
+  GEM_VERSION = '7.3.0'
 end

data/templates/plugin/plugin.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.files = Dir.glob("{targets,lib,public,tools,microservices}/**/*") + %w(Rakefile README.md LICENSE.md plugin.txt)
 
   s.metadata = {
-    # These fields are used when you submit your plugin to our App Store at store.openc3.com
+    # These fields are used when you submit your plugin to the OpenC3 Store at store.openc3.com
     # See this help page for more detail: https://store.openc3.com/help/guidelines
     "source_code_uri" => "https://github.com/your-github/plugin-repo",
     "openc3_store_title" => "<%= plugin_orig %>",

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "7.2.1",
+  "version": "7.3.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -23,7 +23,7 @@
     "@angular/platform-browser-dynamic": "^18.2.6",
     "@angular/router": "^18.2.6",
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "7.2.1",
+    "@openc3/js-common": "7.3.0",
     "rxjs": "~7.8.0",
     "single-spa": "^5.9.5",
     "single-spa-angular": "^9.2.0",

data/templates/tool_react/package.json

@@ -16,7 +16,7 @@
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.11.0",
     "@mui/material": "^6.1.1",
-    "@openc3/js-common": "7.2.1",
+    "@openc3/js-common": "7.3.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "single-spa-react": "^5.1.4"

data/templates/tool_svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "7.2.1",
+    "@openc3/js-common": "7.3.0",
     "@smui/button": "^7.0.0",
     "@smui/common": "^7.0.0",
     "@smui/card": "^7.0.0",

data/templates/tool_vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "7.2.1",
+  "version": "7.3.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "7.2.1",
-    "@openc3/vue-common": "7.2.1",
+    "@openc3/js-common": "7.3.0",
+    "@openc3/vue-common": "7.3.0",
     "axios": "^1.7.7",
     "date-fns": "^4.1.0",
     "lodash": "^4.17.21",

data/templates/widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= widget_name %>",
-  "version": "7.2.1",
+  "version": "7.3.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/vue-common": "7.2.1",
+    "@openc3/vue-common": "7.3.0",
     "vuetify": "^3.7.1"
   },
   "devDependencies": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 7.3.0
 platform: ruby
 authors:
 - Ryan Melton
@@ -900,6 +900,7 @@ files:
 - bin/openc3cli
 - bin/pipinstall
 - bin/pipuninstall
+- bin/uvinstall
 - data/config/_array_params.yaml
 - data/config/_canvas_values.yaml
 - data/config/_graph_params.yaml
@@ -932,6 +933,8 @@ files:
 - data/config/tool.yaml
 - data/config/unknown.yaml
 - data/config/widgets.yaml
+- data/xtce_schemas/SpaceSystem_20180204.xsd
+- data/xtce_schemas/xml.xsd
 - ext/openc3/ext/array/array.c
 - ext/openc3/ext/array/extconf.rb
 - ext/openc3/ext/buffered_file/buffered_file.c
@@ -1107,6 +1110,7 @@ files:
 - lib/openc3/migrations/20260203000000_remove_store_id.rb
 - lib/openc3/migrations/20260204000000_remove_decom_reducer.rb
 - lib/openc3/migrations/20260701000000_updated_at_to_int.rb
+- lib/openc3/migrations/20260731000000_system_health_json.rb
 - lib/openc3/models/activity_model.rb
 - lib/openc3/models/auth_model.rb
 - lib/openc3/models/cvt_model.rb
@@ -1364,7 +1368,6 @@ files:
 - templates/tool_svelte/src/tool_name.js
 - templates/tool_vue/.env.standalone
 - templates/tool_vue/.gitignore
-- templates/tool_vue/.nycrc
 - templates/tool_vue/.prettierrc.cjs
 - templates/tool_vue/eslint.config.mjs
 - templates/tool_vue/jsconfig.json
@@ -1374,7 +1377,6 @@ files:
 - templates/tool_vue/src/router.js
 - templates/tool_vue/src/tools/tool_name/tool_name.vue
 - templates/tool_vue/vite.config.js
-- templates/widget/.nycrc
 - templates/widget/.prettierrc.cjs
 - templates/widget/LICENSE.md
 - templates/widget/Rakefile

data/templates/tool_vue/.nycrc

@@ -1,3 +0,0 @@
-{
-  "extension": [".js", ".vue"]
-}

data/templates/widget/.nycrc

@@ -1,3 +0,0 @@
-{
-  "extension": [".js", ".vue"]
-}