diff --git a/index.html b/index.html
index 916c24d1f2..3a69c14d0b 100644
--- a/index.html
+++ b/index.html
@@ -88,7 +88,6 @@
openmct.install(openmct.plugins.ExampleImagery());
openmct.install(openmct.plugins.PlanLayout());
openmct.install(openmct.plugins.Timeline());
- openmct.install(openmct.plugins.PlotVue());
openmct.install(openmct.plugins.UTCTimeSystem());
openmct.install(openmct.plugins.AutoflowView({
type: "telemetry.panel"
diff --git a/src/adapter/bundle.js b/src/adapter/bundle.js
index 0fc7c2d110..894e8df910 100644
--- a/src/adapter/bundle.js
+++ b/src/adapter/bundle.js
@@ -36,7 +36,8 @@ define([
'./views/installLegacyViews',
'./policies/LegacyCompositionPolicyAdapter',
'./actions/LegacyActionAdapter',
- './services/LegacyPersistenceAdapter'
+ './services/LegacyPersistenceAdapter',
+ './services/ExportImageService'
], function (
ActionDialogDecorator,
AdapterCapability,
@@ -53,7 +54,8 @@ define([
installLegacyViews,
legacyCompositionPolicyAdapter,
LegacyActionAdapter,
- LegacyPersistenceAdapter
+ LegacyPersistenceAdapter,
+ ExportImageService
) {
return {
name: 'src/adapter',
@@ -82,6 +84,13 @@ define([
"identifierService",
"cacheService"
]
+ },
+ {
+ "key": "exportImageService",
+ "implementation": ExportImageService,
+ "depends": [
+ "dialogService"
+ ]
}
],
components: [
diff --git a/src/plugins/plot/src/services/ExportImageService.js b/src/adapter/services/ExportImageService.js
similarity index 100%
rename from src/plugins/plot/src/services/ExportImageService.js
rename to src/adapter/services/ExportImageService.js
diff --git a/src/adapter/views/TypeInspectorViewProvider.js b/src/adapter/views/TypeInspectorViewProvider.js
index 86aa9f2f9f..6ff740e703 100644
--- a/src/adapter/views/TypeInspectorViewProvider.js
+++ b/src/adapter/views/TypeInspectorViewProvider.js
@@ -24,13 +24,6 @@ define([
return false;
}
- //TODO: Remove this when plots Angular implementation is deprecated
- let parent = selection[0].length > 1 && selection[0][1].context.item;
- if (parent && parent.type === 'time-strip') {
- return (selectionContext.item.type === typeDefinition.key)
- && (typeDefinition.key !== 'telemetry.plot.overlay');
- }
-
return selectionContext.item.type === typeDefinition.key;
},
view: function (selection) {
diff --git a/src/api/objects/ObjectAPI.js b/src/api/objects/ObjectAPI.js
index a19ad50f82..d383a2e746 100644
--- a/src/api/objects/ObjectAPI.js
+++ b/src/api/objects/ObjectAPI.js
@@ -486,6 +486,12 @@ ObjectAPI.prototype.getOriginalPath = function (identifier, path = []) {
});
};
+ObjectAPI.prototype.isObjectPathToALink = function (domainObject, objectPath) {
+ return objectPath !== undefined
+ && objectPath.length > 1
+ && domainObject.location !== this.makeKeyString(objectPath[1].identifier);
+};
+
/**
* Uniquely identifies a domain object.
*
diff --git a/src/plugins/plot/vue/single/LinearScale.js b/src/plugins/plot/LinearScale.js
similarity index 100%
rename from src/plugins/plot/vue/single/LinearScale.js
rename to src/plugins/plot/LinearScale.js
diff --git a/src/plugins/plot/vue/single/MctPlot.vue b/src/plugins/plot/MctPlot.vue
similarity index 99%
rename from src/plugins/plot/vue/single/MctPlot.vue
rename to src/plugins/plot/MctPlot.vue
index 15315f0478..0459840b33 100644
--- a/src/plugins/plot/vue/single/MctPlot.vue
+++ b/src/plugins/plot/MctPlot.vue
@@ -65,8 +65,7 @@
-
diff --git a/src/plugins/plot/vue/single/MctTicks.vue b/src/plugins/plot/MctTicks.vue
similarity index 100%
rename from src/plugins/plot/vue/single/MctTicks.vue
rename to src/plugins/plot/MctTicks.vue
diff --git a/src/plugins/plot/vue/single/Plot.vue b/src/plugins/plot/Plot.vue
similarity index 100%
rename from src/plugins/plot/vue/single/Plot.vue
rename to src/plugins/plot/Plot.vue
diff --git a/src/plugins/plot/vue/single/PlotViewProvider.js b/src/plugins/plot/PlotViewProvider.js
similarity index 97%
rename from src/plugins/plot/vue/single/PlotViewProvider.js
rename to src/plugins/plot/PlotViewProvider.js
index f0446d26ce..239450f83b 100644
--- a/src/plugins/plot/vue/single/PlotViewProvider.js
+++ b/src/plugins/plot/PlotViewProvider.js
@@ -48,7 +48,7 @@ export default function PlotViewProvider(openmct) {
name: 'Plot',
cssClass: 'icon-telemetry',
canView(domainObject, objectPath) {
- return isCompactView(objectPath) && hasTelemetry(domainObject, openmct);
+ return hasTelemetry(domainObject, openmct);
},
view: function (domainObject, objectPath) {
diff --git a/src/plugins/plot/vue/single/axis/XAxis.vue b/src/plugins/plot/axis/XAxis.vue
similarity index 100%
rename from src/plugins/plot/vue/single/axis/XAxis.vue
rename to src/plugins/plot/axis/XAxis.vue
diff --git a/src/plugins/plot/vue/single/axis/YAxis.vue b/src/plugins/plot/axis/YAxis.vue
similarity index 100%
rename from src/plugins/plot/vue/single/axis/YAxis.vue
rename to src/plugins/plot/axis/YAxis.vue
diff --git a/src/plugins/plot/vue/single/chart/MCTChartAlarmPointSet.js b/src/plugins/plot/chart/MCTChartAlarmPointSet.js
similarity index 100%
rename from src/plugins/plot/vue/single/chart/MCTChartAlarmPointSet.js
rename to src/plugins/plot/chart/MCTChartAlarmPointSet.js
diff --git a/src/plugins/plot/vue/single/chart/MCTChartLineLinear.js b/src/plugins/plot/chart/MCTChartLineLinear.js
similarity index 100%
rename from src/plugins/plot/vue/single/chart/MCTChartLineLinear.js
rename to src/plugins/plot/chart/MCTChartLineLinear.js
diff --git a/src/plugins/plot/vue/single/chart/MCTChartLineStepAfter.js b/src/plugins/plot/chart/MCTChartLineStepAfter.js
similarity index 100%
rename from src/plugins/plot/vue/single/chart/MCTChartLineStepAfter.js
rename to src/plugins/plot/chart/MCTChartLineStepAfter.js
diff --git a/src/plugins/plot/vue/single/chart/MCTChartPointSet.js b/src/plugins/plot/chart/MCTChartPointSet.js
similarity index 100%
rename from src/plugins/plot/vue/single/chart/MCTChartPointSet.js
rename to src/plugins/plot/chart/MCTChartPointSet.js
diff --git a/src/plugins/plot/vue/single/chart/MCTChartSeriesElement.js b/src/plugins/plot/chart/MCTChartSeriesElement.js
similarity index 100%
rename from src/plugins/plot/vue/single/chart/MCTChartSeriesElement.js
rename to src/plugins/plot/chart/MCTChartSeriesElement.js
diff --git a/src/plugins/plot/vue/single/chart/MctChart.vue b/src/plugins/plot/chart/MctChart.vue
similarity index 100%
rename from src/plugins/plot/vue/single/chart/MctChart.vue
rename to src/plugins/plot/chart/MctChart.vue
diff --git a/src/plugins/plot/vue/single/configuration/Collection.js b/src/plugins/plot/configuration/Collection.js
similarity index 100%
rename from src/plugins/plot/vue/single/configuration/Collection.js
rename to src/plugins/plot/configuration/Collection.js
diff --git a/src/plugins/plot/vue/single/configuration/LegendModel.js b/src/plugins/plot/configuration/LegendModel.js
similarity index 100%
rename from src/plugins/plot/vue/single/configuration/LegendModel.js
rename to src/plugins/plot/configuration/LegendModel.js
diff --git a/src/plugins/plot/vue/single/configuration/Model.js b/src/plugins/plot/configuration/Model.js
similarity index 100%
rename from src/plugins/plot/vue/single/configuration/Model.js
rename to src/plugins/plot/configuration/Model.js
diff --git a/src/plugins/plot/vue/single/configuration/PlotConfigurationModel.js b/src/plugins/plot/configuration/PlotConfigurationModel.js
similarity index 100%
rename from src/plugins/plot/vue/single/configuration/PlotConfigurationModel.js
rename to src/plugins/plot/configuration/PlotConfigurationModel.js
diff --git a/src/plugins/plot/vue/single/configuration/PlotSeries.js b/src/plugins/plot/configuration/PlotSeries.js
similarity index 100%
rename from src/plugins/plot/vue/single/configuration/PlotSeries.js
rename to src/plugins/plot/configuration/PlotSeries.js
diff --git a/src/plugins/plot/vue/single/configuration/SeriesCollection.js b/src/plugins/plot/configuration/SeriesCollection.js
similarity index 100%
rename from src/plugins/plot/vue/single/configuration/SeriesCollection.js
rename to src/plugins/plot/configuration/SeriesCollection.js
diff --git a/src/plugins/plot/vue/single/configuration/XAxisModel.js b/src/plugins/plot/configuration/XAxisModel.js
similarity index 100%
rename from src/plugins/plot/vue/single/configuration/XAxisModel.js
rename to src/plugins/plot/configuration/XAxisModel.js
diff --git a/src/plugins/plot/vue/single/configuration/YAxisModel.js b/src/plugins/plot/configuration/YAxisModel.js
similarity index 99%
rename from src/plugins/plot/vue/single/configuration/YAxisModel.js
rename to src/plugins/plot/configuration/YAxisModel.js
index cc808f296c..6285c63e60 100644
--- a/src/plugins/plot/vue/single/configuration/YAxisModel.js
+++ b/src/plugins/plot/configuration/YAxisModel.js
@@ -166,7 +166,6 @@ export default class YAxisModel extends Model {
* Update yAxis format, values, and label from known series.
*/
updateFromSeries(series) {
- this.unset('displayRange');
const plotModel = this.plot.get('domainObject');
const label = _.get(plotModel, 'configuration.yAxis.label');
const sampleSeries = series.first();
diff --git a/src/plugins/plot/vue/single/configuration/configStore.js b/src/plugins/plot/configuration/configStore.js
similarity index 100%
rename from src/plugins/plot/vue/single/configuration/configStore.js
rename to src/plugins/plot/configuration/configStore.js
diff --git a/src/plugins/plot/vue/single/draw/Draw2D.js b/src/plugins/plot/draw/Draw2D.js
similarity index 100%
rename from src/plugins/plot/vue/single/draw/Draw2D.js
rename to src/plugins/plot/draw/Draw2D.js
diff --git a/src/plugins/plot/vue/single/draw/DrawLoader.js b/src/plugins/plot/draw/DrawLoader.js
similarity index 100%
rename from src/plugins/plot/vue/single/draw/DrawLoader.js
rename to src/plugins/plot/draw/DrawLoader.js
diff --git a/src/plugins/plot/vue/single/draw/DrawWebGL.js b/src/plugins/plot/draw/DrawWebGL.js
similarity index 100%
rename from src/plugins/plot/vue/single/draw/DrawWebGL.js
rename to src/plugins/plot/draw/DrawWebGL.js
diff --git a/src/plugins/plot/vue/single/draw/MarkerShapes.js b/src/plugins/plot/draw/MarkerShapes.js
similarity index 100%
rename from src/plugins/plot/vue/single/draw/MarkerShapes.js
rename to src/plugins/plot/draw/MarkerShapes.js
diff --git a/src/plugins/plot/vue/inspector/PlotOptions.vue b/src/plugins/plot/inspector/PlotOptions.vue
similarity index 91%
rename from src/plugins/plot/vue/inspector/PlotOptions.vue
rename to src/plugins/plot/inspector/PlotOptions.vue
index 20fd584197..0aa28000bd 100644
--- a/src/plugins/plot/vue/inspector/PlotOptions.vue
+++ b/src/plugins/plot/inspector/PlotOptions.vue
@@ -31,8 +31,8 @@