Compare commits

...

1 Commits

Author SHA1 Message Date
a1978b7c52 added description computed property 2020-03-06 16:44:17 -08:00
3 changed files with 49 additions and 10 deletions

View File

@ -42,7 +42,7 @@
<div class="condition-summary">
<span class="condition-name">{{ domainObject.configuration.name }}</span>
<!-- TODO: description should be derived from criteria -->
<span class="condition-description">{{ domainObject.configuration.name }}</span>
<span class="condition-description">{{ getDescription }}</span>
</div>
<span v-if="!domainObject.isDefault"
class="is-enabled c-c__duplicate"
@ -170,7 +170,7 @@
</div>
<div class="condition-config">
<span class="condition-description">
{{ domainObject.configuration.description }}
{{ getDescription }}
</span>
</div>
</div>
@ -179,6 +179,7 @@
<script>
import Criterion from './Criterion.vue';
import { OPERATIONS } from '../utils/operations';
export default {
inject: ['openmct'],
@ -219,6 +220,36 @@ export default {
criterionIndex: 0
};
},
computed: {
getDescription: function () {
let config = this.domainObject.configuration;
if (!config.criteria.length) {
return 'When all else fails';
} else {
let description = '';
if (config.criteria.length === 1) {
if (config.criteria[0].operation && config.criteria[0].input.length) {
description += `When ${config.criteria[0].telemetry.name} value ${this.findDescription(config.criteria[0].operation, config.criteria[0].input)}`
}
} else {
let conjunction = '';
config.criteria.forEach((criterion, index) => {
if (criterion.operation && criterion.input.length) {
if (index !== config.criteria.length - 1 && (criterion.operation && criterion.input.length)) {
conjunction = config.trigger === 'all' ? 'and ' : 'or ';
} else {
conjunction = '';
}
description += `${criterion.telemetry.name} value ${this.findDescription(criterion.operation, criterion.input)} ${conjunction}`
}
});
}
return description;
}
}
},
destroyed() {
this.destroy();
},
@ -229,6 +260,15 @@ export default {
}));
},
methods: {
findDescription(operation, values) {
for (let i=0, ii= OPERATIONS.length; i < ii; i++) {
if (operation === OPERATIONS[i].name) {
console.log('OPERATIONS[i].getDescription()', OPERATIONS[i].getDescription(values));
return OPERATIONS[i].getDescription(values);
}
}
return null;
},
initialize() {
this.setOutputSelection();
},
@ -301,5 +341,3 @@ export default {
}
}
</script>

View File

@ -128,6 +128,7 @@ export default {
if (ev) {this.clearInputs()}
if (this.criterion.telemetry) {
this.openmct.objects.get(this.criterion.telemetry).then((telemetryObject) => {
this.criterion.telemetry.name = telemetryObject.name;
this.telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
this.telemetryMetadataOptions = this.telemetryMetadata.values();
this.updateOperations();

View File

@ -8,7 +8,7 @@ export const OPERATIONS = [
appliesTo: ['number'],
inputCount: 1,
getDescription: function (values) {
return ' == ' + values[0];
return ' is ' + values[0];
}
},
{
@ -20,7 +20,7 @@ export const OPERATIONS = [
appliesTo: ['number'],
inputCount: 1,
getDescription: function (values) {
return ' != ' + values[0];
return ' is not ' + values[0];
}
},
{
@ -80,7 +80,7 @@ export const OPERATIONS = [
appliesTo: ['number'],
inputCount: 2,
getDescription: function (values) {
return ' between ' + values[0] + ' and ' + values[1];
return ' is between ' + values[0] + ' and ' + values[1];
}
},
{
@ -92,7 +92,7 @@ export const OPERATIONS = [
appliesTo: ['number'],
inputCount: 2,
getDescription: function (values) {
return ' not between ' + values[0] + ' and ' + values[1];
return ' is not between ' + values[0] + ' and ' + values[1];
}
},
{
@ -188,7 +188,7 @@ export const OPERATIONS = [
appliesTo: ['enum'],
inputCount: 1,
getDescription: function (values) {
return ' == ' + values[0];
return ' is ' + values[0];
}
},
{
@ -200,7 +200,7 @@ export const OPERATIONS = [
appliesTo: ['enum'],
inputCount: 1,
getDescription: function (values) {
return ' != ' + values[0];
return ' is not ' + values[0];
}
}
];