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

Jump to bottom

fix(#7456): allow children of Overlay Plots to be removed #7516

Merged
merged 7 commits into from
Feb 22, 2024
Merged

fix(#7456): allow children of Overlay Plots to be removed #7516

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
40bff18
fix(#7456): check if object is an identifier
ozyx Feb 20, 2024
9103a59
refactor: use v-show, remove unnecessary deep copy, set yAxes array t…
ozyx Feb 20, 2024
99b394d
refactor: use ESM exports
ozyx Feb 20, 2024
bf8cc75
refactor: use ESM imports
ozyx Feb 20, 2024
3a38f93
test(e2e): add test for element item removal from overlay plot
ozyx Feb 21, 2024
0c379c1
a11y: add accessible name for object labels
ozyx Feb 21, 2024
367bbee
refactor: move overlayPlot creation to beforeAll, use getByLabel
ozyx Feb 21, 2024
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
Next Next commit
fix(#7456): check if object is an identifier
  • Loading branch information
@ozyx
ozyx committed Feb 21, 2024
commit 40bff181764c74d8c8f364b834723e21ccbbd48d
6 changes: 5 additions & 1 deletion src/ui/mixins/staleness-mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import { isProxy, toRaw } from 'vue';

import { isIdentifier } from '@/api/objects/object-utils';
import StalenessUtils from '@/utils/staleness';

export default {
Expand All @@ -40,7 +41,9 @@ export default {
},
methods: {
getSubscriptionId(domainObject) {
return this.openmct?.objects.makeKeyString(domainObject.identifier);
// Only extract the identifier if it is not already an identifier
const identifier = isIdentifier(domainObject) ? domainObject : domainObject.identifier;
return this.openmct?.objects.makeKeyString(identifier);
},
setupClockChangedEvent(callback) {
this.setupClockChanged = true;
Expand Down Expand Up @@ -97,6 +100,7 @@ export default {
if (isProxy(domainObject)) {
domainObject = toRaw(domainObject);
}

const id = this.getSubscriptionId(domainObject);
if (!this.stalenessSubscription[id]) {
return;
Expand Down