ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-24 07:16:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the current timestamp from the global clock (#6851)

Browse Source 
* Use the current timestamp from the global clock. Use mode changes to set if the view is fixed time or real time

* Reload the page after adding a plan and then change the url params.
This commit is contained in:
Shefali Joshi 2023-07-28 09:37:11 -07:00 committed by GitHub
parent 7c58b19c3e
commit d4e51cbaf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/tests/functional/planning/timelist.e2e.spec.js
View File

@ -98,6 +98,8 @@ test.describe('Time List', () => {
const startBound = testPlan.TEST_GROUP[0].start; const startBound = testPlan.TEST_GROUP[0].start;
const endBound = testPlan.TEST_GROUP[testPlan.TEST_GROUP.length - 1].end; const endBound = testPlan.TEST_GROUP[testPlan.TEST_GROUP.length - 1].end;
await page.goto(timelist.url);
// Switch to fixed time mode with all plan events within the bounds // Switch to fixed time mode with all plan events within the bounds
await page.goto( await page.goto(
`${timelist.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=timelist.view` `${timelist.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=timelist.view`

30
src/plugins/timelist/Timelist.vue
View File

@ -38,6 +38,7 @@ import { getPreciseDuration } from '../../utils/duration';
import { SORT_ORDER_OPTIONS } from './constants'; import { SORT_ORDER_OPTIONS } from './constants';
import _ from 'lodash'; import _ from 'lodash';
import { v4 as uuid } from 'uuid'; import { v4 as uuid } from 'uuid';
import { TIME_CONTEXT_EVENTS } from '../../api/time/constants';
const SCROLL_TIMEOUT = 10000; const SCROLL_TIMEOUT = 10000;
@ -114,10 +115,8 @@ export default {
}, },
mounted() { mounted() {
this.isEditing = this.openmct.editor.isEditing(); this.isEditing = this.openmct.editor.isEditing();
this.timestamp = this.openmct.time.isRealTime() this.timestamp = this.openmct.time.now();
? this.openmct.time.now() this.openmct.time.on(TIME_CONTEXT_EVENTS.modeChanged, this.setFixedTime);
: this.openmct.time.bounds().start;
this.openmct.time.on('clock', this.setViewFromClock);
this.getPlanDataAndSetConfig(this.domainObject); this.getPlanDataAndSetConfig(this.domainObject);
@ -138,7 +137,7 @@ export default {
this.status = this.openmct.status.get(this.domainObject.identifier); this.status = this.openmct.status.get(this.domainObject.identifier);
this.updateTimestamp = _.throttle(this.updateTimestamp, 1000); this.updateTimestamp = _.throttle(this.updateTimestamp, 1000);
this.openmct.time.on('bounds', this.updateTimestamp); this.openmct.time.on('tick', this.updateTimestamp);
this.openmct.editor.on('isEditing', this.setEditState); this.openmct.editor.on('isEditing', this.setEditState);
this.deferAutoScroll = _.debounce(this.deferAutoScroll, 500); this.deferAutoScroll = _.debounce(this.deferAutoScroll, 500);
@ -150,7 +149,7 @@ export default {
this.composition.load(); this.composition.load();
} }
this.setViewFromClock(this.openmct.time.getClock()); this.setFixedTime(this.openmct.time.getMode());
}, },
beforeUnmount() { beforeUnmount() {
if (this.unlisten) { if (this.unlisten) {
@ -166,8 +165,8 @@ export default {
} }
this.openmct.editor.off('isEditing', this.setEditState); this.openmct.editor.off('isEditing', this.setEditState);
this.openmct.time.off('bounds', this.updateTimestamp); this.openmct.time.off('tick', this.updateTimestamp);
this.openmct.time.off('clock', this.setViewFromClock); this.openmct.time.off(TIME_CONTEXT_EVENTS.modeChanged, this.setFixedTime);
this.$el.parentElement?.removeEventListener('scroll', this.deferAutoScroll, true); this.$el.parentElement?.removeEventListener('scroll', this.deferAutoScroll, true);
if (this.clearAutoScrollDisabledTimer) { if (this.clearAutoScrollDisabledTimer) {
@ -202,22 +201,15 @@ export default {
this.listActivities(); this.listActivities();
} }
}, },
updateTimestamp(bounds, isTick) { updateTimestamp(timestamp) {
if (isTick === true && this.openmct.time.isRealTime()) { //The clock never stops ticking
this.updateTimeStampAndListActivities(this.openmct.time.now()); this.updateTimeStampAndListActivities(timestamp);
} else if (isTick === false && !this.openmct.time.isRealTime()) {
// set the start time for fixed time using the selected bounds start
this.updateTimeStampAndListActivities(bounds.start);
}
}, },
setViewFromClock(newClock) { setFixedTime() {
this.filterValue = this.domainObject.configuration.filter; this.filterValue = this.domainObject.configuration.filter;
this.isFixedTime = !this.openmct.time.isRealTime(); this.isFixedTime = !this.openmct.time.isRealTime();
if (this.isFixedTime) { if (this.isFixedTime) {
this.hideAll = false; this.hideAll = false;
this.updateTimeStampAndListActivities(this.openmct.time.bounds()?.start);
} else {
this.updateTimeStampAndListActivities(this.openmct.time.now());
} }
}, },
addItem(domainObject) { addItem(domainObject) {