ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-30 09:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'condition-persist' of https://github.com/nasa/openmct into criterion-enum-persist

Browse Source
This commit is contained in:
Joel McKinnon 2020-03-26 08:22:59 -07:00
commit a81009541c
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/condition/components/Condition.vue
View File

@ -214,7 +214,9 @@ export default {
trigger: 'all',
selectedOutputSelection: '',
outputOptions: ['false', 'true', 'string'],
criterionIndex: 0
criterionIndex: 0,
selectedTelemetryName: '',
selectedFieldName: ''
};
},
computed: {
@ -296,10 +298,6 @@ export default {
this.condition.configuration.criteria.splice(index + 1, 0, clonedCriterion);
this.persist()
},
hasTelemetry(identifier) {
// TODO: check parent condition.composition.hasTelemetry
return this.currentCriteria && identifier;
},
persist() {
this.$emit('updateCondition', {
condition: this.condition,

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

@ -5,6 +5,7 @@
<span class="c-cdef__controls">
<span class="c-cdef__control">
<select v-model="criterion.telemetry"
class="js-telemetry-select"
@change="updateMetadataOptions"
>
<option value="">- Select Telemetry -</option>
@ -20,6 +21,7 @@
class="c-cdef__control"
>
<select v-model="criterion.metadata"
class="js-metadata-select"
@change="updateOperations"
>
<option value="">- Select Field -</option>
@ -162,29 +164,34 @@ export default {
});
},
updateMetadataOptions(ev) {
if (ev) {this.clearInputs()}
if (ev) {
this.clearDependentFields(ev.target)
}
if (this.criterion.telemetry) {
this.openmct.objects.get(this.criterion.telemetry).then((telemetryObject) => {
this.telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
this.telemetryMetadataOptions = this.telemetryMetadata.values();
this.updateOperations();
this.updateOperations(ev);
this.updateOperationInputVisibility();
this.$emit('setTelemetryName', telemetryObject.name)
});
} else {
this.criterion.metadata = '';
}
},
updateOperations(ev) {
if (ev) {
this.clearInputs()
if (ev && ev.target.classList.contains('js-metadata-select')) {
this.clearDependentFields(ev.target);
this.persist();
}
this.getOperationFormat();
this.persist();
},
updateOperationInputVisibility(ev) {
if (ev) {
this.criterion.input = this.enumerations.length ? [this.enumerations[0].value.toString()] : [];
this.inputCount = 0;
this.persist();
}
for (let i = 0; i < this.filteredOps.length; i++) {
if (this.criterion.operation === this.filteredOps[i].name) {
@ -192,10 +199,14 @@ export default {
if (!this.inputCount) {this.criterion.input = []}
}
}
this.persist();
},
clearInputs() {
this.criterion.operation = '';
clearDependentFields(el) {
if (el.classList.contains('js-telemetry-select')) {
this.criterion.metadata = '';
this.criterion.operation = '';
} else if (el.classList.contains('js-metadata-select')) {
this.criterion.operation = '';
}
this.criterion.input = [];
this.inputCount = 0;
},