Vue 3 / Vuetify 3 migration for COSMOS 6

.github/workflows/playwright.yml

@@ -61,7 +61,7 @@ jobs:
         working-directory: playwright
       - name: Run Playwright tests
         # Run separately to allow for parallelism
-        run: ./playwright.sh run-chromium --grep-invert enterprise
+        run: ./playwright.sh run-chromium --grep-invert='enterprise'
         working-directory: playwright
       - name: Generate coverage
         run: yarn fixlinux; yarn cobertura

docs.openc3.com/scripts/generate_docs_from_yaml.rb

@@ -109,6 +109,12 @@ def build_page(meta, page)
         page << "```ruby\n"
         page << "#{data['example'].strip}\n"
         page << "```\n"
+        # If this is a screen, check to see if there is an image for the widget
+        if File.basename(@yaml_file) == 'screen.yaml'
+          if File.exist?("../static/img/telemetry_viewer/widgets/#{keyword.downcase}.png")
+            page << "![#{keyword}](/img/telemetry_viewer/widgets/#{keyword.downcase}.png)\n\n"
+          end
+        end
       end
       if data['ruby_example']
         page << "\nRuby Example:\n"

docs.openc3.com/src/css/custom.css

@@ -18,7 +18,7 @@
 }
 
 /* For readability concerns, you should choose a lighter palette in dark mode. */
