mirror of
https://github.com/nasa/openmct.git
synced 2024-12-25 07:41:06 +00:00
425655bae0
Updates to sub object selection, first cut of selection APIs. * [API] Add inspector view registry to register inspector view providers and show a view in the inspector. [API] Modify the selection API to register the click event and handle the event. The API will add a class to the selected object and the immediate parent of the selected object. [Directive] Implemenet mct-selectable directive for making an element selectable. [Layout] Update the layout controller to use the Selection API. Also, add double click gesture to allow drilling into a selected object. Populate the Elements pool with contained elements of the selected object. Update toolbar and inspector to listen for the changes in selection. * [Frontend] Mods to markup and CSS for sub-object selection * MCTSelectable allows selection in initialization, use to select on navigation [Frontend] Show grid in first nested layout, hide from deeper nesting. Only show grids when applicable to relative selection. * Fix checkstyle and lint errors * Bring back the change that made mct-init-select work * [Inspector] Make sure the right content is displayed based on whether a view provider exists or not. * Only show table options when editing * Make reviewers' requested changes * Fix broken tests * [Frontend] Cleanups and tweaks Fixes #1811 - Cleanups between frame, editor and selecting.scss; - Hover and selected borders visually pumped up a bit; - Solid borders on hover and selecting when browsing; - Dashed borders for layouts when editing; - Fixed cursor to only show move capability when element is selected; * [Frontend] Tweaks to frame.no-frame layout Fixes #1811 - Margin set to 0; - Overflow set to hidden; * [Frontend] Fixed position items border width fixed Fixes #1811 - Set to 1px; * Add tests for inspector controller and fix broken tests. Clean up code. * [Fixed Position] Stop event propagation on click handlers in fixed position to avoid the event reaching the selection click handlers which caused issues with toolbar and selection." * Fix tests * Add tests * Add test * Remove element from document
157 lines
6.3 KiB
JavaScript
157 lines
6.3 KiB
JavaScript
/*****************************************************************************
|
|
* Open MCT, Copyright (c) 2014-2017, United States Government
|
|
* as represented by the Administrator of the National Aeronautics and Space
|
|
* Administration. All rights reserved.
|
|
*
|
|
* Open MCT 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 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.
|
|
*****************************************************************************/
|
|
|
|
define(
|
|
["../../src/representers/EditToolbarRepresenter"],
|
|
function (EditToolbarRepresenter) {
|
|
|
|
describe("The Edit mode toolbar representer", function () {
|
|
var mockScope,
|
|
mockElement,
|
|
testAttrs,
|
|
mockUnwatch,
|
|
representer,
|
|
mockOpenMCT,
|
|
mockSelection;
|
|
|
|
beforeEach(function () {
|
|
mockScope = jasmine.createSpyObj(
|
|
'$scope',
|
|
['$on', '$watch', '$watchCollection', "commit"]
|
|
);
|
|
mockElement = {};
|
|
testAttrs = { toolbar: 'testToolbar' };
|
|
mockScope.$parent = jasmine.createSpyObj(
|
|
'$parent',
|
|
['$watch', '$watchCollection']
|
|
);
|
|
mockUnwatch = jasmine.createSpy('unwatch');
|
|
|
|
mockScope.$parent.$watchCollection.andReturn(mockUnwatch);
|
|
|
|
mockSelection = jasmine.createSpyObj("selection", [
|
|
'on',
|
|
'off',
|
|
'get'
|
|
]);
|
|
mockSelection.get.andReturn([]);
|
|
mockOpenMCT = {
|
|
selection: mockSelection
|
|
};
|
|
|
|
representer = new EditToolbarRepresenter(
|
|
mockOpenMCT,
|
|
mockScope,
|
|
mockElement,
|
|
testAttrs
|
|
);
|
|
});
|
|
|
|
it("exposes toolbar state under a attr-defined name", function () {
|
|
// A structure/state object should have been added to the
|
|
// parent scope under the name provided in the "toolbar"
|
|
// attribute
|
|
expect(mockScope.$parent.testToolbar).toBeDefined();
|
|
});
|
|
|
|
it("is robust against lack of a toolbar definition", function () {
|
|
expect(function () {
|
|
representer.represent({});
|
|
}).not.toThrow();
|
|
});
|
|
|
|
it("watches for toolbar state changes", function () {
|
|
representer.represent({});
|
|
expect(mockScope.$watchCollection).toHaveBeenCalledWith(
|
|
jasmine.any(Function),
|
|
jasmine.any(Function)
|
|
);
|
|
expect(mockScope.$watchCollection.calls[0].args[0]())
|
|
.toBe(mockScope.$parent.testToolbar.state);
|
|
});
|
|
|
|
it("removes state from parent scope on destroy", function () {
|
|
// Verify precondition
|
|
expect(mockScope.$parent.testToolbar).toBeDefined();
|
|
// Destroy the representer
|
|
representer.destroy();
|
|
// Should have removed toolbar state from view
|
|
expect(mockScope.$parent.testToolbar).toBeUndefined();
|
|
});
|
|
|
|
// Verify a simple interaction between selection state and toolbar
|
|
// state; more complicated interactions are tested in EditToolbar.
|
|
it("conveys state changes", function () {
|
|
var testObject = { k: 123 };
|
|
|
|
// Provide a view which has a toolbar
|
|
representer.represent({
|
|
toolbar: { sections: [{ items: [{ property: 'k' }] }] }
|
|
});
|
|
|
|
// Update the selection
|
|
mockScope.selection.select(testObject);
|
|
expect(mockScope.$watchCollection.mostRecentCall.args[0])
|
|
.toEqual('selection.all()'); // Make sure we're using right watch
|
|
mockScope.$watchCollection.mostRecentCall.args[1]([testObject]);
|
|
|
|
// Update the state
|
|
mockScope.$parent.testToolbar.state[0] = 456;
|
|
// Invoke the first watch (assumed to be for toolbar state)
|
|
mockScope.$watchCollection.calls[0].args[1](
|
|
mockScope.$parent.testToolbar.state
|
|
);
|
|
|
|
// Should have updated the original object
|
|
expect(testObject.k).toEqual(456);
|
|
|
|
// Should have committed the change
|
|
expect(mockScope.commit).toHaveBeenCalled();
|
|
});
|
|
|
|
it("does not commit if nothing changed", function () {
|
|
var testObject = { k: 123 };
|
|
|
|
// Provide a view which has a toolbar
|
|
representer.represent({
|
|
toolbar: { sections: [{ items: [{ property: 'k' }] }] }
|
|
});
|
|
|
|
// Update the selection
|
|
mockScope.selection.select(testObject);
|
|
expect(mockScope.$watchCollection.mostRecentCall.args[0])
|
|
.toEqual('selection.all()'); // Make sure we're using right watch
|
|
mockScope.$watchCollection.mostRecentCall.args[1]([testObject]);
|
|
|
|
// Invoke the first watch (assumed to be for toolbar state)
|
|
mockScope.$watchCollection.calls[0].args[1](
|
|
mockScope.$parent.testToolbar.state
|
|
);
|
|
|
|
// Should have committed the change
|
|
expect(mockScope.commit).not.toHaveBeenCalled();
|
|
});
|
|
|
|
});
|
|
}
|
|
);
|