mirror of
https://github.com/nasa/openmct.git
synced 2025-01-05 04:44:14 +00:00
Addressing feedback
This commit is contained in:
parent
7896f36748
commit
4b39ea232a
@ -24,7 +24,7 @@ import { EventEmitter } from 'eventemitter3';
|
|||||||
import { v4 as uuid } from 'uuid';
|
import { v4 as uuid } from 'uuid';
|
||||||
|
|
||||||
import Condition from './Condition.js';
|
import Condition from './Condition.js';
|
||||||
import HistoricalTelemetryProvider from './historicalTelemetryProvider.js';
|
import HistoricalTelemetryProvider from './HistoricalTelemetryProvider.js';
|
||||||
import { getLatestTimestamp } from './utils/time.js';
|
import { getLatestTimestamp } from './utils/time.js';
|
||||||
|
|
||||||
export default class ConditionManager extends EventEmitter {
|
export default class ConditionManager extends EventEmitter {
|
||||||
|
@ -352,18 +352,12 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
setOutputSelection() {
|
setOutputSelection() {
|
||||||
let conditionOutput = this.condition.configuration.output;
|
let conditionOutput = this.condition.configuration.output;
|
||||||
if (conditionOutput) {
|
if (conditionOutput === undefined) {
|
||||||
if (
|
|
||||||
conditionOutput !== 'false' &&
|
|
||||||
conditionOutput !== 'true' &&
|
|
||||||
conditionOutput !== 'telemetry value'
|
|
||||||
) {
|
|
||||||
this.selectedOutputSelection = 'string';
|
|
||||||
} else {
|
|
||||||
this.selectedOutputSelection = conditionOutput;
|
|
||||||
}
|
|
||||||
} else if (conditionOutput === undefined) {
|
|
||||||
this.selectedOutputSelection = 'none';
|
this.selectedOutputSelection = 'none';
|
||||||
|
} else if (['false', 'true', 'telemetry value'].includes(conditionOutput)) {
|
||||||
|
this.selectedOutputSelection = conditionOutput;
|
||||||
|
} else {
|
||||||
|
this.selectedOutputSelection = 'string';
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
setOutputValue() {
|
setOutputValue() {
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
:key="index"
|
:key="index"
|
||||||
:value="telemetryOption.identifier"
|
:value="telemetryOption.identifier"
|
||||||
>
|
>
|
||||||
{{ telemetryPaths[index] || telemetryOption.name }}
|
{{ telemetryOption.path || telemetryOption.name }}
|
||||||
</option>
|
</option>
|
||||||
</select>
|
</select>
|
||||||
</span>
|
</span>
|
||||||
@ -201,10 +201,6 @@ export default {
|
|||||||
this.telemetryMetadataOptions[id] = [];
|
this.telemetryMetadataOptions[id] = [];
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.telemetry.forEach(async (telemetryOption, index) => {
|
|
||||||
const telemetryPath = await this.getFullTelemetryPath(telemetryOption);
|
|
||||||
this.telemetryPaths[index] = telemetryPath;
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
addTestInput(testInput) {
|
addTestInput(testInput) {
|
||||||
this.testInputs.push(
|
this.testInputs.push(
|
||||||
|
@ -15,14 +15,6 @@ export default class HistoricalTelemetryProvider {
|
|||||||
this.bounds = bounds;
|
this.bounds = bounds;
|
||||||
}
|
}
|
||||||
|
|
||||||
refreshAllHistoricalTelemetries() {
|
|
||||||
const refreshPromises = [];
|
|
||||||
for (const [, value] of Object.entries(this.telemetryObjects)) {
|
|
||||||
refreshPromises.push(this.refreshHistoricalTelemetry(value));
|
|
||||||
}
|
|
||||||
return Promise.all(refreshPromises);
|
|
||||||
}
|
|
||||||
|
|
||||||
async refreshHistoricalTelemetry(domainObject, identifier) {
|
async refreshHistoricalTelemetry(domainObject, identifier) {
|
||||||
console.log('refreshHistoricalTelemetry');
|
console.log('refreshHistoricalTelemetry');
|
||||||
if (!domainObject && identifier) {
|
if (!domainObject && identifier) {
|
||||||
|
Loading…
Reference in New Issue
Block a user