-[data-theme='dark'] {
+[data-theme="dark"] {
   --ifm-color-primary: #4dacff;
   --ifm-color-primary-dark: #4dacff;
   --ifm-color-primary-darker: #4dacff;
@@ -35,3 +35,10 @@ img {
   width: auto;
   height: auto;
 }
+
+img[alt="LABEL"] {
+  width: 200px;
+}
+img[alt="SPACER"] {
+  width: 200px;
+}

openc3-cosmos-cmd-tlm-api/app/controllers/activity_controller.rb

@@ -20,8 +20,8 @@
 # This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
-require 'openc3/models/activity_model'
 require 'openc3/topics/timeline_topic'
+require 'openc3/models/activity_model'
 
 class ActivityController < ApplicationController
   NOT_FOUND = 'not found'

openc3-cosmos-cmd-tlm-api/app/controllers/reaction_controller.rb

@@ -21,7 +21,6 @@
 # if purchased from OpenC3, Inc.
 
 require 'openc3/models/reaction_model'
-require 'openc3/topics/autonomic_topic'
 
 class ReactionController < ApplicationController
   NOT_FOUND = 'not found'

openc3-cosmos-cmd-tlm-api/app/controllers/trigger_controller.rb

@@ -20,8 +20,8 @@
 # This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
-require 'openc3/models/trigger_model'
 require 'openc3/topics/autonomic_topic'
+require 'openc3/models/trigger_model'
 
 class TriggerController < ApplicationController
   NOT_FOUND = 'not found'

openc3-cosmos-cmd-tlm-api/app/controllers/trigger_group_controller.rb

@@ -21,8 +21,6 @@
 # if purchased from OpenC3, Inc.
 
 require 'openc3/models/trigger_group_model'
-require 'openc3/models/trigger_model'
-require 'openc3/topics/autonomic_topic'
 
 class TriggerGroupController < ApplicationController
   def initialize

openc3-cosmos-cmd-tlm-api/config/routes.rb

@@ -84,45 +84,9 @@
     resources :environment, only: [:index, :create]
     delete '/environment/:name', to: 'environment#destroy', name: /[^\/]+/
 
-    resources :timeline, only: [:index, :create]
-    get '/timeline/:name', to: 'timeline#show', name: /[^\/]+/
-    post '/timeline/:name/color', to: 'timeline#color', name: /[^\/]+/
-    delete '/timeline/:name', to: 'timeline#destroy', name: /[^\/]+/
-
-    post '/timeline/activities/create', to: 'activity#multi_create'
-    post '/timeline/activities/delete', to: 'activity#multi_destroy'
-
-    get '/timeline/:name/count', to: 'activity#count', name: /[^\/]+/
-    get '/timeline/:name/activities', to: 'activity#index', name: /[^\/]+/
-    post '/timeline/:name/activities', to: 'activity#create', name: /[^\/]+/
-    get '/timeline/:name/activity/:id', to: 'activity#show', name: /[^\/]+/, id: /[^\/]+/
-    post '/timeline/:name/activity/:id', to: 'activity#event', name: /[^\/]+/, id: /[^\/]+/
-    match '/timeline/:name/activity/:id', to: 'activity#update', name: /[^\/]+/, id: /[^\/]+/, via: [:patch, :put]
-    # NOTE: uuid is new as of 5.19.0
-    delete '/timeline/:name/activity/:id(/:uuid)', to: 'activity#destroy', name: /[^\/]+/, id: /[^\/]+/, uuid: /[^\/]+/
-
-    get '/autonomic/group', to: 'trigger_group#index'
-    post '/autonomic/group', to: 'trigger_group#create'
-    get '/autonomic/group/:group', to: 'trigger_group#show', group: /[^\/]+/
-    delete '/autonomic/group/:group', to: 'trigger_group#destroy', group: /[^\/]+/
-
-    get '/autonomic/:group/trigger', to: 'trigger#index', group: /[^\/]+/
-    post '/autonomic/:group/trigger', to: 'trigger#create', group: /[^\/]+/
-    get '/autonomic/:group/trigger/:name', to: 'trigger#show', group: /[^\/]+/, name: /[^\/]+/
-    post '/autonomic/:group/trigger/:name/enable', to: 'trigger#enable', group: /[^\/]+/, name: /[^\/]+/
-    post '/autonomic/:group/trigger/:name/disable', to: 'trigger#disable', group: /[^\/]+/, name: /[^\/]+/
-    match '/autonomic/:group/trigger/:name', to: 'trigger#update', group: /[^\/]+/, name: /[^\/]+/, via: [:patch, :put]
-    delete '/autonomic/:group/trigger/:name', to: 'trigger#destroy', group: /[^\/]+/, name: /[^\/]+/
-
-    get '/autonomic/reaction', to: 'reaction#index'
-    post '/autonomic/reaction', to: 'reaction#create'
-    get '/autonomic/reaction/:name', to: 'reaction#show', name: /[^\/]+/
-    # match '/autonomic/reaction/:name, to: 'reaction#update', name: /[^\/]+/, via: [:patch, :put]
-    post '/autonomic/reaction/:name/enable', to: 'reaction#enable', name: /[^\/]+/
-    post '/autonomic/reaction/:name/disable', to: 'reaction#disable', name: /[^\/]+/
-    post '/autonomic/reaction/:name/execute', to: 'reaction#execute', name: /[^\/]+/
-    match '/autonomic/reaction/:name', to: 'reaction#update', name: /[^\/]+/, via: [:patch, :put]
-    delete '/autonomic/reaction/:name', to: 'reaction#destroy', name: /[^\/]+/
+    get '/autocomplete/reserved-item-names', to: 'script_autocomplete#reserved_item_names'
+    get '/autocomplete/keywords/:type', to: 'script_autocomplete#keywords', type: /[^\/]+/
+    get '/autocomplete/data/:type', to: 'script_autocomplete#ace_autocomplete_data', type: /[^\/]+/
 
     get '/metadata', to: 'metadata#index'
     post '/metadata', to: 'metadata#create'
@@ -132,17 +96,6 @@
     match '/metadata/:id', to: 'metadata#update', id: /[^\/]+/, via: [:patch, :put]
     delete '/metadata/:id', to: 'metadata#destroy', id: /[^\/]+/
 
-    get '/notes', to: 'notes#index'
-    post '/notes', to: 'notes#create'
-    # get '/note/_search', to: 'note#search'
-    get '/notes/:id', to: 'notes#show', id: /[^\/]+/
-    match '/notes/:id', to: 'notes#update', id: /[^\/]+/, via: [:patch, :put]
-    delete '/notes/:id', to: 'notes#destroy', id: /[^\/]+/
-
-    get '/autocomplete/reserved-item-names', to: 'script_autocomplete#reserved_item_names'
-    get '/autocomplete/keywords/:type', to: 'script_autocomplete#keywords', type: /[^\/]+/
-    get '/autocomplete/data/:type', to: 'script_autocomplete#ace_autocomplete_data', type: /[^\/]+/
-
     # format: false to ensure the full path is used and not interpreted as a format (.xxx)
     scope format: false do
       get '/storage/buckets', to: 'storage#buckets'
@@ -202,7 +155,9 @@
 
     post "/redis/exec" => "redis#execute_raw"
 
-    # The remaining routes are Enterprise only
+    ##########################
+    # COSMOS Enterprise Routes
+    ##########################
     get "/users/active" => "users#active"
     match "/users/logout/:user", to: "users#logout", id: /[^\/]+/, via: [:patch, :put]
 
@@ -213,6 +168,53 @@
     match '/roles/:id', to: 'roles#update', id: /[^\/]+/, via: [:patch, :put]
     delete '/roles/:id', to: 'roles#destroy', id: /[^\/]+/
 
+    resources :timeline, only: [:index, :create]
+    get '/timeline/:name', to: 'timeline#show', name: /[^\/]+/
+    post '/timeline/:name/color', to: 'timeline#color', name: /[^\/]+/
+    delete '/timeline/:name', to: 'timeline#destroy', name: /[^\/]+/
+
+    post '/timeline/activities/create', to: 'activity#multi_create'
+    post '/timeline/activities/delete', to: 'activity#multi_destroy'
+
+    get '/timeline/:name/count', to: 'activity#count', name: /[^\/]+/
+    get '/timeline/:name/activities', to: 'activity#index', name: /[^\/]+/
+    post '/timeline/:name/activities', to: 'activity#create', name: /[^\/]+/
+    get '/timeline/:name/activity/:id', to: 'activity#show', name: /[^\/]+/, id: /[^\/]+/
+    post '/timeline/:name/activity/:id', to: 'activity#event', name: /[^\/]+/, id: /[^\/]+/
+    match '/timeline/:name/activity/:id', to: 'activity#update', name: /[^\/]+/, id: /[^\/]+/, via: [:patch, :put]
+    # NOTE: uuid is new as of 5.19.0
+    delete '/timeline/:name/activity/:id(/:uuid)', to: 'activity#destroy', name: /[^\/]+/, id: /[^\/]+/, uuid: /[^\/]+/
+
+    get '/autonomic/group', to: 'trigger_group#index'
+    post '/autonomic/group', to: 'trigger_group#create'
+    get '/autonomic/group/:group', to: 'trigger_group#show', group: /[^\/]+/
+    delete '/autonomic/group/:group', to: 'trigger_group#destroy', group: /[^\/]+/
+
+    get '/autonomic/:group/trigger', to: 'trigger#index', group: /[^\/]+/
+    post '/autonomic/:group/trigger', to: 'trigger#create', group: /[^\/]+/
+    get '/autonomic/:group/trigger/:name', to: 'trigger#show', group: /[^\/]+/, name: /[^\/]+/
+    post '/autonomic/:group/trigger/:name/enable', to: 'trigger#enable', group: /[^\/]+/, name: /[^\/]+/
+    post '/autonomic/:group/trigger/:name/disable', to: 'trigger#disable', group: /[^\/]+/, name: /[^\/]+/
+    match '/autonomic/:group/trigger/:name', to: 'trigger#update', group: /[^\/]+/, name: /[^\/]+/, via: [:patch, :put]
+    delete '/autonomic/:group/trigger/:name', to: 'trigger#destroy', group: /[^\/]+/, name: /[^\/]+/
+
+    get '/autonomic/reaction', to: 'reaction#index'
+    post '/autonomic/reaction', to: 'reaction#create'
+    get '/autonomic/reaction/:name', to: 'reaction#show', name: /[^\/]+/
+    # match '/autonomic/reaction/:name, to: 'reaction#update', name: /[^\/]+/, via: [:patch, :put]
+    post '/autonomic/reaction/:name/enable', to: 'reaction#enable', name: /[^\/]+/
+    post '/autonomic/reaction/:name/disable', to: 'reaction#disable', name: /[^\/]+/
+    post '/autonomic/reaction/:name/execute', to: 'reaction#execute', name: /[^\/]+/
+    match '/autonomic/reaction/:name', to: 'reaction#update', name: /[^\/]+/, via: [:patch, :put]
+    delete '/autonomic/reaction/:name', to: 'reaction#destroy', name: /[^\/]+/
+
+    get '/notes', to: 'notes#index'
+    post '/notes', to: 'notes#create'
+    # get '/note/_search', to: 'note#search'
+    get '/notes/:id', to: 'notes#show', id: /[^\/]+/
+    match '/notes/:id', to: 'notes#update', id: /[^\/]+/, via: [:patch, :put]
+    delete '/notes/:id', to: 'notes#destroy', id: /[^\/]+/
+
     get '/cmdauth', to: 'cmd_authority#index'
     post '/cmdauth/take', to: 'cmd_authority#take'
     post '/cmdauth/release', to: 'cmd_authority#release'

openc3-cosmos-init/plugins/.eslintrc.js

@@ -4,7 +4,7 @@ module.exports = {
     node: true,
   },
   extends: [
-    'plugin:vue/essential',
+    'plugin:vue/vue3-essential',
     'plugin:prettier/recommended',
     '@vue/prettier',
   ],

openc3-cosmos-init/plugins/openc3-tool-base/.eslintrc.js

@@ -4,7 +4,7 @@ module.exports = {
     node: true,
   },
   extends: [
-    'plugin:vue/essential',
+    'plugin:vue/vue3-essential',
     'plugin:prettier/recommended',
     '@vue/prettier',
   ],

openc3-cosmos-init/plugins/openc3-tool-base/jsconfig.json

@@ -1,6 +1,6 @@
 {
   "exclude": ["node_modules"],
   "vueCompilerOptions": {
-    "target": 2.7
+    "target": 3.5
   }
 }

openc3-cosmos-init/plugins/openc3-tool-base/package.json

@@ -16,10 +16,10 @@
     "regenerator-runtime": "0.14.1",
     "single-spa": "5.9.5",
     "systemjs": "6.15.1",
-    "vue": "2.7.16",
-    "vue-router": "3.5.4",
-    "vuetify": "2.7.1",
-    "vuex": "3.6.2"
+    "vue": "3.5.4",
+    "vue-router": "4.4.4",
+    "vuetify": "3.7.1",
+    "vuex": "4.1.0"
   },
   "__comment__": "NOTE: sass can't be upgraded until Vuetify 3 to avoid tons of deprecation warnings",
   "devDependencies": {
@@ -28,6 +28,7 @@
     "@babel/plugin-transform-runtime": "7.25.9",
     "@babel/preset-env": "7.26.0",
     "@babel/runtime": "7.26.0",
+    "@vue/compiler-sfc": "3.5.4",
     "@types/systemjs": "6.15.1",
     "babel-plugin-istanbul": "7.0.0",
     "copy-webpack-plugin": "12.0.2",
@@ -37,7 +38,7 @@
     "sass": "1.80.4",
     "sass-loader": "16.0.2",
     "serve": "14.2.4",
-    "vue-loader": "15.9.8",
+    "vue-loader": "17.4.2",
     "vue-template-compiler": "2.7.16",
     "webpack": "5.95.0",
     "webpack-cli": "5.1.4",