From 3498b0a50a35bca8a43d3b9b8274a2f732ecf362 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 8 Dec 2015 12:53:33 -0800 Subject: [PATCH 1/6] [Representation] Prefetch templates ...to ensure that dialogs et al can be displayed, even after loss of network connectivity. https://github.com/nasa/openmctweb/issues/383 --- platform/representation/bundle.json | 13 +++++ platform/representation/src/TemplateLinker.js | 1 - .../representation/src/TemplatePrefetcher.js | 49 +++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 platform/representation/src/TemplatePrefetcher.js diff --git a/platform/representation/bundle.json b/platform/representation/bundle.json index 8b185422b9..044268a5ba 100644 --- a/platform/representation/bundle.json +++ b/platform/representation/bundle.json @@ -68,6 +68,19 @@ "agentService" ] } + ], + "runs": [ + { + "priority": "mandatory", + "implementation": "TemplatePrefetcher.js", + "depends": [ + "templateLinker", + "templates[]", + "views[]", + "representations[]", + "controls[]" + ] + } ] } } diff --git a/platform/representation/src/TemplateLinker.js b/platform/representation/src/TemplateLinker.js index 14d0aa041d..8dcef860e6 100644 --- a/platform/representation/src/TemplateLinker.js +++ b/platform/representation/src/TemplateLinker.js @@ -54,7 +54,6 @@ define( * @param {string} the URL for the template * @returns {Promise.} a promise for the HTML content of * the template - * @private */ TemplateLinker.prototype.load = function (templateUrl) { return this.$templateRequest( diff --git a/platform/representation/src/TemplatePrefetcher.js b/platform/representation/src/TemplatePrefetcher.js new file mode 100644 index 0000000000..38fe4ebae2 --- /dev/null +++ b/platform/representation/src/TemplatePrefetcher.js @@ -0,0 +1,49 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/*global define,Promise*/ + +define( + function () { + 'use strict'; + + function concat(a, b) { + return a.concat(b); + } + + /** + * Loads all templates when the application is started. + * @param {platform/representation.TemplateLinker} templateLinker + * the `templateLinker` service, used to load and cache + * template extensions + * @param {...{templateUrl: string}[]} extensions arrays + * of template or template-like extensions + */ + function TemplatePrefetcher(templateLinker, extensions) { + Array.prototype.slice.apply(arguments, [1]) + .reduce(concat, []) + .map(templateLinker.getPath.bind(templateLinker)) + .forEach(templateLinker.load.bind(templateLinker)); + } + + return TemplatePrefetcher; + } +); \ No newline at end of file From 3c97eb60140fd9785187f2927c5aa0849a6b4708 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 8 Dec 2015 12:59:41 -0800 Subject: [PATCH 2/6] [Representation] Remove obsolete template definition --- platform/commonUI/general/bundle.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json index 76814df12a..7cc15a48b3 100644 --- a/platform/commonUI/general/bundle.json +++ b/platform/commonUI/general/bundle.json @@ -229,10 +229,6 @@ "templateUrl": "templates/subtree.html", "uses": [ "composition" ] }, - { - "key": "test", - "templateUrl": "templates/test.html" - }, { "key": "tree-node", "templateUrl": "templates/tree-node.html", From f8809ce67f39e77f4d3d88a6529f3625521d9a18 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 8 Dec 2015 13:06:24 -0800 Subject: [PATCH 3/6] [Representation] Also prefetch containers --- platform/representation/bundle.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/representation/bundle.json b/platform/representation/bundle.json index 044268a5ba..5c78bccff9 100644 --- a/platform/representation/bundle.json +++ b/platform/representation/bundle.json @@ -78,7 +78,8 @@ "templates[]", "views[]", "representations[]", - "controls[]" + "controls[]", + "containers[]" ] } ] From b2f58614580ea63e6bab09a4fd591e241b7747be Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 8 Dec 2015 13:29:11 -0800 Subject: [PATCH 4/6] [Representation] Test template prefetcher --- .../representation/src/TemplatePrefetcher.js | 16 ++-- .../test/TemplatePrefetcherSpec.js | 76 +++++++++++++++++++ platform/representation/test/suite.json | 3 +- 3 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 platform/representation/test/TemplatePrefetcherSpec.js diff --git a/platform/representation/src/TemplatePrefetcher.js b/platform/representation/src/TemplatePrefetcher.js index 38fe4ebae2..5523bb54f0 100644 --- a/platform/representation/src/TemplatePrefetcher.js +++ b/platform/representation/src/TemplatePrefetcher.js @@ -25,10 +25,6 @@ define( function () { 'use strict'; - function concat(a, b) { - return a.concat(b); - } - /** * Loads all templates when the application is started. * @param {platform/representation.TemplateLinker} templateLinker @@ -39,9 +35,15 @@ define( */ function TemplatePrefetcher(templateLinker, extensions) { Array.prototype.slice.apply(arguments, [1]) - .reduce(concat, []) - .map(templateLinker.getPath.bind(templateLinker)) - .forEach(templateLinker.load.bind(templateLinker)); + .reduce(function (a, b) { + return a.concat(b); + }, []) + .map(function (ext) { + return templateLinker.getPath(ext); + }) + .forEach(function (path) { + templateLinker.load(path); + }); } return TemplatePrefetcher; diff --git a/platform/representation/test/TemplatePrefetcherSpec.js b/platform/representation/test/TemplatePrefetcherSpec.js new file mode 100644 index 0000000000..269f6cc0da --- /dev/null +++ b/platform/representation/test/TemplatePrefetcherSpec.js @@ -0,0 +1,76 @@ +/***************************************************************************** + * Open MCT Web, Copyright (c) 2014-2015, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT Web is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT Web includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ + + +define( + ["../src/TemplatePrefetcher"], + function (TemplatePrefetcher) { + 'use strict'; + + describe("TemplatePrefetcher", function () { + var mockTemplateLinker, + testExtensions, + testPathPrefix, + prefetcher; + + beforeEach(function () { + testPathPrefix = "some/path/"; + + mockTemplateLinker = jasmine.createSpyObj( + 'templateLinker', + [ 'getPath', 'load' ] + ); + + mockTemplateLinker.getPath.andCallFake(function (ext) { + return testPathPrefix + ext.templateUrl; + }); + + testExtensions = ['a', 'b', 'c'].map(function (category) { + return ['x', 'y', 'z'].map(function (ext) { + return { + templateUrl: category + '/' + ext + '.html' + }; + }); + }); + + prefetcher = new TemplatePrefetcher( + mockTemplateLinker, + testExtensions[0], + testExtensions[1], + testExtensions[2] + ); + }); + + it("loads all templates when run", function () { + testExtensions.forEach(function (category) { + category.forEach(function (extension) { + expect(mockTemplateLinker.load).toHaveBeenCalledWith( + mockTemplateLinker.getPath(extension) + ); + }); + }); + }); + + }); + } +); diff --git a/platform/representation/test/suite.json b/platform/representation/test/suite.json index d8ab95219a..54f7907da3 100644 --- a/platform/representation/test/suite.json +++ b/platform/representation/test/suite.json @@ -8,5 +8,6 @@ "services/DndService", "MCTInclude", "MCTRepresentation", - "TemplateLinker" + "TemplateLinker", + "TemplatePrefetcher" ] From 6cef663db536b584ca71bed3582dc5b4f62c8e9c Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 8 Dec 2015 13:43:41 -0800 Subject: [PATCH 5/6] [Representation] Add ending newline --- platform/representation/src/TemplatePrefetcher.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/representation/src/TemplatePrefetcher.js b/platform/representation/src/TemplatePrefetcher.js index 5523bb54f0..7dc05b052a 100644 --- a/platform/representation/src/TemplatePrefetcher.js +++ b/platform/representation/src/TemplatePrefetcher.js @@ -48,4 +48,4 @@ define( return TemplatePrefetcher; } -); \ No newline at end of file +); From 038322e9aa76dcb17d97cf95a37066c4c15faa3c Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 8 Dec 2015 15:04:34 -0800 Subject: [PATCH 6/6] [Layout] Update raw positions on drop When handling a drop into the layout, store the panel's new position to the LayoutController's internal table of raw positions (in addition to writing it to the configuration.) Avoids https://github.com/nasa/openmctweb/issues/384 --- .../features/layout/src/LayoutController.js | 2 ++ .../layout/test/LayoutControllerSpec.js | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/platform/features/layout/src/LayoutController.js b/platform/features/layout/src/LayoutController.js index 017793d2e6..37f434ba88 100644 --- a/platform/features/layout/src/LayoutController.js +++ b/platform/features/layout/src/LayoutController.js @@ -85,6 +85,8 @@ define( $scope.commit("Dropped a frame."); } // Populate template-facing position for this id + self.rawPositions[id] = + $scope.configuration.panels[id]; self.populatePosition(id); // Layout may contain embedded views which will // listen for drops, so call preventDefault() so diff --git a/platform/features/layout/test/LayoutControllerSpec.js b/platform/features/layout/test/LayoutControllerSpec.js index bbed271d2c..338875823b 100644 --- a/platform/features/layout/test/LayoutControllerSpec.js +++ b/platform/features/layout/test/LayoutControllerSpec.js @@ -274,6 +274,23 @@ define( expect(parseInt(style.width, 10)).toBeGreaterThan(63); expect(parseInt(style.height, 10)).toBeGreaterThan(31); }); + + it("updates positions of existing objects on a drop", function () { + var oldStyle; + + mockScope.$watchCollection.mostRecentCall.args[1](); + + oldStyle = controller.getFrameStyle("b"); + + expect(oldStyle).toBeDefined(); + + // ...drop event... + mockScope.$on.mostRecentCall + .args[1](mockEvent, 'b', { x: 300, y: 100 }); + + expect(controller.getFrameStyle("b")) + .not.toEqual(oldStyle); + }); }); } );