ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-18 23:28:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix Independent Time Conductor for Plans within Time Strips (#5671)

Browse Source 
* Update `IndependentTimeContext` only if its `objectPath` differs

* Ensure independent time conductor, fixed and realtime inputs have the right objectPath

* [e2e] Add Plan creation test

* [e2e] add Create TimeStrip test

* mark new faultManagement suite with @unstable

* Upgrade to @playwright/test v1.25.0

* Extract `createPlanFromJSON` to appActions

* [e2e] Add TimeStrip test for Plans, Independent Time Contexts

* [e2e] Move test annotation to the top

* [e2e] fix timestrip test

* Update docker image so the tests run

* update playwright on GHA as well

* [e2e] Fix menu test

* Error if no objectPath provided

Co-authored-by: Shefali <simplyrender@gmail.com>
Co-authored-by: Jesse Mazzella <jesse.d.mazzella@nasa.gov>
This commit is contained in:
Jesse Mazzella
2022-09-09 17:31:03 -07:00
committed by GitHub
parent c231c2d7cb
commit a7ea5afa59
15 changed files with 397 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/timeConductor/ConductorInputsFixed.vue
View File

@ -78,6 +78,12 @@ export default {
default() {
return undefined;
}
},
objectPath: {
type: Array,
default() {
return [];
}
}
},
data() {
@ -127,7 +133,7 @@ export default {
methods: {
setTimeContext() {
this.stopFollowingTimeContext();
this.timeContext = this.openmct.time.getContextForView(this.keyString ? [{identifier: this.keyString}] : []);
this.timeContext = this.openmct.time.getContextForView(this.keyString ? this.objectPath : []);
this.handleNewBounds(this.timeContext.bounds());
this.timeContext.on('bounds', this.handleNewBounds);

8
src/plugins/timeConductor/ConductorInputsRealtime.vue
View File

@ -90,6 +90,12 @@ export default {
return undefined;
}
},
objectPath: {
type: Array,
default() {
return [];
}
},
inputBounds: {
type: Object,
default() {
@ -162,7 +168,7 @@ export default {
},
setTimeContext() {
this.stopFollowingTime();
this.timeContext = this.openmct.time.getContextForView(this.keyString ? [{identifier: this.keyString}] : []);
this.timeContext = this.openmct.time.getContextForView(this.keyString ? this.objectPath : []);
this.followTime();
},
handleNewBounds(bounds) {

8
src/plugins/timeConductor/independent/IndependentTimeConductor.vue
View File

@ -52,12 +52,14 @@
<conductor-inputs-fixed
v-if="isFixed"
:key-string="domainObject.identifier.key"
:object-path="objectPath"
@updated="saveFixedOffsets"
/>
<conductor-inputs-realtime
v-else
:key-string="domainObject.identifier.key"
:object-path="objectPath"
@updated="saveClockOffsets"
/>
</div>
@ -85,6 +87,10 @@ export default {
domainObject: {
type: Object,
required: true
},
objectPath: {
type: Array,
required: true
}
},
data() {
@ -164,7 +170,7 @@ export default {
},
setTimeContext() {
this.stopFollowingTimeContext();
this.timeContext = this.openmct.time.getContextForView([this.domainObject]);
this.timeContext = this.openmct.time.getContextForView(this.objectPath);
this.timeContext.on('clock', this.setTimeOptions);
},
stopFollowingTimeContext() {