Compare commits
	
		
			4 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					198d82ce9a | ||
| 
						 | 
					f602790b1d | ||
| 
						 | 
					66893cd5db | ||
| 
						 | 
					436e35c113 | 
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -39,3 +39,5 @@ npm-debug.log
 | 
			
		||||
 | 
			
		||||
# karma reports
 | 
			
		||||
report.*.json
 | 
			
		||||
 | 
			
		||||
package-lock.json
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										10
									
								
								app.js
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								app.js
									
									
									
									
									
								
							@@ -7,14 +7,6 @@
 | 
			
		||||
 * node app.js [options]
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
class WatchRunPlugin {
 | 
			
		||||
    apply(compiler) {
 | 
			
		||||
        compiler.hooks.emit.tapAsync('WatchRunPlugin', (compilation, callback) => {
 | 
			
		||||
            console.log('Begin compile at ' + new Date());
 | 
			
		||||
            callback();
 | 
			
		||||
        });
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const options = require('minimist')(process.argv.slice(2));
 | 
			
		||||
const express = require('express');
 | 
			
		||||
@@ -51,7 +43,7 @@ app.use('/proxyUrl', function proxyRequest(req, res, next) {
 | 
			
		||||
const webpack = require('webpack');
 | 
			
		||||
const webpackConfig = require('./webpack.config.js');
 | 
			
		||||
webpackConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
 | 
			
		||||
webpackConfig.plugins.push(new WatchRunPlugin());
 | 
			
		||||
webpackConfig.plugins.push(function() { this.plugin('watch-run', function(watching, callback) { console.log('Begin compile at ' + new Date()); callback(); }) });
 | 
			
		||||
 | 
			
		||||
webpackConfig.entry.openmct = [
 | 
			
		||||
    'webpack-hot-middleware/client?reload=true',
 | 
			
		||||
 
 | 
			
		||||
@@ -131,7 +131,8 @@ numbers by the following process:
 | 
			
		||||
  3. In `package.json` change package to be public (private: false)
 | 
			
		||||
  4. Test the package before publishing by doing `npm publish --dry-run` 
 | 
			
		||||
     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`)
 | 
			
		||||
5. Update snapshot status in `package.json`
 | 
			
		||||
  1. Create a new branch off the `master` branch.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8613
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										8613
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										16
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								package.json
									
									
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "openmct",
 | 
			
		||||
  "version": "1.7.3-SNAPSHOT",
 | 
			
		||||
  "version": "1.7.3",
 | 
			
		||||
  "description": "The Open MCT core platform",
 | 
			
		||||
  "dependencies": {},
 | 
			
		||||
  "devDependencies": {
 | 
			
		||||
@@ -9,7 +9,7 @@
 | 
			
		||||
    "babel-eslint": "10.0.3",
 | 
			
		||||
    "comma-separated-values": "^3.6.4",
 | 
			
		||||
    "concurrently": "^3.6.1",
 | 
			
		||||
    "copy-webpack-plugin": "^9.0.0",
 | 
			
		||||
    "copy-webpack-plugin": "^4.5.2",
 | 
			
		||||
    "cross-env": "^6.0.3",
 | 
			
		||||
    "css-loader": "^1.0.0",
 | 
			
		||||
    "d3-array": "1.2.x",
 | 
			
		||||
@@ -41,19 +41,19 @@
 | 
			
		||||
    "jsdoc": "^3.3.2",
 | 
			
		||||
    "karma": "5.1.1",
 | 
			
		||||
    "karma-chrome-launcher": "3.1.0",
 | 
			
		||||
    "karma-firefox-launcher": "1.3.0",
 | 
			
		||||
    "karma-cli": "2.0.0",
 | 
			
		||||
    "karma-coverage": "2.0.3",
 | 
			
		||||
    "karma-coverage-istanbul-reporter": "3.0.3",
 | 
			
		||||
    "karma-firefox-launcher": "1.3.0",
 | 
			
		||||
    "karma-html-reporter": "0.2.7",
 | 
			
		||||
    "karma-jasmine": "3.3.1",
 | 
			
		||||
    "karma-sourcemap-loader": "0.3.7",
 | 
			
		||||
    "karma-webpack": "^5.0.0",
 | 
			
		||||
    "karma-webpack": "4.0.2",
 | 
			
		||||
    "location-bar": "^3.0.1",
 | 
			
		||||
    "lodash": "^4.17.12",
 | 
			
		||||
    "markdown-toc": "^0.11.7",
 | 
			
		||||
    "marked": "^0.3.5",
 | 
			
		||||
    "mini-css-extract-plugin": "^1.6.0",
 | 
			
		||||
    "mini-css-extract-plugin": "^0.4.1",
 | 
			
		||||
    "minimist": "^1.2.5",
 | 
			
		||||
    "moment": "2.25.3",
 | 
			
		||||
    "moment-duration-format": "^2.2.2",
 | 
			
		||||
@@ -69,10 +69,10 @@
 | 
			
		||||
    "uuid": "^3.3.3",
 | 
			
		||||
    "v8-compile-cache": "^1.1.0",
 | 
			
		||||
    "vue": "2.5.6",
 | 
			
		||||
    "vue-loader": "^15.9.7",
 | 
			
		||||
    "vue-loader": "^15.2.6",
 | 
			
		||||
    "vue-template-compiler": "2.5.6",
 | 
			
		||||
    "webpack": "^5.37.0",
 | 
			
		||||
    "webpack-cli": "^3.3.12",
 | 
			
		||||
    "webpack": "^4.16.2",
 | 
			
		||||
    "webpack-cli": "^3.1.0",
 | 
			
		||||
    "webpack-dev-middleware": "^3.1.3",
 | 
			
		||||
    "webpack-hot-middleware": "^2.22.3",
 | 
			
		||||
    "zepto": "^1.2.0"
 | 
			
		||||
 
 | 
			
		||||
@@ -579,7 +579,7 @@ define([
 | 
			
		||||
     */
 | 
			
		||||
    TelemetryAPI.prototype.getLimits = function (domainObject) {
 | 
			
		||||
        const provider = this.findLimitEvaluator(domainObject);
 | 
			
		||||
        if (!provider) {
 | 
			
		||||
        if (!provider || !provider.getLimits) {
 | 
			
		||||
            return {
 | 
			
		||||
                limits: function () {}
 | 
			
		||||
            };
 | 
			
		||||
 
 | 
			
		||||
@@ -43,6 +43,7 @@ import {TRIGGER_CONJUNCTION, TRIGGER_LABEL} from "./utils/constants";
 | 
			
		||||
* }
 | 
			
		||||
*/
 | 
			
		||||
export default class Condition extends EventEmitter {
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Manages criteria and emits the result of - true or false - based on criteria evaluated.
 | 
			
		||||
     * @constructor
 | 
			
		||||
 
 | 
			
		||||
@@ -70,7 +70,7 @@ describe("the plugin", () => {
 | 
			
		||||
            setTimeout(() => {
 | 
			
		||||
                expect(window.location.href).toContain('context.html#/browse/?tc.mode=fixed&tc.startBound=0&tc.endBound=1&tc.timeSystem=utc');
 | 
			
		||||
                done();
 | 
			
		||||
            }, 2500);
 | 
			
		||||
            }, 1500);
 | 
			
		||||
        });
 | 
			
		||||
    });
 | 
			
		||||
});
 | 
			
		||||
 
 | 
			
		||||
@@ -308,6 +308,7 @@ export default {
 | 
			
		||||
                    || !checkItem.navigationPath.includes(path);
 | 
			
		||||
            });
 | 
			
		||||
            this.openTreeItems.splice(pathIndex, 1);
 | 
			
		||||
            this.removeCompositionListenerFor(path);
 | 
			
		||||
        },
 | 
			
		||||
        closeTreeItem(item) {
 | 
			
		||||
            this.closeTreeItemByPath(item.navigationPath);
 | 
			
		||||
@@ -393,12 +394,18 @@ export default {
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            const indexOfScroll = this.treeItems.findIndex(item => item.navigationPath === navigationPath);
 | 
			
		||||
            const scrollTopAmount = indexOfScroll * this.itemHeight;
 | 
			
		||||
 | 
			
		||||
            this.$refs.scrollable.scrollTo({
 | 
			
		||||
                top: scrollTopAmount,
 | 
			
		||||
                behavior: 'smooth'
 | 
			
		||||
            });
 | 
			
		||||
            if (indexOfScroll !== -1) {
 | 
			
		||||
                const scrollTopAmount = indexOfScroll * this.itemHeight;
 | 
			
		||||
 | 
			
		||||
                this.$refs.scrollable.scrollTo({
 | 
			
		||||
                    top: scrollTopAmount,
 | 
			
		||||
                    behavior: 'smooth'
 | 
			
		||||
                });
 | 
			
		||||
            } else if (this.scrollToPath) {
 | 
			
		||||
                this.scrollToPath = undefined;
 | 
			
		||||
                delete this.scrollToPath;
 | 
			
		||||
            }
 | 
			
		||||
        },
 | 
			
		||||
        scrollEndEvent() {
 | 
			
		||||
            this.$nextTick(() => {
 | 
			
		||||
 
 | 
			
		||||
@@ -64,27 +64,21 @@ const webpackConfig = {
 | 
			
		||||
            filename: '[name].css',
 | 
			
		||||
            chunkFilename: '[name].css'
 | 
			
		||||
        }),
 | 
			
		||||
        new CopyWebpackPlugin({
 | 
			
		||||
            patterns: [
 | 
			
		||||
                {
 | 
			
		||||
                    from: 'src/images/favicons',
 | 
			
		||||
                    to: 'favicons'
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    from: './index.html',
 | 
			
		||||
                    transform: function (content) {
 | 
			
		||||
                        return content.toString().replace(/dist\//g, '');
 | 
			
		||||
                    }
 | 
			
		||||
        new CopyWebpackPlugin([
 | 
			
		||||
            {
 | 
			
		||||
                from: 'src/images/favicons',
 | 
			
		||||
                to: 'favicons'
 | 
			
		||||
            },
 | 
			
		||||
            {
 | 
			
		||||
                from: './index.html',
 | 
			
		||||
                transform: function (content) {
 | 
			
		||||
                    return content.toString().replace(/dist\//g, '');
 | 
			
		||||
                }
 | 
			
		||||
            ]
 | 
			
		||||
        })
 | 
			
		||||
            }
 | 
			
		||||
        ])
 | 
			
		||||
    ],
 | 
			
		||||
    module: {
 | 
			
		||||
        rules: [
 | 
			
		||||
            {
 | 
			
		||||
                test: /\.vue$/,
 | 
			
		||||
                use: 'vue-loader'
 | 
			
		||||
            },
 | 
			
		||||
            {
 | 
			
		||||
                test: /\.(sc|sa|c)ss$/,
 | 
			
		||||
                use: [
 | 
			
		||||
@@ -124,14 +118,17 @@ const webpackConfig = {
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            },
 | 
			
		||||
            
 | 
			
		||||
            {
 | 
			
		||||
                test: /\.vue$/,
 | 
			
		||||
                use: 'vue-loader'
 | 
			
		||||
            }
 | 
			
		||||
        ]
 | 
			
		||||
    },
 | 
			
		||||
    ignoreWarnings: [/asset size limit/g],
 | 
			
		||||
    stats: {
 | 
			
		||||
        modules: false,
 | 
			
		||||
        timings: true,
 | 
			
		||||
        colors: true
 | 
			
		||||
        colors: true,
 | 
			
		||||
        warningsFilter: /asset size limit/g
 | 
			
		||||
    }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user