Skip to content

Commit

Permalink
Don't initialize the selected condition style when a view is loaded (#…
Browse files Browse the repository at this point in the history
…6478)

* Don't initialize the selected condition style when a view is loaded

* Ensure selection of styles in Edit mode works as expected. When out of edit mode, only a computed style should be chosen to display.
  • Loading branch information
shefalijoshi authored Mar 21, 2023
1 parent 8cf12db commit e174f07
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/plugins/condition/StyleRuleManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ export default class StyleRuleManager extends EventEmitter {
}

if (styleConfiguration) {
this.initialize(styleConfiguration);
// We don't set the selectedConditionId here because we want condition set computation to happen before we apply any selected style
const styleConfigurationWithNoSelection = Object.assign(styleConfiguration, {selectedConditionId: ''});
this.initialize(styleConfigurationWithNoSelection);
if (styleConfiguration.conditionSetIdentifier) {
this.openmct.time.on("bounds", this.refreshData);
this.subscribeToConditionSet();
Expand All @@ -57,14 +59,18 @@ export default class StyleRuleManager extends EventEmitter {
this.applySelectedConditionStyle();
}
} else if (this.conditionSetIdentifier) {
//reset the selected style and let the condition set output determine what it should be
this.selectedConditionId = undefined;
this.currentStyle = undefined;
this.updateDomainObjectStyle();
this.subscribeToConditionSet();
}
}

initialize(styleConfiguration) {
this.conditionSetIdentifier = styleConfiguration.conditionSetIdentifier;
this.staticStyle = styleConfiguration.staticStyle;
this.selectedConditionId = styleConfiguration.selectedConditionId;
this.staticStyle = styleConfiguration.staticStyle;
this.defaultConditionId = styleConfiguration.defaultConditionId;
this.updateConditionStylesMap(styleConfiguration.styles || []);
}
Expand Down
2 changes: 2 additions & 0 deletions src/plugins/condition/components/inspector/StylesView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,8 @@ export default {
delete this.stopProvidingTelemetry;
}
} else {
//reset the selectedConditionID so that the condition set computation can drive it.
this.applySelectedConditionStyle('');
this.subscribeToConditionSet();
}
},
Expand Down

0 comments on commit e174f07

Please # to comment.