ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-29 13:44:21 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Pre release for Sprint 1.7.3 (#3924)

Browse Source 
* Revert "upgrade to webpack5 (#3871)" (#3907) (#3908)
* [Navigation Tree] Fix composition on closed folders and scrolling for items NOT in tree (#3920)
* Update package.json version and version documentation to include tags for npmjs

Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
This commit is contained in:
Shefali Joshi 2021-06-07 11:25:58 -07:00 committed by GitHub
parent a40867d544
commit a123889d6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/src/process/version.md
View File

@ -131,7 +131,8 @@ numbers by the following process:
3. In `package.json` change package to be public (private: false) 3. In `package.json` change package to be public (private: false)
4. Test the package before publishing by doing `npm publish --dry-run` 4. Test the package before publishing by doing `npm publish --dry-run`
if necessary. if necessary.
5. Publish the package to the npmjs registry (e.g. `npm publish --access public`) 5. Publish the package to the npmjs registry (e.g. `npm publish --access public`)
NOTE: Use the `--tag unstable` flag to the npm publishj if this is a prerelease.
6. Confirm the package has been published (e.g. `https://www.npmjs.com/package/openmct`) 6. Confirm the package has been published (e.g. `https://www.npmjs.com/package/openmct`)
5. Update snapshot status in `package.json` 5. Update snapshot status in `package.json`
1. Create a new branch off the `master` branch. 1. Create a new branch off the `master` branch.

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "openmct", "name": "openmct",
"version": "1.7.3-SNAPSHOT", "version": "1.7.3",
"description": "The Open MCT core platform", "description": "The Open MCT core platform",
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {

2
src/api/telemetry/TelemetryAPI.js
View File

@ -579,7 +579,7 @@ define([
*/ */
TelemetryAPI.prototype.getLimits = function (domainObject) { TelemetryAPI.prototype.getLimits = function (domainObject) {
const provider = this.findLimitEvaluator(domainObject); const provider = this.findLimitEvaluator(domainObject);
if (!provider) { if (!provider || !provider.getLimits) {
return { return {
limits: function () {} limits: function () {}
}; };

17
src/ui/layout/mct-tree.vue
View File

@ -308,6 +308,7 @@ export default {
|| !checkItem.navigationPath.includes(path); || !checkItem.navigationPath.includes(path);
}); });
this.openTreeItems.splice(pathIndex, 1); this.openTreeItems.splice(pathIndex, 1);
this.removeCompositionListenerFor(path);
}, },
closeTreeItem(item) { closeTreeItem(item) {
this.closeTreeItemByPath(item.navigationPath); this.closeTreeItemByPath(item.navigationPath);
@ -393,12 +394,18 @@ export default {
} }
const indexOfScroll = this.treeItems.findIndex(item => item.navigationPath === navigationPath); const indexOfScroll = this.treeItems.findIndex(item => item.navigationPath === navigationPath);
const scrollTopAmount = indexOfScroll * this.itemHeight;
this.$refs.scrollable.scrollTo({ if (indexOfScroll !== -1) {
top: scrollTopAmount, const scrollTopAmount = indexOfScroll * this.itemHeight;
behavior: 'smooth'
}); this.$refs.scrollable.scrollTo({
top: scrollTopAmount,
behavior: 'smooth'
});
} else if (this.scrollToPath) {
this.scrollToPath = undefined;
delete this.scrollToPath;
}
}, },
scrollEndEvent() { scrollEndEvent() {
this.$nextTick(() => { this.$nextTick(() => {