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

WIP request gets to telemetry criterion before erroring

Browse Source
This commit is contained in:
David Tsay 2020-03-05 23:11:20 -08:00
parent 897d05276a
commit 7f32d196e4
4 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,7 @@ export default class ConditionClass extends EventEmitter {
);
});
Promise.all(criteriaResults)
return Promise.all(criteriaResults)
.then(results => {
results.forEach(result => {
this.updateCriteriaResults(result);

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

@ -33,6 +33,7 @@ export default class ConditionManager extends EventEmitter {
this.latestTimestamp = {};
this.instantiate = this.openmct.$injector.get('instantiate');
this.loaded = undefined;
this.conditionCollection = [];
this.initialize();
}
@ -42,25 +43,20 @@ export default class ConditionManager extends EventEmitter {
initialize() {
this.conditionResults = {};
let loading = [];
this.openmct.objects.get(this.domainObject.identifier).then((obj) => {
this.observeForChanges(obj);
this.conditionCollection = [];
if (this.domainObject.configuration.conditionCollection.length) {
this.domainObject.configuration.conditionCollection.forEach((conditionConfigurationId, index) => {
this.openmct.objects.get(conditionConfigurationId).then((conditionConfiguration) => {
loading.push(
this.initCondition(conditionConfiguration, index)
);
this.openmct.objects.get(this.domainObject.identifier)
.then((obj) => {
this.observeForChanges(obj);
if (this.domainObject.configuration.conditionCollection.length) {
this.domainObject.configuration.conditionCollection.forEach((conditionConfigurationId, index) => {
this.openmct.objects.get(conditionConfigurationId).then((conditionConfiguration) => {
this.initCondition(conditionConfiguration, index);
});
});
});
} else {
this.addCondition(true);
}
});
this.loaded = Promise.all(loading)
.then(() => { return true; });
} else {
this.addCondition(true);
}
});
}
observeForChanges(domainObject) {
@ -109,8 +105,6 @@ export default class ConditionManager extends EventEmitter {
if (conditionConfiguration.isDefault) {
this.handleConditionResult();
}
return Promise.resolve(true);
}
createConditionDomainObject(isDefault, conditionConfiguration) {
@ -236,8 +230,6 @@ export default class ConditionManager extends EventEmitter {
}
updateConditionResults(resultObj) {
console.log(this.conditionCollection);
if (!resultObj) {
return;
}
@ -281,37 +273,45 @@ export default class ConditionManager extends EventEmitter {
}
requestLADConditionSetOutput() {
if (!this.domainObject.configuration.conditionCollection.length) {
return Promise.resolve([]);
}
const conditionResults = [];
this.load()
.then(() => {
this.conditionCollection.forEach(conditionId => {
this.openmct.objects.get(conditionId)
.then(condition => {
conditionResults.push(
condition.requestLADConditionResult()
);
});
this.domainObject.configuration.conditionCollection.forEach((conditionId, index) => {
this.openmct.objects.get(conditionId)
.then(conditionConfiguration => {
let condition = new Condition(conditionConfiguration, this.openmct);
if (index !== undefined) {
this.conditionCollection.splice(index + 1, 0, condition);
} else {
this.conditionCollection.unshift(condition);
}
conditionResults.push(
condition.requestLADConditionResult()
);
});
});
Promise.all(conditionResults)
.then((results) => {
results.forEach(resultObj => { this.updateConditionResults(resultObj); });
const currentConditionIdentifier = this.getCurrentConditionId();
this.openmct.objects.get(currentConditionIdentifier).then((obj) => {
return Object.assign(
{
output: obj.configuration.output,
id: this.domainObject.identifier,
conditionId: currentConditionIdentifier
},
this.latestTimestamp
);
});
});
return Promise.all(conditionResults)
.then((results) => {
results.forEach(resultObj => { this.updateConditionResults(resultObj); });
const currentConditionIdentifier = this.getCurrentConditionId();
this.openmct.objects.get(currentConditionIdentifier).then((obj) => {
return Object.assign(
{
output: obj.configuration.output,
id: this.domainObject.identifier,
conditionId: currentConditionIdentifier
},
this.latestTimestamp
);
});
});
}
persist() {

15
src/plugins/condition/ConditionSetTelemetryProvider.js
View File

@ -19,18 +19,17 @@ export default class ConditionSetTelemetryProvider {
request(domainObject, options) {
const conditionManager = new ConditionManager(domainObject, this.openmct);
const output = conditionManager.requestLADConditionSetOutput();
return output;
return conditionManager.requestLADConditionSetOutput();
}
subscribe(domainObject, callback) {
const conditionManager = new ConditionManager(domainObject, this.openmct);
conditionManager.on('conditionSetResultUpdated', callback);
// const conditionManager = new ConditionManager(domainObject, this.openmct);
// conditionManager.on('conditionSetResultUpdated', callback);
return function unsubscribe() {
conditionManager.off('conditionSetResultUpdated');
conditionManager.destroy();
}
// return function unsubscribe() {
// conditionManager.off('conditionSetResultUpdated');
// conditionManager.destroy();
// }
}
}

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

@ -111,10 +111,6 @@ export default class TelemetryCriterion extends EventEmitter {
}
requestLAD(options) {
if (!this.isValid()) {
return this.formatData({});
}
options = Object.assign({},
options,
{
@ -122,14 +118,20 @@ export default class TelemetryCriterion extends EventEmitter {
size: 1
}
);
this.telemetryAPI.request(
this.telemetryObject,
options
).then(results => {
const datum = results.length ? results[results.length - 1] : {};
return this.formatData(datum);
});
return this.objectAPI.get(this.objectAPI.makeKeyString(this.telemetry))
.then((obj) => {
if (!obj || !this.metadata || !this.operation) {
return this.formatData({});
}
return this.telemetryAPI.request(
obj,
options
).then(results => {
const datum = results.length ? results[results.length - 1] : {};
return this.formatData(datum);
});
});
}
/**