Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Condition sets only persist if actively editing #4262

Merged
merged 7 commits into from
Sep 28, 2021
Merged

Condition sets only persist if actively editing #4262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc1a5ef
If there is a pending create request for an id, queue a duplicate req…
shefalijoshi Sep 21, 2021
da1fa0b
Merge branch '1.7.8' of https://github.com/nasa/openmct into 1.7.8
shefalijoshi Sep 22, 2021
a6e8f76
Merge branch '1.7.8' of https://github.com/nasa/openmct into 1.7.8
shefalijoshi Sep 23, 2021
4a7ff3f
Merge branch '1.7.8' of https://github.com/nasa/openmct into 1.7.8
shefalijoshi Sep 23, 2021
135edab
Merge branch '1.7.8' of https://github.com/nasa/openmct into 1.7.8
shefalijoshi Sep 27, 2021
c69a6b0
Don't save condition description to persistence store if we're not ac…
shefalijoshi Sep 27, 2021
09c384a
Rename function and remove unnecessary if condition
shefalijoshi Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/plugins/condition/Condition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default class Condition extends EventEmitter {
}

this.trigger = conditionConfiguration.configuration.trigger;
this.description = '';
this.summary = '';
}

updateResult(datum) {
Expand Down Expand Up @@ -134,7 +134,6 @@ export default class Condition extends EventEmitter {
criterionConfigurations.forEach((criterionConfiguration) => {
this.addCriterion(criterionConfiguration);
});
this.updateDescription();
}

updateCriteria(criterionConfigurations) {
Expand All @@ -146,7 +145,6 @@ export default class Condition extends EventEmitter {
this.criteria.forEach((criterion) => {
criterion.updateTelemetryObjects(this.conditionManager.telemetryObjects);
});
this.updateDescription();
}

/**
Expand Down Expand Up @@ -200,7 +198,6 @@ export default class Condition extends EventEmitter {
criterion.off('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
criterion.off('telemetryIsStale', (obj) => this.handleStaleCriterion(obj));
this.criteria.splice(found.index, 1, newCriterion);
this.updateDescription();
}
}

Expand All @@ -216,7 +213,6 @@ export default class Condition extends EventEmitter {
});
criterion.destroy();
this.criteria.splice(found.index, 1);
this.updateDescription();

return true;
}
Expand All @@ -228,7 +224,6 @@ export default class Condition extends EventEmitter {
let found = this.findCriterion(criterion.id);
if (found) {
this.criteria[found.index] = criterion.data;
this.updateDescription();
}
}

Expand All @@ -254,8 +249,7 @@ export default class Condition extends EventEmitter {

description = `${description} ${criterion.getDescription()} ${(index < this.criteria.length - 1) ? triggerDescription.conjunction : ''}`;
});
this.description = description;
this.conditionManager.updateConditionDescription(this);
this.summary = description;
}

getTriggerDescription() {
Expand Down
26 changes: 17 additions & 9 deletions src/plugins/condition/ConditionManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,14 @@ export default class ConditionManager extends EventEmitter {
}

updateConditionTelemetryObjects() {
this.conditions.forEach((condition) => condition.updateTelemetryObjects());
this.conditions.forEach((condition) => {
condition.updateTelemetryObjects();
let index = this.conditionSetDomainObject.configuration.conditionCollection.findIndex(item => item.id === condition.id);
if (index > -1) {
//Only assign the summary, don't mutate the domain object
this.conditionSetDomainObject.configuration.conditionCollection[index].summary = this.updateConditionDescription(condition);
}
});
}

removeConditionTelemetryObjects() {
Expand Down Expand Up @@ -139,10 +146,17 @@ export default class ConditionManager extends EventEmitter {
}
}

updateConditionDescription(condition) {
condition.updateDescription();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getConditionDescription is calling updateDescription on condition, feels incorrect. May be rename something else?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I could call this updateConditionDescription.


return condition.summary;
}

updateCondition(conditionConfiguration) {
let condition = this.findConditionById(conditionConfiguration.id);
if (condition) {
condition.update(conditionConfiguration);
conditionConfiguration.summary = this.updateConditionDescription(condition);
}

let index = this.conditionSetDomainObject.configuration.conditionCollection.findIndex(item => item.id === conditionConfiguration.id);
Expand All @@ -152,16 +166,10 @@ export default class ConditionManager extends EventEmitter {
}
}

updateConditionDescription(condition) {
const found = this.conditionSetDomainObject.configuration.conditionCollection.find(conditionConfiguration => (conditionConfiguration.id === condition.id));
if (found.summary !== condition.description) {
found.summary = condition.description;
this.persistConditions();
}
}

initCondition(conditionConfiguration, index) {
let condition = new Condition(conditionConfiguration, this.openmct, this);
conditionConfiguration.summary = this.updateConditionDescription(condition);

if (index !== undefined) {
this.conditions.splice(index + 1, 0, condition);
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/condition/components/Criterion.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ export default {
this.telemetryMetadataOptions = [];
telemetryObjects.forEach(telemetryObject => {
let telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
this.addMetaDataOptions(telemetryMetadata.values());
this.addMetaDataOptions(telemetryMetadata ? telemetryMetadata.values() : []);
});
this.updateOperations();
}
Expand Down
6 changes: 5 additions & 1 deletion src/plugins/condition/components/TestData.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,11 @@ export default {
this.telemetry.forEach((telemetryObject) => {
const id = this.openmct.objects.makeKeyString(telemetryObject.identifier);
let telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
this.telemetryMetadataOptions[id] = telemetryMetadata.values().slice();
if (telemetryMetadata) {
this.telemetryMetadataOptions[id] = telemetryMetadata.values().slice();
} else {
this.telemetryMetadataOptions[id] = [];
}
});
},
addTestInput(testInput) {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/condition/criterion/AllTelemetryCriterion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
const timeSystem = this.openmct.time.timeSystem();

telemetryRequestsResults.forEach((results, index) => {
const latestDatum = results.length ? results[results.length - 1] : {};
const latestDatum = (Array.isArray(results) && results.length) ? results[results.length - 1] : {};
const datumId = keys[index];
const normalizedDatum = this.createNormalizedDatum(latestDatum, telemetryObjects[datumId]);

Expand Down
5 changes: 5 additions & 0 deletions src/plugins/condition/criterion/TelemetryCriterion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,11 @@ export default class TelemetryCriterion extends EventEmitter {
id: this.id,
data: this.formatData(normalizedDatum)
};
}).catch((error) => {
return {
id: this.id,
data: this.formatData()
};
});
}

Expand Down