ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-19 15:43:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[Fixed Position] Refresh subscriptions

Browse Source 
Refresh subscriptions when composition changes, such as due to
a drag-drop addition of an element to the view. WTD-877.
This commit is contained in:
Victor Woeltjen
2015-02-17 10:34:13 -08:00
parent 136dddab86
commit 553101100b
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
platform/features/layout/src/FixedController.js
View File

@ -90,9 +90,9 @@ define(
} }
// Compute panel positions based on the layout's object model // Compute panel positions based on the layout's object model
function lookupPanels(model) { function lookupPanels(ids) {
var configuration = $scope.configuration || {}, var configuration = $scope.configuration || {};
ids = (model || {}).composition || []; ids = ids || [];
// Pull panel positions from configuration // Pull panel positions from configuration
rawPositions = shallowCopy(configuration.elements || {}, ids); rawPositions = shallowCopy(configuration.elements || {}, ids);
@ -101,7 +101,7 @@ define(
positions = {}; positions = {};
// Update width/height that we are tracking // Update width/height that we are tracking
gridSize = (model || {}).layoutGrid || DEFAULT_GRID_SIZE; gridSize = ($scope.model || {}).layoutGrid || DEFAULT_GRID_SIZE;
// Compute positions and add defaults where needed // Compute positions and add defaults where needed
ids.forEach(populatePosition); ids.forEach(populatePosition);
@ -147,6 +147,14 @@ define(
telemetrySubscriber.subscribe(domainObject, updateValues); telemetrySubscriber.subscribe(domainObject, updateValues);
} }
// Handle changes in the object's composition
function updateComposition(ids) {
// Populate panel positions
lookupPanels(ids);
// Resubscribe - objects in view have changed
subscribe($scope.domainObject);
}
// Position a panel after a drop event // Position a panel after a drop event
function handleDrop(e, id, position) { function handleDrop(e, id, position) {
// Make sure there is a "elements" field in the // Make sure there is a "elements" field in the
@ -168,7 +176,7 @@ define(
} }
// Position panes when the model field changes // Position panes when the model field changes
$scope.$watch("model", lookupPanels); $scope.$watch("model.composition", updateComposition);
// Subscribe to telemetry when an object is available // Subscribe to telemetry when an object is available
$scope.$watch("domainObject", subscribe); $scope.$watch("domainObject", subscribe);

6
platform/features/layout/test/FixedControllerSpec.js
View File

@ -113,7 +113,7 @@ define(
it("configures view based on model", function () { it("configures view based on model", function () {
mockScope.model = testModel; mockScope.model = testModel;
findWatch("model")(mockScope.model); findWatch("model.composition")(mockScope.model.composition);
// Should have styles for all elements of composition // Should have styles for all elements of composition
expect(controller.getStyle('a')).toBeDefined(); expect(controller.getStyle('a')).toBeDefined();
expect(controller.getStyle('b')).toBeDefined(); expect(controller.getStyle('b')).toBeDefined();
@ -126,7 +126,7 @@ define(
mockScope.domainObject = mockDomainObject; mockScope.domainObject = mockDomainObject;
mockScope.model = testModel; mockScope.model = testModel;
findWatch("domainObject")(mockDomainObject); findWatch("domainObject")(mockDomainObject);
findWatch("model")(mockScope.model); findWatch("model.composition")(mockScope.model.composition);
// Invoke the subscription callback // Invoke the subscription callback
mockSubscriber.subscribe.mostRecentCall.args[1](); mockSubscriber.subscribe.mostRecentCall.args[1]();
@ -148,7 +148,7 @@ define(
}; };
mockScope.model = testModel; mockScope.model = testModel;
findWatch("model")(mockScope.model); findWatch("model.composition")(mockScope.model.composition);
// Set first bounds // Set first bounds
controller.setBounds(s1); controller.setBounds(s1);