Merge branch 'main' into 303/remove-deprecated-config

Author: davetsay

.cspell.json

@@ -0,0 +1,32 @@
+{
+  "version": "0.2",
+  "language": "en,en-us",
+  "dictionaries": [
+    "npm",
+    "softwareTerms",
+    "node",
+    "html",
+    "css",
+    "bash",
+    "en_US",
+    "en-gb",
+    "misc",
+    "omm"
+  ],
+  "dictionaryDefinitions": [
+    {
+      "name": "omm",
+      "path": ".cspell/omm-dictionary.txt",
+      "description": "Open MCT for MCWS dictionary"
+    }
+  ],
+  "ignorePaths": [
+    "package.json",
+    "dist/**",
+    "package-lock.json",
+    "node_modules",
+    "*.log",
+    "test_data/**",
+    "target/**"
+  ]
+}

.cspell/omm-dictionary.txt

@@ -0,0 +1,55 @@
+# openmct
+openmct
+metadatas
+metadatum
+unlisten
+unlisteners
+persistable
+Persistable
+timesystem
+TIMESYSTEM
+frameaccountability
+DDDTHH
+DDDDTHH
+
+# dependencies
+printj
+
+# testing
+xdescribe
+
+# ammos
+mcws
+MCWSEVR
+mcwsurl
+ampcs
+mpcs # root_topic was hardcoded as mpcs before name change to ampcs
+atlo
+rfsw
+spsc
+apid
+apids
+scid
+vcid
+vcids
+vcfc
+evrs
+scmf
+cltus
+insync
+datatable
+
+# time
+scet
+lmst
+sclk
+mslsol
+
+# names
+dsanto
+peterr
+smap
+
+# TODO fix
+# remove dismissable when implementing https://github.com/NASA-AMMOS/openmct-mcws/issues/209
+dismissable

README.md

@@ -1,5 +1,5 @@
 # Open MCT for MCWS
