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

Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor

Browse Source
This commit is contained in:
Joshi 2020-02-28 11:09:41 -08:00
commit ba780981a5
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/condition/ConditionManager.js
View File

@ -113,7 +113,6 @@ export default class ConditionManager extends EventEmitter {
conditionObj = {
isDefault: isDefault,
type: 'condition',
name: isDefault ? 'Default' : 'Unnamed Condition',
identifier: {
...this.domainObject.identifier,
key: uuid()
@ -121,7 +120,7 @@ export default class ConditionManager extends EventEmitter {
configuration: {
name: isDefault ? 'Default' : 'Unnamed Condition',
output: 'false',
trigger: 'any',
trigger: 'all',
criteria: isDefault ? [] : [{
telemetry: '',
operation: '',

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

@ -102,7 +102,9 @@
<li class="has-local-controls t-condition">
<label>Match when</label>
<span class="controls">
<select v-model="trigger">
<select v-model="domainObject.configuration.trigger"
@change="persist"
>
<option value="all">all criteria are met</option>
<option value="any">any criteria are met</option>
</select>
@ -119,7 +121,7 @@
<Criterion :telemetry="telemetry"
:criterion="criterion"
:index="index"
:trigger="trigger"
:trigger="domainObject.configuration.trigger"
:is-default="domainObject.configuration.criteria.length === 1"
@persist="persist"
/>
@ -210,7 +212,6 @@ export default {
domainObject: this.domainObject,
currentCriteria: this.currentCriteria,
expanded: true,
trigger: 'all',
selectedOutputKey: '',
stringOutputField: false,
outputOptions: ['false', 'true', 'string'],

7
src/plugins/condition/components/ConditionCollection.vue
View File

@ -38,19 +38,22 @@
<div v-show="isEditing"
class="help"
>
<span>The first condition to match is the one that wins. Drag conditions to rearrange.</span>
<span v-if="!telemetryObjs.length">Drag telemetry into Condition Set in order to add conditions.</span>
<span v-else>The first condition to match is the one that wins. Drag conditions to rearrange.</span>
</div>
<div class="holder add-condition-button-wrapper align-left">
<button
v-show="isEditing"
id="addCondition"
class="c-cs-button c-cs-button--major add-condition-button"
:class="{ 'is-disabled': !telemetryObjs.length}"
:disabled="!telemetryObjs.length"
@click="addCondition"
>
<span class="c-cs-button__label">Add Condition</span>
</button>
</div>
<div class="c-c condition-collection">
<div class="c-c__condition-collection">
<ul class="c-c__container-holder">
<li v-for="(conditionIdentifier, index) in conditionCollection"
:key="conditionIdentifier.key"

8
src/plugins/condition/components/condition-set.scss
View File

@ -64,6 +64,10 @@ section {
margin-top: 5px;
}
.c-c__condition-collection.is-disabled {
opacity: 0.5;
}
.widget-condition form {
padding: 0.5em;
display: flex;
@ -91,6 +95,10 @@ section {
font-weight: bold;
color: #eee;
border-radius: 6px;
&.is-disabled {
opacity: 0.5;
}
}
.c-cs__disclosure-triangle,