ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-21 09:31:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'conditionals-refactor' into dave/provide-conditions-telemetry

Browse Source
This commit is contained in:
David Tsay 2020-02-27 13:36:46 -08:00
commit 0e9bf74332
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,9 +22,9 @@
import * as EventEmitter from 'eventemitter3';
import uuid from 'uuid';
import TelemetryCriterion from "@/plugins/condition/criterion/TelemetryCriterion";
import { TRIGGER } from "@/plugins/condition/utils/constants";
import {computeCondition} from "@/plugins/condition/utils/evaluator";
import TelemetryCriterion from "./criterion/TelemetryCriterion";
import { TRIGGER } from "./utils/constants";
import {computeCondition} from "./utils/evaluator";
/*
* conditionConfiguration = {

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

@ -125,7 +125,7 @@ export default class ConditionManager extends EventEmitter {
criteria: isDefault ? [] : [{
telemetry: '',
operation: '',
input: '',
input: [],
metadata: ''
}]
},
@ -185,7 +185,7 @@ export default class ConditionManager extends EventEmitter {
found = {
item: this.conditionCollection[i],
index: i
}
};
break;
}
}
@ -197,13 +197,11 @@ export default class ConditionManager extends EventEmitter {
reorderConditions(reorderPlan) {
let oldConditions = Array.from(this.domainObject.configuration.conditionCollection);
let newCollection = [];
console.log(this.domainObject.configuration.conditionCollection);
reorderPlan.forEach((reorderEvent) => {
let item = oldConditions[reorderEvent.oldIndex];
newCollection.push(item);
this.domainObject.configuration.conditionCollection = newCollection;
});
console.log(this.domainObject.configuration.conditionCollection);
this.persist();
}
@ -229,7 +227,6 @@ export default class ConditionManager extends EventEmitter {
}
this.openmct.objects.get(currentConditionIdentifier).then((obj) => {
console.log(obj.configuration.output);
this.emit('conditionSetResultUpdated', {
id: this.domainObject.identifier,
output: obj.configuration.output,

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

@ -68,6 +68,7 @@
<input v-model="domainObject.configuration.name"
class="t-condition-input__name"
type="text"
@blur="persist"
>
</span>
</li>
@ -161,7 +162,7 @@
</template>
<script>
import Criterion from '../../condition/components/Criterion.vue';
import Criterion from './Criterion.vue';
export default {
inject: ['openmct'],

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

@ -79,9 +79,8 @@
</template>
<script>
import Condition from '../../condition/components/Condition.vue';
import ConditionManager from '../../condition/ConditionManager';
import uuid from 'uuid';
import Condition from './Condition.vue';
import ConditionManager from '../ConditionManager';
export default {

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

@ -79,8 +79,6 @@ export default class TelemetryCriterion extends EventEmitter {
params.push(data[this.metadata]);
if (this.input instanceof Array && this.input.length) {
params.push(this.input[0]);
} else if (this.input) {
params.push(this.input);
}
if (typeof comparator === 'function') {
result = comparator(params);