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

removed refs from dom elements and added index to call to isLastCriterion

Browse Source
This commit is contained in:
Joel McKinnon 2020-03-24 09:43:54 -07:00
parent 87513a14b7
commit 0a2e912091
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,6 @@
></span> ></span>
<span class="c-condition__name">{{ condition.configuration.name }}</span> <span class="c-condition__name">{{ condition.configuration.name }}</span>
<!-- TODO: description should be derived from criteria -->
<span v-if="condition.isDefault" <span v-if="condition.isDefault"
class="c-condition__summary" class="c-condition__summary"
> >
@ -59,7 +58,7 @@
:key="index" :key="index"
> >
{{ getRule(criterion, index) }} {{ getRule(criterion, index) }}
<template v-if="!isLastCriterion"> <template v-if="!isLastCriterion(index)">
{{ getConjunction }} {{ getConjunction }}
</template> </template>
</span> </span>
@ -198,7 +197,7 @@
:key="index" :key="index"
> >
{{ getRule(criterion, index) }} {{ getRule(criterion, index) }}
<template v-if="!isLastCriterion"> <template v-if="!isLastCriterion(index)">
{{ getConjunction }} {{ getConjunction }}
</template> </template>
</span> </span>

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

@ -4,8 +4,8 @@
<span class="c-cdef__label">{{ setRowLabel }}</span> <span class="c-cdef__label">{{ setRowLabel }}</span>
<span class="c-cdef__controls"> <span class="c-cdef__controls">
<span class="c-cdef__control"> <span class="c-cdef__control">
<select ref="telemetrySelect" <select v-model="criterion.telemetry"
v-model="criterion.telemetry" class="js-telemetry-select"
@change="updateMetadataOptions" @change="updateMetadataOptions"
> >
<option value="">- Select Telemetry -</option> <option value="">- Select Telemetry -</option>
@ -20,8 +20,8 @@
<span v-if="criterion.telemetry" <span v-if="criterion.telemetry"
class="c-cdef__control" class="c-cdef__control"
> >
<select ref="metadataSelect" <select v-model="criterion.metadata"
v-model="criterion.metadata" class="js-metadata-select"
@change="updateOperations" @change="updateOperations"
> >
<option value="">- Select Field -</option> <option value="">- Select Field -</option>
@ -36,8 +36,7 @@
<span v-if="criterion.telemetry && criterion.metadata" <span v-if="criterion.telemetry && criterion.metadata"
class="c-cdef__control" class="c-cdef__control"
> >
<select ref="operationSelect" <select v-model="criterion.operation"
v-model="criterion.operation"
@change="updateOperationInputVisibility" @change="updateOperationInputVisibility"
> >
<option value="">- Select Comparison -</option> <option value="">- Select Comparison -</option>
@ -202,10 +201,10 @@ export default {
} }
}, },
clearDependentFields(el) { clearDependentFields(el) {
if (el === this.$refs.telemetrySelect) { if (el.classList.contains('js-telemetry-select')) {
this.criterion.metadata = ''; this.criterion.metadata = '';
this.criterion.operation = ''; this.criterion.operation = '';
} else if (el === this.$refs.metadataSelect) { } else if (el.classList.contains('js-metadata-select')) {
this.criterion.operation = ''; this.criterion.operation = '';
} }
this.criterion.input = []; this.criterion.input = [];