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

[Tooltips] Fixes for dictionary objects and self-referential objects #6916

Merged
merged 11 commits into from
Aug 17, 2023
Merged

[Tooltips] Fixes for dictionary objects and self-referential objects #6916

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f19129b
Fix getTelemetryPath to handle cases where parent is the same as the …
khalidadil Aug 10, 2023
6f745a0
Merge branch 'bugfix/issue-6810' of https://github.com/nasa/openmct i…
khalidadil Aug 10, 2023
e40d6a2
Cleanup getTelemetryPath
khalidadil Aug 15, 2023
1187204
Switch to filter instead of forEach
khalidadil Aug 16, 2023
d11e21b
Get path item names
khalidadil Aug 16, 2023
6fc541e
Remove tooltips on scroll of tree
khalidadil Aug 16, 2023
2448635
Remove handing for scroll
khalidadil Aug 16, 2023
3fde5c7
Allow break-words
khalidadil Aug 16, 2023
72f4f2e
Merge branch 'master' into bugfix/issue-6810
khalidadil Aug 16, 2023
aa0ebf0
Cleanup
khalidadil Aug 16, 2023
a364f2f
Merge branch 'master' into bugfix/issue-6810
khalidadil Aug 17, 2023
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
40 changes: 26 additions & 14 deletions src/api/objects/ObjectAPI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,27 +555,39 @@ export default class ObjectAPI {
async getTelemetryPath(identifier, telemetryIdentifier) {
const objectDetails = await this.get(identifier);
const telemetryPath = [];
if (objectDetails.composition && !['folder'].includes(objectDetails.type)) {
let sourceTelemetry = objectDetails.composition[0];
if (['folder'].includes(objectDetails.type)) {
return telemetryPath;
}

let sourceTelemetry = null;
let isParentSameAsChild = true;
Object.keys(identifier).forEach((key) => {
if (identifier[key] !== telemetryIdentifier[key]) {
isParentSameAsChild = false;
}
});
if (isParentSameAsChild) {
sourceTelemetry = identifier;
} else if (objectDetails.composition) {
sourceTelemetry = objectDetails.composition[0];
if (telemetryIdentifier) {
sourceTelemetry = objectDetails.composition.find(
(telemetrySource) =>
this.makeKeyString(telemetrySource) === this.makeKeyString(telemetryIdentifier)
);
}
const compositionElement = await this.get(sourceTelemetry);
if (!['yamcs.telemetry', 'generator'].includes(compositionElement.type)) {
return telemetryPath;
}
const telemetryKey = compositionElement.identifier.key;
const telemetryPathObjects = await this.getOriginalPath(telemetryKey);
telemetryPathObjects.forEach((pathObject) => {
if (pathObject.type === 'root') {
return;
}
telemetryPath.unshift(pathObject.name);
});
}
const compositionElement = await this.get(sourceTelemetry);
if (!['yamcs.telemetry', 'generator', 'yamcs.aggregate'].includes(compositionElement.type)) {
return telemetryPath;
}
const telemetryPathObjects = await this.getOriginalPath(compositionElement.identifier);
telemetryPathObjects.forEach((pathObject) => {
if (pathObject.type === 'root') {
return;
}
telemetryPath.unshift(pathObject.name);
});
return telemetryPath;
}

Expand Down