Skip to content

Commit b6f3a07

Browse files
committed
consistent naming in channel table sets for time system variables, remove special handling for installing summary widgets
1 parent 10b0aaf commit b6f3a07

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

loader.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,13 @@ define([
113113
});
114114
}
115115

116-
// install optional plugins, summary widget is handled separately as it was added long ago
116+
// install optional plugins
117117
if (config.plugins) {
118-
if (config.plugins.summaryWidget === true || config.plugins.summaryWidget?.enabled === true) {
119-
openmct.install(openmct.plugins.SummaryWidget());
120-
}
121-
122118
Object.entries(config.plugins).forEach(([plugin, pluginConfig]) => {
123119
const examplePluginExists = openmct.plugins.example[plugin];
124120
const pluginExists = openmct.plugins[plugin] || examplePluginExists;
125121
const pluginEnabled = pluginConfig?.enabled;
126-
const isSummaryWidget = plugin === 'summaryWidget';
127-
const installPlugin = pluginExists && pluginEnabled && !isSummaryWidget;
122+
const installPlugin = pluginExists && pluginEnabled;
128123

129124
if (installPlugin) {
130125
if (examplePluginExists) {

src/channelTable/channelTableSetPlugin/ChannelTableSet.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ export default {
5454
this.composition.on('add', this.addLadTable);
5555
this.composition.on('remove', this.removeLadTable);
5656
this.composition.on('reorder', this.reorderLadTables);
57-
this.openmct.time.on('timeSystemChanged', this.setTimesystem);
58-
this.setTimesystem(this.openmct.time.getTimeSystem());
57+
this.openmct.time.on('timeSystemChanged', this.setTimeSystem);
58+
this.setTimeSystem(this.openmct.time.getTimeSystem());
5959
this.composition.load();
6060
},
6161
beforeUnmount() {
@@ -66,7 +66,7 @@ export default {
6666
c.composition.off('add', c.addCallback);
6767
c.composition.off('remove', c.removeCallback);
6868
});
69-
this.openmct.time.off('timeSystemChanged', this.setTimesystem);
69+
this.openmct.time.off('timeSystemChanged', this.setTimeSystem);
7070
},
7171
methods: {
7272
addLadTable(domainObject) {
@@ -102,7 +102,7 @@ export default {
102102
this.ladTableObjects[reorderEvent.newIndex] = oldComposition[reorderEvent.oldIndex];
103103
});
104104
},
105-
setTimesystem(timesystem) {
105+
setTimeSystem(timesystem) {
106106
this.timesystem = timesystem.name;
107107
},
108108
addTelemetryObject(ladTable) {

0 commit comments

Comments
 (0)