{{ autoClearTimeout }}
@@ -34,18 +34,6 @@ export default {
autoClearTimeout: undefined
};
},
- methods: {
- toggleEdit(isEditing) {
- this.isEditing = isEditing;
- },
- setAutoClearTimeout() {
- this.openmct.objects.mutate(
- this.domainObject,
- 'configuration.autoClearTimeout',
- this.autoClearTimeout
- );
- }
- },
mounted() {
this.domainObject = this.openmct.selection.get()[0][0].context.item;
if (this.domainObject.configuration && this.domainObject.configuration.autoClearTimeout) {
@@ -57,6 +45,18 @@ export default {
beforeUnmount() {
this.openmct.editor.off('isEditing', this.toggleEdit);
this.unlisteners.forEach((unlisten) => unlisten());
+ },
+ methods: {
+ toggleEdit(isEditing) {
+ this.isEditing = isEditing;
+ },
+ setAutoClearTimeout() {
+ this.openmct.objects.mutate(
+ this.domainObject,
+ 'configuration.autoClearTimeout',
+ this.autoClearTimeout
+ );
+ }
}
};
diff --git a/src/realtime/MCWSAlarmMessageStreamProvider.js b/src/realtime/MCWSAlarmMessageStreamProvider.js
index 90783538..2dfe4fda 100644
--- a/src/realtime/MCWSAlarmMessageStreamProvider.js
+++ b/src/realtime/MCWSAlarmMessageStreamProvider.js
@@ -56,10 +56,10 @@ class MCWSAlarmMessageStreamProvider extends MCWSStreamProvider {
object.telemetry.values = domainObject.telemetry.values;
});
- let unsubscribers = objects.map((object) => super.subscribe(object, callback, options));
+ let unsubscribes = objects.map((object) => super.subscribe(object, callback, options));
return () => {
- unsubscribers.forEach((unsubscribe) => unsubscribe());
+ unsubscribes.forEach((unsubscribe) => unsubscribe());
};
}
}
diff --git a/src/realtimeIndicator/RealtimeIndicator.vue b/src/realtimeIndicator/RealtimeIndicator.vue
index 6500b91a..71d75d0b 100644
--- a/src/realtimeIndicator/RealtimeIndicator.vue
+++ b/src/realtimeIndicator/RealtimeIndicator.vue
@@ -17,6 +17,26 @@ export default {
}
};
},
+ computed: {
+ cssClass() {
+ let className = this.currentValue['cssClass'];
+ let classObject = {};
+ classObject[className] = className.length > 0;
+ return classObject;
+ }
+ },
+ mounted() {
+ this.lastTimestamp = new Date();
+
+ if (this.vistaTime.ladClocks.ert) {
+ this.vistaTime.ladClocks.ert.on('tick', this.setTick.bind(this));
+ }
+ },
+ beforeUnmount() {
+ if (this.vistaTime.ladClocks.ert) {
+ this.vistaTime.ladClocks.ert.off('tick', this.setTick.bind(this));
+ }
+ },
methods: {
isRefreshRateNominal(newTimestamp, lastTimestamp) {
if (newTimestamp - lastTimestamp <= 100) {
@@ -45,26 +65,6 @@ export default {
console.warn('Error setting tick', e);
}
}
- },
- computed: {
- cssClass() {
- let className = this.currentValue['cssClass'];
- let classObject = {};
- classObject[className] = className.length > 0;
- return classObject;
- }
- },
- mounted() {
- this.lastTimestamp = new Date();
-
- if (this.vistaTime.ladClocks.ert) {
- this.vistaTime.ladClocks.ert.on('tick', this.setTick.bind(this));
- }
- },
- beforeUnmount() {
- if (this.vistaTime.ladClocks.ert) {
- this.vistaTime.ladClocks.ert.off('tick', this.setTick.bind(this));
- }
}
};
diff --git a/src/realtimeSessions/components/RealtimeSessionIndicator.vue b/src/realtimeSessions/components/RealtimeSessionIndicator.vue
index 1052f0bc..94ed3029 100644
--- a/src/realtimeSessions/components/RealtimeSessionIndicator.vue
+++ b/src/realtimeSessions/components/RealtimeSessionIndicator.vue
@@ -51,6 +51,11 @@ export default {
realtimeSessionDisabled: undefined
};
},
+ computed: {
+ hasActiveSession() {
+ return this.activeSession !== undefined;
+ }
+ },
mounted() {
this.sessionService = SessionService();
this.realtimeSessionDisabled = this.sessionService.realtimeSessionConfig.disable;
@@ -62,11 +67,6 @@ export default {
beforeUnmount() {
this.stopListening?.();
},
- computed: {
- hasActiveSession() {
- return this.activeSession !== undefined;
- }
- },
methods: {
pollForSessions() {
if (!this.activeSession) {
diff --git a/src/realtimeSessions/components/RealtimeSessionSelector.vue b/src/realtimeSessions/components/RealtimeSessionSelector.vue
index cfc77940..ca4c325b 100644
--- a/src/realtimeSessions/components/RealtimeSessionSelector.vue
+++ b/src/realtimeSessions/components/RealtimeSessionSelector.vue
@@ -20,7 +20,7 @@
- -
+
-
- -
+
-
Connect
-
+
@@ -83,6 +87,7 @@ import SessionService from 'services/session/SessionService';
export default {
inject: ['openmct'],
+ emits: ['close-session-selector'],
data() {
return {
isLoading: true,
diff --git a/src/services/mcws/NamespaceMIO.js b/src/services/mcws/NamespaceMIO.js
index 2f6aca17..5c203651 100644
--- a/src/services/mcws/NamespaceMIO.js
+++ b/src/services/mcws/NamespaceMIO.js
@@ -23,7 +23,7 @@ class NamespaceMIO extends MIO {
/**
* Create the namespace. Returns a promise from the underlying
- * AbstractMIO's `request` method.
+ * AbstractMIOs `request` method.
* @memberof NamespaceMIO
* @returns {Promise} a promise that is resolved when the namespace
* is created, or rejected if there is an error.
diff --git a/src/types/DatasetType.js b/src/types/DatasetType.js
index d1e135d2..d432fa69 100644
--- a/src/types/DatasetType.js
+++ b/src/types/DatasetType.js
@@ -25,37 +25,37 @@ define(['./VISTAType'], function (VISTAType) {
{
name: 'MCWS Root URL',
key: 'mcwsRootUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
name: 'Channel Dictionary URL',
key: 'channelDictionaryUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
name: 'Channel Enumeration Dictionary URL',
key: 'channelEnumerationDictionaryUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
name: 'Channel Historical URL',
key: 'channelHistoricalUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
name: 'Channel MinMax URL',
key: 'channelMinMaxUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
name: 'Channel LAD URL',
key: 'channelLADUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
@@ -74,31 +74,31 @@ define(['./VISTAType'], function (VISTAType) {
{
name: 'Session URL',
key: 'sessionUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
name: 'Session LAD URL',
key: 'sessionLADUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
name: 'Event Record Dictionary URL',
key: 'eventRecordDictionaryUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
name: 'EVR Historical URL',
key: 'evrHistoricalUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
name: 'EVR LAD URL',
key: 'evrLADUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
@@ -110,13 +110,13 @@ define(['./VISTAType'], function (VISTAType) {
{
name: 'Data Product URL',
key: 'dataProductUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
name: 'Data Product Content URL',
key: 'dataProductContentUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
@@ -128,13 +128,13 @@ define(['./VISTAType'], function (VISTAType) {
{
name: 'Packet URL',
key: 'packetUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
name: 'Packet Content URL',
key: 'packetContentUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
@@ -146,7 +146,7 @@ define(['./VISTAType'], function (VISTAType) {
{
name: 'Command Event Historical URL',
key: 'commandEventUrl',
- control: 'urlfield',
+ control: 'url-field',
cssClass: 'l-input-lg'
},
{
diff --git a/src/types/EVRType.js b/src/types/EVRType.js
index fdeb18bd..e731f780 100644
--- a/src/types/EVRType.js
+++ b/src/types/EVRType.js
@@ -21,7 +21,7 @@ define(['./VISTAType', './EVRModuleType', '../constants', 'lodash'], function (
};
},
getLocation: function (dataset, data) {
- // FIXME: this works soley because the dataset must have loaded for
+ // FIXME: this works solely because the dataset must have loaded for
// the EVRType to load.
return EVRModuleType.makeIdentifier(
dataset.evrs.byName[data.name].module,
diff --git a/src/venues/Venue.js b/src/venues/Venue.js
index 031fd151..d4b40b7e 100644
--- a/src/venues/Venue.js
+++ b/src/venues/Venue.js
@@ -44,7 +44,7 @@ class Venue {
return this.sessionService.getActiveSessions(this.domainObject.sessionLADUrl);
}
- getdomainObject() {
+ getDomainObject() {
const domainObject = JSON.parse(JSON.stringify(this.domainObject));
domainObject.name += ' Dataset';
diff --git a/src/venues/VenueSpec.js b/src/venues/VenueSpec.js
index 950ebd69..1097d007 100644
--- a/src/venues/VenueSpec.js
+++ b/src/venues/VenueSpec.js
@@ -56,7 +56,7 @@ describe('Venue', () => {
});
it('returns a domain object', () => {
- const domainObject = venue.getdomainObject();
+ const domainObject = venue.getDomainObject();
expect(domainObject.name).toBe(`${configuration.name} Dataset`);
expect(domainObject.host).not.toBeDefined();
expect(domainObject.prefix).toBe(configuration.prefix);
diff --git a/src/venues/components/ActiveSessionSelectorComponent.vue b/src/venues/components/ActiveSessionSelectorComponent.vue
index 8b2e3d7b..1d2b5d33 100644
--- a/src/venues/components/ActiveSessionSelectorComponent.vue
+++ b/src/venues/components/ActiveSessionSelectorComponent.vue
@@ -9,11 +9,11 @@
-