From aa7a5ca22202491578cf488a85b5a16dd4fd283f Mon Sep 17 00:00:00 2001 From: David Tsay Date: Fri, 22 Dec 2023 15:48:53 -0800 Subject: [PATCH 01/49] bump to 5.3.0 update core to v3.2.0 --- config.js | 4 ++-- package.json | 4 ++-- pom.xml | 2 +- src/services/session/SessionURLHandler.js | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config.js b/config.js index bbfc180..4ce7efc 100644 --- a/config.js +++ b/config.js @@ -486,8 +486,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 index 6424e41..17c7ed5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openmct-mcws", - "version": "5.2.0-rc2", + "version": "5.3.0", "description": "Open MCT for MCWS", "devDependencies": { "@braintree/sanitize-url": "6.0.2", @@ -32,7 +32,7 @@ "mini-css-extract-plugin": "2.6.0", "moment": "2.29.4", "node-bourbon": "^4.2.3", - "openmct": "nasa/openmct#omm-r5.2.0-rc2", + "openmct": "nasa/openmct#omm-release/5.3", "openmct-legacy-support": "akhenry/openmct-legacy-support#omm-r5.1.0-rc1", "printj": "^1.2.1", "raw-loader": "^0.5.1", diff --git a/pom.xml b/pom.xml index 7582a5f..310b835 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ gov.nasa.arc.wtd openmct-client Open MCT for MCWS Client - 5.2.0-rc2 + 5.3.0 war diff --git a/src/services/session/SessionURLHandler.js b/src/services/session/SessionURLHandler.js index 126eb75..9004f0e 100644 --- a/src/services/session/SessionURLHandler.js +++ b/src/services/session/SessionURLHandler.js @@ -14,6 +14,8 @@ export default class SessionURLHandler { ); this.didSessionParamsChange = this.didSessionParamsChange.bind(this); + + this.updateSession(); } getParams () { From 26a57b70273df95c51030a8207a8e6faae348f61 Mon Sep 17 00:00:00 2001 From: David Tsay Date: Tue, 26 Dec 2023 13:26:20 -0800 Subject: [PATCH 02/49] upgrade to use vue 3 compatibility layer --- .webpack/webpack.common.js | 11 ++++++++++- .webpack/webpack.dev.js | 5 ----- .webpack/webpack.prod.js | 8 +------- package.json | 6 ++++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.webpack/webpack.common.js b/.webpack/webpack.common.js index fc7d337..8f4da83 100644 --- a/.webpack/webpack.common.js +++ b/.webpack/webpack.common.js @@ -45,6 +45,7 @@ const config = { "EventEmitter": "eventemitter3", "bourbon": "bourbon.scss", "printj": path.join(__dirname, '..', "node_modules/printj/dist/printj.min.js"), + "vue": path.join(__dirname, '..', "node_modules/@vue/compat/dist/vue.esm-bundler.js"), "styles": path.join(__dirname, '..', "node_modules/openmct/src/styles"), /** * VISTA Paths @@ -104,7 +105,15 @@ const config = { }, { test: /\.vue$/, - use: 'vue-loader' + loader: 'vue-loader', + options: { + compilerOptions: { + whitespace: 'preserve', + compatConfig: { + MODE: 2 + } + } + } }, { test: /\.html$/, diff --git a/.webpack/webpack.dev.js b/.webpack/webpack.dev.js index 6fd5fa1..c17932b 100644 --- a/.webpack/webpack.dev.js +++ b/.webpack/webpack.dev.js @@ -21,11 +21,6 @@ module.exports = merge(common, { entry: { config: './config.js' }, - resolve: { - alias: { - vue: path.join(__dirname, '..', 'node_modules/vue/dist/vue.js'), - } - }, plugins: [ new CopyWebpackPlugin({ patterns: [ diff --git a/.webpack/webpack.prod.js b/.webpack/webpack.prod.js index adc6b9e..6767fc4 100644 --- a/.webpack/webpack.prod.js +++ b/.webpack/webpack.prod.js @@ -11,11 +11,5 @@ const path = require('path'); /** @type {import('webpack').Configuration} */ module.exports = merge(common, { - mode: 'production', - resolve: { - alias: { - "vue": path.join(__dirname, '..', 'node_modules/vue/dist/vue.min.js'), - } - }, - devtool: 'source-map' + mode: 'production' }); diff --git a/package.json b/package.json index 17c7ed5..93b4409 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,8 @@ "description": "Open MCT for MCWS", "devDependencies": { "@braintree/sanitize-url": "6.0.2", + "@vue/compat": "^3.1.0", + "@vue/compiler-sfc": "^3.1.0", "axios": "^0.21.2", "babel-loader": "8.2.3", "babel-plugin-istanbul": "6.1.1", @@ -41,8 +43,8 @@ "sass-loader": "12.6.0", "source-map-loader": "^0.2.4", "style-loader": "^1.0.1", - "vue": "2.6.14", - "vue-loader": "15.9.8", + "vue": "^3.1.0", + "vue-loader": "^16.0.0", "vue-template-compiler": "2.6.14", "webpack": "5.76.3", "webpack-cli": "5.0.0", From b2019d677a8003c5c15c5a43ba114b58922d7335 Mon Sep 17 00:00:00 2001 From: David Tsay Date: Tue, 26 Dec 2023 13:32:52 -0800 Subject: [PATCH 03/49] add element to body for vue 3 component mounting --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 23013c8..2ec3d9d 100644 --- a/index.html +++ b/index.html @@ -20,5 +20,6 @@ +
From fba4c412eb266cdf5ad779dcaeefd0982853b700 Mon Sep 17 00:00:00 2001 From: David Tsay Date: Tue, 26 Dec 2023 14:11:18 -0800 Subject: [PATCH 04/49] fix `resolve-url-loader` error --- .webpack/webpack.common.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.webpack/webpack.common.js b/.webpack/webpack.common.js index 8f4da83..3386af2 100644 --- a/.webpack/webpack.common.js +++ b/.webpack/webpack.common.js @@ -73,7 +73,7 @@ const config = { /** * Telemetry Table Components **/ - "openmct.tables.components.Table": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/components/table.vue"), + "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/table-configuration.vue"), } }, @@ -99,8 +99,13 @@ const config = { { loader: 'css-loader' }, - 'resolve-url-loader', - 'sass-loader' + { + loader: 'resolve-url-loader' + }, + { + loader: 'sass-loader', + options: { sourceMap: true } + } ] }, { From e357c4b659dd0ccda7fe74bd4b9a30e88796375a Mon Sep 17 00:00:00 2001 From: David Tsay Date: Tue, 26 Dec 2023 14:45:02 -0800 Subject: [PATCH 05/49] fix name of extended component changed in core --- .webpack/webpack.common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.webpack/webpack.common.js b/.webpack/webpack.common.js index 3386af2..a040138 100644 --- a/.webpack/webpack.common.js +++ b/.webpack/webpack.common.js @@ -74,7 +74,7 @@ const config = { * 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/table-configuration.vue"), + "openmct.tables.components.TableConfiguration": path.join(__dirname, '..', "node_modules/openmct/src/plugins/telemetryTable/components/TableConfiguration.vue"), } }, plugins: [ From ca3cf6fe51ee7513e8d55ca334b3d73cdc5b7015 Mon Sep 17 00:00:00 2001 From: David Tsay Date: Tue, 26 Dec 2023 15:07:57 -0800 Subject: [PATCH 06/49] fix resolving of `@` alias in core --- .webpack/webpack.common.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.webpack/webpack.common.js b/.webpack/webpack.common.js index a040138..683d510 100644 --- a/.webpack/webpack.common.js +++ b/.webpack/webpack.common.js @@ -41,6 +41,8 @@ const config = { * 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", From cfd61181fb2a2dde3ff4bbe661a94cc2598b890c Mon Sep 17 00:00:00 2001 From: David Tsay Date: Tue, 26 Dec 2023 16:02:57 -0800 Subject: [PATCH 07/49] key should be bound to v-for --- src/channelTable/channelTableSetPlugin/ChannelTableSet.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/channelTable/channelTableSetPlugin/ChannelTableSet.vue b/src/channelTable/channelTableSetPlugin/ChannelTableSet.vue index 456922b..2e44dbb 100644 --- a/src/channelTable/channelTableSetPlugin/ChannelTableSet.vue +++ b/src/channelTable/channelTableSetPlugin/ChannelTableSet.vue @@ -11,9 +11,9 @@ -