ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-16 22:28:13 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Addresses comments

Browse Source 
Removes console log statements
Fixes import paths
This commit is contained in:
Joshi
2020-02-27 11:21:40 -08:00
parent b8dc5acf00
commit 2609a41ee8
5 changed files with 8 additions and 13 deletions
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 * as EventEmitter from 'eventemitter3';
import uuid from 'uuid'; import uuid from 'uuid';
import TelemetryCriterion from "@/plugins/condition/criterion/TelemetryCriterion"; import TelemetryCriterion from "./criterion/TelemetryCriterion";
import { TRIGGER } from "@/plugins/condition/utils/constants"; import { TRIGGER } from "./utils/constants";
import {computeCondition} from "@/plugins/condition/utils/evaluator"; import {computeCondition} from "./utils/evaluator";
/* /*
* conditionConfiguration = { * conditionConfiguration = {

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

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

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

@ -162,7 +162,7 @@
</template> </template>
<script> <script>
import Criterion from '../../condition/components/Criterion.vue'; import Criterion from './Criterion.vue';
export default { export default {
inject: ['openmct'], inject: ['openmct'],

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

@ -79,8 +79,8 @@
</template> </template>
<script> <script>
import Condition from '../../condition/components/Condition.vue'; import Condition from './Condition.vue';
import ConditionManager from '../../condition/ConditionManager'; import ConditionManager from '../ConditionManager';
export default { 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]); params.push(data[this.metadata]);
if (this.input instanceof Array && this.input.length) { if (this.input instanceof Array && this.input.length) {
params.push(this.input[0]); params.push(this.input[0]);
} else if (this.input) {
params.push(this.input);
} }
if (typeof comparator === 'function') { if (typeof comparator === 'function') {
result = comparator(params); result = comparator(params);