Update to use core Open MCT v4.0.0 (#206)

NASA-AMMOS · Sep 27, 2024 · 4bdf87b · 4bdf87b
1 parent 10dffa0
commit 4bdf87b
Show file tree

Hide file tree

Showing 43 changed files with 264 additions and 303 deletions.
diff --git a/.webpack/webpack.common.js b/.webpack/webpack.common.js
@@ -37,46 +37,37 @@ const config = {
     },
     resolve: {
         alias: {
+            /**
+             * Open MCT Source Paths
+             * TODO FIXME these rely on openmct core source paths becase we extend core code directly
+             */
+            "@": path.join(__dirname, '..', "node_modules/openmct/src"),
+            "objectUtils": path.join(__dirname, '..', 'node_modules/openmct/src/api/objects/object-utils.js'),
+            "utils": path.join(__dirname, '..', 'node_modules/openmct/src/utils'),
+            "openmct.views.FolderGridViewComponent": path.join(__dirname, '..', "node_modules/openmct/src/plugins/folderView/components/GridView.vue"),
+            "openmct.views.FolderListViewComponent": path.join(__dirname, '..', "node_modules/openmct/src/plugins/folderView/components/ListView.vue"),
+            "openmct.tables.TelemetryTable": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/TelemetryTable.js"),
+            "openmct.tables.TelemetryTableColumn": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/TelemetryTableColumn.js"),
+            "openmct.tables.TelemetryTableRow": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/TelemetryTableRow.js"),
+            "openmct.tables.TelemetryTableConfiguration": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/TelemetryTableConfiguration.js"),
+            "openmct.tables.collections.TableRowCollection": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/collections/TableRowCollection.js"),
+            "openmct.tables.components.Table": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/components/TableComponent.vue"),
+            "openmct.tables.components.TableConfiguration": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/components/TableConfiguration.vue"),
             /**
              * Globals
             **/
             "openmct": path.join(__dirname, '..', "node_modules/openmct/dist/openmct.js"),
-            // this is a core openmct alias required to resolve '@' in core components
-            "@": path.join(__dirname, '..', "node_modules/openmct/src"),
             "saveAs": "file-saver/src/FileSaver.js",
-            "EventEmitter": "eventemitter3",
             "bourbon": "bourbon.scss",
             "printj": path.join(__dirname, '..', "node_modules/printj/dist/printj.min.js"),
-            "styles": path.join(__dirname, '..', "node_modules/openmct/src/styles"),
             /**
              * VISTA Paths
             **/
             "types": path.join(__dirname, '..', "src/types"),
             "services": path.join(__dirname, '..', "src/services"),
             "lib": path.join(__dirname, '..', "src/lib"),
             "tables": path.join(__dirname, '..', "src/tables"),
-            "utils": path.join(__dirname, '..', "src/utils"),
-            /**
-             * Open MCT Folder View Components
-            **/
-            "openmct.views.FolderGridViewComponent": path.join(__dirname, '..', "node_modules/openmct/src/plugins/folderView/components/GridView.vue"),
-            "openmct.views.FolderListViewComponent": path.join(__dirname, '..', "node_modules/openmct/src/plugins/folderView/components/ListView.vue"),
-            /**
-             * Open MCT Telemetry Tables
-            **/
-            "openmct.tables.TelemetryTable": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/TelemetryTable.js"),
-            "openmct.tables.TelemetryTableColumn": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/TelemetryTableColumn.js"),
-            "openmct.tables.TelemetryTableRow": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/TelemetryTableRow.js"),
-            "openmct.tables.TelemetryTableConfiguration": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/TelemetryTableConfiguration.js"),
-            /**
-             * Telemetry Table Collections
-            **/
-            "openmct.tables.collections.TableRowCollection": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/collections/TableRowCollection.js"),
-             /**
-             * Telemetry Table Components
-            **/
-            "openmct.tables.components.Table": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/components/TableComponent.vue"),
-            "openmct.tables.components.TableConfiguration": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/components/TableConfiguration.vue"),
+            "ommUtils": path.join(__dirname, '..', "src/utils"),
             "vue": "vue/dist/vue.esm-bundler.js"
         }
     },
@@ -118,6 +109,7 @@ const config = {
                 loader: 'vue-loader',
                 options: {
                     compilerOptions: {
+                        hoistStatic: false,
                         whitespace: 'preserve'
                     }
                 }

diff --git a/.webpack/webpack.dev.js b/.webpack/webpack.dev.js
@@ -48,7 +48,6 @@ module.exports = merge(common, {
     },
     devtool: 'eval-source-map',
     devServer: {
-        open: true,
         devMiddleware: {
             writeToDisk: (filePathString) => {
                 const filePath = path.parse(filePathString);
@@ -57,40 +56,46 @@ module.exports = merge(common, {
                 return shouldWrite;
             }
         },
-        watchFiles: ['**/*.css'],
+        watchFiles: ['src/**/*.css'],
         static: [{
             directory: path.join(__dirname, '..', 'node_modules/openmct/dist'),
-            publicPath: '/node_modules/openmct/dist'
+            publicPath: '/node_modules/openmct/dist',
+            watch: false
         },{
             directory: path.join(__dirname, '..', 'test_data'),
-            publicPath: '/test_data'
+            publicPath: '/test_data',
+            watch: false
         }],
         client: {
             progress: true,
-            overlay: true
+            overlay: false
         },
-        proxy: {
-            '/mcws-test': {
-                target: 'http://localhost:8090',
-                secure: false
-            },
-            '/mcws': {
-                target: apiUrl,
-                secure: false,
-                headers: proxyHeaders
-            },
-            '/proxyUrl': {
-                target: proxyUrl,
-                secure: false,
-                headers: proxyHeaders,
-                pathRewrite: (_path, req) => {
-                    const apiUrl = req.query.url;
-                    console.log('Generic URL Proxy to: ', apiUrl);
+        proxy: [
+          {
+            context: ['/mcws-test'],
+            target: 'http://localhost:8090',
+            secure: false,
+          },
+          {
+            context: ['/mcws'],
+            target: apiUrl,
+            secure: false,
+            headers: proxyHeaders
+          },
+          {
+            context: ['/proxyUrl'],
+              target: proxyUrl,
+              secure: false,
+              headers: proxyHeaders,
+              pathRewrite: (_path, req) => {
+                  const apiUrl = req.query.url;
+                  console.log('Generic URL Proxy to: ', apiUrl);
 
-                    return apiUrl;
-                }
-            }
-        }
+                  return apiUrl;
+              }
+          }
+        ],
+        hot: true,
     },
     stats: 'errors-warnings'
 });
diff --git a/config.js b/config.js
@@ -503,8 +503,8 @@
          * they do!
          */
         assetPath: 'node_modules/openmct/dist',
-        // proxyUrl: 'http://localhost:8080/',
-        // useDeveloperStorage: true
+        proxyUrl: 'http://localhost:8080/',
+        useDeveloperStorage: true
     };
 
     window.openmctMCWSConfig = openmctMCWSConfig;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openmct-mcws",
-  "version": "5.3.0-next",
+  "version": "5.3.0-rc1",
   "description": "Open MCT for MCWS",
   "devDependencies": {
     "@braintree/sanitize-url": "6.0.2",
@@ -11,7 +11,7 @@
     "comma-separated-values": "3.6.4",
     "copy-webpack-plugin": "11.0.0",
     "css-loader": "4.0.0",
-    "eventemitter3": "1.2.0",
+    "eventemitter3": "5.0.1",
     "file-saver": "2.0.5",
     "git-rev-sync": "3.0.2",
     "html2canvas": "1.4.1",
@@ -32,7 +32,7 @@
     "mini-css-extract-plugin": "2.6.0",
     "moment": "2.29.4",
     "node-bourbon": "^4.2.3",
-    "openmct": "nasa/openmct#omm-release/5.3-next",
+    "openmct": "nasa/openmct#omm-r5.3.0-rc1",
     "printj": "^1.2.1",
     "raw-loader": "^0.5.1",
     "resolve-url-loader": "5.0.0",
@@ -42,10 +42,10 @@
     "style-loader": "^1.0.1",
     "vue": "3.3.8",
     "vue-loader": "16.8.3",
-    "webpack": "5.76.3",
-    "webpack-cli": "5.0.0",
-    "webpack-dev-server": "4.11.1",
-    "webpack-merge": "5.8.0",
+    "webpack": "5.90.3",
+    "webpack-cli": "5.1.1",
+    "webpack-dev-server": "5.0.2",
+    "webpack-merge": "5.10.0",
     "zepto": "^1.2.0"
   },
   "scripts": {

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>gov.nasa.arc.wtd</groupId>
     <artifactId>openmct-client</artifactId>
     <name>Open MCT for MCWS Client</name>
-    <version>5.3.0-next</version>
+    <version>5.3.0-rc1</version>
     <packaging>war</packaging>
 
     <properties>

diff --git a/src/AMMOSPlugins.js b/src/AMMOSPlugins.js
@@ -77,7 +77,7 @@ define([
 
             openmct.install(new FormatPlugin(options));
 
-            const timePlugin = new TimePlugin(openmct, options.time);
+            const timePlugin = new TimePlugin.default(options.time);
             openmct.install(timePlugin);
 
             const formatKey = options.time.utcFormat;

diff --git a/src/actionModifiers/ImportExportWithDatasets/importWithDatasetsModifier.js b/src/actionModifiers/ImportExportWithDatasets/importWithDatasetsModifier.js
@@ -1,5 +1,5 @@
 import ImportWithDatasetsFormComponent from './ImportWithDatasetsFormComponent.vue';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 import DatasetCache from 'services/dataset/DatasetCache';
 import Types from 'types/types';
 

diff --git a/src/alarmsView/AlarmsAutoclearViewProvider.js b/src/alarmsView/AlarmsAutoclearViewProvider.js
@@ -1,4 +1,4 @@
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 import AlarmsAutoclear from './AlarmsAutoclear.vue';
 import TelemetryTableConfiguration from 'openmct.tables.TelemetryTableConfiguration';
 

diff --git a/src/alarmsView/AlarmsViewProvider.js b/src/alarmsView/AlarmsViewProvider.js
@@ -1,4 +1,4 @@
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 import TableComponent from 'openmct.tables.components.Table';
 import AlarmsTable from './AlarmsTable.js';
 

diff --git a/src/channelTable/channelTablePlugin/ChannelTableFormatViewProvider.js b/src/channelTable/channelTablePlugin/ChannelTableFormatViewProvider.js
@@ -1,6 +1,6 @@
 import CellFormatConfigurationComponent from './CellFormatConfigurationComponent.vue';
 import TelemetryTableConfiguration from 'openmct.tables.TelemetryTableConfiguration';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default function ChannelTableFormatViewProvider(openmct, options) {
   return {

diff --git a/src/channelTable/channelTablePlugin/ChannelTableViewProvider.js b/src/channelTable/channelTablePlugin/ChannelTableViewProvider.js
@@ -1,6 +1,6 @@
 import ChannelTable from './ChannelTable';
 import TableComponent from 'openmct.tables.components.Table';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default class ChannelTableViewProvider { 
     constructor(openmct, options) {

diff --git a/src/channelTable/channelTableSetPlugin/ChannelTableSetView.js b/src/channelTable/channelTableSetPlugin/ChannelTableSetView.js
@@ -1,5 +1,5 @@
 import ChannelTableSet from './ChannelTableSet.vue';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default class ChannelTableSetView {
     constructor(openmct, domainObject, objectPath) {

diff --git a/src/clearDataIndicator/plugin.js b/src/clearDataIndicator/plugin.js
@@ -1,4 +1,4 @@
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 import ClearDataIndicator from './ClearDataIndicator.vue';
 
 export default function plugin(globalStalenessMs) {

diff --git a/src/commandEventsView/CommandEventsViewProvider.js b/src/commandEventsView/CommandEventsViewProvider.js
@@ -1,6 +1,6 @@
 import CommandEventsTable from './CommandEventsTable.js';
 import TableComponent from 'openmct.tables.components.Table';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default class CommandEventsViewProvider {
     constructor(openmct, options) {

diff --git a/src/containerView/FolderGridViewProvider.js b/src/containerView/FolderGridViewProvider.js
@@ -1,5 +1,5 @@
 import FolderGridViewComponent from 'openmct.views.FolderGridViewComponent';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default class FolderGridView {
     constructor(openmct, types) {

diff --git a/src/containerView/FolderListViewProvider.js b/src/containerView/FolderListViewProvider.js
@@ -1,5 +1,5 @@
 import FolderListViewComponent from 'openmct.views.FolderListViewComponent';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default class FolderListView {
     constructor(openmct, types) {

diff --git a/src/customForms/UrlField/UrlFieldFormController.js b/src/customForms/UrlField/UrlFieldFormController.js
@@ -1,5 +1,5 @@
 import UrlField from './UrlField.vue'
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default function UrlFieldFormController(openmct) {
   let _destroy = null;

diff --git a/src/dictionaryView/dictionaryViewProvider.js b/src/dictionaryView/dictionaryViewProvider.js
@@ -1,6 +1,6 @@
 import DictionaryView from './components/dictionaryView.vue';
 import DictionaryViewTable from './dictionaryViewTable.js';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default class DictionaryViewProvider {
     constructor(openmct, options) {

diff --git a/src/evrView/EVRViewLevelsConfigurationViewProvider.js b/src/evrView/EVRViewLevelsConfigurationViewProvider.js
@@ -1,5 +1,5 @@
 import EVRViewLevelsConfigurationView from './EVRViewLevelsConfigurationView.vue'
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default function EVRViewLevelsConfigurationViewProvider(options) {
     return {

diff --git a/src/evrView/EVRViewProvider.js b/src/evrView/EVRViewProvider.js
@@ -1,6 +1,6 @@
 import EVRTable from './EVRTable';
 import TableComponent from 'openmct.tables.components.Table';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 const RESTRICTED_VIEWS = ['plot-single', 'table'];
 const EVR_SOURCES = [

diff --git a/src/frameEventFilterView/FrameEventFilterViewProvider.js b/src/frameEventFilterView/FrameEventFilterViewProvider.js
@@ -1,6 +1,6 @@
 import FrameEventFilterTable from './FrameEventFilterTable.js';
 import TableComponent from 'openmct.tables.components.Table';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default class FrameEventFilterViewProvider {
     constructor(openmct, options) {

diff --git a/src/frameaccountability/frameAccountabilityViewProvider.js b/src/frameaccountability/frameAccountabilityViewProvider.js
@@ -1,6 +1,6 @@
 import frameAccountability from './components/frameAccountability';
 import BadFramesTelemetryTable from './BadFramesTelemetryTable';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 const FLAG_COLORS = {
     'InSync': '#7FFF00',

diff --git a/src/framesummary/FrameWatchConfigurationViewProvider.js b/src/framesummary/FrameWatchConfigurationViewProvider.js
@@ -1,4 +1,4 @@
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 import FrameWatchTableConfiguration from './FrameWatchTableConfiguration';
 import TableConfigurationComponent from 'openmct.tables.components.TableConfiguration';
 

diff --git a/src/framesummary/FrameWatchViewProvider.js b/src/framesummary/FrameWatchViewProvider.js
@@ -1,4 +1,4 @@
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 import FrameWatchTable from './FrameWatchTable';
 import FrameWatchViewComponent from './components/FrameWatchViewComponent.vue';
 import { FRAME_WATCH_TYPE } from './config';

diff --git a/src/globalFilters/plugin.js b/src/globalFilters/plugin.js
@@ -1,4 +1,4 @@
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 import GlobalFilterIndicator from './GlobalFilterIndicator.vue';
 
 export default function plugin(config) {

diff --git a/src/mcwsIndicator/MCWSIndicatorSpec.js b/src/mcwsIndicator/MCWSIndicatorSpec.js
@@ -1,6 +1,6 @@
 import MCWSIndicator from './MCWSIndicator.vue';
 import mcws from 'services/mcws/mcws'
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 import { nextTick } from 'vue';
 
 function getText(el) {

diff --git a/src/mcwsIndicator/plugin.js b/src/mcwsIndicator/plugin.js
@@ -1,5 +1,5 @@
 import MCWSIndicator from './MCWSIndicator.vue';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default function MCWSIndicatorPlugin() {
   return function install(openmct) {

diff --git a/src/messagesView/MessagesViewProvider.js b/src/messagesView/MessagesViewProvider.js
@@ -1,6 +1,6 @@
 import MessagesTable from './MessagesTable.js';
 import TableComponent from 'openmct.tables.components.Table';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default class MessagesViewProvider {
     constructor(openmct, options) {

diff --git a/src/metadataAction/metadataAction.js b/src/metadataAction/metadataAction.js
@@ -1,5 +1,5 @@
 import MetadataListView from './components/metadataList.vue';
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 
 export default class MetadataAction {
   constructor(openmct) {

diff --git a/src/multipleHistoricalSessions/plugin.js b/src/multipleHistoricalSessions/plugin.js
@@ -1,4 +1,4 @@
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 import HistoricalSessionIndicator from './indicator/historicalSessionIndicator.vue';
 import SessionTable from './sessionTable/SessionTable';
 import HistoricalSessionMetadata from './HistoricalSessionMetadata';

diff --git a/src/packetQuery/PacketQueryViewProvider.js b/src/packetQuery/PacketQueryViewProvider.js
@@ -1,4 +1,4 @@
-import mount from 'utils/mountVueComponent';
+import mount from 'ommUtils/mountVueComponent';
 import PacketQueryView from './components/PacketQueryView.vue';
 
 export default class PacketQueryViewProvider {