Compare commits

...

20 Commits

Author SHA1 Message Date
David Tsay
1440dfb76d lint fix 2023-07-10 18:59:00 -07:00
David Tsay
48db22a51e Merge tag 'v2.2.5' into omm-release/5.1 2023-07-10 18:51:07 -07:00
Shefali Joshi
55d0efa510 Remove snapshot (#6783) 2023-07-10 17:38:46 +00:00
Jamie V
59ae7cddc5 Merge branch 'omm-release/5.1' of https://github.com/nasa/openmct into omm-release/5.1
mergin
2023-07-07 11:14:50 -07:00
Jamie V
321c7a3af5 suppressing abort errors as they are expected 2023-07-07 11:13:43 -07:00
David Tsay
609cf72bd1 chicken needs to come first 2023-07-06 14:39:26 -07:00
Jamie V
a447b0ada8 removing eval-source-map, dont debuggin 2023-06-21 16:32:57 -07:00
Jamie V
5788f4cc69 temp source maps for debugin 2023-06-21 14:11:23 -07:00
Jamie V
f94b4e53c7 adding back in abort on item close in tree 2023-06-21 13:31:12 -07:00
Jamie V
faf71f1e67 omm-cherry-pick(#6602) : [ExportAsJson] Multiple Aliases in Export an… (#6662)
omm-cherry-pick(#6602) : [ExportAsJson] Multiple Aliases in Export and Conditional Styles Fixes (#6602)

Fixes issues that prevent import and export from being completed successfully. Specifically:

* if multiple aliases are detected, the first is created as a new object and and added to it's parent's composition, any subsequent aliases of the same object will not be recreated, but the originally created one will be added to the current parent's composition, creating an alias.

* Also, there are cases were conditionSetIdentifiers are stored in an object keyed by an item id in the configuration.objectstyles object, this fix will handle these as well.

* Replaces an errant `return` statement with a `continue` statement to prevent early exit from a recursive function.

---------

Co-authored-by: Andrew Henry <akhenry@gmail.com>
2023-05-15 13:12:37 -07:00
David Tsay
23310f85ae cherry pick retain styles on url change 2023-05-02 13:38:13 -07:00
David Tsay
d80819634b revert opening in new tab 2023-04-12 15:01:53 -07:00
Shefali
483b62c152 Only decrement and save if there is composition but no child object reference 2023-04-07 14:08:58 -07:00
Jamie V
1254279635 Fix ExportAsJSONAction to not lose layout configurations on linked objects (#6562) 2023-04-05 23:05:27 -07:00
David Tsay
c768a71656 free findSubscriptionProvider 2023-03-31 15:50:38 -07:00
David Tsay
678a92bd29 Revert "enable source maps in prod"
This reverts commit 34b488944a.
2023-03-31 14:43:02 -07:00
David Tsay
34b488944a enable source maps in prod 2023-03-31 14:42:39 -07:00
David Tsay
4d1dd2f51d add temporary debugging 2023-03-31 12:23:23 -07:00
David Tsay
080f7b8f4b pass openmct and object key to function
re-enable historical row action
2023-03-29 17:09:35 -07:00
David Tsay
483f2feac8 allow contextual domain objects to row actions 2023-03-29 16:58:51 -07:00
4 changed files with 17 additions and 5 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "openmct",
"version": "2.2.5-SNAPSHOT",
"version": "2.2.5",
"description": "The Open MCT core platform",
"devDependencies": {
"@babel/eslint-parser": "7.21.8",

View File

@@ -242,9 +242,15 @@ export default class ObjectAPI {
return domainObject;
})
.catch((error) => {
console.warn(`Failed to retrieve ${keystring}:`, error);
let result;
delete this.cache[keystring];
const result = this.applyGetInterceptors(identifier);
// suppress abort errors
if (error.name !== 'AbortError') {
console.warn(`Failed to retrieve ${keystring}:`, error);
result = this.applyGetInterceptors(identifier);
}
return result;
});

View File

@@ -52,6 +52,11 @@ define([], function () {
*/
function parseKeyString(keyString) {
if (isIdentifier(keyString)) {
// TODO REMOVE FOR OMM-RELEASE-5.0
if (!keyString.namespace && keyString.key.includes(':')) {
console.error(`smushed key: ${keyString.key}`);
}
return keyString;
}

View File

@@ -326,12 +326,13 @@ export default {
},
async openTreeItem(parentItem) {
const parentPath = parentItem.navigationPath;
const abortSignal = this.startItemLoad(parentPath);
this.startItemLoad(parentPath);
// pass in abort signal when functional
const childrenItems = await this.loadAndBuildTreeItemsFor(
parentItem.object.identifier,
parentItem.objectPath
parentItem.objectPath,
abortSignal
);
const parentIndex = this.treeItems.indexOf(parentItem);