-
-
-
+ Right click name to pin item
Right click value for details / graph
-
- mdi-download
-
-
-
- Download Log
-
+
+
+ Download Log
+
-
- mdi-delete
-
-
-
- Clear Log
-
+
+
+ Clear Log
+
-
- mdi-{{ alertType }}
- {{ alertText }}
-
- Close
-
-
-
- mdi-pencil-off
- {{ lockedBy }} is editing this script. Editor is in read-only mode
-
-
- Unlock
-
-
- dismiss
-
-
-
-
-
+
+ mdi-{{ alertType }}
+ {{ alertText }}
+
+
+ Close
+
+
+
+
+ mdi-pencil-off
+ {{ lockedBy }} is editing this script. Editor is in read-only mode
+
+
-
+
+ dismiss
+
+
+
+
-
+ Unlock
+
+
-
+
+
+
+
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/EditScreenDialog.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/EditScreenDialog.vue
index 80eb9af5a..26cf5f160 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/EditScreenDialog.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/EditScreenDialog.vue
@@ -20,11 +20,11 @@
-
+
+
-
+
-
-
- mdi-connection
-
-
-
+
+
+
+
+ mdi-connection
+
+
+
+
+
+
+
+ Saving...
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+ Start
+
+
+
- mdi-cached
+ {{ environmentIcon }}
- Reload File
+ Script Environment
-
+
+
+
+
+ Go
+
+
+ {{ pauseOrRetryButton }}
+
+
+
+ Stop
+
+
+
+
+
+ mdi-step-forward
+
-
-
-
-
- Start
-
-
-
-
- {{ environmentIcon }}
-
-
- Script Environment
-
-
-
-
- Go
-
-
- {{ pauseOrRetryButton }}
-
-
-
- Stop
-
-
-
- Saving...
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
-
-
-
-
-
- Step
- mdi-step-forward
-
-
-
-
-
-
-
+
+
+
mdi-delete
@@ -37,9 +37,9 @@
Edit Screen: {{ target }} {{ screen }}
-
-
-
+
+
+
Download Screen
-
+
Upload a screen file.
@@ -78,13 +78,7 @@
class="editor"
@contextmenu.prevent="showContextMenu"
>
-
+
@@ -95,7 +89,7 @@
-
+
Cancel
@@ -135,7 +129,7 @@ import { ScreenCompleter } from './autocomplete'
export default {
props: {
- value: Boolean, // value is the default prop when using v-model
+ modelValue: Boolean,
target: {
type: String,
default: '',
@@ -191,10 +185,10 @@ export default {
},
show: {
get() {
- return this.value
+ return this.modelValue
},
set(value) {
- this.$emit('input', value) // input is the default event when using v-model
+ this.$emit('update:modelValue', value)
},
},
},
@@ -223,10 +217,10 @@ export default {
this.menuX = event.pageX
this.menuY = event.pageY
- var position = this.editor.getCursorPosition()
- var token = this.editor.session.getTokenAt(position.row, position.column)
+ let position = this.editor.getCursorPosition()
+ let token = this.editor.session.getTokenAt(position.row, position.column)
if (token) {
- var value = token.value.trim()
+ let value = token.value.trim()
if (value.includes(' ')) {
this.docsKeyword = value.split(' ')[0]
} else {
@@ -240,17 +234,17 @@ export default {
`${
window.location.origin
}/tools/staticdocs/docs/configuration/telemetry-screens#${this.docsKeyword.toLowerCase()}`,
- '_blank'
+ '_blank',
)
},
buildScreenMode() {
- var oop = ace.require('ace/lib/oop')
- var TextHighlightRules = ace.require(
- 'ace/mode/text_highlight_rules'
+ let oop = ace.require('ace/lib/oop')
+ let TextHighlightRules = ace.require(
+ 'ace/mode/text_highlight_rules',
).TextHighlightRules
let list = this.keywords.join('|')
- var OpenC3HighlightRules = function () {
+ let OpenC3HighlightRules = function () {
this.$rules = {
start: [
{
@@ -278,10 +272,10 @@ export default {
this.normalizeRules()
}
oop.inherits(OpenC3HighlightRules, TextHighlightRules)
- var Mode = function () {
+ let Mode = function () {
this.HighlightRules = OpenC3HighlightRules
}
- var TextMode = ace.require('ace/mode/text').Mode
+ let TextMode = ace.require('ace/mode/text').Mode
oop.inherits(Mode, TextMode)
;(function () {
this.$id = 'ace/mode/openc3'
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/Empty.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/Empty.vue
new file mode 100644
index 000000000..a73dc175e
--- /dev/null
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/Empty.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/EnvironmentChooser.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/EnvironmentChooser.vue
index 4e61322fd..27acae302 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/EnvironmentChooser.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/EnvironmentChooser.vue
@@ -22,16 +22,16 @@
-
+
-
+
Add environment variables (optional)
Key
Value
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/Openc3Screen.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/Openc3Screen.vue
index 951432318..e7bac4910 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/Openc3Screen.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/Openc3Screen.vue
@@ -26,11 +26,11 @@
+
+
+
mdi-plus
@@ -41,52 +41,50 @@
-
- mdi-delete
-
-
-
- Delete Environment
-
+
+ mdi-delete
+
+
+
+ Delete Environment
+
-
-
-
+
+
+
Errors
-
-
-
+
+
+
mdi-pencil
@@ -52,9 +52,9 @@
Edit Screen
-
-
-
+
+
+
{{ floated ? 'mdi-balloon' : 'mdi-view-grid-outline' }}
@@ -62,9 +62,9 @@
{{ floated ? 'Unfloat Screen' : 'Float Screen' }}
-
-
-
+
+
+
mdi-arrow-up
@@ -72,9 +72,9 @@
Move Screen Up
-
-
-
+
+
+
mdi-arrow-down
@@ -83,11 +83,11 @@
Move Screen Down
-
-
+
+
+
Minimize Screen
Maximize Screen
-
-
-
+
+
+
Close Screen
-
+
@@ -157,63 +163,30 @@
-
+
+
-
+
+
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/TargetPacketItemChooser.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/TargetPacketItemChooser.vue
index f999d1938..dc08d6381 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/TargetPacketItemChooser.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/TargetPacketItemChooser.vue
@@ -21,18 +21,17 @@
-->
-
-
+
-
+
Description: {{ description }} (HAZARDOUS)
@@ -217,10 +215,10 @@ export default {
selectedValueType: 'CONVERTED',
reductionModes: [
// Map NONE to DECOM for clarity
- { text: 'NONE', value: 'DECOM' },
- { text: 'REDUCED_MINUTE', value: 'REDUCED_MINUTE' },
- { text: 'REDUCED_HOUR', value: 'REDUCED_HOUR' },
- { text: 'REDUCED_DAY', value: 'REDUCED_DAY' },
+ { title: 'NONE', value: 'DECOM' },
+ { title: 'REDUCED_MINUTE', value: 'REDUCED_MINUTE' },
+ { title: 'REDUCED_HOUR', value: 'REDUCED_HOUR' },
+ { title: 'REDUCED_DAY', value: 'REDUCED_DAY' },
],
selectedArrayIndex: null,
selectedReduced: 'DECOM',
@@ -258,7 +256,7 @@ export default {
// TODO: This is a nice enhancement but results in logs of API calls for many targets
// See if we can reduce this to a single API call
// Filter out any targets without packets
- // for (var i = this.targetNames.length - 1; i >= 0; i--) {
+ // for (let i = this.targetNames.length - 1; i >= 0; i--) {
// const cmd =
// this.mode === 'tlm' ? 'get_all_tlm_names' : 'get_all_cmd_names'
// await this.api[cmd](this.targetNames[i].value).then((names) => {
@@ -311,6 +309,7 @@ export default {
},
selectedItemNameWIndex: function () {
if (
+ this.itemIsArray() &&
this.selectedArrayIndex !== null &&
this.selectedArrayIndex !== this.ALL.label
) {
@@ -546,7 +545,7 @@ export default {
} else if (this.selectedItemName === 'ALL') {
this.allPacketItems()
} else if (this.chooseItem) {
- this.$emit('click', {
+ this.$emit('addItem', {
targetName: this.selectedTargetName,
packetName: this.selectedPacketName,
itemName: this.selectedItemNameWIndex,
@@ -555,7 +554,7 @@ export default {
reducedType: this.selectedReducedType,
})
} else {
- this.$emit('click', {
+ this.$emit('addItem', {
targetName: this.selectedTargetName,
packetName: this.selectedPacketName,
valueType: this.selectedValueType,
@@ -572,7 +571,7 @@ export default {
this.api[cmd](this.selectedTargetName, packetName.value).then(
(packet) => {
packet.items.forEach((item) => {
- this.$emit('click', {
+ this.$emit('addItem', {
targetName: this.selectedTargetName,
packetName: packetName.value,
itemName: item['name'],
@@ -589,7 +588,7 @@ export default {
allPacketItems: function () {
this.itemNames.forEach((item) => {
if (item === this.ALL) return
- this.$emit('click', {
+ this.$emit('addItem', {
targetName: this.selectedTargetName,
packetName: this.selectedPacketName,
itemName: item.value,
@@ -609,7 +608,4 @@ export default {
.select {
max-width: 300px;
}
-.row + .row {
- margin-top: 0px;
-}
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/TextBoxDialog.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/TextBoxDialog.vue
index b7e653884..fe838c80f 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/TextBoxDialog.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/TextBoxDialog.vue
@@ -16,21 +16,21 @@
# All changes Copyright 2022, OpenC3, Inc.
# All Rights Reserved
#
-# This file may also be used under the terms of a commercial license
+# This file may also be used under the terms of a commercial license
# if purchased from OpenC3, Inc.
-->
-
+
-
-
-
+
+
+
mdi-download
@@ -39,7 +39,7 @@
Download
-
+
-
+
Ok
+ Ok
@@ -61,7 +61,7 @@
+
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/icons/CosmosRuxIcon.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/icons/CosmosRuxIcon.vue
index 7f257697c..d217fbc82 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/icons/CosmosRuxIcon.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/icons/CosmosRuxIcon.vue
@@ -13,7 +13,7 @@
# GNU Affero General Public License for more details.
# Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2024, OpenC3, Inc.
# All Rights Reserved
#
# This file may also be used under the terms of a commercial license
@@ -21,22 +21,11 @@
-->
-
-
-
-
+
+
{
+ this.appliedSettings.forEach((setting) => {
if (setting[0] === 'MIN_VALUE') {
this.minValue = parseInt(setting[1])
}
@@ -96,14 +93,10 @@ export default {
// Always pass CONVERTED so we can calculate the value against the limits (in converted units)
this.valueId = `${this.parameters[0]}__${this.parameters[1]}__${this.parameters[2]}__CONVERTED`
- if (this.screen) {
- this.screen.addItem(this.valueId)
- }
+ this.$emit('addItem', this.valueId)
},
destroyed() {
- if (this.screen) {
- this.screen.deleteItem(this.valueId)
- }
+ this.$emit('deleteItem', this.valueId)
clearInterval(this.currentSetRefreshInterval)
},
methods: {
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/widgets/BlockWidget.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/widgets/BlockWidget.vue
index afb55ae47..bd4e5d6df 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/widgets/BlockWidget.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/widgets/BlockWidget.vue
@@ -23,26 +23,20 @@
@@ -46,10 +49,10 @@ export default {
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/ModifiedPluginDialog.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/ModifiedPluginDialog.vue
index f0f9349c9..d186ff385 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/ModifiedPluginDialog.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/ModifiedPluginDialog.vue
@@ -19,29 +19,27 @@
-
+
+
-
- {{ target.name }}
- {{ file }}
-
+ {{ target.name }}
+ {{ file }}
-
+
Cancel
+ Cancel
+
Confirm
+ >
+ Confirm
@@ -82,7 +84,7 @@ import Api from '../../services/api'
export default {
props: {
- value: Boolean, // value is the default prop when using v-model
+ modelValue: Boolean,
plugin: String,
targets: Array,
pluginDelete: Boolean,
@@ -96,10 +98,10 @@ export default {
computed: {
show: {
get() {
- return this.value
+ return this.modelValue
},
set(value) {
- this.$emit('input', value) // input is the default event when using v-model
+ this.$emit('update:modelValue', value)
},
},
},
@@ -114,7 +116,7 @@ export default {
files: response.data,
})
}
- }
+ },
)
}
},
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/OpenC3Admin.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/OpenC3Admin.vue
index 69613eefc..09f665c20 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/OpenC3Admin.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/OpenC3Admin.vue
@@ -46,9 +46,17 @@ export default {
return {
title: 'Administrator Console',
curTab: null,
- tabs: TabsList,
}
},
- methods: {},
+ computed: {
+ tabs: function () {
+ return TabsList.map((tab) => {
+ return {
+ displayName: tab.displayName,
+ path: { name: tab.name },
+ }
+ })
+ },
+ },
}
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/PluginDialog.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/PluginDialog.vue
index 2ffe64017..9973367f7 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/PluginDialog.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/PluginDialog.vue
@@ -26,7 +26,7 @@
{{ pluginName }}
- mdi-alert-box
+ mdi-alert-box
Plugin {{ plugin }} was modified. Would you like to delete the
existing modified files?
The existing plugin.txt is different from the {{ pluginName }}'s
plugin.txt. Navigate the diffs making whatever edits you want before
@@ -37,15 +37,12 @@
Variables
-
- plugin.txt
-
- plugin.txt
+ plugin.txt
-
@@ -127,6 +121,7 @@ import 'ace-builds/src-min-noconflict/ext-searchbox'
import AceDiff from '@openc3/ace-diff'
import '@openc3/ace-diff/dist/ace-diff.min.css'
import '@openc3/ace-diff/dist/ace-diff-dark.min.css'
+import { toRaw } from 'vue'
export default {
props: {
@@ -146,7 +141,7 @@ export default {
type: String,
required: false,
},
- value: Boolean, // value is the default prop when using v-model
+ modelValue: Boolean, // modelValue is the default prop when using v-model
},
data() {
return {
@@ -192,7 +187,7 @@ export default {
this.curDiff = -1 // so the first will be 0
}
},
- beforeDestroy() {
+ beforeUnmount() {
if (this.editor) {
this.editor.destroy()
}
@@ -203,10 +198,10 @@ export default {
computed: {
show: {
get() {
- return this.value
+ return this.modelValue
},
set(value) {
- this.$emit('input', value) // input is the default event when using v-model
+ this.$emit('update:modelValue', value)
},
},
},
@@ -252,18 +247,18 @@ export default {
this.differ.getEditors().right.scrollToLine(rrow)
},
buildPluginMode() {
- var oop = ace.require('ace/lib/oop')
- var RubyHighlightRules = ace.require(
+ let oop = ace.require('ace/lib/oop')
+ let RubyHighlightRules = ace.require(
'ace/mode/ruby_highlight_rules',
).RubyHighlightRules
// TODO: Grab from code
let keywords = ['VARIABLE']
let regex = new RegExp(`(\\b${keywords.join('\\b|\\b')}\\b)`)
- var PluginHighlightRules = function () {
+ let PluginHighlightRules = function () {
RubyHighlightRules.call(this)
// add openc3 rules to the ruby rules
- for (var rule in this.$rules) {
+ for (let rule in this.$rules) {
this.$rules[rule].unshift({
regex: regex,
token: 'support.function',
@@ -272,21 +267,21 @@ export default {
}
oop.inherits(PluginHighlightRules, RubyHighlightRules)
- var MatchingBraceOutdent = ace.require(
+ let MatchingBraceOutdent = ace.require(
'ace/mode/matching_brace_outdent',
).MatchingBraceOutdent
- var CstyleBehaviour = ace.require(
+ let CstyleBehaviour = ace.require(
'ace/mode/behaviour/cstyle',
).CstyleBehaviour
- var FoldMode = ace.require('ace/mode/folding/ruby').FoldMode
- var Mode = function () {
+ let FoldMode = ace.require('ace/mode/folding/ruby').FoldMode
+ let Mode = function () {
this.HighlightRules = PluginHighlightRules
this.$outdent = new MatchingBraceOutdent()
this.$behaviour = new CstyleBehaviour()
this.foldingRules = new FoldMode()
this.indentKeywords = this.foldingRules.indentKeywords
}
- var RubyMode = ace.require('ace/mode/ruby').Mode
+ let RubyMode = ace.require('ace/mode/ruby').Mode
oop.inherits(Mode, RubyMode)
;(function () {
this.$id = 'ace/mode/openc3'
@@ -324,10 +319,10 @@ export default {
emitSubmit(lines) {
let pluginHash = {
name: this.pluginName,
- variables: this.localVariables,
+ variables: toRaw(this.localVariables),
plugin_txt_lines: lines,
}
- this.$emit('submit', pluginHash)
+ this.$emit('callback', pluginHash)
},
close: function () {
this.show = !this.show
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/InterfacesTab.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/InterfacesTab.vue
index ff5956274..8f5f62031 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/InterfacesTab.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/InterfacesTab.vue
@@ -25,23 +25,18 @@
-
- {{ openc3_interface }}
-
-
-
-
-
+ {{ openc3_interface }}
+
+
+
+
+
mdi-eye
Show Interface Details
-
+
-
- {{ microservice }}
-
- Updated:
- {{ formatDate(microservice_status[microservice].updated_at) }},
- State: {{ microservice_status[microservice].state }}, Count:
- {{ microservice_status[microservice].count }}
-
-
- mdi-cloud-upload
+ mdi-cloud-upload
Upload
Loading...
- {{ alert }}
+ {{
+ alert
+ }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
mdi-eye
Show Output
-
+
Ruby Gems
-
- {{ gem }}
-
-
-
-
-
+ {{ gem }}
+
+
+
+
+
mdi-delete
Delete Package
-
+
Python Packages
-
- {{ pkg }}
-
-
-
-
-
+ {{ pkg }}
+
+
+
+
+
mdi-delete
Delete Package
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
mdi-eye
@@ -118,7 +115,7 @@
Show Output
-
+
Plugin List
-
- * {{ plugin }} * {{ plugin }}
+
+
-
-
- {{ target.name }}
-
- {{ target.name }}
-
-
-
-
+ {{ target.name }}
+
+ {{ target.name }}
+
+
+
+
+
{
this.upload(this.currentPlugin)
@@ -603,7 +596,7 @@ export default {
{
okText: 'Ok',
cancelText: 'Cancel',
- }
+ },
)
.then(() => {
this.upload(this.currentPlugin)
@@ -628,4 +621,7 @@ export default {
.list {
background-color: var(--color-background-surface-default) !important;
}
+.v-theme--cosmosDark.v-list div:nth-child(odd) .v-list-item {
+ background-color: var(--color-background-base-selected) !important;
+}
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/RedisTab.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/RedisTab.vue
index 3b4268806..5c54bd123 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/RedisTab.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/RedisTab.vue
@@ -43,17 +43,16 @@
Response: {{ redisResponse }}
-
+
Execute
-
+
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/RoutersTab.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/RoutersTab.vue
index eed18342e..dc4cd9411 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/RoutersTab.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/RoutersTab.vue
@@ -25,19 +25,18 @@
-
- {{ router }}
-
-
-
-
-
+ {{ router }}
+
+
+
+
+
mdi-eye
Show Router Details
-
+
mdi-cloud-upload
+ mdi-cloud-upload
Set
Loading...
@@ -60,29 +60,24 @@
- {{ alert }}
+ {{
+ alert
+ }}
-
- {{ secret }}
-
-
-
-
-
+ {{ secret }}
+
+
+
+
+
mdi-delete
Delete Secret
-
+
-
- {{ target.name }}
- Plugin: {{ target.plugin }}
-
-
+ {{ target.name }}
+ Plugin: {{ target.plugin }}
+
+
-
-
+
+
+
mdi-eye
Show Target Details
-
+
{{ icon }}
+ {{ icon }}
@@ -52,33 +52,30 @@
>
Astro Settings
-
+
Error loading previous configuration due to {{ errorText }}
-
+
Error saving due to {{ errorText }}
-
+
Saved! (Refresh the page to see changes)
-
-
+
Save
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/ClassificationBannerSettings.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/ClassificationBannerSettings.vue
index b58e8b5e7..634e6ff3f 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/ClassificationBannerSettings.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/ClassificationBannerSettings.vue
@@ -19,13 +19,13 @@
Classification Banner Settings
-
+
Error loading previous configuration due to {{ errorText }}
-
+
Error saving due to {{ errorText }}
-
+
Saved! (Refresh the page to see changes)
@@ -43,21 +43,21 @@
mdi-square
-
-
- mdi-square
-
- {{ data.item.text }}
+
+
+
+
+ mdi-square
+
+
+
@@ -84,6 +84,7 @@
@@ -92,15 +93,14 @@
mdi-square
-
-
- mdi-square
-
- {{ data.item.text }}
+
+
+
+
+ mdi-square
+
+
+
@@ -126,6 +126,7 @@
+
Clear
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/PypiSettings.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/PypiSettings.vue
index 8e464c0ec..4107ff8c9 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/PypiSettings.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/PypiSettings.vue
@@ -23,20 +23,25 @@
This sets the URL for installing dependency python packages. Also used for
package discovery.
-
+
Error loading previous configuration due to {{ errorText }}
-
+
Error saving due to {{ errorText }}
-
+
Saved! (Refresh the page to see changes)
-
+
Save
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/RubyGemsSettings.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/RubyGemsSettings.vue
index b962178d5..a04207162 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/RubyGemsSettings.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/RubyGemsSettings.vue
@@ -23,13 +23,13 @@
This sets the URL for installing dependency rubygems. Also used for
rubygem discovery.
-
+
Error loading previous configuration due to {{ errorText }}
-
+
Error saving due to {{ errorText }}
-
+
Saved! (Refresh the page to see changes)
@@ -40,7 +40,12 @@
/>
-
+
Save
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/SourceCodeSettings.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/SourceCodeSettings.vue
index 76ee3abb3..f3b86d363 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/SourceCodeSettings.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/SourceCodeSettings.vue
@@ -23,13 +23,13 @@
This sets the URL for the "Source" link in the footer. This is required
under the AGPL license.
-
+
Error loading previous configuration due to {{ errorText }}
-
+
Error saving due to {{ errorText }}
-
+
Saved! (Refresh the page to see changes)
@@ -40,7 +40,12 @@
/>
-
+
Save
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/SubtitleSettings.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/SubtitleSettings.vue
index efab38fac..d21f0af54 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/SubtitleSettings.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/SubtitleSettings.vue
@@ -23,20 +23,25 @@
This sets a subtitle to display below the COSMOS logo in the Navigation
bar.
-
+
Error loading previous configuration due to {{ errorText }}
-
+
Error saving due to {{ errorText }}
-
+
Saved! (Refresh the page to see changes)
-
+
Save
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/SuppressedSettings.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/SuppressedSettings.vue
index 186896cd2..3ce45a704 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/SuppressedSettings.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/SuppressedSettings.vue
@@ -26,9 +26,8 @@
+
Reset
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/TimeZoneSettings.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/TimeZoneSettings.vue
index bf2d36e23..7a1ac5cf2 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/TimeZoneSettings.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/TimeZoneSettings.vue
@@ -23,20 +23,19 @@
The time zone to display for all COSMOS tools. (Note: All timestamps are
UTC in the backend).
-
+
Error loading previous configuration due to {{ errorText }}
-
+
Error saving due to {{ errorText }}
-
+
Saved! (Refresh the page to see changes)
-
+
Save
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/base/AppFooter.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/base/AppFooter.vue
index 35f23ca46..6ad113e3a 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/base/AppFooter.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/base/AppFooter.vue
@@ -28,7 +28,7 @@
{{ license }}
![OpenC3]()
@@ -38,9 +37,9 @@
@@ -50,38 +49,34 @@
-
-
- {{ open ? 'mdi-chevron-down' : 'mdi-chevron-right' }}
-
-
+
+
- {{ item.icon }}
+ {{ item.icon }}
- {{ item.icon }}
+ {{ item.icon }}
-
+
{{ item.name }}
@@ -90,7 +85,7 @@
{{ item.name }}
@@ -123,17 +118,12 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
@@ -169,7 +160,7 @@
import { OpenC3Api } from '../../services/openc3-api'
import Api from '../../services/api'
import logo from '../../../public/img/logo.png'
-import { registerApplication, start } from 'single-spa'
+import { navigateToUrl, registerApplication, start } from 'single-spa'
import ScopeSelector from './components/ScopeSelector.vue'
import Notifications from './components/Notifications.vue'
import UserMenu from './components/UserMenu.vue'
@@ -209,7 +200,7 @@ export default {
// a computed getter
shownTools: function () {
let result = {}
- for (var key of Object.keys(this.appNav)) {
+ for (let key of Object.keys(this.appNav)) {
if (this.appNav[key].shown && this.appNav[key].category !== 'Admin') {
result[key] = this.appNav[key]
}
@@ -218,7 +209,7 @@ export default {
},
adminTools: function () {
let result = {}
- for (var key of Object.keys(this.appNav)) {
+ for (let key of Object.keys(this.appNav)) {
if (this.appNav[key].shown && this.appNav[key].category === 'Admin') {
result[key] = this.appNav[key]
}
@@ -271,14 +262,16 @@ export default {
let id = 1
// Register apps and start single-spa
- for (var key of Object.keys(this.appNav)) {
+ for (let key of Object.keys(this.appNav)) {
if (this.appNav[key].shown) {
if (
this.appNav[key].category &&
this.appNav[key].category !== 'Admin'
) {
// TODO: Make this initiallyOpen configurable like with a CATEGORY parameter?
- this.initiallyOpen.push(this.appNav[key].category)
+ if (!this.initiallyOpen.includes(this.appNav[key].category)) {
+ this.initiallyOpen.push(this.appNav[key].category)
+ }
const result = this.items.filter(
(item) => item.name === this.appNav[key].category,
)
@@ -345,20 +338,6 @@ export default {
urlRerouteOnly: true,
})
- // Redirect some base paths to the first tool
- if (
- window.location.pathname == '/' ||
- window.location.pathname == '/tools' ||
- window.location.pathname == '/tools/'
- ) {
- for (var key of Object.keys(this.shownTools)) {
- if (this.appNav[key].shown) {
- history.replaceState(null, '', this.appNav[key].url)
- break
- }
- }
- }
-
// Check every minute if we need to update our token
setInterval(() => {
OpenC3Auth.updateToken(120).then(function (refreshed) {
@@ -371,6 +350,7 @@ export default {
)
},
methods: {
+ navigateToUrl,
newTabUrl(tool) {
let url = null
if (tool.url[0] == '/' && tool.url[1] != '/') {
@@ -402,7 +382,6 @@ export default {
}
div a {
color: white;
- font-size: 16px;
display: block;
height: 100%;
width: 100%;
@@ -419,21 +398,21 @@ a.fixcenter {
/* Remove the padding on root level nodes since we removed the expand icon */
#openc3-nav-drawer
.v-treeview
- > .v-treeview-node
- > .v-treeview-node__root
- > .v-treeview-node__level {
+ > .v-treeview-item
+ > .v-treeview-item__root
+ > .v-treeview-item__level {
width: 0px;
}
#openc3-nav-drawer
.v-treeview
- > .v-treeview-node
- > .v-treeview-node__root
- > .v-treeview-node__toggle {
+ > .v-treeview-item
+ > .v-treeview-item__root
+ > .v-treeview-item__toggle {
width: 0px;
}
#openc3-nav-drawer
- .v-treeview-node__children
- div.v-treeview-node__level:nth-child(1) {
+ .v-treeview-item__children
+ div.v-treeview-item__level:nth-child(1) {
width: 0px;
}
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/base/components/ClassificationBanners.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/base/components/ClassificationBanners.vue
index 20fb5e814..167c48141 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/base/components/ClassificationBanners.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/base/components/ClassificationBanners.vue
@@ -74,6 +74,7 @@ export default {
-
-
-
-
+
+
+
mdi-eye
View Microservice
-
+
@@ -175,4 +167,7 @@ export default {
.list {
background-color: var(--color-background-surface-default) !important;
}
+.v-theme--cosmosDark.v-list div:nth-child(odd) .v-list-item {
+ background-color: var(--color-background-base-selected) !important;
+}
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/PackagesTab.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/PackagesTab.vue
index b406e4bdb..b363a8cad 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/PackagesTab.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/PackagesTab.vue
@@ -45,20 +45,16 @@
:disabled="files.length < 1"
:loading="loadingPackage"
>
-
-
-
-
+ {{ microservice }}
+
+ Updated:
+ {{ formatDate(microservice_status[microservice].updated_at) }},
+ State: {{ microservice_status[microservice].state }}, Count:
+ {{ microservice_status[microservice].count }}
+
+
+
+
-
+
-
+
+
mdi-alert
View Error
-
+
-
-
+
+
mdi-download
@@ -163,12 +159,11 @@
-
-
+
+
mdi-pencil
@@ -178,12 +173,11 @@
-
-
+
+
mdi-update
@@ -193,12 +187,11 @@
-
-
+
+
mdi-delete
@@ -207,7 +200,7 @@
Delete Plugin
-
-
-
-
+
+
+
mdi-download
Download Target Modified Files
-
-
-
- mdi-drag-horizontal
-
-
- {{ tool }}
-
-
-
-
-
+
+ {{ tool }}
+
+
+
+
+
mdi-pencil
Edit Tool
-
-
-
-
-
+
+
+
mdi-delete
Delete Tool
-
+
@@ -104,7 +101,7 @@ export default {
data() {
return {
name: null,
- icon: '$astro-add-small',
+ icon: 'astro:add-small',
url: null,
tools: [],
jsonContent: '',
@@ -115,7 +112,7 @@ export default {
},
mounted() {
this.update()
- var el = document.getElementById('toollist')
+ let el = document.getElementById('toollist')
Sortable.create(el, {
filter: '.filter', // 'filter' class is not draggable
onUpdate: this.sortChanged,
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/index.js b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/index.js
index 55a7ae3c8..244f95663 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/index.js
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/index.js
@@ -23,51 +23,61 @@
const TabsList = [
{
displayName: 'Plugins',
+ name: 'PluginsTab',
path: 'plugins',
component: () => import('./PluginsTab'),
},
{
displayName: 'Targets',
+ name: 'TargetsTab',
path: 'targets',
component: () => import('./TargetsTab'),
},
{
displayName: 'Interfaces',
+ name: 'InterfacesTab',
path: 'interfaces',
component: () => import('./InterfacesTab'),
},
{
displayName: 'Routers',
+ name: 'RoutersTab',
path: 'routers',
component: () => import('./RoutersTab'),
},
{
displayName: 'Microservices',
+ name: 'MicroservicesTab',
path: 'microservices',
component: () => import('./MicroservicesTab'),
},
{
displayName: 'Packages',
+ name: 'PackagesTab',
path: 'packages',
component: () => import('./PackagesTab'),
},
{
displayName: 'Tools',
+ name: 'ToolsTab',
path: 'tools',
component: () => import('./ToolsTab'),
},
{
displayName: 'Redis',
+ name: 'RedisTab',
path: 'redis',
component: () => import('./RedisTab'),
},
{
displayName: 'Secrets',
+ name: 'SecretsTab',
path: 'secrets',
component: () => import('./SecretsTab'),
},
{
displayName: 'Settings',
+ name: 'SettingsTab',
path: 'settings',
component: () => import('./SettingsTab'),
},
diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/AstroSettings.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/AstroSettings.vue
index f6231c6a3..ae9d8ac29 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/AstroSettings.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/admin/tabs/settings/AstroSettings.vue
@@ -19,24 +19,25 @@