-Open Mission Control Techologies for Mission Control Web Services (Open MCT for MCWS) is a next-generation web-based mission control framework for visualization of data on desktop and mobile devices. Open MCT for MCWS is built on the [Open MCT Framework](https://github.com/nasa/openmct), and includes adapter code for using MCWS as a telemetry and persistence provider. Open MCT is developed at NASA Ames Research Center in Silicon Valley, in collaboration with NASA AMMOS and the Jet Propulsion Laboratory, California Institute of Technology (under its contract with NASA, 80NM0018D0004).
+Open Mission Control Technologies for Mission Control Web Services (Open MCT for MCWS) is a next-generation web-based mission control framework for visualization of data on desktop and mobile devices. Open MCT for MCWS is built on the [Open MCT Framework](https://github.com/nasa/openmct), and includes adapter code for using MCWS as a telemetry and persistence provider. Open MCT is developed at NASA Ames Research Center in Silicon Valley, in collaboration with NASA AMMOS and the Jet Propulsion Laboratory, California Institute of Technology (under its contract with NASA, 80NM0018D0004).
 
 ## Configuration
 Various configurations and customizations are available by editing `config.js`. Descriptions of each configuration reside with the configuration in the file.

config.js

@@ -84,11 +84,11 @@
       evrDefaultBackgroundColor: undefined,
 
       /**
-       * evrDefaultForegoundColor: default foreground color for EVRs.
+       * evrDefaultForegroundColor: default foreground color for EVRs.
        * Set to `undefined` to use the theme default.  Otherwise, specify
        * a hex string for an RGB color, e.g. `#ababab`.
        */
-      evrDefaultForegoundColor: undefined,
+      evrDefaultForegroundColor: undefined,
 
       /**
        * evrBackgroundColorByLevel: specify the background color of EVRs
@@ -181,6 +181,14 @@
        */
       lmstEpoch: Date.UTC(2020, 2, 18, 0, 0, 0),
 
+      /*
+       * subscriptionMCWSFilterDelay: delay in milliseconds for combining filters for the same subscription
+       * endpoint connection. Smaller value = quicker display of realtime data (ex, 10ms in a
+       *  low latency environment), higher value = avoids potentially creating and subsequently tearing down new websocket connections if filter changes are happening faster than server response times
+       * (ex, 100ms+ in a high latency environment)
+       */
+      subscriptionMCWSFilterDelay: 100,
+
       /**
        * timeSystems: specify the time systems to use.
        * Options are 'scet', 'ert', 'sclk', 'msl.sol' and 'lmst'.
@@ -193,83 +201,137 @@
              *
              * key property is required and other options are optional
              * timeSystem:
-             * * key: string, required
+             * * key: string, required. Time system. Options are 'scet', 'ert', 'sclk', 'msl.sol' and 'lmst'.
              * * limit: number, optional - maximum duration between start and end bounds allow
-             * * presets: array, optional - preset bounds for convenience
-             * * * preset:
-             * * * * label: string, descriptive label for preset
+             * * modeSettings: object, optional - presets for convenience. 
+             * * * fixed: object, optional - valid objects are bounds objects and presets array. 
+             * * * realtime: object, optional - valid objects are clockOffsets and presets array. 
+             * * * lad:object, optional - valid objects are clockOffsets. 
+             * * * * 
+             * * * * Optional objects: 
              * * * * bounds: start and end bounds for preset as numbers
-             * * * * * * * * start and end can be declared as a number or a function returning a number
-             * 
+             * * * * * * * * start: and end: can be declared as a number or a function returning a number
+             * * * * presets: array of objects consisting of: 
+             * * * * * bounds: - required. 
+             * * * * * label: - required, string
+             * * * * clockOffsets: object, optional. Start and end relative to active clock. 
+             * * * * start: and end: numbers relative to active clock's 0. Start is negative, end is positive. 
              * *advanced** example configuration below 
              *
             timeSystems: [
-                {
-                    key:'scet',
-                    presets: [
-                        {
-                            label: 'Last 2 hours',
-                            bounds: {
-                                start: Date.now() - 1000 * 60 * 60 * 2,
-                                end: Date.now()
-                            }
+             {
+                key:'scet',
+                modeSettings:{
+                  fixed:{
+                    bounds:{
+                        // 1 day ago
+                        start: new Date(
+                            Date.UTC(
+                                new Date().getUTCFullYear(),
+                                new Date().getUTCMonth(),
+                                new Date().getUTCDate()
+                            ) - 1 * 864e5
+                            ).getTime(),
+                        end: new Date(
+                            Date.UTC(
+                                new Date().getUTCFullYear(),
+                                new Date().getUTCMonth(),
+                                new Date().getUTCDate()
+                            ) + 864e5 - 1
+                            ).getTime()                  
                         },
-                        {
-                            label: 'Last 1 hour',
-                            bounds: {
-                                start: Date.now() - 1000 * 60 * 60,
-                                end: Date.now()
-                            }
+                    presets:[
+                      {
+                        label: 'Last 2 hours (SCET Recorded)',
+                        bounds: {
+                            start: () => Date.now() - 1000 * 60 * 60 * 2,
+                            end:  () => Date.now()
                         }
-                    ],
-                    limit: 1000 * 60 * 60 * 6
-                },
-                {
-                    key:'ert',
-                    presets: [
-                        {
-                            label: 'Last 2 hours',
-                            bounds: {
-                                start: Date.now() - 1000 * 60 * 60 * 2,
-                                end: Date.now()
-                            }
-                        },
-                        {
-                            label: 'Last 1 hour',
-                            bounds: {
-                                start: Date.now() - 1000 * 60 * 60,
-                                end: Date.now()
-                            }
+                      },
+                    ]
+                  },
+                  realtime:{
+                    clockOffsets:{
+                      start: -60 * 60 * 1000,
+                      end: 5 * 60 * 1000
+                    },
+                    presets:[
+                      {
+                        label: 'Last 2 hours (SCET Realtime)',
+                        bounds: {
+                            start: -60 * 60 * 1000 * 2,
+                            end: 5 * 60 * 1000
                         }
-                    ],
-                    limit: 1000 * 60 * 60 * 6
+                      }
+                    ]
+                  },
+                  lad:{
+                    clockOffsets:{
+                      start: -60 * 60 * 1000,
+                      end: 5 * 60 * 1000
+                    },
+                  },
+              },
+                limit: 1000 * 60 * 60 * 60
+            },
+            {
+              key:'ert',
+              modeSettings:{
+                fixed:{
+                  bounds:{
+                    // 1 day ago
+                    start: new Date(
+                    Date.UTC(
+                        new Date().getUTCFullYear(),
+                        new Date().getUTCMonth(),
+                        new Date().getUTCDate()
+                    ) - 1 * 864e5
+                    ).getTime(),
+                    // today
+                    end: new Date(
+                    Date.UTC(
+                        new Date().getUTCFullYear(),
+                        new Date().getUTCMonth(),
+                        new Date().getUTCDate()
+                    ) + 864e5 - 1
+                    ).getTime()
                 },
-                {
-                    key:'sclk',
-                    presets: [
-                        {
-                            label: 'Last 2 hours',
-                            bounds: {
-                                start: Date.now() - 1000 * 60 * 60 * 2,
-                                end: Date.now()
-                            }
-                        },
-                        {
-                            label: 'Last 1 hour',
-                            bounds: {
-                                start: Date.now() - 1000 * 60 * 60,
-                                end: Date.now()
-                            }
-                        }
-                    ],
-                    limit: 1000 / 5 * 60 * 60 * 6
+                  presets:[
+                    {
+                      label: 'Last 2 hours (ERT Recorded)',
+                      bounds: {
+                          start: Date.now() - 1000 * 60 * 60 * 2,
+                          end: Date.now()
+                      }
+                    },
+                  ]
                 },
-                {
-                    key:'lmst',
-                    presets: []
-                }
-            ],
-            */
+                realtime:{
+                  clockOffsets:{
+                    start: -60 * 60 * 1000,
+                    end: 5 * 60 * 1000
+                  },
+                  presets:[
+                    {
+                      label: 'Last 2 hours (ERT Realtime)',
+                      bounds: {
+                          start: -60 * 60 * 1000 * 2,
+                          end: 5 * 60 * 1000
+                      }
+                    }
+                  ]
+                },
+                lad:{
+                  clockOffsets:{
+                    start: -60 * 60 * 1000,
+                    end: 5 * 60 * 1000
+                  },
+                },
+            },
+              limit: 1000 * 60 * 60 * 60
+           }
+          ],
+          */
 
       /**
        * allowRealtime: whether or not to allow utc-relative time conductor.
@@ -287,6 +349,27 @@
       records: 10
     },
 
+    /**
+     * Data Product Temporary Workaround:
+     *
+     * If you want to view real-time product data, you must specify all
+     * product APIDs that you want to see in the below array.  This config
+     * is only required for MCWS R3.2, and will not be required for
+     * MCWS R3.3.
+     *
+     * This list can be quickly extracted from apid.xml with the following
+     * python code:
+     *
+     * temporarily disable spellcheck, to be removed in https://github.com/NASA-AMMOS/openmct-mcws/issues/303
+     * cspell:disable
+     * import xml.etree.ElementTree as ET
+     * tree = ET.parse('apid.xml')
+     * apids = [int(a.attrib['number']) for a in tree.getroot() if a.tag == 'apid']
+     * cspell:enable
+     *
+     */
+    realtimeProductAPIDs: [],
+
     /**
      * Plugin Support 
      * Example configuration:

docs/process/lines-of-code.md

@@ -1,3 +1,4 @@
+<!-- cspell:words cloc  -->
 # Lines of code
 
 Per release, we report on total lines of code, plus the different in lines of 

eslint.config.js

@@ -1,5 +1,6 @@
 const globals = require('globals');
 const js = require('@eslint/js');
+const vue = require('eslint-plugin-vue');
 const vueParser = require('vue-eslint-parser');
 const babelParser = require('@babel/eslint-parser');
 // eslint-plugin-prettier/recommended must be last in configuration
@@ -38,6 +39,7 @@ module.exports = [
     }
   },
   js.configs.recommended,
+  ...vue.configs['flat/recommended'],
   prettierRecommended,
   {
     rules: {

karma.conf.js

@@ -45,7 +45,7 @@ module.exports = function (config) {
     // Web server port.
     port: 9876,
 
-    // Wnable / disable colors in the output (reporters and logs).
+    // enable / disable colors in the output (reporters and logs).
     colors: true,
 
     logLevel: config.LOG_INFO,