diff --git a/package.json b/package.json index 93778c6..c63584a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openmct-mcws", - "version": "5.3.0-rc2", + "version": "5.3.0-rc3", "description": "Open MCT for MCWS", "devDependencies": { "@braintree/sanitize-url": "6.0.4", @@ -32,7 +32,7 @@ "mini-css-extract-plugin": "2.7.6", "moment": "2.30.1", "node-bourbon": "^4.2.3", - "openmct": "nasa/openmct#v5.3.0-release-candidate-3", + "openmct": "nasa/openmct#omm-r5.3.0-rc2", "printj": "1.3.1", "raw-loader": "^0.5.1", "resolve-url-loader": "5.0.0", diff --git a/pom.xml b/pom.xml index be2bde3..dd16e68 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ gov.nasa.arc.wtd openmct-client Open MCT for MCWS Client - 5.3.0-rc2 + 5.3.0-rc3 war diff --git a/src/dictionaryView/dictionaryViewProvider.js b/src/dictionaryView/dictionaryViewProvider.js index ad7485f..9ce09db 100644 --- a/src/dictionaryView/dictionaryViewProvider.js +++ b/src/dictionaryView/dictionaryViewProvider.js @@ -29,7 +29,7 @@ export default class DictionaryViewProvider { }; const view = { - show: function (element, editMode) { + show: function (element, editMode, { renderWhenVisible }) { const componentDefinition = { components: { DictionaryView @@ -46,7 +46,8 @@ export default class DictionaryViewProvider { domainObject, table, objectPath, - currentView: view + currentView: view, + renderWhenVisible }, template: ` ` }; - const componentOptions = { - element - }; + const mountingElement = element ?? document.createElement('div'); + + const vueComponent = defineComponent(componentDefinition); + const app = createApp(vueComponent); + + app.component('vista-table-dat-cell', DATDownloadCell); + app.component('vista-table-emd-cell', EMDDownloadCell); + app.component('vista-table-emd-preview-cell', EMDPreviewCell); + app.component('vista-table-txt-cell', TXTDownloadCell); + + const componentInstance = app.mount(mountingElement); - const { - componentInstance, - destroy, - el - } = mount(componentDefinition, componentOptions); - component = componentInstance; - _destroy = destroy; + _destroy = () => app.unmount(); }, onEditModeChange(editMode) { component.isEditing = editMode; diff --git a/src/product-status/plugin.js b/src/product-status/plugin.js index 76c8e0e..fdabb13 100644 --- a/src/product-status/plugin.js +++ b/src/product-status/plugin.js @@ -1,9 +1,5 @@ import DataProductViewProvider from './DataProductViewProvider.js'; import DataProductInspectorViewProvider from './DataProductInspectorViewProvider.js'; -import DATDownloadCell from './DATDownloadCell.js'; -import EMDDownloadCell from './EMDDownloadCell.js'; -import EMDPreviewCell from './EMDPreviewCell.js'; -import TXTDownloadCell from './TXTDownloadCell.js'; import VistaTableConfigurationProvider from '../tables/VistaTableConfigurationProvider.js'; import DataProductViewActions from './DataProductViewActions.js'; @@ -41,14 +37,5 @@ export default function install(options) { DataProductViewActions.forEach(action => { openmct.actions.register(action); }); - - // register cell components globally for dynamic component in core openmct table rows - openmct.on('start', () => { - openmct.app - .component('vista-table-dat-cell', DATDownloadCell) - .component('vista-table-emd-cell', EMDDownloadCell) - .component('vista-table-emd-preview-cell', EMDPreviewCell) - .component('vista-table-txt-cell', TXTDownloadCell); - }); } }