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

Moves condition class initialization to conditionEdit component

Browse Source 
sets correct condition output in condition edit component
This commit is contained in:
Joshi 2020-01-22 12:07:14 -08:00
parent 8fc785bbd6
commit cdb7066bed
5 changed files with 140 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/condition/Condition.js
View File

@ -55,13 +55,24 @@ export default class ConditionClass extends EventEmitter {
this.openmct = openmct;
this.id = this.openmct.objects.makeKeyString(conditionDefinition.identifier);
if (conditionDefinition.criteria) {
this.createCriteria(conditionDefinition.criteria);
} else {
this.criteria = [];
this.criteria = [];
if (conditionDefinition.definition.criteria) {
this.createCriteria(conditionDefinition.definition.criteria);
}
this.trigger = conditionDefinition.trigger;
this.trigger = conditionDefinition.definition.trigger;
this.result = null;
this.openmct.objects.get(this.id).then(obj => this.observeForChanges(obj));
}
observeForChanges(conditionDO) {
this.stopObservingForChanges = this.openmct.objects.observe(conditionDO, '*', this.update.bind(this));
}
update(newDomainObject) {
console.log('ConditionClass: ', newDomainObject.definition);
this.updateTrigger(newDomainObject.definition.trigger);
this.updateCriteria(newDomainObject.definition.criteria);
this.handleConditionUpdated();
}
updateTrigger(conditionDefinition) {
@ -103,6 +114,7 @@ export default class ConditionClass extends EventEmitter {
this.criteria = [];
}
this.criteria.push(criterion);
//Do we need this here?
this.handleConditionUpdated();
return criterionDefinitionWithId.id;
}
@ -147,7 +159,7 @@ export default class ConditionClass extends EventEmitter {
let found = this.findCriterion(id);
if (found) {
let criterion = found.item;
criterion.unsubscribe();
criterion.destroy();
criterion.off('criterionUpdated', (result) => {
this.handleCriterionUpdated(id, result);
});
@ -160,7 +172,8 @@ export default class ConditionClass extends EventEmitter {
handleCriterionUpdated(criterion) {
let found = this.findCriterion(criterion.id);
if (found) {
this.criteria[found.index] = criterion;
this.criteria[found.index] = criterion.data;
//Most likely don't need this.
this.emitEvent('conditionUpdated', {
trigger: this.trigger,
criteria: this.criteria
@ -171,7 +184,8 @@ export default class ConditionClass extends EventEmitter {
handleConditionUpdated() {
// trigger an updated event so that consumers can react accordingly
this.emitEvent('conditionResultUpdated');
this.evaluate();
this.emitEvent('conditionResultUpdated', {result: this.result});
}
getCriteria() {
@ -190,7 +204,7 @@ export default class ConditionClass extends EventEmitter {
//TODO: implement as part of the evaluator class task.
evaluate() {
if (this.trigger === TRIGGER.ANY) {
this.result = false;
this.result = true;
} else if (this.trigger === TRIGGER.ALL) {
this.result = false;
}
@ -202,4 +216,11 @@ export default class ConditionClass extends EventEmitter {
data: data
});
}
destroy() {
if (typeof this.stopObservingForChanges === 'function') {
this.stopObservingForChanges();
}
this.destroyCriteria();
}
}

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

@ -34,10 +34,12 @@
class="conditionArea"
>
<div v-if="isEditing">
<ConditionEdit :conditionIdentifier="conditionIdentifier" />
<ConditionEdit :condition-identifier="conditionIdentifier"
@condition-result-updated="handleConditionResult"
/>
</div>
<div v-else>
<Condition :conditionIdentifier="conditionIdentifier" />
<Condition :condition-identifier="conditionIdentifier" />
</div>
</div>
</div>
@ -49,7 +51,6 @@
import Condition from '../../condition/components/Condition.vue';
import ConditionEdit from '../../condition/components/ConditionEdit.vue';
import uuid from 'uuid';
import ConditionClass from '../Condition';
export default {
inject: ['openmct', 'domainObject'],
@ -81,6 +82,9 @@ export default {
if (!this.conditionCollection.length) {this.addCondition(null, true)}
},
methods: {
handleConditionResult(args) {
console.log('ConditionCollection: ', args.result);
},
addTelemetry(telemetryDomainObject) {
this.telemetryObjs.push(telemetryDomainObject);
},
@ -90,27 +94,25 @@ export default {
this.openmct.objects.mutate(conditionDO, 'created', new Date());
this.conditionCollection.unshift(conditionDO.identifier);
let condition = new ConditionClass(conditionDO, this.openmct);
this.conditions.push(condition);
},
getConditionDomainObject(isDefault) {
let conditionObj = {
isDefault: isDefault,
isCurrent: true,
identifier: {
namespace: this.domainObject.identifier.namespace,
key: uuid()
},
name: isDefault ? 'Default' : 'Unnamed Condition',
trigger: 'any',
criteria: isDefault ? [] : [{
operation: '',
input: '',
metaDataKey: this.openmct.telemetry.getMetadata(this.telemetryObjs[0]).values()[0].key,
key: this.telemetryObjs.length ? this.openmct.objects.makeKeyString(this.telemetryObjs[0].identifier) : null
}],
output: 'false',
definition: {
name: isDefault ? 'Default' : 'Unnamed Condition',
output: 'false',
trigger: 'any',
criteria: isDefault ? [] : [{
operation: '',
input: '',
metaDataKey: this.openmct.telemetry.getMetadata(this.telemetryObjs[0]).values()[0].key,
key: this.telemetryObjs.length ? this.openmct.objects.makeKeyString(this.telemetryObjs[0].identifier) : null
}]
},
summary: 'summary description'
};
let conditionDOKeyString = this.openmct.objects.makeKeyString(conditionObj.identifier);
@ -119,6 +121,7 @@ export default {
return newDO.useCapability('adapter');
},
updateCondition(updatedCondition) {
//TODO: this should only happen for reordering
let index = _.findIndex(this.conditions, (condition) => condition.id === updatedCondition.id);
this.conditions[index] = updatedCondition;
},

152
src/plugins/condition/components/ConditionEdit.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="c-cs-editui__conditions"
v-if="condition"
<div v-if="condition"
class="c-cs-editui__conditions"
:class="['widget-condition', { 'widget-condition--current': condition.isCurrent }]"
>
<div class="title-bar">
@ -15,8 +15,8 @@
@click="expanded = !condition.expanded"
></span>
<div class="condition-summary">
<span class="condition-name">{{ condition.name }}</span>
<span class="condition-description">{{ condition.description }}</span>
<span class="condition-name">{{ condition.definition.name }}</span>
<span class="condition-description">{{ condition.definition.description }}</span>
</div>
<span v-if="!condition.isDefault"
class="is-enabled c-c__duplicate"
@ -39,7 +39,7 @@
<li>
<label>Condition Name</label>
<span class="controls">
<input v-model="condition.name"
<input v-model="condition.definition.name"
class="t-rule-name-input"
type="text"
>
@ -48,18 +48,21 @@
<li>
<label>Output</label>
<span class="controls">
<select ref="outputSelect"
@change="getOutputBinary">
<option value="false">False</option>
<option value="true">True</option>
<option value="string">String</option>
<select v-model="selectedOutputKey"
@change="checkInputValue"
>
<option value="">- Select Output -</option>
<option v-for="option in outputOptions"
:key="option.key"
:value="option.key"
>
{{ option.text }}
</option>
</select>
<input v-if="stringOutputField"
ref="outputString"
<input v-if="selectedOutputKey === outputOptions[2].key"
v-model="condition.definition.output"
class="t-rule-name-input"
type="text"
:value="condition.output"
@keyup="getOutputString"
>
</span>
</li>
@ -85,9 +88,11 @@
<label>when</label>
<span class="t-configuration">
<span class="controls">
<select class="">
<select v-model="selectedTelemetryKey"
class=""
>
<option value="">- Select Telemetry -</option>
<option :value="telemetryObject.key">{{ telemetryObject.name }}</option>
<option :value="telemetryObject.identifier">{{ telemetryObject.name }}</option>
</select>
</span>
<span class="controls">
@ -131,6 +136,7 @@
<script>
import { OPERATIONS } from '../utils/operations';
import ConditionClass from "@/plugins/condition/Condition";
export default {
inject: ['openmct', 'domainObject'],
props: {
@ -148,95 +154,109 @@ export default {
telemetryMetadata: this.telemetryMetadata,
operations: OPERATIONS,
selectedMetaDataKey: null,
selectedTelemetryKey: null,
selectedOperationKey: null,
selectedOutputKey: null,
stringOutputField: false,
comparisonValueField: false
comparisonValueField: false,
outputOptions: [
{
key: 'false',
text: 'False'
},
{
key: 'true',
text: 'True'
},
{
key: 'string',
text: 'String'
}
]
};
},
destroyed() {
if (this.conditionClass && typeof this.conditionClass.destroy === 'function') {
this.conditionClass.destroy();
}
},
mounted() {
this.conditionCollection = this.domainObject.configuration.conditionCollection;
this.openmct.objects.get(this.conditionIdentifier).then((obj => {
console.log('ConditionEdit obj', obj);
this.condition = obj;
if (this.condition.output !== 'false' && this.condition.output !== 'true') {
this.$refs.outputSelect.value = 'string';
this.stringOutputField = true;
}
this.conditionClass = new ConditionClass(this.condition, this.openmct);
this.conditionClass.on('conditionResultUpdated', this.handleConditionResult.bind(this))
this.setOutput();
this.updateTelemetry();
}));
},
updated() {
this.updateCurrentCondition();
this.persist();
},
methods: {
removeCondition(ev) {
const conditionDiv = ev.target.closest('.conditionArea');
const conditionCollectionDiv = conditionDiv.closest('.condition-collection');
const index = Array.from(conditionCollectionDiv.children).indexOf(conditionDiv);
this.domainObject.configuration.conditionCollection.splice(index, 1);
handleConditionResult(args) {
console.log('ConditionEdit::Result', args);
this.$emit('condition-result-updated', {
id: this.conditionIdentifier,
result: args.data.result
})
},
removeCondition(ev) { //move this to conditionCollection
// const conditionDiv = ev.target.closest('.conditionArea');
// const conditionCollectionDiv = conditionDiv.closest('.condition-collection');
// const index = Array.from(conditionCollectionDiv.children).indexOf(conditionDiv);
//
// this.domainObject.configuration.conditionCollection.splice(index, 1);
},
setOutput() {
if (this.condition.definition.output !== 'false' && this.condition.definition.output !== 'true') {
// this.$refs.outputSelect.value = 'string';
this.selectedOutputKey = this.outputOptions[2].key;
// this.stringOutputField = true;
} else {
if (this.condition.definition.output === 'true') {
this.selectedOutputKey = this.outputOptions[1].key;
} else {
this.selectedOutputKey = this.outputOptions[0].key;
}
}
},
updateTelemetry() {
if (this.hasTelemetry()) {
this.openmct.objects.get(this.condition.criteria[0].key).then((obj) => {
this.openmct.objects.get(this.condition.definition.criteria[0].key).then((obj) => {
this.telemetryObject = obj;
this.telemetryMetadata = this.openmct.telemetry.getMetadata(this.telemetryObject).values();
this.selectedMetaDataKey = this.telemetryMetadata[0].key;
console.log('ConditionEdit', this.telemetryObject, this.telemetryMetadata);
this.selectedTelemetryKey = this.telemetryObject.identifier;
});
} else {
this.telemetryObject = null;
}
},
hasTelemetry() {
return this.condition.criteria.length && this.condition.criteria[0].key;
return this.condition.definition.criteria.length && this.condition.definition.criteria[0].key;
},
persist(index) {
if (index) {
this.openmct.objects.mutate(this.domainObject, `configuration.conditionCollection[${index}]`, this.domainObject.configuration.conditionCollection[index]);
} else {
this.openmct.objects.mutate(this.domainObject, 'configuration.conditionCollection', this.domainObject.configuration.conditionCollection);
persist(index) { //this should only persist the condition domain object
this.openmct.objects.mutate(this.condition, 'definition', this.condition.definition);
},
checkInputValue() {
if (this.selectedOutputKey === this.outputOptions[2].key) {
this.condition.definition.output = '';
}
},
updateCurrentCondition() {
//mutate / persist the condition domainObject
//persist the condition DO so that we can do an openmct.objects.get on it and only persist the identifier in the conditionCollection of conditionSet
this.openmct.objects.mutate(this.condition, 'created', new Date());
//
// // TODO: replace based on telemetry
// if (this.conditionCollection.length > 1) {
// this.conditionCollection.forEach((condition, index) => {
// index === 0 ? condition.isCurrent = true : condition.isCurrent = false
// });
// } else {
// this.conditionCollection[0].isCurrent = true;
// }
// console.log(this.condition);
// console.log(this.conditionCollection);
},
getOutputBinary(ev) {
if (ev.target.value !== 'string') {
this.condition.output = ev.target.value;
this.stringOutputField = false;
} else {
this.stringOutputField = true;
}
},
getOutputString(ev) {
this.condition.output = ev.target.value;
},
getOperationKey(ev) {
console.log(ev.target.value)
if (ev.target.value !== 'isUndefined' && ev.target.value !== 'isDefined') {
this.comparisonValueField = true;
} else {
this.comparisonValueField = false;
}
this.selectedOperationKey = ev.target.value;
this.condition.definition.operator = this.selectedOperationKey;
this.persist();
//find the criterion being updated and set the operator property
},
getOperationValue(ev) {
this.selectedOperationKey = ev.target.value;
//find the criterion being updated and set the input property
}
}
}

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

@ -90,6 +90,10 @@ export default class TelemetryCriterion extends EventEmitter {
this.subscription();
}
delete this.subscription;
}
destroy() {
this.unsubscribe();
this.emitEvent('criterionRemoved');
delete this.telemetryObjectIdAsString;
delete this.telemetryObject;

2
src/plugins/condition/criterion/TelemetryCriterionSpec.js
View File

@ -119,7 +119,7 @@ describe("The telemetry criterion", function () {
it("un-subscribes from telemetry providers", function () {
telemetryCriterion.subscribe();
expect(telemetryCriterion.subscription).toBeDefined();
telemetryCriterion.unsubscribe();
telemetryCriterion.destroy();
expect(telemetryCriterion.subscription).toBeUndefined();
expect(telemetryCriterion.telemetryObjectIdAsString).toBeUndefined();
expect(telemetryCriterion.telemetryObject).toBeUndefined();