Compare commits
	
		
			6 Commits
		
	
	
		
			release/2.
			...
			static-roo
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 7a0041b663 | ||
|   | 44f5372c31 | ||
|   | 2f292fbd07 | ||
|   | 205dc67809 | ||
|   | 169c23dbcc | ||
|   | 457cd42987 | 
| @@ -1,5 +1,5 @@ | ||||
| /***************************************************************************** | ||||
|  * Open MCT, Copyright (c) 2014-2021, United States Government | ||||
|  * Open MCT, Copyright (c) 2014-2022, United States Government | ||||
|  * as represented by the Administrator of the National Aeronautics and Space | ||||
|  * Administration. All rights reserved. | ||||
|  * | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /***************************************************************************** | ||||
|  * Open MCT, Copyright (c) 2014-2021, United States Government | ||||
|  * Open MCT, Copyright (c) 2014-2022, United States Government | ||||
|  * as represented by the Administrator of the National Aeronautics and Space | ||||
|  * Administration. All rights reserved. | ||||
|  * | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /***************************************************************************** | ||||
|  * Open MCT, Copyright (c) 2014-2021, United States Government | ||||
|  * Open MCT, Copyright (c) 2014-2022, United States Government | ||||
|  * as represented by the Administrator of the National Aeronautics and Space | ||||
|  * Administration. All rights reserved. | ||||
|  * | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /***************************************************************************** | ||||
|  * Open MCT, Copyright (c) 2014-2021, United States Government | ||||
|  * Open MCT, Copyright (c) 2014-2022, United States Government | ||||
|  * as represented by the Administrator of the National Aeronautics and Space | ||||
|  * Administration. All rights reserved. | ||||
|  * | ||||
|   | ||||
| @@ -195,6 +195,7 @@ | ||||
|         )); | ||||
|         openmct.install(openmct.plugins.Clock({ enableClockIndicator: true })); | ||||
|         openmct.install(openmct.plugins.Timer()); | ||||
|         openmct.install(openmct.plugins.StaticRootPlugin('root', './dist/static-root.json')); | ||||
|         openmct.start(); | ||||
|     </script> | ||||
| </html> | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "openmct", | ||||
|   "version": "1.8.4-SNAPSHOT", | ||||
|   "version": "1.8.4", | ||||
|   "description": "The Open MCT core platform", | ||||
|   "devDependencies": { | ||||
|     "@braintree/sanitize-url": "^5.0.2", | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /***************************************************************************** | ||||
|  * Open MCT, Copyright (c) 2014-2021, United States Government | ||||
|  * Open MCT, Copyright (c) 2014-2022, United States Government | ||||
|  * as represented by the Administrator of the National Aeronautics and Space | ||||
|  * Administration. All rights reserved. | ||||
|  * | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /***************************************************************************** | ||||
|  * Open MCT, Copyright (c) 2014-2021, United States Government | ||||
|  * Open MCT, Copyright (c) 2014-2022, United States Government | ||||
|  * as represented by the Administrator of the National Aeronautics and Space | ||||
|  * Administration. All rights reserved. | ||||
|  * | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /***************************************************************************** | ||||
|  * Open MCT, Copyright (c) 2014-2021, United States Government | ||||
|  * Open MCT, Copyright (c) 2014-2022, United States Government | ||||
|  * as represented by the Administrator of the National Aeronautics and Space | ||||
|  * Administration. All rights reserved. | ||||
|  * | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /***************************************************************************** | ||||
|  * Open MCT, Copyright (c) 2014-2021, United States Government | ||||
|  * Open MCT, Copyright (c) 2014-2022, United States Government | ||||
|  * as represented by the Administrator of the National Aeronautics and Space | ||||
|  * Administration. All rights reserved. | ||||
|  * | ||||
|   | ||||
| @@ -97,7 +97,14 @@ export default { | ||||
|     }, | ||||
|     mounted() { | ||||
|         if (this.frame.domainObjectIdentifier) { | ||||
|             this.openmct.objects.get(this.frame.domainObjectIdentifier).then((object) => { | ||||
|             let domainObjectPromise; | ||||
|             if (this.openmct.objects.supportsMutation(this.frame.domainObjectIdentifier)) { | ||||
|                 domainObjectPromise = this.openmct.objects.getMutable(this.frame.domainObjectIdentifier); | ||||
|             } else { | ||||
|                 domainObjectPromise = this.openmct.objects.get(this.frame.domainObjectIdentifier); | ||||
|             } | ||||
|  | ||||
|             domainObjectPromise.then((object) => { | ||||
|                 this.setDomainObject(object); | ||||
|             }); | ||||
|         } | ||||
| @@ -105,6 +112,10 @@ export default { | ||||
|         this.dragGhost = document.getElementById('js-fl-drag-ghost'); | ||||
|     }, | ||||
|     beforeDestroy() { | ||||
|         if (this.domainObject.isMutable) { | ||||
|             this.openmct.objects.destroyMutable(this.domainObject); | ||||
|         } | ||||
|  | ||||
|         if (this.unsubscribeSelection) { | ||||
|             this.unsubscribeSelection(); | ||||
|         } | ||||
|   | ||||
| @@ -632,7 +632,8 @@ export default { | ||||
|         updateDefaultNotebook(updatedNotebookStorageObject) { | ||||
|             if (!this.isDefaultNotebook()) { | ||||
|                 const persistedNotebookStorageObject = getDefaultNotebook(); | ||||
|                 if (persistedNotebookStorageObject.identifier !== undefined) { | ||||
|                 if (persistedNotebookStorageObject | ||||
|                     && persistedNotebookStorageObject.identifier !== undefined) { | ||||
|                     this.removeDefaultClass(persistedNotebookStorageObject.identifier); | ||||
|                 } | ||||
|  | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /***************************************************************************** | ||||
|  * Open MCT, Copyright (c) 2014-2021, United States Government | ||||
|  * Open MCT, Copyright (c) 2014-2022, United States Government | ||||
|  * as represented by the Administrator of the National Aeronautics and Space | ||||
|  * Administration. All rights reserved. | ||||
|  * | ||||
|   | ||||
| @@ -278,7 +278,7 @@ export default { | ||||
|             // Have to throw away the old canvas elements and replace with new | ||||
|             // canvas elements in order to get new drawing contexts. | ||||
|             const div = document.createElement('div'); | ||||
|             div.innerHTML = this.TEMPLATE; | ||||
|             div.innerHTML = this.canvasTemplate + this.canvasTemplate; | ||||
|             const mainCanvas = div.querySelectorAll("canvas")[1]; | ||||
|             const overlayCanvas = div.querySelectorAll("canvas")[0]; | ||||
|             this.canvas.parentNode.replaceChild(mainCanvas, this.canvas); | ||||
|   | ||||
| @@ -32,6 +32,8 @@ define([ | ||||
|             } | ||||
|         }); | ||||
|  | ||||
|         console.log(JSON.parse(objectString)); | ||||
|  | ||||
|         return JSON.parse(objectString); | ||||
|     } | ||||
|  | ||||
|   | ||||
| @@ -95,6 +95,11 @@ export default { | ||||
|             isUTCBased: timeSystem.isUTCBased | ||||
|         }; | ||||
|     }, | ||||
|     watch: { | ||||
|         keyString() { | ||||
|             this.setTimeContext(); | ||||
|         } | ||||
|     }, | ||||
|     mounted() { | ||||
|         this.handleNewBounds = _.throttle(this.handleNewBounds, 300); | ||||
|         this.setTimeSystem(JSON.parse(JSON.stringify(this.openmct.time.timeSystem()))); | ||||
|   | ||||
| @@ -115,6 +115,11 @@ export default { | ||||
|             isUTCBased: timeSystem.isUTCBased | ||||
|         }; | ||||
|     }, | ||||
|     watch: { | ||||
|         keyString() { | ||||
|             this.setTimeContext(); | ||||
|         } | ||||
|     }, | ||||
|     mounted() { | ||||
|         this.handleNewBounds = _.throttle(this.handleNewBounds, 300); | ||||
|         this.setTimeSystem(JSON.parse(JSON.stringify(this.openmct.time.timeSystem()))); | ||||
|   | ||||
| @@ -105,42 +105,49 @@ export default { | ||||
|     watch: { | ||||
|         domainObject: { | ||||
|             handler(domainObject) { | ||||
|                 this.independentTCEnabled = domainObject.configuration.useIndependentTime === true; | ||||
|  | ||||
|                 if (!domainObject.configuration.timeOptions || !this.independentTCEnabled) { | ||||
|                 const key = this.openmct.objects.makeKeyString(domainObject.identifier); | ||||
|                 if (key !== this.keyString) { | ||||
|                     //domain object has changed | ||||
|                     this.destroyIndependentTime(); | ||||
|  | ||||
|                     return; | ||||
|                 } | ||||
|                     this.independentTCEnabled = domainObject.configuration.useIndependentTime === true; | ||||
|                     this.timeOptions = domainObject.configuration.timeOptions || { | ||||
|                         clockOffsets: this.openmct.time.clockOffsets(), | ||||
|                         fixedOffsets: this.openmct.time.bounds() | ||||
|                     }; | ||||
|  | ||||
|                 if (this.timeOptions.start !== domainObject.configuration.timeOptions.start | ||||
|                     || this.timeOptions.end !== domainObject.configuration.timeOptions.end) { | ||||
|                     this.timeOptions = domainObject.configuration.timeOptions; | ||||
|                     this.destroyIndependentTime(); | ||||
|                     this.registerIndependentTimeOffsets(); | ||||
|                     this.initialize(); | ||||
|                 } | ||||
|             }, | ||||
|             deep: true | ||||
|         } | ||||
|     }, | ||||
|     mounted() { | ||||
|         this.setTimeContext(); | ||||
|  | ||||
|         if (this.timeOptions.mode) { | ||||
|             this.mode = this.timeOptions.mode; | ||||
|         } else { | ||||
|             this.timeOptions.mode = this.mode = this.timeContext.clock() === undefined ? { key: 'fixed' } : { key: Object.create(this.timeContext.clock()).key}; | ||||
|         } | ||||
|  | ||||
|         if (this.independentTCEnabled) { | ||||
|             this.registerIndependentTimeOffsets(); | ||||
|         } | ||||
|         this.initialize(); | ||||
|     }, | ||||
|     beforeDestroy() { | ||||
|         this.stopFollowingTimeContext(); | ||||
|         this.destroyIndependentTime(); | ||||
|     }, | ||||
|     methods: { | ||||
|         initialize() { | ||||
|             this.keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier); | ||||
|             this.setTimeContext(); | ||||
|  | ||||
|             if (this.timeOptions.mode) { | ||||
|                 this.mode = this.timeOptions.mode; | ||||
|             } else { | ||||
|                 if (this.timeContext.clock() === undefined) { | ||||
|                     this.timeOptions.mode = this.mode = { key: 'fixed' }; | ||||
|                 } else { | ||||
|                     this.timeOptions.mode = this.mode = { key: Object.create(this.timeContext.clock()).key}; | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             if (this.independentTCEnabled) { | ||||
|                 this.registerIndependentTimeOffsets(); | ||||
|             } | ||||
|         }, | ||||
|         toggleIndependentTC() { | ||||
|             this.independentTCEnabled = !this.independentTCEnabled; | ||||
|             if (this.independentTCEnabled) { | ||||
| @@ -213,10 +220,9 @@ export default { | ||||
|                 offsets = this.timeOptions.clockOffsets; | ||||
|             } | ||||
|  | ||||
|             const key = this.openmct.objects.makeKeyString(this.domainObject.identifier); | ||||
|             const timeContext = this.openmct.time.getIndependentContext(key); | ||||
|             const timeContext = this.openmct.time.getIndependentContext(this.keyString); | ||||
|             if (!timeContext.hasOwnContext()) { | ||||
|                 this.unregisterIndependentTime = this.openmct.time.addIndependentContext(key, offsets, this.isFixed ? undefined : this.mode.key); | ||||
|                 this.unregisterIndependentTime = this.openmct.time.addIndependentContext(this.keyString, offsets, this.isFixed ? undefined : this.mode.key); | ||||
|             } else { | ||||
|                 if (this.isFixed) { | ||||
|                     timeContext.stopClock(); | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| <!-- | ||||
|  Open MCT, Copyright (c) 2014-2021, United States Government | ||||
|  Open MCT, Copyright (c) 2014-2022, United States Government | ||||
|  as represented by the Administrator of the National Aeronautics and Space | ||||
|  Administration. All rights reserved. | ||||
|  | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /***************************************************************************** | ||||
|  * Open MCT, Copyright (c) 2014-2021, United States Government | ||||
|  * Open MCT, Copyright (c) 2014-2022, United States Government | ||||
|  * as represented by the Administrator of the National Aeronautics and Space | ||||
|  * Administration. All rights reserved. | ||||
|  * | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /***************************************************************************** | ||||
|  * Open MCT, Copyright (c) 2014-2021, United States Government | ||||
|  * Open MCT, Copyright (c) 2014-2022, United States Government | ||||
|  * as represented by the Administrator of the National Aeronautics and Space | ||||
|  * Administration. All rights reserved. | ||||
|  * | ||||
|   | ||||
							
								
								
									
										1
									
								
								static-root.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								static-root.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| {"openmct":{"c1b7f449-459e-4f37-ac00-07b91936d079":{"identifier":{"key":"c1b7f449-459e-4f37-ac00-07b91936d079","namespace":""},"name":"A Folder","type":"folder","composition":[{"key":"3e1b49d7-4b95-47a6-9744-93d18c1f7d86","namespace":""},{"key":"da052eaf-1631-48e4-944f-c4688276181b","namespace":""}],"modified":1641506166404,"location":"mine","persisted":1641506166404},"3e1b49d7-4b95-47a6-9744-93d18c1f7d86":{"identifier":{"key":"3e1b49d7-4b95-47a6-9744-93d18c1f7d86","namespace":""},"name":"Test Clock","type":"clock","configuration":{"baseFormat":"YYYY/MM/DD hh:mm:ss","use24":"clock12","timezone":"UTC"},"modified":1641506137466,"location":"c1b7f449-459e-4f37-ac00-07b91936d079","persisted":1641506137466},"da052eaf-1631-48e4-944f-c4688276181b":{"identifier":{"key":"da052eaf-1631-48e4-944f-c4688276181b","namespace":""},"name":"B Hyperlink","type":"hyperlink","displayFormat":"link","linkTarget":"_self","url":"www.google.com","displayText":"Google","modified":1641506166402,"location":"c1b7f449-459e-4f37-ac00-07b91936d079","persisted":1641506166402}},"rootId":"c1b7f449-459e-4f37-ac00-07b91936d079"} | ||||
| @@ -1,5 +1,6 @@ | ||||
| const { merge } = require('webpack-merge'); | ||||
| const common = require('./webpack.common'); | ||||
| const CopyWebpackPlugin = require('copy-webpack-plugin'); | ||||
|  | ||||
| const path = require('path'); | ||||
| const webpack = require('webpack'); | ||||
| @@ -14,6 +15,14 @@ module.exports = merge(common, { | ||||
|     plugins: [ | ||||
|         new webpack.DefinePlugin({ | ||||
|             __OPENMCT_ROOT_RELATIVE__: '"dist/"' | ||||
|         }), | ||||
|         new CopyWebpackPlugin({ | ||||
|             patterns: [ | ||||
|                 { | ||||
|                     from: './static-root.json', | ||||
|                     to: '.' | ||||
|                 } | ||||
|             ] | ||||
|         }) | ||||
|     ], | ||||
|     devtool: 'eval-source-map' | ||||
|   | ||||
		Reference in New Issue
	
	Block a user