ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-02 19:36:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

addressed review comments

Browse Source
This commit is contained in:
Joel McKinnon 2020-02-25 15:36:37 -08:00
parent d46310ca7d
commit a51c0d5139
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/condition/components/Criterion.vue
View File

@ -91,21 +91,40 @@ export default {
telemetryMetadata: {},
telemetryMetadataOptions: {},
operations: OPERATIONS,
filteredOps: [],
inputCount: 0,
rowLabel: ''
rowLabel: '',
operationFormat: ''
}
},
computed: {
setRowLabel: function () {
let operator = this.trigger === 'all' ? 'and ': 'or ';
return (this.index !== 0 ? operator : '') + 'when';
},
filteredOps: function () {
return [...this.operations.filter(op => op.appliesTo.indexOf(this.operationFormat) !== -1)];
}
},
mounted() {
this.updateMetadataOptions();
},
methods: {
getOperationFormat() {
this.telemetryMetadata.valueMetadatas.forEach((value, index) => {
let valueMetadata = this.telemetryMetadataOptions[index];
if (valueMetadata.formatString) {
this.operationFormat = 'number';
} else if (valueMetadata.format) {
if (valueMetadata.format === 'utc') {
this.operationFormat = 'number';
} else if (valueMetadata.format === 'enum') {
this.operationFormat = 'enum';
}
} else {
this.operationFormat = 'string';
}
});
},
updateMetadataOptions(ev) {
if (ev) {this.clearInputs()}
if (this.criterion.telemetry) {
@ -121,27 +140,13 @@ export default {
},
updateOperations(ev) {
if (ev) {this.clearInputs()}
let operationFormat = 'string';
this.telemetryMetadata.valueMetadatas.forEach((value, index) => {
if (value.key === this.criterion.metadata) {
let valueMetadata = this.telemetryMetadataOptions[index];
if (valueMetadata.formatString) {
operationFormat = 'number';
} else if (valueMetadata.format) {
if (valueMetadata.format === 'utc') {
operationFormat = 'number';
} else if (valueMetadata.format === 'enum') {
operationFormat = 'enum';
}
}
}
});
this.filteredOps = [...this.operations.filter(op => op.appliesTo.indexOf(operationFormat) !== -1)];
this.getOperationFormat();
this.persist();
},
updateOperationInputVisibility(ev) {
if (ev) {
this.criterion.input = [];
this.inputCount = 0;
}
for (let i = 0; i < this.filteredOps.length; i++) {
if (this.criterion.operation === this.filteredOps[i].name) {

4
src/plugins/condition/criterion/TelemetryCriterion.js
View File

@ -76,10 +76,8 @@ export default class TelemetryCriterion extends EventEmitter {
let params = [];
let result = false;
params.push(data[this.metadata]);
if (this.input instanceof Array && this.input.length) {
if (this.input.length) {
this.input.forEach(input => {params.push(this.input[0])});
} else if (this.input) {
params.push(this.input);
}
if (typeof comparator === 'function') {
result = comparator(params);