Compare commits
90 Commits
drawing-ob
...
1.6.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d7697e366 | ||
|
|
ffbab225e6 | ||
|
|
b042d9098d | ||
|
|
325f2c4860 | ||
|
|
74a516aa9e | ||
|
|
28e26461cc | ||
|
|
3e5ecdeb8e | ||
|
|
cfaaf6b1fe | ||
|
|
60eaccf609 | ||
|
|
bffe79ecbd | ||
|
|
94d9852339 | ||
|
|
905e397d3f | ||
|
|
e70a636073 | ||
|
|
03abb5e5de | ||
|
|
ac20c01233 | ||
|
|
b8ded0a16e | ||
|
|
b68f79f427 | ||
|
|
221d10d3e6 | ||
|
|
22d32eed1d | ||
|
|
5d656f0963 | ||
|
|
201d622b85 | ||
|
|
3571004f5c | ||
|
|
16249c3790 | ||
|
|
5377f0d0b3 | ||
|
|
15778b00a0 | ||
|
|
169eec0a51 | ||
|
|
f789775b1c | ||
|
|
fc59a4dce4 | ||
|
|
29128a891d | ||
|
|
dd3d4c8c3a | ||
|
|
4047c888be | ||
|
|
1499286bee | ||
|
|
6226763c37 | ||
|
|
7623a0648f | ||
|
|
b7085f7f62 | ||
|
|
55c851873c | ||
|
|
2b143dfc0f | ||
|
|
9405272f3b | ||
|
|
a9be9f1827 | ||
|
|
abb1a5c75b | ||
|
|
5e2fe7dc42 | ||
|
|
e4d6e90c35 | ||
|
|
84d9a525a9 | ||
|
|
0aca0ce6a6 | ||
|
|
c0742d521c | ||
|
|
92737b43af | ||
|
|
8b0f6885ee | ||
|
|
9af2d15cef | ||
|
|
e60d8d08a4 | ||
|
|
3e9b567fce | ||
|
|
6f51de85db | ||
|
|
f202ae19cb | ||
|
|
668bd75025 | ||
|
|
e6e07cf959 | ||
|
|
2f8431905f | ||
|
|
23aba14dfe | ||
|
|
b0fa955914 | ||
|
|
98207a3e0d | ||
|
|
26b81345f2 | ||
|
|
ac2034b243 | ||
|
|
351848ad56 | ||
|
|
cbac495f93 | ||
|
|
15ef5b7623 | ||
|
|
46c7ac944f | ||
|
|
aa4bfab462 | ||
|
|
f5cbb37e5a | ||
|
|
8d9079984a | ||
|
|
41783d8939 | ||
|
|
441ad58fe7 | ||
|
|
06a6a3f773 | ||
|
|
52fab78625 | ||
|
|
5eb6c15959 | ||
|
|
ce8c31cfa4 | ||
|
|
d80c0eef8e | ||
|
|
55829dcf05 | ||
|
|
d78956327c | ||
|
|
4a0728a55b | ||
|
|
2e1d57aa8c | ||
|
|
1c2b0678be | ||
|
|
6f810add43 | ||
|
|
12727adb16 | ||
|
|
9da750c3bb | ||
|
|
176226ddef | ||
|
|
acea18fa70 | ||
|
|
d1656f8561 | ||
|
|
87751e882c | ||
|
|
dff393a714 | ||
|
|
fd9c9aee03 | ||
|
|
59bf981fb0 | ||
|
|
4bbdac759f |
20
.eslintrc.js
20
.eslintrc.js
@@ -54,7 +54,7 @@ module.exports = {
|
|||||||
{
|
{
|
||||||
"anonymous": "always",
|
"anonymous": "always",
|
||||||
"asyncArrow": "always",
|
"asyncArrow": "always",
|
||||||
"named": "never",
|
"named": "never"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"array-bracket-spacing": "error",
|
"array-bracket-spacing": "error",
|
||||||
@@ -178,7 +178,10 @@ module.exports = {
|
|||||||
//https://eslint.org/docs/rules/no-whitespace-before-property
|
//https://eslint.org/docs/rules/no-whitespace-before-property
|
||||||
"no-whitespace-before-property": "error",
|
"no-whitespace-before-property": "error",
|
||||||
// https://eslint.org/docs/rules/object-curly-newline
|
// https://eslint.org/docs/rules/object-curly-newline
|
||||||
"object-curly-newline": ["error", {"consistent": true, "multiline": true}],
|
"object-curly-newline": ["error", {
|
||||||
|
"consistent": true,
|
||||||
|
"multiline": true
|
||||||
|
}],
|
||||||
// https://eslint.org/docs/rules/object-property-newline
|
// https://eslint.org/docs/rules/object-property-newline
|
||||||
"object-property-newline": "error",
|
"object-property-newline": "error",
|
||||||
// https://eslint.org/docs/rules/brace-style
|
// https://eslint.org/docs/rules/brace-style
|
||||||
@@ -188,7 +191,7 @@ module.exports = {
|
|||||||
// https://eslint.org/docs/rules/operator-linebreak
|
// https://eslint.org/docs/rules/operator-linebreak
|
||||||
"operator-linebreak": ["error", "before", {"overrides": {"=": "after"}}],
|
"operator-linebreak": ["error", "before", {"overrides": {"=": "after"}}],
|
||||||
// https://eslint.org/docs/rules/padding-line-between-statements
|
// https://eslint.org/docs/rules/padding-line-between-statements
|
||||||
"padding-line-between-statements":["error", {
|
"padding-line-between-statements": ["error", {
|
||||||
"blankLine": "always",
|
"blankLine": "always",
|
||||||
"prev": "multiline-block-like",
|
"prev": "multiline-block-like",
|
||||||
"next": "*"
|
"next": "*"
|
||||||
@@ -200,11 +203,17 @@ module.exports = {
|
|||||||
// https://eslint.org/docs/rules/space-infix-ops
|
// https://eslint.org/docs/rules/space-infix-ops
|
||||||
"space-infix-ops": "error",
|
"space-infix-ops": "error",
|
||||||
// https://eslint.org/docs/rules/space-unary-ops
|
// https://eslint.org/docs/rules/space-unary-ops
|
||||||
"space-unary-ops": ["error", {"words": true, "nonwords": false}],
|
"space-unary-ops": ["error", {
|
||||||
|
"words": true,
|
||||||
|
"nonwords": false
|
||||||
|
}],
|
||||||
// https://eslint.org/docs/rules/arrow-spacing
|
// https://eslint.org/docs/rules/arrow-spacing
|
||||||
"arrow-spacing": "error",
|
"arrow-spacing": "error",
|
||||||
// https://eslint.org/docs/rules/semi-spacing
|
// https://eslint.org/docs/rules/semi-spacing
|
||||||
"semi-spacing": ["error", {"before": false, "after": true}],
|
"semi-spacing": ["error", {
|
||||||
|
"before": false,
|
||||||
|
"after": true
|
||||||
|
}],
|
||||||
|
|
||||||
"vue/html-indent": [
|
"vue/html-indent": [
|
||||||
"error",
|
"error",
|
||||||
@@ -237,6 +246,7 @@ module.exports = {
|
|||||||
}],
|
}],
|
||||||
"vue/multiline-html-element-content-newline": "off",
|
"vue/multiline-html-element-content-newline": "off",
|
||||||
"vue/singleline-html-element-content-newline": "off",
|
"vue/singleline-html-element-content-newline": "off",
|
||||||
|
"vue/no-mutating-props": "off"
|
||||||
|
|
||||||
},
|
},
|
||||||
"overrides": [
|
"overrides": [
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ The following guidelines are provided for anyone contributing source code to the
|
|||||||
1. Avoid the use of "magic" values.
|
1. Avoid the use of "magic" values.
|
||||||
eg.
|
eg.
|
||||||
```JavaScript
|
```JavaScript
|
||||||
Const UNAUTHORIZED = 401
|
const UNAUTHORIZED = 401;
|
||||||
if (responseCode === UNAUTHORIZED)
|
if (responseCode === UNAUTHORIZED)
|
||||||
```
|
```
|
||||||
is preferable to
|
is preferable to
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ define([
|
|||||||
"id": "styleguide:home",
|
"id": "styleguide:home",
|
||||||
"priority": "preferred",
|
"priority": "preferred",
|
||||||
"model": {
|
"model": {
|
||||||
"type": "folder",
|
"type": "noneditable.folder",
|
||||||
"name": "Style Guide Home",
|
"name": "Style Guide Home",
|
||||||
"location": "ROOT",
|
"location": "ROOT",
|
||||||
"composition": [
|
"composition": [
|
||||||
@@ -155,7 +155,7 @@ define([
|
|||||||
"id": "styleguide:ui-elements",
|
"id": "styleguide:ui-elements",
|
||||||
"priority": "preferred",
|
"priority": "preferred",
|
||||||
"model": {
|
"model": {
|
||||||
"type": "folder",
|
"type": "noneditable.folder",
|
||||||
"name": "UI Elements",
|
"name": "UI Elements",
|
||||||
"location": "styleguide:home",
|
"location": "styleguide:home",
|
||||||
"composition": [
|
"composition": [
|
||||||
|
|||||||
@@ -86,7 +86,9 @@
|
|||||||
openmct.install(openmct.plugins.MyItems());
|
openmct.install(openmct.plugins.MyItems());
|
||||||
openmct.install(openmct.plugins.Generator());
|
openmct.install(openmct.plugins.Generator());
|
||||||
openmct.install(openmct.plugins.ExampleImagery());
|
openmct.install(openmct.plugins.ExampleImagery());
|
||||||
|
openmct.install(openmct.plugins.PlanLayout());
|
||||||
openmct.install(openmct.plugins.Timeline());
|
openmct.install(openmct.plugins.Timeline());
|
||||||
|
openmct.install(openmct.plugins.PlotVue());
|
||||||
openmct.install(openmct.plugins.UTCTimeSystem());
|
openmct.install(openmct.plugins.UTCTimeSystem());
|
||||||
openmct.install(openmct.plugins.AutoflowView({
|
openmct.install(openmct.plugins.AutoflowView({
|
||||||
type: "telemetry.panel"
|
type: "telemetry.panel"
|
||||||
@@ -131,10 +133,10 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
// maximum recent bounds to retain in conductor history
|
// maximum recent bounds to retain in conductor history
|
||||||
records: 10,
|
records: 10
|
||||||
// maximum duration between start and end bounds
|
// maximum duration between start and end bounds
|
||||||
// for utc-based time systems this is in milliseconds
|
// for utc-based time systems this is in milliseconds
|
||||||
limit: ONE_DAY
|
// limit: ONE_DAY
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Realtime",
|
name: "Realtime",
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ module.exports = (config) => {
|
|||||||
reports: ['html', 'lcovonly', 'text-summary'],
|
reports: ['html', 'lcovonly', 'text-summary'],
|
||||||
thresholds: {
|
thresholds: {
|
||||||
global: {
|
global: {
|
||||||
lines: 65
|
lines: 66
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "openmct",
|
"name": "openmct",
|
||||||
"version": "1.4.1-SNAPSHOT",
|
"version": "1.6.2",
|
||||||
"description": "The Open MCT core platform",
|
"description": "The Open MCT core platform",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
"d3-time": "1.0.x",
|
"d3-time": "1.0.x",
|
||||||
"d3-time-format": "2.1.x",
|
"d3-time-format": "2.1.x",
|
||||||
"eslint": "7.0.0",
|
"eslint": "7.0.0",
|
||||||
"eslint-plugin-vue": "^6.0.0",
|
"eslint-plugin-vue": "^7.5.0",
|
||||||
"eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0",
|
"eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0",
|
||||||
"eventemitter3": "^1.2.0",
|
"eventemitter3": "^1.2.0",
|
||||||
"exports-loader": "^0.7.0",
|
"exports-loader": "^0.7.0",
|
||||||
|
|||||||
@@ -71,10 +71,10 @@ define(
|
|||||||
openmct.editor.cancel();
|
openmct.editor.cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
function isFirstViewEditable(domainObject) {
|
function isFirstViewEditable(domainObject, objectPath) {
|
||||||
let firstView = openmct.objectViews.get(domainObject)[0];
|
let firstView = openmct.objectViews.get(domainObject, objectPath)[0];
|
||||||
|
|
||||||
return firstView && firstView.canEdit && firstView.canEdit(domainObject);
|
return firstView && firstView.canEdit && firstView.canEdit(domainObject, objectPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
function navigateAndEdit(object) {
|
function navigateAndEdit(object) {
|
||||||
@@ -88,7 +88,7 @@ define(
|
|||||||
|
|
||||||
window.location.href = url;
|
window.location.href = url;
|
||||||
|
|
||||||
if (isFirstViewEditable(object.useCapability('adapter'))) {
|
if (isFirstViewEditable(object.useCapability('adapter'), objectPath)) {
|
||||||
openmct.editor.edit();
|
openmct.editor.edit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,9 +44,9 @@ define(
|
|||||||
// is also invoked during the create process which should be allowed,
|
// is also invoked during the create process which should be allowed,
|
||||||
// because it may be saved elsewhere
|
// because it may be saved elsewhere
|
||||||
if ((key === 'edit' && category === 'view-control') || key === 'properties') {
|
if ((key === 'edit' && category === 'view-control') || key === 'properties') {
|
||||||
let newStyleObject = objectUtils.toNewFormat(domainObject, domainObject.getId());
|
let identifier = this.openmct.objects.parseKeyString(domainObject.getId());
|
||||||
|
|
||||||
return this.openmct.objects.isPersistable(newStyleObject);
|
return this.openmct.objects.isPersistable(identifier);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -43,7 +43,8 @@ define(
|
|||||||
);
|
);
|
||||||
|
|
||||||
mockObjectAPI = jasmine.createSpyObj('objectAPI', [
|
mockObjectAPI = jasmine.createSpyObj('objectAPI', [
|
||||||
'isPersistable'
|
'isPersistable',
|
||||||
|
'parseKeyString'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
mockAPI = {
|
mockAPI = {
|
||||||
|
|||||||
@@ -48,9 +48,9 @@ define(
|
|||||||
// prevents editing of objects that cannot be persisted, so we can assume that this
|
// prevents editing of objects that cannot be persisted, so we can assume that this
|
||||||
// is a new object.
|
// is a new object.
|
||||||
if (!(parent.hasCapability('editor') && parent.getCapability('editor').isEditContextRoot())) {
|
if (!(parent.hasCapability('editor') && parent.getCapability('editor').isEditContextRoot())) {
|
||||||
let newStyleObject = objectUtils.toNewFormat(parent, parent.getId());
|
let identifier = this.openmct.objects.parseKeyString(parent.getId());
|
||||||
|
|
||||||
return this.openmct.objects.isPersistable(newStyleObject);
|
return this.openmct.objects.isPersistable(identifier);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -33,7 +33,8 @@ define(
|
|||||||
|
|
||||||
beforeEach(function () {
|
beforeEach(function () {
|
||||||
objectAPI = jasmine.createSpyObj('objectsAPI', [
|
objectAPI = jasmine.createSpyObj('objectsAPI', [
|
||||||
'isPersistable'
|
'isPersistable',
|
||||||
|
'parseKeyString'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
mockOpenMCT = {
|
mockOpenMCT = {
|
||||||
|
|||||||
@@ -21,32 +21,24 @@
|
|||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
define([
|
define([
|
||||||
"./src/actions/MoveAction",
|
|
||||||
"./src/actions/CopyAction",
|
|
||||||
"./src/actions/LinkAction",
|
"./src/actions/LinkAction",
|
||||||
"./src/actions/SetPrimaryLocationAction",
|
"./src/actions/SetPrimaryLocationAction",
|
||||||
"./src/services/LocatingCreationDecorator",
|
"./src/services/LocatingCreationDecorator",
|
||||||
"./src/services/LocatingObjectDecorator",
|
"./src/services/LocatingObjectDecorator",
|
||||||
"./src/policies/CopyPolicy",
|
"./src/policies/CopyPolicy",
|
||||||
"./src/policies/CrossSpacePolicy",
|
"./src/policies/CrossSpacePolicy",
|
||||||
"./src/policies/MovePolicy",
|
|
||||||
"./src/capabilities/LocationCapability",
|
"./src/capabilities/LocationCapability",
|
||||||
"./src/services/MoveService",
|
|
||||||
"./src/services/LinkService",
|
"./src/services/LinkService",
|
||||||
"./src/services/CopyService",
|
"./src/services/CopyService",
|
||||||
"./src/services/LocationService"
|
"./src/services/LocationService"
|
||||||
], function (
|
], function (
|
||||||
MoveAction,
|
|
||||||
CopyAction,
|
|
||||||
LinkAction,
|
LinkAction,
|
||||||
SetPrimaryLocationAction,
|
SetPrimaryLocationAction,
|
||||||
LocatingCreationDecorator,
|
LocatingCreationDecorator,
|
||||||
LocatingObjectDecorator,
|
LocatingObjectDecorator,
|
||||||
CopyPolicy,
|
CopyPolicy,
|
||||||
CrossSpacePolicy,
|
CrossSpacePolicy,
|
||||||
MovePolicy,
|
|
||||||
LocationCapability,
|
LocationCapability,
|
||||||
MoveService,
|
|
||||||
LinkService,
|
LinkService,
|
||||||
CopyService,
|
CopyService,
|
||||||
LocationService
|
LocationService
|
||||||
@@ -60,39 +52,6 @@ define([
|
|||||||
"configuration": {},
|
"configuration": {},
|
||||||
"extensions": {
|
"extensions": {
|
||||||
"actions": [
|
"actions": [
|
||||||
{
|
|
||||||
"key": "move",
|
|
||||||
"name": "Move",
|
|
||||||
"description": "Move object to another location.",
|
|
||||||
"cssClass": "icon-move",
|
|
||||||
"category": "contextual",
|
|
||||||
"group": "action",
|
|
||||||
"priority": 9,
|
|
||||||
"implementation": MoveAction,
|
|
||||||
"depends": [
|
|
||||||
"policyService",
|
|
||||||
"locationService",
|
|
||||||
"moveService"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "copy",
|
|
||||||
"name": "Duplicate",
|
|
||||||
"description": "Duplicate object to another location.",
|
|
||||||
"cssClass": "icon-duplicate",
|
|
||||||
"category": "contextual",
|
|
||||||
"group": "action",
|
|
||||||
"priority": 8,
|
|
||||||
"implementation": CopyAction,
|
|
||||||
"depends": [
|
|
||||||
"$log",
|
|
||||||
"policyService",
|
|
||||||
"locationService",
|
|
||||||
"copyService",
|
|
||||||
"dialogService",
|
|
||||||
"notificationService"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"key": "link",
|
"key": "link",
|
||||||
"name": "Create Link",
|
"name": "Create Link",
|
||||||
@@ -141,10 +100,6 @@ define([
|
|||||||
{
|
{
|
||||||
"category": "action",
|
"category": "action",
|
||||||
"implementation": CopyPolicy
|
"implementation": CopyPolicy
|
||||||
},
|
|
||||||
{
|
|
||||||
"category": "action",
|
|
||||||
"implementation": MovePolicy
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"capabilities": [
|
"capabilities": [
|
||||||
@@ -160,17 +115,6 @@ define([
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"services": [
|
"services": [
|
||||||
{
|
|
||||||
"key": "moveService",
|
|
||||||
"name": "Move Service",
|
|
||||||
"description": "Provides a service for moving objects",
|
|
||||||
"implementation": MoveService,
|
|
||||||
"depends": [
|
|
||||||
"openmct",
|
|
||||||
"linkService",
|
|
||||||
"$q"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"key": "linkService",
|
"key": "linkService",
|
||||||
"name": "Link Service",
|
"name": "Link Service",
|
||||||
|
|||||||
@@ -1,168 +0,0 @@
|
|||||||
/*****************************************************************************
|
|
||||||
* Open MCT, Copyright (c) 2014-2020, 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(
|
|
||||||
['./AbstractComposeAction', './CancelError'],
|
|
||||||
function (AbstractComposeAction, CancelError) {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The CopyAction is available from context menus and allows a user to
|
|
||||||
* deep copy an object to another location of their choosing.
|
|
||||||
*
|
|
||||||
* @implements {Action}
|
|
||||||
* @constructor
|
|
||||||
* @memberof platform/entanglement
|
|
||||||
*/
|
|
||||||
function CopyAction(
|
|
||||||
$log,
|
|
||||||
policyService,
|
|
||||||
locationService,
|
|
||||||
copyService,
|
|
||||||
dialogService,
|
|
||||||
notificationService,
|
|
||||||
context
|
|
||||||
) {
|
|
||||||
this.dialog = undefined;
|
|
||||||
this.notification = undefined;
|
|
||||||
this.dialogService = dialogService;
|
|
||||||
this.notificationService = notificationService;
|
|
||||||
this.$log = $log;
|
|
||||||
//Extend the behaviour of the Abstract Compose Action
|
|
||||||
AbstractComposeAction.call(
|
|
||||||
this,
|
|
||||||
policyService,
|
|
||||||
locationService,
|
|
||||||
copyService,
|
|
||||||
context,
|
|
||||||
"Duplicate",
|
|
||||||
"To a Location"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
CopyAction.prototype = Object.create(AbstractComposeAction.prototype);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates user about progress of copy. Should not be invoked by
|
|
||||||
* client code under any circumstances.
|
|
||||||
*
|
|
||||||
* @private
|
|
||||||
* @param phase
|
|
||||||
* @param totalObjects
|
|
||||||
* @param processed
|
|
||||||
*/
|
|
||||||
CopyAction.prototype.progress = function (phase, totalObjects, processed) {
|
|
||||||
/*
|
|
||||||
Copy has two distinct phases. In the first phase a copy plan is
|
|
||||||
made in memory. During this phase of execution, the user is
|
|
||||||
shown a blocking 'modal' dialog.
|
|
||||||
|
|
||||||
In the second phase, the copying is taking place, and the user
|
|
||||||
is shown non-invasive banner notifications at the bottom of the screen.
|
|
||||||
*/
|
|
||||||
if (phase.toLowerCase() === 'preparing' && !this.dialog) {
|
|
||||||
this.dialog = this.dialogService.showBlockingMessage({
|
|
||||||
title: "Preparing to copy objects",
|
|
||||||
hint: "Do not navigate away from this page or close this browser tab while this message is displayed.",
|
|
||||||
unknownProgress: true,
|
|
||||||
severity: "info"
|
|
||||||
});
|
|
||||||
} else if (phase.toLowerCase() === "copying") {
|
|
||||||
if (this.dialog) {
|
|
||||||
this.dialog.dismiss();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!this.notification) {
|
|
||||||
this.notification = this.notificationService
|
|
||||||
.notify({
|
|
||||||
title: "Copying objects",
|
|
||||||
unknownProgress: false,
|
|
||||||
severity: "info"
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
this.notification.model.progress = (processed / totalObjects) * 100;
|
|
||||||
this.notification.model.title = ["Copied ", processed, "of ",
|
|
||||||
totalObjects, "objects"].join(" ");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Executes the CopyAction. The CopyAction uses the default behaviour of
|
|
||||||
* the AbstractComposeAction, but extends it to support notification
|
|
||||||
* updates of progress on copy.
|
|
||||||
*/
|
|
||||||
CopyAction.prototype.perform = function () {
|
|
||||||
var self = this;
|
|
||||||
|
|
||||||
function success(domainObject) {
|
|
||||||
var domainObjectName = domainObject.model.name;
|
|
||||||
|
|
||||||
self.notification.dismiss();
|
|
||||||
self.notificationService.info(domainObjectName + " copied successfully.");
|
|
||||||
}
|
|
||||||
|
|
||||||
function error(errorDetails) {
|
|
||||||
// No need to notify user of their own cancellation
|
|
||||||
if (errorDetails instanceof CancelError) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var errorDialog,
|
|
||||||
errorMessage = {
|
|
||||||
title: "Error copying objects.",
|
|
||||||
severity: "error",
|
|
||||||
hint: errorDetails.message,
|
|
||||||
minimized: true, // want the notification to be minimized initially (don't show banner)
|
|
||||||
options: [{
|
|
||||||
label: "OK",
|
|
||||||
callback: function () {
|
|
||||||
errorDialog.dismiss();
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
};
|
|
||||||
|
|
||||||
self.dialog.dismiss();
|
|
||||||
if (self.notification) {
|
|
||||||
self.notification.dismiss(); // Clear the progress notification
|
|
||||||
}
|
|
||||||
|
|
||||||
self.$log.error("Error copying objects. ", errorDetails);
|
|
||||||
//Show a minimized notification of error for posterity
|
|
||||||
self.notificationService.notify(errorMessage);
|
|
||||||
//Display a blocking message
|
|
||||||
errorDialog = self.dialogService.showBlockingMessage(errorMessage);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
function notification(details) {
|
|
||||||
self.progress(details.phase, details.totalObjects, details.processed);
|
|
||||||
}
|
|
||||||
|
|
||||||
return AbstractComposeAction.prototype.perform.call(this)
|
|
||||||
.then(success, error, notification);
|
|
||||||
};
|
|
||||||
|
|
||||||
CopyAction.appliesTo = AbstractComposeAction.appliesTo;
|
|
||||||
|
|
||||||
return CopyAction;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
@@ -37,7 +37,7 @@ define(
|
|||||||
this.$q = $q;
|
this.$q = $q;
|
||||||
}
|
}
|
||||||
|
|
||||||
LocatingObjectDecorator.prototype.getObjects = function (ids) {
|
LocatingObjectDecorator.prototype.getObjects = function (ids, abortSignal) {
|
||||||
var $q = this.$q,
|
var $q = this.$q,
|
||||||
$log = this.$log,
|
$log = this.$log,
|
||||||
objectService = this.objectService,
|
objectService = this.objectService,
|
||||||
@@ -79,7 +79,7 @@ define(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return objectService.getObjects([id]).then(attachContext);
|
return objectService.getObjects([id], abortSignal).then(attachContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
ids.forEach(function (id) {
|
ids.forEach(function (id) {
|
||||||
|
|||||||
@@ -1,104 +0,0 @@
|
|||||||
/*****************************************************************************
|
|
||||||
* Open MCT, Copyright (c) 2014-2020, 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(
|
|
||||||
function () {
|
|
||||||
/**
|
|
||||||
* MoveService provides an interface for moving objects from one
|
|
||||||
* location to another. It also provides a method for determining if
|
|
||||||
* an object can be copied to a specific location.
|
|
||||||
* @constructor
|
|
||||||
* @memberof platform/entanglement
|
|
||||||
* @implements {platform/entanglement.AbstractComposeService}
|
|
||||||
*/
|
|
||||||
function MoveService(openmct, linkService) {
|
|
||||||
this.openmct = openmct;
|
|
||||||
this.linkService = linkService;
|
|
||||||
}
|
|
||||||
|
|
||||||
MoveService.prototype.validate = function (object, parentCandidate) {
|
|
||||||
var currentParent = object
|
|
||||||
.getCapability('context')
|
|
||||||
.getParent();
|
|
||||||
|
|
||||||
if (!parentCandidate || !parentCandidate.getId) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (parentCandidate.getId() === currentParent.getId()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (parentCandidate.getId() === object.getId()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (parentCandidate.getModel().composition.indexOf(object.getId()) !== -1) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.openmct.composition.checkPolicy(
|
|
||||||
parentCandidate.useCapability('adapter'),
|
|
||||||
object.useCapability('adapter')
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
MoveService.prototype.perform = function (object, parentObject) {
|
|
||||||
function relocate(objectInNewContext) {
|
|
||||||
var newLocationCapability = objectInNewContext
|
|
||||||
.getCapability('location'),
|
|
||||||
oldLocationCapability = object
|
|
||||||
.getCapability('location');
|
|
||||||
|
|
||||||
if (!newLocationCapability
|
|
||||||
|| !oldLocationCapability) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (oldLocationCapability.isOriginal()) {
|
|
||||||
return newLocationCapability.setPrimaryLocation(
|
|
||||||
newLocationCapability
|
|
||||||
.getContextualLocation()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!this.validate(object, parentObject)) {
|
|
||||||
throw new Error(
|
|
||||||
"Tried to move objects without validating first."
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.linkService
|
|
||||||
.perform(object, parentObject)
|
|
||||||
.then(relocate)
|
|
||||||
.then(function () {
|
|
||||||
return object
|
|
||||||
.getCapability('action')
|
|
||||||
.perform('remove', true);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
return MoveService;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
@@ -1,243 +0,0 @@
|
|||||||
/*****************************************************************************
|
|
||||||
* Open MCT, Copyright (c) 2014-2020, 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/actions/CopyAction',
|
|
||||||
'../services/MockCopyService',
|
|
||||||
'../DomainObjectFactory'
|
|
||||||
],
|
|
||||||
function (CopyAction, MockCopyService, domainObjectFactory) {
|
|
||||||
|
|
||||||
describe("Copy Action", function () {
|
|
||||||
|
|
||||||
var copyAction,
|
|
||||||
policyService,
|
|
||||||
locationService,
|
|
||||||
locationServicePromise,
|
|
||||||
copyService,
|
|
||||||
context,
|
|
||||||
selectedObject,
|
|
||||||
selectedObjectContextCapability,
|
|
||||||
currentParent,
|
|
||||||
newParent,
|
|
||||||
notificationService,
|
|
||||||
notification,
|
|
||||||
dialogService,
|
|
||||||
mockDialog,
|
|
||||||
mockLog,
|
|
||||||
abstractComposePromise,
|
|
||||||
domainObject = {model: {name: "mockObject"}},
|
|
||||||
progress = {
|
|
||||||
phase: "copying",
|
|
||||||
totalObjects: 10,
|
|
||||||
processed: 1
|
|
||||||
};
|
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
policyService = jasmine.createSpyObj(
|
|
||||||
'policyService',
|
|
||||||
['allow']
|
|
||||||
);
|
|
||||||
policyService.allow.and.returnValue(true);
|
|
||||||
|
|
||||||
selectedObjectContextCapability = jasmine.createSpyObj(
|
|
||||||
'selectedObjectContextCapability',
|
|
||||||
[
|
|
||||||
'getParent'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
selectedObject = domainObjectFactory({
|
|
||||||
name: 'selectedObject',
|
|
||||||
model: {
|
|
||||||
name: 'selectedObject'
|
|
||||||
},
|
|
||||||
capabilities: {
|
|
||||||
context: selectedObjectContextCapability
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
currentParent = domainObjectFactory({
|
|
||||||
name: 'currentParent'
|
|
||||||
});
|
|
||||||
|
|
||||||
selectedObjectContextCapability
|
|
||||||
.getParent
|
|
||||||
.and.returnValue(currentParent);
|
|
||||||
|
|
||||||
newParent = domainObjectFactory({
|
|
||||||
name: 'newParent'
|
|
||||||
});
|
|
||||||
|
|
||||||
locationService = jasmine.createSpyObj(
|
|
||||||
'locationService',
|
|
||||||
[
|
|
||||||
'getLocationFromUser'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
locationServicePromise = jasmine.createSpyObj(
|
|
||||||
'locationServicePromise',
|
|
||||||
[
|
|
||||||
'then'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
abstractComposePromise = jasmine.createSpyObj(
|
|
||||||
'abstractComposePromise',
|
|
||||||
[
|
|
||||||
'then'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
abstractComposePromise.then.and.callFake(function (success, error, notify) {
|
|
||||||
notify(progress);
|
|
||||||
success(domainObject);
|
|
||||||
});
|
|
||||||
|
|
||||||
locationServicePromise.then.and.callFake(function (callback) {
|
|
||||||
callback(newParent);
|
|
||||||
|
|
||||||
return abstractComposePromise;
|
|
||||||
});
|
|
||||||
|
|
||||||
locationService
|
|
||||||
.getLocationFromUser
|
|
||||||
.and.returnValue(locationServicePromise);
|
|
||||||
|
|
||||||
dialogService = jasmine.createSpyObj('dialogService',
|
|
||||||
['showBlockingMessage']
|
|
||||||
);
|
|
||||||
|
|
||||||
mockDialog = jasmine.createSpyObj("dialog", ["dismiss"]);
|
|
||||||
dialogService.showBlockingMessage.and.returnValue(mockDialog);
|
|
||||||
|
|
||||||
notification = jasmine.createSpyObj('notification',
|
|
||||||
['dismiss', 'model']
|
|
||||||
);
|
|
||||||
|
|
||||||
notificationService = jasmine.createSpyObj('notificationService',
|
|
||||||
['notify', 'info']
|
|
||||||
);
|
|
||||||
|
|
||||||
notificationService.notify.and.returnValue(notification);
|
|
||||||
|
|
||||||
mockLog = jasmine.createSpyObj('log', ['error']);
|
|
||||||
|
|
||||||
copyService = new MockCopyService();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("with context from context-action", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
context = {
|
|
||||||
domainObject: selectedObject
|
|
||||||
};
|
|
||||||
|
|
||||||
copyAction = new CopyAction(
|
|
||||||
mockLog,
|
|
||||||
policyService,
|
|
||||||
locationService,
|
|
||||||
copyService,
|
|
||||||
dialogService,
|
|
||||||
notificationService,
|
|
||||||
context
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("initializes happily", function () {
|
|
||||||
expect(copyAction).toBeDefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("when performed it", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
spyOn(copyAction, 'progress').and.callThrough();
|
|
||||||
copyAction.perform();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("prompts for location", function () {
|
|
||||||
expect(locationService.getLocationFromUser)
|
|
||||||
.toHaveBeenCalledWith(
|
|
||||||
"Duplicate selectedObject To a Location",
|
|
||||||
"Duplicate To",
|
|
||||||
jasmine.any(Function),
|
|
||||||
currentParent
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("waits for location and handles cancellation by user", function () {
|
|
||||||
expect(locationServicePromise.then)
|
|
||||||
.toHaveBeenCalledWith(jasmine.any(Function), jasmine.any(Function));
|
|
||||||
});
|
|
||||||
|
|
||||||
it("copies object to selected location", function () {
|
|
||||||
locationServicePromise
|
|
||||||
.then
|
|
||||||
.calls.mostRecent()
|
|
||||||
.args[0](newParent);
|
|
||||||
|
|
||||||
expect(copyService.perform)
|
|
||||||
.toHaveBeenCalledWith(selectedObject, newParent);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("notifies the user of progress", function () {
|
|
||||||
expect(notificationService.info).toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("notifies the user with name of object copied", function () {
|
|
||||||
expect(notificationService.info)
|
|
||||||
.toHaveBeenCalledWith("mockObject copied successfully.");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("with context from drag-drop", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
context = {
|
|
||||||
selectedObject: selectedObject,
|
|
||||||
domainObject: newParent
|
|
||||||
};
|
|
||||||
|
|
||||||
copyAction = new CopyAction(
|
|
||||||
mockLog,
|
|
||||||
policyService,
|
|
||||||
locationService,
|
|
||||||
copyService,
|
|
||||||
dialogService,
|
|
||||||
notificationService,
|
|
||||||
context
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("initializes happily", function () {
|
|
||||||
expect(copyAction).toBeDefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("performs copy immediately", function () {
|
|
||||||
copyAction.perform();
|
|
||||||
expect(copyService.perform)
|
|
||||||
.toHaveBeenCalledWith(selectedObject, newParent);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
);
|
|
||||||
@@ -1,178 +0,0 @@
|
|||||||
/*****************************************************************************
|
|
||||||
* Open MCT, Copyright (c) 2014-2020, 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/actions/MoveAction',
|
|
||||||
'../services/MockMoveService',
|
|
||||||
'../DomainObjectFactory'
|
|
||||||
],
|
|
||||||
function (MoveAction, MockMoveService, domainObjectFactory) {
|
|
||||||
|
|
||||||
describe("Move Action", function () {
|
|
||||||
|
|
||||||
var moveAction,
|
|
||||||
policyService,
|
|
||||||
locationService,
|
|
||||||
locationServicePromise,
|
|
||||||
moveService,
|
|
||||||
context,
|
|
||||||
selectedObject,
|
|
||||||
selectedObjectContextCapability,
|
|
||||||
currentParent,
|
|
||||||
newParent;
|
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
policyService = jasmine.createSpyObj(
|
|
||||||
'policyService',
|
|
||||||
['allow']
|
|
||||||
);
|
|
||||||
policyService.allow.and.returnValue(true);
|
|
||||||
|
|
||||||
selectedObjectContextCapability = jasmine.createSpyObj(
|
|
||||||
'selectedObjectContextCapability',
|
|
||||||
[
|
|
||||||
'getParent'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
selectedObject = domainObjectFactory({
|
|
||||||
name: 'selectedObject',
|
|
||||||
model: {
|
|
||||||
name: 'selectedObject'
|
|
||||||
},
|
|
||||||
capabilities: {
|
|
||||||
context: selectedObjectContextCapability
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
currentParent = domainObjectFactory({
|
|
||||||
name: 'currentParent'
|
|
||||||
});
|
|
||||||
|
|
||||||
selectedObjectContextCapability
|
|
||||||
.getParent
|
|
||||||
.and.returnValue(currentParent);
|
|
||||||
|
|
||||||
newParent = domainObjectFactory({
|
|
||||||
name: 'newParent'
|
|
||||||
});
|
|
||||||
|
|
||||||
locationService = jasmine.createSpyObj(
|
|
||||||
'locationService',
|
|
||||||
[
|
|
||||||
'getLocationFromUser'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
locationServicePromise = jasmine.createSpyObj(
|
|
||||||
'locationServicePromise',
|
|
||||||
[
|
|
||||||
'then'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
locationService
|
|
||||||
.getLocationFromUser
|
|
||||||
.and.returnValue(locationServicePromise);
|
|
||||||
|
|
||||||
moveService = new MockMoveService();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("with context from context-action", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
context = {
|
|
||||||
domainObject: selectedObject
|
|
||||||
};
|
|
||||||
|
|
||||||
moveAction = new MoveAction(
|
|
||||||
policyService,
|
|
||||||
locationService,
|
|
||||||
moveService,
|
|
||||||
context
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("initializes happily", function () {
|
|
||||||
expect(moveAction).toBeDefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("when performed it", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
moveAction.perform();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("prompts for location", function () {
|
|
||||||
expect(locationService.getLocationFromUser)
|
|
||||||
.toHaveBeenCalledWith(
|
|
||||||
"Move selectedObject To a New Location",
|
|
||||||
"Move To",
|
|
||||||
jasmine.any(Function),
|
|
||||||
currentParent
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("waits for location and handles cancellation by user", function () {
|
|
||||||
expect(locationServicePromise.then)
|
|
||||||
.toHaveBeenCalledWith(jasmine.any(Function), jasmine.any(Function));
|
|
||||||
});
|
|
||||||
|
|
||||||
it("moves object to selected location", function () {
|
|
||||||
locationServicePromise
|
|
||||||
.then
|
|
||||||
.calls.mostRecent()
|
|
||||||
.args[0](newParent);
|
|
||||||
|
|
||||||
expect(moveService.perform)
|
|
||||||
.toHaveBeenCalledWith(selectedObject, newParent);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("with context from drag-drop", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
context = {
|
|
||||||
selectedObject: selectedObject,
|
|
||||||
domainObject: newParent
|
|
||||||
};
|
|
||||||
|
|
||||||
moveAction = new MoveAction(
|
|
||||||
policyService,
|
|
||||||
locationService,
|
|
||||||
moveService,
|
|
||||||
context
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("initializes happily", function () {
|
|
||||||
expect(moveAction).toBeDefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("performs move immediately", function () {
|
|
||||||
moveAction.perform();
|
|
||||||
expect(moveService.perform)
|
|
||||||
.toHaveBeenCalledWith(selectedObject, newParent);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
);
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
/*****************************************************************************
|
|
||||||
* Open MCT, Copyright (c) 2014-2020, 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/policies/MovePolicy',
|
|
||||||
'../DomainObjectFactory'
|
|
||||||
], function (MovePolicy, domainObjectFactory) {
|
|
||||||
|
|
||||||
describe("MovePolicy", function () {
|
|
||||||
var testMetadata,
|
|
||||||
testContext,
|
|
||||||
mockDomainObject,
|
|
||||||
mockParent,
|
|
||||||
mockParentType,
|
|
||||||
mockType,
|
|
||||||
mockAction,
|
|
||||||
policy;
|
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
var mockContextCapability =
|
|
||||||
jasmine.createSpyObj('context', ['getParent']);
|
|
||||||
|
|
||||||
mockType =
|
|
||||||
jasmine.createSpyObj('type', ['hasFeature']);
|
|
||||||
mockParentType =
|
|
||||||
jasmine.createSpyObj('parent-type', ['hasFeature']);
|
|
||||||
|
|
||||||
testMetadata = {};
|
|
||||||
|
|
||||||
mockDomainObject = domainObjectFactory({
|
|
||||||
capabilities: {
|
|
||||||
context: mockContextCapability,
|
|
||||||
type: mockType
|
|
||||||
}
|
|
||||||
});
|
|
||||||
mockParent = domainObjectFactory({
|
|
||||||
capabilities: {
|
|
||||||
type: mockParentType
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
mockContextCapability.getParent.and.returnValue(mockParent);
|
|
||||||
|
|
||||||
mockType.hasFeature.and.callFake(function (feature) {
|
|
||||||
return feature === 'creation';
|
|
||||||
});
|
|
||||||
mockParentType.hasFeature.and.callFake(function (feature) {
|
|
||||||
return feature === 'creation';
|
|
||||||
});
|
|
||||||
|
|
||||||
mockAction = jasmine.createSpyObj('action', ['getMetadata']);
|
|
||||||
mockAction.getMetadata.and.returnValue(testMetadata);
|
|
||||||
|
|
||||||
testContext = { domainObject: mockDomainObject };
|
|
||||||
|
|
||||||
policy = new MovePolicy();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("for move actions", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
testMetadata.key = 'move';
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("when an object is non-modifiable", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
mockType.hasFeature.and.returnValue(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("disallows the action", function () {
|
|
||||||
expect(policy.allow(mockAction, testContext)).toBe(false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("when a parent is non-modifiable", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
mockParentType.hasFeature.and.returnValue(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("disallows the action", function () {
|
|
||||||
expect(policy.allow(mockAction, testContext)).toBe(false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("when an object and its parent are modifiable", function () {
|
|
||||||
it("allows the action", function () {
|
|
||||||
expect(policy.allow(mockAction, testContext)).toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("for other actions", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
testMetadata.key = 'foo';
|
|
||||||
});
|
|
||||||
|
|
||||||
it("simply allows the action", function () {
|
|
||||||
expect(policy.allow(mockAction, testContext)).toBe(true);
|
|
||||||
mockType.hasFeature.and.returnValue(false);
|
|
||||||
expect(policy.allow(mockAction, testContext)).toBe(true);
|
|
||||||
mockParentType.hasFeature.and.returnValue(false);
|
|
||||||
expect(policy.allow(mockAction, testContext)).toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,96 +0,0 @@
|
|||||||
/*****************************************************************************
|
|
||||||
* Open MCT, Copyright (c) 2014-2020, 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(
|
|
||||||
function () {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* MockMoveService provides the same interface as the moveService,
|
|
||||||
* returning promises where it would normally do so. At it's core,
|
|
||||||
* it is a jasmine spy object, but it also tracks the promises it
|
|
||||||
* returns and provides shortcut methods for resolving those promises
|
|
||||||
* synchronously.
|
|
||||||
*
|
|
||||||
* Usage:
|
|
||||||
*
|
|
||||||
* ```javascript
|
|
||||||
* var moveService = new MockMoveService();
|
|
||||||
*
|
|
||||||
* // validate is a standard jasmine spy.
|
|
||||||
* moveService.validate.and.returnValue(true);
|
|
||||||
* var isValid = moveService.validate(object, parentCandidate);
|
|
||||||
* expect(isValid).toBe(true);
|
|
||||||
*
|
|
||||||
* // perform returns promises and tracks them.
|
|
||||||
* var whenCopied = jasmine.createSpy('whenCopied');
|
|
||||||
* moveService.perform(object, parentObject).then(whenCopied);
|
|
||||||
* expect(whenCopied).not.toHaveBeenCalled();
|
|
||||||
* moveService.perform.calls.mostRecent().resolve('someArg');
|
|
||||||
* expect(whenCopied).toHaveBeenCalledWith('someArg');
|
|
||||||
* ```
|
|
||||||
*/
|
|
||||||
function MockMoveService() {
|
|
||||||
// track most recent call of a function,
|
|
||||||
// perform automatically returns
|
|
||||||
var mockMoveService = jasmine.createSpyObj(
|
|
||||||
'MockMoveService',
|
|
||||||
[
|
|
||||||
'validate',
|
|
||||||
'perform'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
mockMoveService.perform.and.callFake(() => {
|
|
||||||
var performPromise,
|
|
||||||
callExtensions,
|
|
||||||
spy;
|
|
||||||
|
|
||||||
performPromise = jasmine.createSpyObj(
|
|
||||||
'performPromise',
|
|
||||||
['then']
|
|
||||||
);
|
|
||||||
|
|
||||||
callExtensions = {
|
|
||||||
promise: performPromise,
|
|
||||||
resolve: function (resolveWith) {
|
|
||||||
performPromise.then.calls.all().forEach(function (call) {
|
|
||||||
call.args[0](resolveWith);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
spy = mockMoveService.perform;
|
|
||||||
|
|
||||||
Object.keys(callExtensions).forEach(function (key) {
|
|
||||||
spy.calls.mostRecent()[key] = callExtensions[key];
|
|
||||||
spy.calls.all()[spy.calls.count() - 1][key] = callExtensions[key];
|
|
||||||
});
|
|
||||||
|
|
||||||
return performPromise;
|
|
||||||
});
|
|
||||||
|
|
||||||
return mockMoveService;
|
|
||||||
}
|
|
||||||
|
|
||||||
return MockMoveService;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
@@ -1,260 +0,0 @@
|
|||||||
/*****************************************************************************
|
|
||||||
* Open MCT, Copyright (c) 2014-2020, 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/services/MoveService',
|
|
||||||
'../services/MockLinkService',
|
|
||||||
'../DomainObjectFactory',
|
|
||||||
'../ControlledPromise'
|
|
||||||
],
|
|
||||||
function (
|
|
||||||
MoveService,
|
|
||||||
MockLinkService,
|
|
||||||
domainObjectFactory,
|
|
||||||
ControlledPromise
|
|
||||||
) {
|
|
||||||
|
|
||||||
xdescribe("MoveService", function () {
|
|
||||||
|
|
||||||
var moveService,
|
|
||||||
policyService,
|
|
||||||
object,
|
|
||||||
objectContextCapability,
|
|
||||||
currentParent,
|
|
||||||
parentCandidate,
|
|
||||||
linkService;
|
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
objectContextCapability = jasmine.createSpyObj(
|
|
||||||
'objectContextCapability',
|
|
||||||
[
|
|
||||||
'getParent'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
object = domainObjectFactory({
|
|
||||||
name: 'object',
|
|
||||||
id: 'a',
|
|
||||||
capabilities: {
|
|
||||||
context: objectContextCapability,
|
|
||||||
type: { type: 'object' }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
currentParent = domainObjectFactory({
|
|
||||||
name: 'currentParent',
|
|
||||||
id: 'b'
|
|
||||||
});
|
|
||||||
|
|
||||||
objectContextCapability.getParent.and.returnValue(currentParent);
|
|
||||||
|
|
||||||
parentCandidate = domainObjectFactory({
|
|
||||||
name: 'parentCandidate',
|
|
||||||
model: { composition: [] },
|
|
||||||
id: 'c',
|
|
||||||
capabilities: {
|
|
||||||
type: { type: 'parentCandidate' }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
policyService = jasmine.createSpyObj(
|
|
||||||
'policyService',
|
|
||||||
['allow']
|
|
||||||
);
|
|
||||||
linkService = new MockLinkService();
|
|
||||||
policyService.allow.and.returnValue(true);
|
|
||||||
moveService = new MoveService(policyService, linkService);
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("validate", function () {
|
|
||||||
var validate;
|
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
validate = function () {
|
|
||||||
return moveService.validate(object, parentCandidate);
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not allow an invalid parent", function () {
|
|
||||||
parentCandidate = undefined;
|
|
||||||
expect(validate()).toBe(false);
|
|
||||||
parentCandidate = {};
|
|
||||||
expect(validate()).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not allow moving to current parent", function () {
|
|
||||||
parentCandidate.id = currentParent.id = 'xyz';
|
|
||||||
expect(validate()).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not allow moving to self", function () {
|
|
||||||
object.id = parentCandidate.id = 'xyz';
|
|
||||||
expect(validate()).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not allow moving to the same location", function () {
|
|
||||||
object.id = 'abc';
|
|
||||||
parentCandidate.model.composition = ['abc'];
|
|
||||||
expect(validate()).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("defers to policyService", function () {
|
|
||||||
|
|
||||||
it("calls policy service with correct args", function () {
|
|
||||||
validate();
|
|
||||||
expect(policyService.allow).toHaveBeenCalledWith(
|
|
||||||
"composition",
|
|
||||||
parentCandidate,
|
|
||||||
object
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("and returns false", function () {
|
|
||||||
policyService.allow.and.returnValue(false);
|
|
||||||
expect(validate()).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("and returns true", function () {
|
|
||||||
policyService.allow.and.returnValue(true);
|
|
||||||
expect(validate()).toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("perform", function () {
|
|
||||||
|
|
||||||
var actionCapability,
|
|
||||||
locationCapability,
|
|
||||||
locationPromise,
|
|
||||||
newParent,
|
|
||||||
moveResult;
|
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
newParent = parentCandidate;
|
|
||||||
|
|
||||||
actionCapability = jasmine.createSpyObj(
|
|
||||||
'actionCapability',
|
|
||||||
['perform']
|
|
||||||
);
|
|
||||||
|
|
||||||
locationCapability = jasmine.createSpyObj(
|
|
||||||
'locationCapability',
|
|
||||||
[
|
|
||||||
'isOriginal',
|
|
||||||
'setPrimaryLocation',
|
|
||||||
'getContextualLocation'
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
locationPromise = new ControlledPromise();
|
|
||||||
locationCapability.setPrimaryLocation
|
|
||||||
.and.returnValue(locationPromise);
|
|
||||||
|
|
||||||
object = domainObjectFactory({
|
|
||||||
name: 'object',
|
|
||||||
capabilities: {
|
|
||||||
action: actionCapability,
|
|
||||||
location: locationCapability,
|
|
||||||
context: objectContextCapability,
|
|
||||||
type: { type: 'object' }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
moveResult = moveService.perform(object, newParent);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("links object to newParent", function () {
|
|
||||||
expect(linkService.perform).toHaveBeenCalledWith(
|
|
||||||
object,
|
|
||||||
newParent
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("returns a promise", function () {
|
|
||||||
expect(moveResult.then).toEqual(jasmine.any(Function));
|
|
||||||
});
|
|
||||||
|
|
||||||
it("waits for result of link", function () {
|
|
||||||
expect(linkService.perform.calls.mostRecent().promise.then)
|
|
||||||
.toHaveBeenCalledWith(jasmine.any(Function));
|
|
||||||
});
|
|
||||||
|
|
||||||
it("throws an error when performed on invalid inputs", function () {
|
|
||||||
function perform() {
|
|
||||||
moveService.perform(object, newParent);
|
|
||||||
}
|
|
||||||
|
|
||||||
spyOn(moveService, "validate");
|
|
||||||
moveService.validate.and.returnValue(true);
|
|
||||||
expect(perform).not.toThrow();
|
|
||||||
moveService.validate.and.returnValue(false);
|
|
||||||
expect(perform).toThrow();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("when moving an original", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
locationCapability.getContextualLocation
|
|
||||||
.and.returnValue('new-location');
|
|
||||||
locationCapability.isOriginal.and.returnValue(true);
|
|
||||||
linkService.perform.calls.mostRecent().promise.resolve();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("updates location", function () {
|
|
||||||
expect(locationCapability.setPrimaryLocation)
|
|
||||||
.toHaveBeenCalledWith('new-location');
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("after location update", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
locationPromise.resolve();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("removes object from parent without user warning dialog", function () {
|
|
||||||
expect(actionCapability.perform)
|
|
||||||
.toHaveBeenCalledWith('remove', true);
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("when moving a link", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
locationCapability.isOriginal.and.returnValue(false);
|
|
||||||
linkService.perform.calls.mostRecent().promise.resolve();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not update location", function () {
|
|
||||||
expect(locationCapability.setPrimaryLocation)
|
|
||||||
.not
|
|
||||||
.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("removes object from parent without user warning dialog", function () {
|
|
||||||
expect(actionCapability.perform)
|
|
||||||
.toHaveBeenCalledWith('remove', true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
);
|
|
||||||
@@ -32,7 +32,8 @@
|
|||||||
function indexItem(id, model) {
|
function indexItem(id, model) {
|
||||||
indexedItems.push({
|
indexedItems.push({
|
||||||
id: id,
|
id: id,
|
||||||
name: model.name.toLowerCase()
|
name: model.name.toLowerCase(),
|
||||||
|
type: model.type
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -125,13 +125,12 @@ define([
|
|||||||
* @param topic the topicService.
|
* @param topic the topicService.
|
||||||
*/
|
*/
|
||||||
GenericSearchProvider.prototype.indexOnMutation = function (topic) {
|
GenericSearchProvider.prototype.indexOnMutation = function (topic) {
|
||||||
var mutationTopic = topic('mutation'),
|
let mutationTopic = topic('mutation');
|
||||||
provider = this;
|
|
||||||
|
|
||||||
mutationTopic.listen(function (mutatedObject) {
|
mutationTopic.listen(mutatedObject => {
|
||||||
var editor = mutatedObject.getCapability('editor');
|
let editor = mutatedObject.getCapability('editor');
|
||||||
if (!editor || !editor.inEditContext()) {
|
if (!editor || !editor.inEditContext()) {
|
||||||
provider.index(
|
this.index(
|
||||||
mutatedObject.getId(),
|
mutatedObject.getId(),
|
||||||
mutatedObject.getModel()
|
mutatedObject.getModel()
|
||||||
);
|
);
|
||||||
@@ -147,10 +146,15 @@ define([
|
|||||||
* @param {String} id to be indexed.
|
* @param {String} id to be indexed.
|
||||||
*/
|
*/
|
||||||
GenericSearchProvider.prototype.scheduleForIndexing = function (id) {
|
GenericSearchProvider.prototype.scheduleForIndexing = function (id) {
|
||||||
if (!this.indexedIds[id] && !this.pendingIndex[id]) {
|
const identifier = objectUtils.parseKeyString(id);
|
||||||
this.indexedIds[id] = true;
|
const objectProvider = this.openmct.objects.getProvider(identifier);
|
||||||
this.pendingIndex[id] = true;
|
|
||||||
this.idsToIndex.push(id);
|
if (objectProvider === undefined || objectProvider.search === undefined) {
|
||||||
|
if (!this.indexedIds[id] && !this.pendingIndex[id]) {
|
||||||
|
this.indexedIds[id] = true;
|
||||||
|
this.pendingIndex[id] = true;
|
||||||
|
this.idsToIndex.push(id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.keepIndexing();
|
this.keepIndexing();
|
||||||
@@ -262,6 +266,7 @@ define([
|
|||||||
return {
|
return {
|
||||||
id: hit.item.id,
|
id: hit.item.id,
|
||||||
model: hit.item.model,
|
model: hit.item.model,
|
||||||
|
type: hit.item.type,
|
||||||
score: hit.matchCount
|
score: hit.matchCount
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -41,7 +41,8 @@
|
|||||||
indexedItems.push({
|
indexedItems.push({
|
||||||
id: id,
|
id: id,
|
||||||
vector: vector,
|
vector: vector,
|
||||||
model: model
|
model: model,
|
||||||
|
type: model.type
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -80,12 +80,15 @@ define([
|
|||||||
* @param {Function} [filter] if provided, will be called for every
|
* @param {Function} [filter] if provided, will be called for every
|
||||||
* potential modelResult. If it returns false, the model result will be
|
* potential modelResult. If it returns false, the model result will be
|
||||||
* excluded from the search results.
|
* excluded from the search results.
|
||||||
|
* @param {AbortController.signal} abortSignal (optional) can pass in an abortSignal to cancel any
|
||||||
|
* downstream fetch requests.
|
||||||
* @returns {Promise} A Promise for a search result object.
|
* @returns {Promise} A Promise for a search result object.
|
||||||
*/
|
*/
|
||||||
SearchAggregator.prototype.query = function (
|
SearchAggregator.prototype.query = function (
|
||||||
inputText,
|
inputText,
|
||||||
maxResults,
|
maxResults,
|
||||||
filter
|
filter,
|
||||||
|
abortSignal
|
||||||
) {
|
) {
|
||||||
|
|
||||||
var aggregator = this,
|
var aggregator = this,
|
||||||
@@ -120,7 +123,7 @@ define([
|
|||||||
modelResults = aggregator.applyFilter(modelResults, filter);
|
modelResults = aggregator.applyFilter(modelResults, filter);
|
||||||
modelResults = aggregator.removeDuplicates(modelResults);
|
modelResults = aggregator.removeDuplicates(modelResults);
|
||||||
|
|
||||||
return aggregator.asObjectResults(modelResults);
|
return aggregator.asObjectResults(modelResults, abortSignal);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -193,16 +196,19 @@ define([
|
|||||||
* Convert modelResults to objectResults by fetching them from the object
|
* Convert modelResults to objectResults by fetching them from the object
|
||||||
* service.
|
* service.
|
||||||
*
|
*
|
||||||
|
* @param {Object} modelResults an object containing the results from the search
|
||||||
|
* @param {AbortController.signal} abortSignal (optional) abort signal to cancel any
|
||||||
|
* downstream fetch requests
|
||||||
* @returns {Promise} for an objectResults object.
|
* @returns {Promise} for an objectResults object.
|
||||||
*/
|
*/
|
||||||
SearchAggregator.prototype.asObjectResults = function (modelResults) {
|
SearchAggregator.prototype.asObjectResults = function (modelResults, abortSignal) {
|
||||||
var objectIds = modelResults.hits.map(function (modelResult) {
|
var objectIds = modelResults.hits.map(function (modelResult) {
|
||||||
return modelResult.id;
|
return modelResult.id;
|
||||||
});
|
});
|
||||||
|
|
||||||
return this
|
return this
|
||||||
.objectService
|
.objectService
|
||||||
.getObjects(objectIds)
|
.getObjects(objectIds, abortSignal)
|
||||||
.then(function (objects) {
|
.then(function (objects) {
|
||||||
|
|
||||||
var objectResults = {
|
var objectResults = {
|
||||||
|
|||||||
12
src/MCT.js
12
src/MCT.js
@@ -46,6 +46,8 @@ define([
|
|||||||
'./api/Branding',
|
'./api/Branding',
|
||||||
'./plugins/licenses/plugin',
|
'./plugins/licenses/plugin',
|
||||||
'./plugins/remove/plugin',
|
'./plugins/remove/plugin',
|
||||||
|
'./plugins/move/plugin',
|
||||||
|
'./plugins/duplicate/plugin',
|
||||||
'vue'
|
'vue'
|
||||||
], function (
|
], function (
|
||||||
EventEmitter,
|
EventEmitter,
|
||||||
@@ -73,6 +75,8 @@ define([
|
|||||||
BrandingAPI,
|
BrandingAPI,
|
||||||
LicensesPlugin,
|
LicensesPlugin,
|
||||||
RemoveActionPlugin,
|
RemoveActionPlugin,
|
||||||
|
MoveActionPlugin,
|
||||||
|
DuplicateActionPlugin,
|
||||||
Vue
|
Vue
|
||||||
) {
|
) {
|
||||||
/**
|
/**
|
||||||
@@ -215,7 +219,7 @@ define([
|
|||||||
* @memberof module:openmct.MCT#
|
* @memberof module:openmct.MCT#
|
||||||
* @name objects
|
* @name objects
|
||||||
*/
|
*/
|
||||||
this.objects = new api.ObjectAPI();
|
this.objects = new api.ObjectAPI.default(this.types, this);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An interface for retrieving and interpreting telemetry data associated
|
* An interface for retrieving and interpreting telemetry data associated
|
||||||
@@ -263,6 +267,8 @@ define([
|
|||||||
this.install(LegacyIndicatorsPlugin());
|
this.install(LegacyIndicatorsPlugin());
|
||||||
this.install(LicensesPlugin.default());
|
this.install(LicensesPlugin.default());
|
||||||
this.install(RemoveActionPlugin.default());
|
this.install(RemoveActionPlugin.default());
|
||||||
|
this.install(MoveActionPlugin.default());
|
||||||
|
this.install(DuplicateActionPlugin.default());
|
||||||
this.install(this.plugins.FolderView());
|
this.install(this.plugins.FolderView());
|
||||||
this.install(this.plugins.Tabs());
|
this.install(this.plugins.Tabs());
|
||||||
this.install(ImageryPlugin.default());
|
this.install(ImageryPlugin.default());
|
||||||
@@ -276,6 +282,8 @@ define([
|
|||||||
this.install(this.plugins.NotificationIndicator());
|
this.install(this.plugins.NotificationIndicator());
|
||||||
this.install(this.plugins.NewFolderAction());
|
this.install(this.plugins.NewFolderAction());
|
||||||
this.install(this.plugins.ViewDatumAction());
|
this.install(this.plugins.ViewDatumAction());
|
||||||
|
this.install(this.plugins.ObjectInterceptors());
|
||||||
|
this.install(this.plugins.NonEditableFolder());
|
||||||
}
|
}
|
||||||
|
|
||||||
MCT.prototype = Object.create(EventEmitter.prototype);
|
MCT.prototype = Object.create(EventEmitter.prototype);
|
||||||
@@ -364,7 +372,7 @@ define([
|
|||||||
* MCT; if undefined, MCT will be run in the body of the document
|
* MCT; if undefined, MCT will be run in the body of the document
|
||||||
*/
|
*/
|
||||||
MCT.prototype.start = function (domElement = document.body, isHeadlessMode = false) {
|
MCT.prototype.start = function (domElement = document.body, isHeadlessMode = false) {
|
||||||
if (!this.plugins.DisplayLayout._installed) {
|
if (this.types.get('layout') === undefined) {
|
||||||
this.install(this.plugins.DisplayLayout({
|
this.install(this.plugins.DisplayLayout({
|
||||||
showAsView: ['summary-widget']
|
showAsView: ['summary-widget']
|
||||||
}));
|
}));
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ define([
|
|||||||
context.domainObject.getModel(),
|
context.domainObject.getModel(),
|
||||||
objectUtils.parseKeyString(context.domainObject.getId())
|
objectUtils.parseKeyString(context.domainObject.getId())
|
||||||
);
|
);
|
||||||
const providers = mct.propertyEditors.get(domainObject);
|
const providers = mct.propertyEditors.get(domainObject, mct.router.path);
|
||||||
|
|
||||||
if (providers.length > 0) {
|
if (providers.length > 0) {
|
||||||
action.dialogService = Object.create(action.dialogService);
|
action.dialogService = Object.create(action.dialogService);
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ define([], function () {
|
|||||||
if (Object.prototype.hasOwnProperty.call(view, 'provider')) {
|
if (Object.prototype.hasOwnProperty.call(view, 'provider')) {
|
||||||
const domainObject = legacyObject.useCapability('adapter');
|
const domainObject = legacyObject.useCapability('adapter');
|
||||||
|
|
||||||
return view.provider.canView(domainObject);
|
return view.provider.canView(domainObject, this.openmct.router.path);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ define([
|
|||||||
const newStyleObject = utils.toNewFormat(legacyObject.getModel(), legacyObject.getId());
|
const newStyleObject = utils.toNewFormat(legacyObject.getModel(), legacyObject.getId());
|
||||||
const keystring = utils.makeKeyString(newStyleObject.identifier);
|
const keystring = utils.makeKeyString(newStyleObject.identifier);
|
||||||
|
|
||||||
|
this.eventEmitter.emit(keystring + ':$_synchronize_model', newStyleObject);
|
||||||
this.eventEmitter.emit(keystring + ":*", newStyleObject);
|
this.eventEmitter.emit(keystring + ":*", newStyleObject);
|
||||||
this.eventEmitter.emit('mutation', newStyleObject);
|
this.eventEmitter.emit('mutation', newStyleObject);
|
||||||
}.bind(this);
|
}.bind(this);
|
||||||
@@ -138,18 +139,26 @@ define([
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ObjectServiceProvider.prototype.superSecretFallbackSearch = function (query, abortSignal) {
|
||||||
|
const searchService = this.$injector.get('searchService');
|
||||||
|
|
||||||
|
// need to pass the abortSignal down, so need to
|
||||||
|
// pass in undefined for maxResults and filter on query
|
||||||
|
return searchService.query(query, undefined, undefined, abortSignal);
|
||||||
|
};
|
||||||
|
|
||||||
// Injects new object API as a decorator so that it hijacks all requests.
|
// Injects new object API as a decorator so that it hijacks all requests.
|
||||||
// Object providers implemented on new API should just work, old API should just work, many things may break.
|
// Object providers implemented on new API should just work, old API should just work, many things may break.
|
||||||
function LegacyObjectAPIInterceptor(openmct, ROOTS, instantiate, topic, objectService) {
|
function LegacyObjectAPIInterceptor(openmct, ROOTS, instantiate, topic, objectService) {
|
||||||
const eventEmitter = openmct.objects.eventEmitter;
|
const eventEmitter = openmct.objects.eventEmitter;
|
||||||
|
|
||||||
this.getObjects = function (keys) {
|
this.getObjects = function (keys, abortSignal) {
|
||||||
const results = {};
|
const results = {};
|
||||||
|
|
||||||
const promises = keys.map(function (keyString) {
|
const promises = keys.map(function (keyString) {
|
||||||
const key = utils.parseKeyString(keyString);
|
const key = utils.parseKeyString(keyString);
|
||||||
|
|
||||||
return openmct.objects.get(key)
|
return openmct.objects.get(key, abortSignal)
|
||||||
.then(function (object) {
|
.then(function (object) {
|
||||||
object = utils.toOldFormat(object);
|
object = utils.toOldFormat(object);
|
||||||
results[keyString] = instantiate(object, keyString);
|
results[keyString] = instantiate(object, keyString);
|
||||||
|
|||||||
242
src/api/actions/ActionCollectionSpec.js
Normal file
242
src/api/actions/ActionCollectionSpec.js
Normal file
@@ -0,0 +1,242 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2020, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
|
import ActionCollection from './ActionCollection';
|
||||||
|
import { createOpenMct, resetApplicationState } from '../../utils/testing';
|
||||||
|
|
||||||
|
describe('The ActionCollection', () => {
|
||||||
|
let openmct;
|
||||||
|
let actionCollection;
|
||||||
|
let mockApplicableActions;
|
||||||
|
let mockObjectPath;
|
||||||
|
let mockView;
|
||||||
|
let mockIdentifierService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
openmct = createOpenMct();
|
||||||
|
openmct.$injector = jasmine.createSpyObj('$injector', ['get']);
|
||||||
|
mockIdentifierService = jasmine.createSpyObj(
|
||||||
|
'identifierService',
|
||||||
|
['parse']
|
||||||
|
);
|
||||||
|
mockIdentifierService.parse.and.returnValue({
|
||||||
|
getSpace: () => {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
openmct.$injector.get.and.returnValue(mockIdentifierService);
|
||||||
|
mockObjectPath = [
|
||||||
|
{
|
||||||
|
name: 'mock folder',
|
||||||
|
type: 'fake-folder',
|
||||||
|
identifier: {
|
||||||
|
key: 'mock-folder',
|
||||||
|
namespace: ''
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'mock parent folder',
|
||||||
|
type: 'fake-folder',
|
||||||
|
identifier: {
|
||||||
|
key: 'mock-parent-folder',
|
||||||
|
namespace: ''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
];
|
||||||
|
openmct.objects.addProvider('', jasmine.createSpyObj('mockMutableObjectProvider', [
|
||||||
|
'create',
|
||||||
|
'update'
|
||||||
|
]));
|
||||||
|
mockView = {
|
||||||
|
getViewContext: () => {
|
||||||
|
return {
|
||||||
|
onlyAppliesToTestCase: true
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
||||||
|
mockApplicableActions = {
|
||||||
|
'test-action-object-path': {
|
||||||
|
name: 'Test Action Object Path',
|
||||||
|
key: 'test-action-object-path',
|
||||||
|
cssClass: 'test-action-object-path',
|
||||||
|
description: 'This is a test action for object path',
|
||||||
|
group: 'action',
|
||||||
|
priority: 9,
|
||||||
|
appliesTo: (objectPath) => {
|
||||||
|
if (objectPath.length) {
|
||||||
|
return objectPath[0].type === 'fake-folder';
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
invoke: () => {
|
||||||
|
}
|
||||||
|
},
|
||||||
|
'test-action-view': {
|
||||||
|
name: 'Test Action View',
|
||||||
|
key: 'test-action-view',
|
||||||
|
cssClass: 'test-action-view',
|
||||||
|
description: 'This is a test action for view',
|
||||||
|
group: 'action',
|
||||||
|
priority: 9,
|
||||||
|
showInStatusBar: true,
|
||||||
|
appliesTo: (objectPath, view = {}) => {
|
||||||
|
if (view.getViewContext) {
|
||||||
|
let viewContext = view.getViewContext();
|
||||||
|
|
||||||
|
return viewContext.onlyAppliesToTestCase;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
invoke: () => {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
actionCollection = new ActionCollection(mockApplicableActions, mockObjectPath, mockView, openmct);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
actionCollection.destroy();
|
||||||
|
resetApplicationState(openmct);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("disable method invoked with action keys", () => {
|
||||||
|
it("marks those actions as isDisabled", () => {
|
||||||
|
let actionKey = 'test-action-object-path';
|
||||||
|
let actionsObject = actionCollection.getActionsObject();
|
||||||
|
let action = actionsObject[actionKey];
|
||||||
|
|
||||||
|
expect(action.isDisabled).toBeFalsy();
|
||||||
|
|
||||||
|
actionCollection.disable([actionKey]);
|
||||||
|
actionsObject = actionCollection.getActionsObject();
|
||||||
|
action = actionsObject[actionKey];
|
||||||
|
|
||||||
|
expect(action.isDisabled).toBeTrue();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("enable method invoked with action keys", () => {
|
||||||
|
it("marks the isDisabled property as false", () => {
|
||||||
|
let actionKey = 'test-action-object-path';
|
||||||
|
|
||||||
|
actionCollection.disable([actionKey]);
|
||||||
|
|
||||||
|
let actionsObject = actionCollection.getActionsObject();
|
||||||
|
let action = actionsObject[actionKey];
|
||||||
|
|
||||||
|
expect(action.isDisabled).toBeTrue();
|
||||||
|
|
||||||
|
actionCollection.enable([actionKey]);
|
||||||
|
actionsObject = actionCollection.getActionsObject();
|
||||||
|
action = actionsObject[actionKey];
|
||||||
|
|
||||||
|
expect(action.isDisabled).toBeFalse();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("hide method invoked with action keys", () => {
|
||||||
|
it("marks those actions as isHidden", () => {
|
||||||
|
let actionKey = 'test-action-object-path';
|
||||||
|
let actionsObject = actionCollection.getActionsObject();
|
||||||
|
let action = actionsObject[actionKey];
|
||||||
|
|
||||||
|
expect(action.isHidden).toBeFalsy();
|
||||||
|
|
||||||
|
actionCollection.hide([actionKey]);
|
||||||
|
actionsObject = actionCollection.getActionsObject();
|
||||||
|
action = actionsObject[actionKey];
|
||||||
|
|
||||||
|
expect(action.isHidden).toBeTrue();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("show method invoked with action keys", () => {
|
||||||
|
it("marks the isHidden property as false", () => {
|
||||||
|
let actionKey = 'test-action-object-path';
|
||||||
|
|
||||||
|
actionCollection.hide([actionKey]);
|
||||||
|
|
||||||
|
let actionsObject = actionCollection.getActionsObject();
|
||||||
|
let action = actionsObject[actionKey];
|
||||||
|
|
||||||
|
expect(action.isHidden).toBeTrue();
|
||||||
|
|
||||||
|
actionCollection.show([actionKey]);
|
||||||
|
actionsObject = actionCollection.getActionsObject();
|
||||||
|
action = actionsObject[actionKey];
|
||||||
|
|
||||||
|
expect(action.isHidden).toBeFalse();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("getVisibleActions method", () => {
|
||||||
|
it("returns an array of non hidden actions", () => {
|
||||||
|
let action1Key = 'test-action-object-path';
|
||||||
|
let action2Key = 'test-action-view';
|
||||||
|
|
||||||
|
actionCollection.hide([action1Key]);
|
||||||
|
|
||||||
|
let visibleActions = actionCollection.getVisibleActions();
|
||||||
|
|
||||||
|
expect(Array.isArray(visibleActions)).toBeTrue();
|
||||||
|
expect(visibleActions.length).toEqual(1);
|
||||||
|
expect(visibleActions[0].key).toEqual(action2Key);
|
||||||
|
|
||||||
|
actionCollection.show([action1Key]);
|
||||||
|
visibleActions = actionCollection.getVisibleActions();
|
||||||
|
|
||||||
|
expect(visibleActions.length).toEqual(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("getStatusBarActions method", () => {
|
||||||
|
it("returns an array of non disabled, non hidden statusBar actions", () => {
|
||||||
|
let action2Key = 'test-action-view';
|
||||||
|
|
||||||
|
let statusBarActions = actionCollection.getStatusBarActions();
|
||||||
|
|
||||||
|
expect(Array.isArray(statusBarActions)).toBeTrue();
|
||||||
|
expect(statusBarActions.length).toEqual(1);
|
||||||
|
expect(statusBarActions[0].key).toEqual(action2Key);
|
||||||
|
|
||||||
|
actionCollection.disable([action2Key]);
|
||||||
|
statusBarActions = actionCollection.getStatusBarActions();
|
||||||
|
|
||||||
|
expect(statusBarActions.length).toEqual(0);
|
||||||
|
|
||||||
|
actionCollection.enable([action2Key]);
|
||||||
|
statusBarActions = actionCollection.getStatusBarActions();
|
||||||
|
|
||||||
|
expect(statusBarActions.length).toEqual(1);
|
||||||
|
expect(statusBarActions[0].key).toEqual(action2Key);
|
||||||
|
|
||||||
|
actionCollection.hide([action2Key]);
|
||||||
|
statusBarActions = actionCollection.getStatusBarActions();
|
||||||
|
|
||||||
|
expect(statusBarActions.length).toEqual(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -22,22 +22,41 @@
|
|||||||
|
|
||||||
import ActionsAPI from './ActionsAPI';
|
import ActionsAPI from './ActionsAPI';
|
||||||
import { createOpenMct, resetApplicationState } from '../../utils/testing';
|
import { createOpenMct, resetApplicationState } from '../../utils/testing';
|
||||||
|
import ActionCollection from './ActionCollection';
|
||||||
|
|
||||||
describe('The Actions API', () => {
|
describe('The Actions API', () => {
|
||||||
let openmct;
|
let openmct;
|
||||||
let actionsAPI;
|
let actionsAPI;
|
||||||
let mockAction;
|
let mockAction;
|
||||||
let mockObjectPath;
|
let mockObjectPath;
|
||||||
|
let mockObjectPathAction;
|
||||||
let mockViewContext1;
|
let mockViewContext1;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
openmct = createOpenMct();
|
openmct = createOpenMct();
|
||||||
actionsAPI = new ActionsAPI(openmct);
|
actionsAPI = new ActionsAPI(openmct);
|
||||||
|
mockObjectPathAction = {
|
||||||
|
name: 'Test Action Object Path',
|
||||||
|
key: 'test-action-object-path',
|
||||||
|
cssClass: 'test-action-object-path',
|
||||||
|
description: 'This is a test action for object path',
|
||||||
|
group: 'action',
|
||||||
|
priority: 9,
|
||||||
|
appliesTo: (objectPath) => {
|
||||||
|
if (objectPath.length) {
|
||||||
|
return objectPath[0].type === 'fake-folder';
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
invoke: () => {
|
||||||
|
}
|
||||||
|
};
|
||||||
mockAction = {
|
mockAction = {
|
||||||
name: 'Test Action',
|
name: 'Test Action View',
|
||||||
key: 'test-action',
|
key: 'test-action-view',
|
||||||
cssClass: 'test-action',
|
cssClass: 'test-action-view',
|
||||||
description: 'This is a test action',
|
description: 'This is a test action for view',
|
||||||
group: 'action',
|
group: 'action',
|
||||||
priority: 9,
|
priority: 9,
|
||||||
appliesTo: (objectPath, view = {}) => {
|
appliesTo: (objectPath, view = {}) => {
|
||||||
@@ -45,8 +64,6 @@ describe('The Actions API', () => {
|
|||||||
let viewContext = view.getViewContext();
|
let viewContext = view.getViewContext();
|
||||||
|
|
||||||
return viewContext.onlyAppliesToTestCase;
|
return viewContext.onlyAppliesToTestCase;
|
||||||
} else if (objectPath.length) {
|
|
||||||
return objectPath[0].type === 'fake-folder';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -100,9 +117,32 @@ describe('The Actions API', () => {
|
|||||||
describe("get method", () => {
|
describe("get method", () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
actionsAPI.register(mockAction);
|
actionsAPI.register(mockAction);
|
||||||
|
actionsAPI.register(mockObjectPathAction);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("returns an object with relevant actions when invoked with objectPath only", () => {
|
it("returns an ActionCollection when invoked with an objectPath only", () => {
|
||||||
|
let actionCollection = actionsAPI.get(mockObjectPath);
|
||||||
|
let instanceOfActionCollection = actionCollection instanceof ActionCollection;
|
||||||
|
|
||||||
|
expect(instanceOfActionCollection).toBeTrue();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns an ActionCollection when invoked with an objectPath and view", () => {
|
||||||
|
let actionCollection = actionsAPI.get(mockObjectPath, mockViewContext1);
|
||||||
|
let instanceOfActionCollection = actionCollection instanceof ActionCollection;
|
||||||
|
|
||||||
|
expect(instanceOfActionCollection).toBeTrue();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns relevant actions when invoked with objectPath only", () => {
|
||||||
|
let actionCollection = actionsAPI.get(mockObjectPath);
|
||||||
|
let action = actionCollection.getActionsObject()[mockObjectPathAction.key];
|
||||||
|
|
||||||
|
expect(action.key).toEqual(mockObjectPathAction.key);
|
||||||
|
expect(action.name).toEqual(mockObjectPathAction.name);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns relevant actions when invoked with objectPath and view", () => {
|
||||||
let actionCollection = actionsAPI.get(mockObjectPath, mockViewContext1);
|
let actionCollection = actionsAPI.get(mockObjectPath, mockViewContext1);
|
||||||
let action = actionCollection.getActionsObject()[mockAction.key];
|
let action = actionCollection.getActionsObject()[mockAction.key];
|
||||||
|
|
||||||
|
|||||||
@@ -60,6 +60,17 @@ define([
|
|||||||
};
|
};
|
||||||
this.onProviderAdd = this.onProviderAdd.bind(this);
|
this.onProviderAdd = this.onProviderAdd.bind(this);
|
||||||
this.onProviderRemove = this.onProviderRemove.bind(this);
|
this.onProviderRemove = this.onProviderRemove.bind(this);
|
||||||
|
this.mutables = {};
|
||||||
|
|
||||||
|
if (this.domainObject.isMutable) {
|
||||||
|
this.returnMutables = true;
|
||||||
|
let unobserve = this.domainObject.$on('$_destroy', () => {
|
||||||
|
Object.values(this.mutables).forEach(mutable => {
|
||||||
|
this.publicAPI.objects.destroyMutable(mutable);
|
||||||
|
});
|
||||||
|
unobserve();
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -75,10 +86,6 @@ define([
|
|||||||
throw new Error('Event not supported by composition: ' + event);
|
throw new Error('Event not supported by composition: ' + event);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.mutationListener) {
|
|
||||||
this._synchronize();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.provider.on && this.provider.off) {
|
if (this.provider.on && this.provider.off) {
|
||||||
if (event === 'add') {
|
if (event === 'add') {
|
||||||
this.provider.on(
|
this.provider.on(
|
||||||
@@ -189,6 +196,13 @@ define([
|
|||||||
|
|
||||||
this.provider.add(this.domainObject, child.identifier);
|
this.provider.add(this.domainObject, child.identifier);
|
||||||
} else {
|
} else {
|
||||||
|
if (this.returnMutables && this.publicAPI.objects.supportsMutation(child.identifier)) {
|
||||||
|
let keyString = this.publicAPI.objects.makeKeyString(child.identifier);
|
||||||
|
|
||||||
|
child = this.publicAPI.objects._toMutable(child);
|
||||||
|
this.mutables[keyString] = child;
|
||||||
|
}
|
||||||
|
|
||||||
this.emit('add', child);
|
this.emit('add', child);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -202,6 +216,8 @@ define([
|
|||||||
* @name load
|
* @name load
|
||||||
*/
|
*/
|
||||||
CompositionCollection.prototype.load = function () {
|
CompositionCollection.prototype.load = function () {
|
||||||
|
this.cleanUpMutables();
|
||||||
|
|
||||||
return this.provider.load(this.domainObject)
|
return this.provider.load(this.domainObject)
|
||||||
.then(function (children) {
|
.then(function (children) {
|
||||||
return Promise.all(children.map((c) => this.publicAPI.objects.get(c)));
|
return Promise.all(children.map((c) => this.publicAPI.objects.get(c)));
|
||||||
@@ -234,6 +250,14 @@ define([
|
|||||||
if (!skipMutate) {
|
if (!skipMutate) {
|
||||||
this.provider.remove(this.domainObject, child.identifier);
|
this.provider.remove(this.domainObject, child.identifier);
|
||||||
} else {
|
} else {
|
||||||
|
if (this.returnMutables) {
|
||||||
|
let keyString = this.publicAPI.objects.makeKeyString(child);
|
||||||
|
if (this.mutables[keyString] !== undefined && this.mutables[keyString].isMutable) {
|
||||||
|
this.publicAPI.objects.destroyMutable(this.mutables[keyString]);
|
||||||
|
delete this.mutables[keyString];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
this.emit('remove', child);
|
this.emit('remove', child);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -281,12 +305,6 @@ define([
|
|||||||
this.remove(child, true);
|
this.remove(child, true);
|
||||||
};
|
};
|
||||||
|
|
||||||
CompositionCollection.prototype._synchronize = function () {
|
|
||||||
this.mutationListener = this.publicAPI.objects.observe(this.domainObject, '*', (newDomainObject) => {
|
|
||||||
this.domainObject = JSON.parse(JSON.stringify(newDomainObject));
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
CompositionCollection.prototype._destroy = function () {
|
CompositionCollection.prototype._destroy = function () {
|
||||||
if (this.mutationListener) {
|
if (this.mutationListener) {
|
||||||
this.mutationListener();
|
this.mutationListener();
|
||||||
@@ -308,5 +326,11 @@ define([
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
CompositionCollection.prototype.cleanUpMutables = function () {
|
||||||
|
Object.values(this.mutables).forEach(mutable => {
|
||||||
|
this.publicAPI.objects.destroyMutable(mutable);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
return CompositionCollection;
|
return CompositionCollection;
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ class MenuAPI {
|
|||||||
this._showObjectMenu = this._showObjectMenu.bind(this);
|
this._showObjectMenu = this._showObjectMenu.bind(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
showMenu(x, y, actions) {
|
showMenu(x, y, actions, onDestroy) {
|
||||||
if (this.menuComponent) {
|
if (this.menuComponent) {
|
||||||
this.menuComponent.dismiss();
|
this.menuComponent.dismiss();
|
||||||
}
|
}
|
||||||
@@ -46,7 +46,8 @@ class MenuAPI {
|
|||||||
let options = {
|
let options = {
|
||||||
x,
|
x,
|
||||||
y,
|
y,
|
||||||
actions
|
actions,
|
||||||
|
onDestroy
|
||||||
};
|
};
|
||||||
|
|
||||||
this.menuComponent = new Menu(options);
|
this.menuComponent = new Menu(options);
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ describe ('The Menu API', () => {
|
|||||||
let x;
|
let x;
|
||||||
let y;
|
let y;
|
||||||
let result;
|
let result;
|
||||||
|
let onDestroy;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
openmct = createOpenMct();
|
openmct = createOpenMct();
|
||||||
@@ -73,7 +74,9 @@ describe ('The Menu API', () => {
|
|||||||
let vueComponent;
|
let vueComponent;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
menuAPI.showMenu(x, y, actionsArray);
|
onDestroy = jasmine.createSpy('onDestroy');
|
||||||
|
|
||||||
|
menuAPI.showMenu(x, y, actionsArray, onDestroy);
|
||||||
vueComponent = menuAPI.menuComponent.component;
|
vueComponent = menuAPI.menuComponent.component;
|
||||||
menuComponent = document.querySelector(".c-menu");
|
menuComponent = document.querySelector(".c-menu");
|
||||||
|
|
||||||
@@ -120,6 +123,12 @@ describe ('The Menu API', () => {
|
|||||||
|
|
||||||
expect(vueComponent.$destroy).toHaveBeenCalled();
|
expect(vueComponent.$destroy).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("invokes the onDestroy callback if passed in", () => {
|
||||||
|
document.body.click();
|
||||||
|
|
||||||
|
expect(onDestroy).toHaveBeenCalled();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -30,12 +30,12 @@ class Menu extends EventEmitter {
|
|||||||
this.options = options;
|
this.options = options;
|
||||||
|
|
||||||
this.component = new Vue({
|
this.component = new Vue({
|
||||||
provide: {
|
|
||||||
actions: options.actions
|
|
||||||
},
|
|
||||||
components: {
|
components: {
|
||||||
MenuComponent
|
MenuComponent
|
||||||
},
|
},
|
||||||
|
provide: {
|
||||||
|
actions: options.actions
|
||||||
|
},
|
||||||
template: '<menu-component />'
|
template: '<menu-component />'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -75,13 +75,20 @@ export default class NotificationAPI extends EventEmitter {
|
|||||||
* Info notifications are low priority informational messages for the user. They will be auto-destroy after a brief
|
* Info notifications are low priority informational messages for the user. They will be auto-destroy after a brief
|
||||||
* period of time.
|
* period of time.
|
||||||
* @param {string} message The message to display to the user
|
* @param {string} message The message to display to the user
|
||||||
|
* @param {Object} [options] object with following properties
|
||||||
|
* autoDismissTimeout: {number} in miliseconds to automatically dismisses notification
|
||||||
|
* link: {Object} Add a link to notifications for navigation
|
||||||
|
* onClick: callback function
|
||||||
|
* cssClass: css class name to add style on link
|
||||||
|
* text: text to display for link
|
||||||
* @returns {InfoNotification}
|
* @returns {InfoNotification}
|
||||||
*/
|
*/
|
||||||
info(message) {
|
info(message, options = {}) {
|
||||||
let notificationModel = {
|
let notificationModel = {
|
||||||
message: message,
|
message: message,
|
||||||
autoDismiss: true,
|
autoDismiss: true,
|
||||||
severity: "info"
|
severity: "info",
|
||||||
|
options
|
||||||
};
|
};
|
||||||
|
|
||||||
return this._notify(notificationModel);
|
return this._notify(notificationModel);
|
||||||
@@ -90,12 +97,19 @@ export default class NotificationAPI extends EventEmitter {
|
|||||||
/**
|
/**
|
||||||
* Present an alert to the user.
|
* Present an alert to the user.
|
||||||
* @param {string} message The message to display to the user.
|
* @param {string} message The message to display to the user.
|
||||||
|
* @param {Object} [options] object with following properties
|
||||||
|
* autoDismissTimeout: {number} in miliseconds to automatically dismisses notification
|
||||||
|
* link: {Object} Add a link to notifications for navigation
|
||||||
|
* onClick: callback function
|
||||||
|
* cssClass: css class name to add style on link
|
||||||
|
* text: text to display for link
|
||||||
* @returns {Notification}
|
* @returns {Notification}
|
||||||
*/
|
*/
|
||||||
alert(message) {
|
alert(message, options = {}) {
|
||||||
let notificationModel = {
|
let notificationModel = {
|
||||||
message: message,
|
message: message,
|
||||||
severity: "alert"
|
severity: "alert",
|
||||||
|
options
|
||||||
};
|
};
|
||||||
|
|
||||||
return this._notify(notificationModel);
|
return this._notify(notificationModel);
|
||||||
@@ -104,12 +118,19 @@ export default class NotificationAPI extends EventEmitter {
|
|||||||
/**
|
/**
|
||||||
* Present an error message to the user
|
* Present an error message to the user
|
||||||
* @param {string} message
|
* @param {string} message
|
||||||
|
* @param {Object} [options] object with following properties
|
||||||
|
* autoDismissTimeout: {number} in miliseconds to automatically dismisses notification
|
||||||
|
* link: {Object} Add a link to notifications for navigation
|
||||||
|
* onClick: callback function
|
||||||
|
* cssClass: css class name to add style on link
|
||||||
|
* text: text to display for link
|
||||||
* @returns {Notification}
|
* @returns {Notification}
|
||||||
*/
|
*/
|
||||||
error(message) {
|
error(message, options = {}) {
|
||||||
let notificationModel = {
|
let notificationModel = {
|
||||||
message: message,
|
message: message,
|
||||||
severity: "error"
|
severity: "error",
|
||||||
|
options
|
||||||
};
|
};
|
||||||
|
|
||||||
return this._notify(notificationModel);
|
return this._notify(notificationModel);
|
||||||
@@ -325,9 +346,11 @@ export default class NotificationAPI extends EventEmitter {
|
|||||||
this.emit('notification', notification);
|
this.emit('notification', notification);
|
||||||
|
|
||||||
if (notification.model.autoDismiss || this._selectNextNotification()) {
|
if (notification.model.autoDismiss || this._selectNextNotification()) {
|
||||||
|
const autoDismissTimeout = notification.model.options.autoDismissTimeout
|
||||||
|
|| DEFAULT_AUTO_DISMISS_TIMEOUT;
|
||||||
this.activeTimeout = setTimeout(() => {
|
this.activeTimeout = setTimeout(() => {
|
||||||
this._dismissOrMinimize(notification);
|
this._dismissOrMinimize(notification);
|
||||||
}, DEFAULT_AUTO_DISMISS_TIMEOUT);
|
}, autoDismissTimeout);
|
||||||
} else {
|
} else {
|
||||||
delete this.activeTimeout;
|
delete this.activeTimeout;
|
||||||
}
|
}
|
||||||
|
|||||||
154
src/api/notifications/NotificationAPISpec.js
Normal file
154
src/api/notifications/NotificationAPISpec.js
Normal file
@@ -0,0 +1,154 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2020, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
|
import NotificationAPI from './NotificationAPI';
|
||||||
|
|
||||||
|
describe('The Notifiation API', () => {
|
||||||
|
let notificationAPIInstance;
|
||||||
|
let defaultTimeout = 4000;
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
notificationAPIInstance = new NotificationAPI();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('the info method', () => {
|
||||||
|
let message = 'Example Notification Message';
|
||||||
|
let severity = 'info';
|
||||||
|
let notificationModel;
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
notificationModel = notificationAPIInstance.info(message).model;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
notificationAPIInstance.dismissAllNotifications();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows a string message with info severity', () => {
|
||||||
|
expect(notificationModel.message).toEqual(message);
|
||||||
|
expect(notificationModel.severity).toEqual(severity);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('auto dismisses the notification after a brief timeout', (done) => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
expect(notificationAPIInstance.notifications.length).toEqual(0);
|
||||||
|
done();
|
||||||
|
}, defaultTimeout);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('the alert method', () => {
|
||||||
|
let message = 'Example alert message';
|
||||||
|
let severity = 'alert';
|
||||||
|
let notificationModel;
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
notificationModel = notificationAPIInstance.alert(message).model;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
notificationAPIInstance.dismissAllNotifications();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows a string message, with alert severity', () => {
|
||||||
|
expect(notificationModel.message).toEqual(message);
|
||||||
|
expect(notificationModel.severity).toEqual(severity);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not auto dismiss the notification', (done) => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
expect(notificationAPIInstance.notifications.length).toEqual(1);
|
||||||
|
done();
|
||||||
|
}, defaultTimeout);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('the error method', () => {
|
||||||
|
let message = 'Example error message';
|
||||||
|
let severity = 'error';
|
||||||
|
let notificationModel;
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
notificationModel = notificationAPIInstance.error(message).model;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
notificationAPIInstance.dismissAllNotifications();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows a string message, with severity error', () => {
|
||||||
|
expect(notificationModel.message).toEqual(message);
|
||||||
|
expect(notificationModel.severity).toEqual(severity);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not auto dismiss the notification', (done) => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
expect(notificationAPIInstance.notifications.length).toEqual(1);
|
||||||
|
done();
|
||||||
|
}, defaultTimeout);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('the progress method', () => {
|
||||||
|
let title = 'This is a progress notification';
|
||||||
|
let message1 = 'Example progress message 1';
|
||||||
|
let message2 = 'Example progress message 2';
|
||||||
|
let percentage1 = 50;
|
||||||
|
let percentage2 = 99.9;
|
||||||
|
let severity = 'info';
|
||||||
|
let notification;
|
||||||
|
let updatedPercentage;
|
||||||
|
let updatedMessage;
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
notification = notificationAPIInstance.progress(title, percentage1, message1);
|
||||||
|
notification.on('progress', (percentage, text) => {
|
||||||
|
updatedPercentage = percentage;
|
||||||
|
updatedMessage = text;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
notificationAPIInstance.dismissAllNotifications();
|
||||||
|
});
|
||||||
|
|
||||||
|
it ('shows a notification with a message, progress message, percentage and info severity', () => {
|
||||||
|
expect(notification.model.message).toEqual(title);
|
||||||
|
expect(notification.model.severity).toEqual(severity);
|
||||||
|
expect(notification.model.progressText).toEqual(message1);
|
||||||
|
expect(notification.model.progressPerc).toEqual(percentage1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it ('allows dynamically updating the progress attributes', () => {
|
||||||
|
notification.progress(percentage2, message2);
|
||||||
|
|
||||||
|
expect(updatedPercentage).toEqual(percentage2);
|
||||||
|
expect(updatedMessage).toEqual(message2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it ('allows dynamically dismissing of progress notification', () => {
|
||||||
|
notification.dismiss();
|
||||||
|
|
||||||
|
expect(notificationAPIInstance.notifications.length).toEqual(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
66
src/api/objects/InterceptorRegistry.js
Normal file
66
src/api/objects/InterceptorRegistry.js
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2020, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
export default class InterceptorRegistry {
|
||||||
|
/**
|
||||||
|
* A InterceptorRegistry maintains the definitions for different interceptors that may be invoked on domain objects.
|
||||||
|
* @interface InterceptorRegistry
|
||||||
|
* @memberof module:openmct
|
||||||
|
*/
|
||||||
|
constructor() {
|
||||||
|
this.interceptors = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @interface InterceptorDef
|
||||||
|
* @property {function} appliesTo function that determines if this interceptor should be called for the given identifier/object
|
||||||
|
* @property {function} invoke function that transforms the provided domain object and returns the transformed domain object
|
||||||
|
* @property {function} priority the priority for this interceptor. A higher number returned has more weight than a lower number
|
||||||
|
* @memberof module:openmct InterceptorRegistry#
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register a new object interceptor.
|
||||||
|
*
|
||||||
|
* @param {module:openmct.InterceptorDef} interceptorDef the interceptor to add
|
||||||
|
* @method addInterceptor
|
||||||
|
* @memberof module:openmct.InterceptorRegistry#
|
||||||
|
*/
|
||||||
|
addInterceptor(interceptorDef) {
|
||||||
|
//TODO: sort by priority
|
||||||
|
this.interceptors.push(interceptorDef);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve all interceptors applicable to a domain object.
|
||||||
|
* @method getInterceptors
|
||||||
|
* @returns [module:openmct.InterceptorDef] the registered interceptors for this identifier/object
|
||||||
|
* @memberof module:openmct.InterceptorRegistry#
|
||||||
|
*/
|
||||||
|
getInterceptors(identifier, object) {
|
||||||
|
return this.interceptors.filter(interceptor => {
|
||||||
|
return typeof interceptor.appliesTo === 'function'
|
||||||
|
&& interceptor.appliesTo(identifier, object);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
0
src/api/objects/InterceptorRegistrySpec.js
Normal file
0
src/api/objects/InterceptorRegistrySpec.js
Normal file
147
src/api/objects/MutableDomainObject.js
Normal file
147
src/api/objects/MutableDomainObject.js
Normal file
@@ -0,0 +1,147 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2020, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
import _ from 'lodash';
|
||||||
|
import utils from './object-utils.js';
|
||||||
|
import EventEmitter from 'EventEmitter';
|
||||||
|
|
||||||
|
const ANY_OBJECT_EVENT = 'mutation';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Wraps a domain object to keep its model synchronized with other instances of the same object.
|
||||||
|
*
|
||||||
|
* Creating a MutableDomainObject will automatically register listeners to keep its model in sync. As such, developers
|
||||||
|
* should be careful to destroy MutableDomainObject in order to avoid memory leaks.
|
||||||
|
*
|
||||||
|
* All Open MCT API functions that provide objects will provide MutableDomainObjects where possible, except
|
||||||
|
* `openmct.objects.get()`, and will manage that object's lifecycle for you. Calling `openmct.objects.getMutable()`
|
||||||
|
* will result in the creation of a new MutableDomainObject and you will be responsible for destroying it
|
||||||
|
* (via openmct.objects.destroy) when you're done with it.
|
||||||
|
*
|
||||||
|
* @typedef MutableDomainObject
|
||||||
|
* @memberof module:openmct
|
||||||
|
*/
|
||||||
|
class MutableDomainObject {
|
||||||
|
constructor(eventEmitter) {
|
||||||
|
Object.defineProperties(this, {
|
||||||
|
_globalEventEmitter: {
|
||||||
|
value: eventEmitter,
|
||||||
|
// Property should not be serialized
|
||||||
|
enumerable: false
|
||||||
|
},
|
||||||
|
_instanceEventEmitter: {
|
||||||
|
value: new EventEmitter(),
|
||||||
|
// Property should not be serialized
|
||||||
|
enumerable: false
|
||||||
|
},
|
||||||
|
_observers: {
|
||||||
|
value: [],
|
||||||
|
// Property should not be serialized
|
||||||
|
enumerable: false
|
||||||
|
},
|
||||||
|
isMutable: {
|
||||||
|
value: true,
|
||||||
|
// Property should not be serialized
|
||||||
|
enumerable: false
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
$observe(path, callback) {
|
||||||
|
let fullPath = qualifiedEventName(this, path);
|
||||||
|
let eventOff =
|
||||||
|
this._globalEventEmitter.off.bind(this._globalEventEmitter, fullPath, callback);
|
||||||
|
|
||||||
|
this._globalEventEmitter.on(fullPath, callback);
|
||||||
|
this._observers.push(eventOff);
|
||||||
|
|
||||||
|
return eventOff;
|
||||||
|
}
|
||||||
|
$set(path, value) {
|
||||||
|
_.set(this, path, value);
|
||||||
|
_.set(this, 'modified', Date.now());
|
||||||
|
|
||||||
|
//Emit secret synchronization event first, so that all objects are in sync before subsequent events fired.
|
||||||
|
this._globalEventEmitter.emit(qualifiedEventName(this, '$_synchronize_model'), this);
|
||||||
|
|
||||||
|
//Emit a general "any object" event
|
||||||
|
this._globalEventEmitter.emit(ANY_OBJECT_EVENT, this);
|
||||||
|
//Emit wildcard event, with path so that callback knows what changed
|
||||||
|
this._globalEventEmitter.emit(qualifiedEventName(this, '*'), this, path, value);
|
||||||
|
|
||||||
|
//Emit events specific to properties affected
|
||||||
|
let parentPropertiesList = path.split('.');
|
||||||
|
for (let index = parentPropertiesList.length; index > 0; index--) {
|
||||||
|
let parentPropertyPath = parentPropertiesList.slice(0, index).join('.');
|
||||||
|
this._globalEventEmitter.emit(qualifiedEventName(this, parentPropertyPath), _.get(this, parentPropertyPath));
|
||||||
|
}
|
||||||
|
|
||||||
|
//TODO: Emit events for listeners of child properties when parent changes.
|
||||||
|
// Do it at observer time - also register observers for parent attribute path.
|
||||||
|
}
|
||||||
|
|
||||||
|
$refresh(model) {
|
||||||
|
//TODO: Currently we are updating the entire object.
|
||||||
|
// In the future we could update a specific property of the object using the 'path' parameter.
|
||||||
|
this._globalEventEmitter.emit(qualifiedEventName(this, '$_synchronize_model'), model);
|
||||||
|
|
||||||
|
//Emit wildcard event, with path so that callback knows what changed
|
||||||
|
this._globalEventEmitter.emit(qualifiedEventName(this, '*'), this);
|
||||||
|
}
|
||||||
|
|
||||||
|
$on(event, callback) {
|
||||||
|
this._instanceEventEmitter.on(event, callback);
|
||||||
|
|
||||||
|
return () => this._instanceEventEmitter.off(event, callback);
|
||||||
|
}
|
||||||
|
$destroy() {
|
||||||
|
this._observers.forEach(observer => observer());
|
||||||
|
delete this._globalEventEmitter;
|
||||||
|
delete this._observers;
|
||||||
|
this._instanceEventEmitter.emit('$_destroy');
|
||||||
|
}
|
||||||
|
|
||||||
|
static createMutable(object, mutationTopic) {
|
||||||
|
let mutable = Object.create(new MutableDomainObject(mutationTopic));
|
||||||
|
Object.assign(mutable, object);
|
||||||
|
|
||||||
|
mutable.$observe('$_synchronize_model', (updatedObject) => {
|
||||||
|
let clone = JSON.parse(JSON.stringify(updatedObject));
|
||||||
|
let deleted = _.difference(Object.keys(mutable), Object.keys(updatedObject));
|
||||||
|
deleted.forEach((propertyName) => delete mutable[propertyName]);
|
||||||
|
Object.assign(mutable, clone);
|
||||||
|
});
|
||||||
|
|
||||||
|
return mutable;
|
||||||
|
}
|
||||||
|
|
||||||
|
static mutateObject(object, path, value) {
|
||||||
|
_.set(object, path, value);
|
||||||
|
_.set(object, 'modified', Date.now());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function qualifiedEventName(object, eventName) {
|
||||||
|
let keystring = utils.makeKeyString(object.identifier);
|
||||||
|
|
||||||
|
return [keystring, eventName].join(':');
|
||||||
|
}
|
||||||
|
|
||||||
|
export default MutableDomainObject;
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
/*****************************************************************************
|
|
||||||
* Open MCT, Copyright (c) 2014-2020, 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([
|
|
||||||
'objectUtils',
|
|
||||||
'lodash'
|
|
||||||
], function (
|
|
||||||
utils,
|
|
||||||
_
|
|
||||||
) {
|
|
||||||
const ANY_OBJECT_EVENT = "mutation";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The MutableObject wraps a DomainObject and provides getters and
|
|
||||||
* setters for
|
|
||||||
* @param eventEmitter
|
|
||||||
* @param object
|
|
||||||
* @interface MutableObject
|
|
||||||
*/
|
|
||||||
function MutableObject(eventEmitter, object) {
|
|
||||||
this.eventEmitter = eventEmitter;
|
|
||||||
this.object = object;
|
|
||||||
this.unlisteners = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
function qualifiedEventName(object, eventName) {
|
|
||||||
const keystring = utils.makeKeyString(object.identifier);
|
|
||||||
|
|
||||||
return [keystring, eventName].join(':');
|
|
||||||
}
|
|
||||||
|
|
||||||
MutableObject.prototype.stopListening = function () {
|
|
||||||
this.unlisteners.forEach(function (unlisten) {
|
|
||||||
unlisten();
|
|
||||||
});
|
|
||||||
this.unlisteners = [];
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Observe changes to this domain object.
|
|
||||||
* @param {string} path the property to observe
|
|
||||||
* @param {Function} callback a callback to invoke when new values for
|
|
||||||
* this property are observed
|
|
||||||
* @method on
|
|
||||||
* @memberof module:openmct.MutableObject#
|
|
||||||
*/
|
|
||||||
MutableObject.prototype.on = function (path, callback) {
|
|
||||||
const fullPath = qualifiedEventName(this.object, path);
|
|
||||||
const eventOff =
|
|
||||||
this.eventEmitter.off.bind(this.eventEmitter, fullPath, callback);
|
|
||||||
|
|
||||||
this.eventEmitter.on(fullPath, callback);
|
|
||||||
this.unlisteners.push(eventOff);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Modify this domain object.
|
|
||||||
* @param {string} path the property to modify
|
|
||||||
* @param {*} value the new value for this property
|
|
||||||
* @method set
|
|
||||||
* @memberof module:openmct.MutableObject#
|
|
||||||
*/
|
|
||||||
MutableObject.prototype.set = function (path, value) {
|
|
||||||
_.set(this.object, path, value);
|
|
||||||
_.set(this.object, 'modified', Date.now());
|
|
||||||
|
|
||||||
const handleRecursiveMutation = function (newObject) {
|
|
||||||
this.object = newObject;
|
|
||||||
}.bind(this);
|
|
||||||
|
|
||||||
//Emit wildcard event
|
|
||||||
this.eventEmitter.emit(qualifiedEventName(this.object, '*'), this.object);
|
|
||||||
//Emit a general "any object" event
|
|
||||||
this.eventEmitter.emit(ANY_OBJECT_EVENT, this.object);
|
|
||||||
|
|
||||||
this.eventEmitter.on(qualifiedEventName(this.object, '*'), handleRecursiveMutation);
|
|
||||||
//Emit event specific to property
|
|
||||||
this.eventEmitter.emit(qualifiedEventName(this.object, path), value);
|
|
||||||
this.eventEmitter.off(qualifiedEventName(this.object, '*'), handleRecursiveMutation);
|
|
||||||
};
|
|
||||||
|
|
||||||
return MutableObject;
|
|
||||||
});
|
|
||||||
@@ -20,337 +20,508 @@
|
|||||||
* at runtime from the About dialog for additional information.
|
* at runtime from the About dialog for additional information.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
define([
|
import utils from 'objectUtils';
|
||||||
'lodash',
|
import MutableDomainObject from './MutableDomainObject';
|
||||||
'objectUtils',
|
import RootRegistry from './RootRegistry';
|
||||||
'./MutableObject',
|
import RootObjectProvider from './RootObjectProvider';
|
||||||
'./RootRegistry',
|
import EventEmitter from 'EventEmitter';
|
||||||
'./RootObjectProvider',
|
import InterceptorRegistry from './InterceptorRegistry';
|
||||||
'EventEmitter'
|
|
||||||
], function (
|
|
||||||
_,
|
|
||||||
utils,
|
|
||||||
MutableObject,
|
|
||||||
RootRegistry,
|
|
||||||
RootObjectProvider,
|
|
||||||
EventEmitter
|
|
||||||
) {
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utilities for loading, saving, and manipulating domain objects.
|
* Utilities for loading, saving, and manipulating domain objects.
|
||||||
* @interface ObjectAPI
|
* @interface ObjectAPI
|
||||||
* @memberof module:openmct
|
* @memberof module:openmct
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function ObjectAPI() {
|
function ObjectAPI(typeRegistry, openmct) {
|
||||||
this.eventEmitter = new EventEmitter();
|
this.typeRegistry = typeRegistry;
|
||||||
this.providers = {};
|
this.eventEmitter = new EventEmitter();
|
||||||
this.rootRegistry = new RootRegistry();
|
this.providers = {};
|
||||||
this.rootProvider = new RootObjectProvider.default(this.rootRegistry);
|
this.rootRegistry = new RootRegistry();
|
||||||
this.cache = {};
|
this.injectIdentifierService = function () {
|
||||||
|
this.identifierService = openmct.$injector.get("identifierService");
|
||||||
|
};
|
||||||
|
|
||||||
|
this.rootProvider = new RootObjectProvider(this.rootRegistry);
|
||||||
|
this.cache = {};
|
||||||
|
this.interceptorRegistry = new InterceptorRegistry();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set fallback provider, this is an internal API for legacy reasons.
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.supersecretSetFallbackProvider = function (p) {
|
||||||
|
this.fallbackProvider = p;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.getIdentifierService = function () {
|
||||||
|
// Lazily acquire identifier service
|
||||||
|
if (!this.identifierService) {
|
||||||
|
this.injectIdentifierService();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
return this.identifierService;
|
||||||
* Set fallback provider, this is an internal API for legacy reasons.
|
};
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
ObjectAPI.prototype.supersecretSetFallbackProvider = function (p) {
|
|
||||||
this.fallbackProvider = p;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve the provider for a given identifier.
|
* Retrieve the provider for a given identifier.
|
||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
ObjectAPI.prototype.getProvider = function (identifier) {
|
ObjectAPI.prototype.getProvider = function (identifier) {
|
||||||
if (identifier.key === 'ROOT') {
|
//handles the '' vs 'mct' namespace issue
|
||||||
return this.rootProvider;
|
const keyString = utils.makeKeyString(identifier);
|
||||||
}
|
const identifierService = this.getIdentifierService();
|
||||||
|
const namespace = identifierService.parse(keyString).getSpace();
|
||||||
|
|
||||||
return this.providers[identifier.namespace] || this.fallbackProvider;
|
if (identifier.key === 'ROOT') {
|
||||||
};
|
return this.rootProvider;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
return this.providers[namespace] || this.fallbackProvider;
|
||||||
* Get the root-level object.
|
};
|
||||||
* @returns {Promise.<DomainObject>} a promise for the root object
|
|
||||||
*/
|
|
||||||
ObjectAPI.prototype.getRoot = function () {
|
|
||||||
return this.rootProvider.get();
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Register a new object provider for a particular namespace.
|
* Get the root-level object.
|
||||||
*
|
* @returns {Promise.<DomainObject>} a promise for the root object
|
||||||
* @param {string} namespace the namespace for which to provide objects
|
*/
|
||||||
* @param {module:openmct.ObjectProvider} provider the provider which
|
ObjectAPI.prototype.getRoot = function () {
|
||||||
* will handle loading domain objects from this namespace
|
return this.rootProvider.get();
|
||||||
* @memberof {module:openmct.ObjectAPI#}
|
};
|
||||||
* @name addProvider
|
|
||||||
*/
|
|
||||||
ObjectAPI.prototype.addProvider = function (namespace, provider) {
|
|
||||||
this.providers[namespace] = provider;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides the ability to read, write, and delete domain objects.
|
* Register a new object provider for a particular namespace.
|
||||||
*
|
*
|
||||||
* When registering a new object provider, all methods on this interface
|
* @param {string} namespace the namespace for which to provide objects
|
||||||
* are optional.
|
* @param {module:openmct.ObjectProvider} provider the provider which
|
||||||
*
|
* will handle loading domain objects from this namespace
|
||||||
* @interface ObjectProvider
|
* @memberof {module:openmct.ObjectAPI#}
|
||||||
* @memberof module:openmct
|
* @name addProvider
|
||||||
*/
|
*/
|
||||||
|
ObjectAPI.prototype.addProvider = function (namespace, provider) {
|
||||||
|
this.providers[namespace] = provider;
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create the given domain object in the corresponding persistence store
|
* Provides the ability to read, write, and delete domain objects.
|
||||||
*
|
*
|
||||||
* @method create
|
* When registering a new object provider, all methods on this interface
|
||||||
* @memberof module:openmct.ObjectProvider#
|
* are optional.
|
||||||
* @param {module:openmct.DomainObject} domainObject the domain object to
|
*
|
||||||
* create
|
* @interface ObjectProvider
|
||||||
* @returns {Promise} a promise which will resolve when the domain object
|
* @memberof module:openmct
|
||||||
* has been created, or be rejected if it cannot be saved
|
*/
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update this domain object in its persistence store
|
* Create the given domain object in the corresponding persistence store
|
||||||
*
|
*
|
||||||
* @method update
|
* @method create
|
||||||
* @memberof module:openmct.ObjectProvider#
|
* @memberof module:openmct.ObjectProvider#
|
||||||
* @param {module:openmct.DomainObject} domainObject the domain object to
|
* @param {module:openmct.DomainObject} domainObject the domain object to
|
||||||
* update
|
* create
|
||||||
* @returns {Promise} a promise which will resolve when the domain object
|
* @returns {Promise} a promise which will resolve when the domain object
|
||||||
* has been updated, or be rejected if it cannot be saved
|
* has been created, or be rejected if it cannot be saved
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete this domain object.
|
* Update this domain object in its persistence store
|
||||||
*
|
*
|
||||||
* @method delete
|
* @method update
|
||||||
* @memberof module:openmct.ObjectProvider#
|
* @memberof module:openmct.ObjectProvider#
|
||||||
* @param {module:openmct.DomainObject} domainObject the domain object to
|
* @param {module:openmct.DomainObject} domainObject the domain object to
|
||||||
* delete
|
* update
|
||||||
* @returns {Promise} a promise which will resolve when the domain object
|
* @returns {Promise} a promise which will resolve when the domain object
|
||||||
* has been deleted, or be rejected if it cannot be deleted
|
* has been updated, or be rejected if it cannot be saved
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a domain object.
|
* Delete this domain object.
|
||||||
*
|
*
|
||||||
* @method get
|
* @method delete
|
||||||
* @memberof module:openmct.ObjectProvider#
|
* @memberof module:openmct.ObjectProvider#
|
||||||
* @param {string} key the key for the domain object to load
|
* @param {module:openmct.DomainObject} domainObject the domain object to
|
||||||
* @returns {Promise} a promise which will resolve when the domain object
|
* delete
|
||||||
* has been saved, or be rejected if it cannot be saved
|
* @returns {Promise} a promise which will resolve when the domain object
|
||||||
*/
|
* has been deleted, or be rejected if it cannot be deleted
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a domain object.
|
* Get a domain object.
|
||||||
*
|
*
|
||||||
* @method get
|
* @method get
|
||||||
* @memberof module:openmct.ObjectAPI#
|
* @memberof module:openmct.ObjectProvider#
|
||||||
* @param {module:openmct.ObjectAPI~Identifier} identifier
|
* @param {string} key the key for the domain object to load
|
||||||
* the identifier for the domain object to load
|
* @param {AbortController.signal} abortSignal (optional) signal to abort fetch requests
|
||||||
* @returns {Promise} a promise which will resolve when the domain object
|
* @returns {Promise} a promise which will resolve when the domain object
|
||||||
* has been saved, or be rejected if it cannot be saved
|
* has been saved, or be rejected if it cannot be saved
|
||||||
*/
|
*/
|
||||||
ObjectAPI.prototype.get = function (identifier) {
|
|
||||||
let keystring = this.makeKeyString(identifier);
|
|
||||||
if (this.cache[keystring] !== undefined) {
|
|
||||||
return this.cache[keystring];
|
|
||||||
}
|
|
||||||
|
|
||||||
identifier = utils.parseKeyString(identifier);
|
ObjectAPI.prototype.get = function (identifier, abortSignal) {
|
||||||
const provider = this.getProvider(identifier);
|
let keystring = this.makeKeyString(identifier);
|
||||||
|
if (this.cache[keystring] !== undefined) {
|
||||||
|
return this.cache[keystring];
|
||||||
|
}
|
||||||
|
|
||||||
if (!provider) {
|
identifier = utils.parseKeyString(identifier);
|
||||||
throw new Error('No Provider Matched');
|
const provider = this.getProvider(identifier);
|
||||||
}
|
|
||||||
|
|
||||||
if (!provider.get) {
|
if (!provider) {
|
||||||
throw new Error('Provider does not support get!');
|
throw new Error('No Provider Matched');
|
||||||
}
|
}
|
||||||
|
|
||||||
let objectPromise = provider.get(identifier);
|
if (!provider.get) {
|
||||||
|
throw new Error('Provider does not support get!');
|
||||||
|
}
|
||||||
|
|
||||||
this.cache[keystring] = objectPromise;
|
let objectPromise = provider.get(identifier, abortSignal);
|
||||||
|
this.cache[keystring] = objectPromise;
|
||||||
|
|
||||||
return objectPromise.then(result => {
|
return objectPromise.then(result => {
|
||||||
delete this.cache[keystring];
|
delete this.cache[keystring];
|
||||||
|
result = this.applyGetInterceptors(identifier, result);
|
||||||
return result;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
ObjectAPI.prototype.delete = function () {
|
|
||||||
throw new Error('Delete not implemented');
|
|
||||||
};
|
|
||||||
|
|
||||||
ObjectAPI.prototype.isPersistable = function (domainObject) {
|
|
||||||
let provider = this.getProvider(domainObject.identifier);
|
|
||||||
|
|
||||||
return provider !== undefined
|
|
||||||
&& provider.create !== undefined
|
|
||||||
&& provider.update !== undefined;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save this domain object in its current state. EXPERIMENTAL
|
|
||||||
*
|
|
||||||
* @private
|
|
||||||
* @memberof module:openmct.ObjectAPI#
|
|
||||||
* @param {module:openmct.DomainObject} domainObject the domain object to
|
|
||||||
* save
|
|
||||||
* @returns {Promise} a promise which will resolve when the domain object
|
|
||||||
* has been saved, or be rejected if it cannot be saved
|
|
||||||
*/
|
|
||||||
ObjectAPI.prototype.save = function (domainObject) {
|
|
||||||
let provider = this.getProvider(domainObject.identifier);
|
|
||||||
let savedResolve;
|
|
||||||
let result;
|
|
||||||
|
|
||||||
if (!this.isPersistable(domainObject)) {
|
|
||||||
result = Promise.reject('Object provider does not support saving');
|
|
||||||
} else if (hasAlreadyBeenPersisted(domainObject)) {
|
|
||||||
result = Promise.resolve(true);
|
|
||||||
} else {
|
|
||||||
const persistedTime = Date.now();
|
|
||||||
if (domainObject.persisted === undefined) {
|
|
||||||
result = new Promise((resolve) => {
|
|
||||||
savedResolve = resolve;
|
|
||||||
});
|
|
||||||
domainObject.persisted = persistedTime;
|
|
||||||
provider.create(domainObject).then((response) => {
|
|
||||||
this.mutate(domainObject, 'persisted', persistedTime);
|
|
||||||
savedResolve(response);
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
domainObject.persisted = persistedTime;
|
|
||||||
this.mutate(domainObject, 'persisted', persistedTime);
|
|
||||||
result = provider.update(domainObject);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
};
|
});
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a root-level object.
|
* Search for domain objects.
|
||||||
* @param {module:openmct.ObjectAPI~Identifier|function} an array of
|
*
|
||||||
* identifiers for root level objects, or a function that returns a
|
* Object providersSearches and combines results of each object provider search.
|
||||||
* promise for an identifier or an array of root level objects.
|
* Objects without search provided will have been indexed
|
||||||
* @method addRoot
|
* and will be searched using the fallback indexed search.
|
||||||
* @memberof module:openmct.ObjectAPI#
|
* Search results are asynchronous and resolve in parallel.
|
||||||
*/
|
*
|
||||||
ObjectAPI.prototype.addRoot = function (key) {
|
* @method search
|
||||||
this.rootRegistry.addRoot(key);
|
* @memberof module:openmct.ObjectAPI#
|
||||||
};
|
* @param {string} query the term to search for
|
||||||
|
* @param {AbortController.signal} abortSignal (optional) signal to cancel downstream fetch requests
|
||||||
|
* @returns {Array.<Promise.<module:openmct.DomainObject>>}
|
||||||
|
* an array of promises returned from each object provider's search function
|
||||||
|
* each resolving to domain objects matching provided search query and options.
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.search = function (query, abortSignal) {
|
||||||
|
const searchPromises = Object.values(this.providers)
|
||||||
|
.filter(provider => provider.search !== undefined)
|
||||||
|
.map(provider => provider.search(query, abortSignal));
|
||||||
|
|
||||||
/**
|
searchPromises.push(this.fallbackProvider.superSecretFallbackSearch(query, abortSignal)
|
||||||
* Modify a domain object.
|
.then(results => results.hits
|
||||||
* @param {module:openmct.DomainObject} object the object to mutate
|
.map(hit => {
|
||||||
* @param {string} path the property to modify
|
let domainObject = utils.toNewFormat(hit.object.getModel(), hit.object.getId());
|
||||||
* @param {*} value the new value for this property
|
domainObject = this.applyGetInterceptors(domainObject.identifier, domainObject);
|
||||||
* @method mutate
|
|
||||||
* @memberof module:openmct.ObjectAPI#
|
|
||||||
*/
|
|
||||||
ObjectAPI.prototype.mutate = function (domainObject, path, value) {
|
|
||||||
const mutableObject =
|
|
||||||
new MutableObject(this.eventEmitter, domainObject);
|
|
||||||
|
|
||||||
return mutableObject.set(path, value);
|
return domainObject;
|
||||||
};
|
})));
|
||||||
|
|
||||||
/**
|
return searchPromises;
|
||||||
* Observe changes to a domain object.
|
};
|
||||||
* @param {module:openmct.DomainObject} object the object to observe
|
|
||||||
* @param {string} path the property to observe
|
|
||||||
* @param {Function} callback a callback to invoke when new values for
|
|
||||||
* this property are observed
|
|
||||||
* @method observe
|
|
||||||
* @memberof module:openmct.ObjectAPI#
|
|
||||||
*/
|
|
||||||
ObjectAPI.prototype.observe = function (domainObject, path, callback) {
|
|
||||||
const mutableObject =
|
|
||||||
new MutableObject(this.eventEmitter, domainObject);
|
|
||||||
mutableObject.on(path, callback);
|
|
||||||
|
|
||||||
return mutableObject.stopListening.bind(mutableObject);
|
/**
|
||||||
};
|
* Will fetch object for the given identifier, returning a version of the object that will automatically keep
|
||||||
|
* itself updated as it is mutated. Before using this function, you should ask yourself whether you really need it.
|
||||||
/**
|
* The platform will provide mutable objects to views automatically if the underlying object can be mutated. The
|
||||||
* @param {module:openmct.ObjectAPI~Identifier} identifier
|
* platform will manage the lifecycle of any mutable objects that it provides. If you use `getMutable` you are
|
||||||
* @returns {string} A string representation of the given identifier, including namespace and key
|
* committing to managing that lifecycle yourself. `.destroy` should be called when the object is no longer needed.
|
||||||
*/
|
*
|
||||||
ObjectAPI.prototype.makeKeyString = function (identifier) {
|
* @memberof {module:openmct.ObjectAPI#}
|
||||||
return utils.makeKeyString(identifier);
|
* @returns {Promise.<MutableDomainObject>} a promise that will resolve with a MutableDomainObject if
|
||||||
};
|
* the object can be mutated.
|
||||||
|
*/
|
||||||
/**
|
ObjectAPI.prototype.getMutable = function (identifier) {
|
||||||
* Given any number of identifiers, will return true if they are all equal, otherwise false.
|
if (!this.supportsMutation(identifier)) {
|
||||||
* @param {module:openmct.ObjectAPI~Identifier[]} identifiers
|
throw new Error(`Object "${this.makeKeyString(identifier)}" does not support mutation.`);
|
||||||
*/
|
|
||||||
ObjectAPI.prototype.areIdsEqual = function (...identifiers) {
|
|
||||||
return identifiers.map(utils.parseKeyString)
|
|
||||||
.every(identifier => {
|
|
||||||
return identifier === identifiers[0]
|
|
||||||
|| (identifier.namespace === identifiers[0].namespace
|
|
||||||
&& identifier.key === identifiers[0].key);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
ObjectAPI.prototype.getOriginalPath = function (identifier, path = []) {
|
|
||||||
return this.get(identifier).then((domainObject) => {
|
|
||||||
path.push(domainObject);
|
|
||||||
let location = domainObject.location;
|
|
||||||
|
|
||||||
if (location) {
|
|
||||||
return this.getOriginalPath(utils.parseKeyString(location), path);
|
|
||||||
} else {
|
|
||||||
return path;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Uniquely identifies a domain object.
|
|
||||||
*
|
|
||||||
* @typedef Identifier
|
|
||||||
* @memberof module:openmct.ObjectAPI~
|
|
||||||
* @property {string} namespace the namespace to/from which this domain
|
|
||||||
* object should be loaded/stored.
|
|
||||||
* @property {string} key a unique identifier for the domain object
|
|
||||||
* within that namespace
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A domain object is an entity of relevance to a user's workflow, that
|
|
||||||
* should appear as a distinct and meaningful object within the user
|
|
||||||
* interface. Examples of domain objects are folders, telemetry sensors,
|
|
||||||
* and so forth.
|
|
||||||
*
|
|
||||||
* A few common properties are defined for domain objects. Beyond these,
|
|
||||||
* individual types of domain objects may add more as they see fit.
|
|
||||||
*
|
|
||||||
* @property {module:openmct.ObjectAPI~Identifier} identifier a key/namespace pair which
|
|
||||||
* uniquely identifies this domain object
|
|
||||||
* @property {string} type the type of domain object
|
|
||||||
* @property {string} name the human-readable name for this domain object
|
|
||||||
* @property {string} [creator] the user name of the creator of this domain
|
|
||||||
* object
|
|
||||||
* @property {number} [modified] the time, in milliseconds since the UNIX
|
|
||||||
* epoch, at which this domain object was last modified
|
|
||||||
* @property {module:openmct.ObjectAPI~Identifier[]} [composition] if
|
|
||||||
* present, this will be used by the default composition provider
|
|
||||||
* to load domain objects
|
|
||||||
* @typedef DomainObject
|
|
||||||
* @memberof module:openmct
|
|
||||||
*/
|
|
||||||
|
|
||||||
function hasAlreadyBeenPersisted(domainObject) {
|
|
||||||
return domainObject.persisted !== undefined
|
|
||||||
&& domainObject.persisted === domainObject.modified;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ObjectAPI;
|
return this.get(identifier).then((object) => {
|
||||||
});
|
return this._toMutable(object);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This function is for cleaning up a mutable domain object when you're done with it.
|
||||||
|
* You only need to use this if you retrieved the object using `getMutable()`. If the object was provided by the
|
||||||
|
* platform (eg. passed into a `view()` function) then the platform is responsible for its lifecycle.
|
||||||
|
* @param {MutableDomainObject} domainObject
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.destroyMutable = function (domainObject) {
|
||||||
|
if (domainObject.isMutable) {
|
||||||
|
return domainObject.$destroy();
|
||||||
|
} else {
|
||||||
|
throw new Error("Attempted to destroy non-mutable domain object");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
ObjectAPI.prototype.delete = function () {
|
||||||
|
throw new Error('Delete not implemented');
|
||||||
|
};
|
||||||
|
|
||||||
|
ObjectAPI.prototype.isPersistable = function (idOrKeyString) {
|
||||||
|
let identifier = utils.parseKeyString(idOrKeyString);
|
||||||
|
let provider = this.getProvider(identifier);
|
||||||
|
|
||||||
|
return provider !== undefined
|
||||||
|
&& provider.create !== undefined
|
||||||
|
&& provider.update !== undefined;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Save this domain object in its current state. EXPERIMENTAL
|
||||||
|
*
|
||||||
|
* @private
|
||||||
|
* @memberof module:openmct.ObjectAPI#
|
||||||
|
* @param {module:openmct.DomainObject} domainObject the domain object to
|
||||||
|
* save
|
||||||
|
* @returns {Promise} a promise which will resolve when the domain object
|
||||||
|
* has been saved, or be rejected if it cannot be saved
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.save = function (domainObject) {
|
||||||
|
let provider = this.getProvider(domainObject.identifier);
|
||||||
|
let savedResolve;
|
||||||
|
let result;
|
||||||
|
|
||||||
|
if (!this.isPersistable(domainObject.identifier)) {
|
||||||
|
result = Promise.reject('Object provider does not support saving');
|
||||||
|
} else if (hasAlreadyBeenPersisted(domainObject)) {
|
||||||
|
result = Promise.resolve(true);
|
||||||
|
} else {
|
||||||
|
const persistedTime = Date.now();
|
||||||
|
if (domainObject.persisted === undefined) {
|
||||||
|
result = new Promise((resolve) => {
|
||||||
|
savedResolve = resolve;
|
||||||
|
});
|
||||||
|
domainObject.persisted = persistedTime;
|
||||||
|
provider.create(domainObject).then((response) => {
|
||||||
|
this.mutate(domainObject, 'persisted', persistedTime);
|
||||||
|
savedResolve(response);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
domainObject.persisted = persistedTime;
|
||||||
|
this.mutate(domainObject, 'persisted', persistedTime);
|
||||||
|
result = provider.update(domainObject);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a root-level object.
|
||||||
|
* @param {module:openmct.ObjectAPI~Identifier|function} an array of
|
||||||
|
* identifiers for root level objects, or a function that returns a
|
||||||
|
* promise for an identifier or an array of root level objects.
|
||||||
|
* @method addRoot
|
||||||
|
* @memberof module:openmct.ObjectAPI#
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.addRoot = function (key) {
|
||||||
|
this.rootRegistry.addRoot(key);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register an object interceptor that transforms a domain object requested via module:openmct.ObjectAPI.get
|
||||||
|
* The domain object will be transformed after it is retrieved from the persistence store
|
||||||
|
* The domain object will be transformed only if the interceptor is applicable to that domain object as defined by the InterceptorDef
|
||||||
|
*
|
||||||
|
* @param {module:openmct.InterceptorDef} interceptorDef the interceptor definition to add
|
||||||
|
* @method addGetInterceptor
|
||||||
|
* @memberof module:openmct.InterceptorRegistry#
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.addGetInterceptor = function (interceptorDef) {
|
||||||
|
this.interceptorRegistry.addInterceptor(interceptorDef);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve the interceptors for a given domain object.
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.listGetInterceptors = function (identifier, object) {
|
||||||
|
return this.interceptorRegistry.getInterceptors(identifier, object);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Inovke interceptors if applicable for a given domain object.
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.applyGetInterceptors = function (identifier, domainObject) {
|
||||||
|
const interceptors = this.listGetInterceptors(identifier, domainObject);
|
||||||
|
interceptors.forEach(interceptor => {
|
||||||
|
domainObject = interceptor.invoke(identifier, domainObject);
|
||||||
|
});
|
||||||
|
|
||||||
|
return domainObject;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Modify a domain object.
|
||||||
|
* @param {module:openmct.DomainObject} object the object to mutate
|
||||||
|
* @param {string} path the property to modify
|
||||||
|
* @param {*} value the new value for this property
|
||||||
|
* @method mutate
|
||||||
|
* @memberof module:openmct.ObjectAPI#
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.mutate = function (domainObject, path, value) {
|
||||||
|
if (!this.supportsMutation(domainObject.identifier)) {
|
||||||
|
throw `Error: Attempted to mutate immutable object ${domainObject.name}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (domainObject.isMutable) {
|
||||||
|
domainObject.$set(path, value);
|
||||||
|
} else {
|
||||||
|
//Creating a temporary mutable domain object allows other mutable instances of the
|
||||||
|
//object to be kept in sync.
|
||||||
|
let mutableDomainObject = this._toMutable(domainObject);
|
||||||
|
|
||||||
|
//Mutate original object
|
||||||
|
MutableDomainObject.mutateObject(domainObject, path, value);
|
||||||
|
|
||||||
|
//Mutate temporary mutable object, in the process informing any other mutable instances
|
||||||
|
mutableDomainObject.$set(path, value);
|
||||||
|
|
||||||
|
//Destroy temporary mutable object
|
||||||
|
this.destroyMutable(mutableDomainObject);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype._toMutable = function (object) {
|
||||||
|
let mutableObject;
|
||||||
|
|
||||||
|
if (object.isMutable) {
|
||||||
|
mutableObject = object;
|
||||||
|
} else {
|
||||||
|
mutableObject = MutableDomainObject.createMutable(object, this.eventEmitter);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if provider supports realtime updates
|
||||||
|
let identifier = utils.parseKeyString(mutableObject.identifier);
|
||||||
|
let provider = this.getProvider(identifier);
|
||||||
|
|
||||||
|
if (provider !== undefined
|
||||||
|
&& provider.observe !== undefined) {
|
||||||
|
let unobserve = provider.observe(identifier, (updatedModel) => {
|
||||||
|
mutableObject.$refresh(updatedModel);
|
||||||
|
});
|
||||||
|
mutableObject.$on('$destroy', () => {
|
||||||
|
unobserve();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return mutableObject;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param module:openmct.ObjectAPI~Identifier identifier An object identifier
|
||||||
|
* @returns {boolean} true if the object can be mutated, otherwise returns false
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.supportsMutation = function (identifier) {
|
||||||
|
return this.isPersistable(identifier);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Observe changes to a domain object.
|
||||||
|
* @param {module:openmct.DomainObject} object the object to observe
|
||||||
|
* @param {string} path the property to observe
|
||||||
|
* @param {Function} callback a callback to invoke when new values for
|
||||||
|
* this property are observed
|
||||||
|
* @method observe
|
||||||
|
* @memberof module:openmct.ObjectAPI#
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.observe = function (domainObject, path, callback) {
|
||||||
|
if (domainObject.isMutable) {
|
||||||
|
return domainObject.$observe(path, callback);
|
||||||
|
} else {
|
||||||
|
let mutable = this._toMutable(domainObject);
|
||||||
|
mutable.$observe(path, callback);
|
||||||
|
|
||||||
|
return () => mutable.$destroy();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {module:openmct.ObjectAPI~Identifier} identifier
|
||||||
|
* @returns {string} A string representation of the given identifier, including namespace and key
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.makeKeyString = function (identifier) {
|
||||||
|
return utils.makeKeyString(identifier);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {string} keyString A string representation of the given identifier, that is, a namespace and key separated by a colon.
|
||||||
|
* @returns {module:openmct.ObjectAPI~Identifier} An identifier object
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.parseKeyString = function (keyString) {
|
||||||
|
return utils.parseKeyString(keyString);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Given any number of identifiers, will return true if they are all equal, otherwise false.
|
||||||
|
* @param {module:openmct.ObjectAPI~Identifier[]} identifiers
|
||||||
|
*/
|
||||||
|
ObjectAPI.prototype.areIdsEqual = function (...identifiers) {
|
||||||
|
return identifiers.map(utils.parseKeyString)
|
||||||
|
.every(identifier => {
|
||||||
|
return identifier === identifiers[0]
|
||||||
|
|| (identifier.namespace === identifiers[0].namespace
|
||||||
|
&& identifier.key === identifiers[0].key);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
ObjectAPI.prototype.getOriginalPath = function (identifier, path = []) {
|
||||||
|
return this.get(identifier).then((domainObject) => {
|
||||||
|
path.push(domainObject);
|
||||||
|
let location = domainObject.location;
|
||||||
|
|
||||||
|
if (location) {
|
||||||
|
return this.getOriginalPath(utils.parseKeyString(location), path);
|
||||||
|
} else {
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Uniquely identifies a domain object.
|
||||||
|
*
|
||||||
|
* @typedef Identifier
|
||||||
|
* @memberof module:openmct.ObjectAPI~
|
||||||
|
* @property {string} namespace the namespace to/from which this domain
|
||||||
|
* object should be loaded/stored.
|
||||||
|
* @property {string} key a unique identifier for the domain object
|
||||||
|
* within that namespace
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A domain object is an entity of relevance to a user's workflow, that
|
||||||
|
* should appear as a distinct and meaningful object within the user
|
||||||
|
* interface. Examples of domain objects are folders, telemetry sensors,
|
||||||
|
* and so forth.
|
||||||
|
*
|
||||||
|
* A few common properties are defined for domain objects. Beyond these,
|
||||||
|
* individual types of domain objects may add more as they see fit.
|
||||||
|
*
|
||||||
|
* @property {module:openmct.ObjectAPI~Identifier} identifier a key/namespace pair which
|
||||||
|
* uniquely identifies this domain object
|
||||||
|
* @property {string} type the type of domain object
|
||||||
|
* @property {string} name the human-readable name for this domain object
|
||||||
|
* @property {string} [creator] the user name of the creator of this domain
|
||||||
|
* object
|
||||||
|
* @property {number} [modified] the time, in milliseconds since the UNIX
|
||||||
|
* epoch, at which this domain object was last modified
|
||||||
|
* @property {module:openmct.ObjectAPI~Identifier[]} [composition] if
|
||||||
|
* present, this will be used by the default composition provider
|
||||||
|
* to load domain objects
|
||||||
|
* @typedef DomainObject
|
||||||
|
* @memberof module:openmct
|
||||||
|
*/
|
||||||
|
|
||||||
|
function hasAlreadyBeenPersisted(domainObject) {
|
||||||
|
return domainObject.persisted !== undefined
|
||||||
|
&& domainObject.persisted === domainObject.modified;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default ObjectAPI;
|
||||||
|
|||||||
119
src/api/objects/ObjectAPISearchSpec.js
Normal file
119
src/api/objects/ObjectAPISearchSpec.js
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
import ObjectAPI from './ObjectAPI.js';
|
||||||
|
|
||||||
|
describe("The Object API Search Function", () => {
|
||||||
|
const MOCK_PROVIDER_KEY = 'mockProvider';
|
||||||
|
const ANOTHER_MOCK_PROVIDER_KEY = 'anotherMockProvider';
|
||||||
|
const MOCK_PROVIDER_SEARCH_DELAY = 15000;
|
||||||
|
const ANOTHER_MOCK_PROVIDER_SEARCH_DELAY = 20000;
|
||||||
|
const TOTAL_TIME_ELAPSED = 21000;
|
||||||
|
const BASE_TIME = new Date(2021, 0, 1);
|
||||||
|
|
||||||
|
let objectAPI;
|
||||||
|
let mockObjectProvider;
|
||||||
|
let anotherMockObjectProvider;
|
||||||
|
let mockFallbackProvider;
|
||||||
|
let fallbackProviderSearchResults;
|
||||||
|
let resultsPromises;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
jasmine.clock().install();
|
||||||
|
jasmine.clock().mockDate(BASE_TIME);
|
||||||
|
|
||||||
|
resultsPromises = [];
|
||||||
|
fallbackProviderSearchResults = {
|
||||||
|
hits: []
|
||||||
|
};
|
||||||
|
|
||||||
|
objectAPI = new ObjectAPI();
|
||||||
|
|
||||||
|
mockObjectProvider = jasmine.createSpyObj("mock object provider", [
|
||||||
|
"search"
|
||||||
|
]);
|
||||||
|
anotherMockObjectProvider = jasmine.createSpyObj("another mock object provider", [
|
||||||
|
"search"
|
||||||
|
]);
|
||||||
|
mockFallbackProvider = jasmine.createSpyObj("super secret fallback provider", [
|
||||||
|
"superSecretFallbackSearch"
|
||||||
|
]);
|
||||||
|
objectAPI.addProvider('objects', mockObjectProvider);
|
||||||
|
objectAPI.addProvider('other-objects', anotherMockObjectProvider);
|
||||||
|
objectAPI.supersecretSetFallbackProvider(mockFallbackProvider);
|
||||||
|
|
||||||
|
mockObjectProvider.search.and.callFake(() => {
|
||||||
|
return new Promise(resolve => {
|
||||||
|
const mockProviderSearch = {
|
||||||
|
name: MOCK_PROVIDER_KEY,
|
||||||
|
start: new Date()
|
||||||
|
};
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
mockProviderSearch.end = new Date();
|
||||||
|
|
||||||
|
return resolve(mockProviderSearch);
|
||||||
|
}, MOCK_PROVIDER_SEARCH_DELAY);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
anotherMockObjectProvider.search.and.callFake(() => {
|
||||||
|
return new Promise(resolve => {
|
||||||
|
const anotherMockProviderSearch = {
|
||||||
|
name: ANOTHER_MOCK_PROVIDER_KEY,
|
||||||
|
start: new Date()
|
||||||
|
};
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
anotherMockProviderSearch.end = new Date();
|
||||||
|
|
||||||
|
return resolve(anotherMockProviderSearch);
|
||||||
|
}, ANOTHER_MOCK_PROVIDER_SEARCH_DELAY);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
mockFallbackProvider.superSecretFallbackSearch.and.callFake(
|
||||||
|
() => new Promise(
|
||||||
|
resolve => setTimeout(
|
||||||
|
() => resolve(fallbackProviderSearchResults),
|
||||||
|
50
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
resultsPromises = objectAPI.search('foo');
|
||||||
|
|
||||||
|
jasmine.clock().tick(TOTAL_TIME_ELAPSED);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
jasmine.clock().uninstall();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses each objects given provider's search function", () => {
|
||||||
|
expect(mockObjectProvider.search).toHaveBeenCalled();
|
||||||
|
expect(anotherMockObjectProvider.search).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses the fallback indexed search for objects without a search function provided", () => {
|
||||||
|
expect(mockFallbackProvider.superSecretFallbackSearch).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("provides each providers results as promises that resolve in parallel", async () => {
|
||||||
|
const results = await Promise.all(resultsPromises);
|
||||||
|
const mockProviderResults = results.find(
|
||||||
|
result => result.name === MOCK_PROVIDER_KEY
|
||||||
|
);
|
||||||
|
const anotherMockProviderResults = results.find(
|
||||||
|
result => result.name === ANOTHER_MOCK_PROVIDER_KEY
|
||||||
|
);
|
||||||
|
const mockProviderStart = mockProviderResults.start.getTime();
|
||||||
|
const mockProviderEnd = mockProviderResults.end.getTime();
|
||||||
|
const anotherMockProviderStart = anotherMockProviderResults.start.getTime();
|
||||||
|
const anotherMockProviderEnd = anotherMockProviderResults.end.getTime();
|
||||||
|
const searchElapsedTime = Math.max(mockProviderEnd, anotherMockProviderEnd)
|
||||||
|
- Math.min(mockProviderEnd, anotherMockProviderEnd);
|
||||||
|
|
||||||
|
expect(mockProviderStart).toBeLessThan(anotherMockProviderEnd);
|
||||||
|
expect(anotherMockProviderStart).toBeLessThan(mockProviderEnd);
|
||||||
|
expect(searchElapsedTime).toBeLessThan(
|
||||||
|
MOCK_PROVIDER_SEARCH_DELAY
|
||||||
|
+ ANOTHER_MOCK_PROVIDER_SEARCH_DELAY
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -2,12 +2,30 @@ import ObjectAPI from './ObjectAPI.js';
|
|||||||
|
|
||||||
describe("The Object API", () => {
|
describe("The Object API", () => {
|
||||||
let objectAPI;
|
let objectAPI;
|
||||||
|
let typeRegistry;
|
||||||
|
let openmct = {};
|
||||||
|
let mockIdentifierService;
|
||||||
let mockDomainObject;
|
let mockDomainObject;
|
||||||
const TEST_NAMESPACE = "test-namespace";
|
const TEST_NAMESPACE = "test-namespace";
|
||||||
const FIFTEEN_MINUTES = 15 * 60 * 1000;
|
const FIFTEEN_MINUTES = 15 * 60 * 1000;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
objectAPI = new ObjectAPI();
|
typeRegistry = jasmine.createSpyObj('typeRegistry', [
|
||||||
|
'get'
|
||||||
|
]);
|
||||||
|
openmct.$injector = jasmine.createSpyObj('$injector', ['get']);
|
||||||
|
mockIdentifierService = jasmine.createSpyObj(
|
||||||
|
'identifierService',
|
||||||
|
['parse']
|
||||||
|
);
|
||||||
|
mockIdentifierService.parse.and.returnValue({
|
||||||
|
getSpace: () => {
|
||||||
|
return TEST_NAMESPACE;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
openmct.$injector.get.and.returnValue(mockIdentifierService);
|
||||||
|
objectAPI = new ObjectAPI(typeRegistry, openmct);
|
||||||
mockDomainObject = {
|
mockDomainObject = {
|
||||||
identifier: {
|
identifier: {
|
||||||
namespace: TEST_NAMESPACE,
|
namespace: TEST_NAMESPACE,
|
||||||
@@ -33,6 +51,7 @@ describe("The Object API", () => {
|
|||||||
"update"
|
"update"
|
||||||
]);
|
]);
|
||||||
mockProvider.create.and.returnValue(Promise.resolve(true));
|
mockProvider.create.and.returnValue(Promise.resolve(true));
|
||||||
|
mockProvider.update.and.returnValue(Promise.resolve(true));
|
||||||
objectAPI.addProvider(TEST_NAMESPACE, mockProvider);
|
objectAPI.addProvider(TEST_NAMESPACE, mockProvider);
|
||||||
});
|
});
|
||||||
it("Calls 'create' on provider if object is new", () => {
|
it("Calls 'create' on provider if object is new", () => {
|
||||||
@@ -63,12 +82,51 @@ describe("The Object API", () => {
|
|||||||
describe("The get function", () => {
|
describe("The get function", () => {
|
||||||
describe("when a provider is available", () => {
|
describe("when a provider is available", () => {
|
||||||
let mockProvider;
|
let mockProvider;
|
||||||
|
let mockInterceptor;
|
||||||
|
let anotherMockInterceptor;
|
||||||
|
let notApplicableMockInterceptor;
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
mockProvider = jasmine.createSpyObj("mock provider", [
|
mockProvider = jasmine.createSpyObj("mock provider", [
|
||||||
"get"
|
"get"
|
||||||
]);
|
]);
|
||||||
mockProvider.get.and.returnValue(Promise.resolve(mockDomainObject));
|
mockProvider.get.and.returnValue(Promise.resolve(mockDomainObject));
|
||||||
|
|
||||||
|
mockInterceptor = jasmine.createSpyObj("mock interceptor", [
|
||||||
|
"appliesTo",
|
||||||
|
"invoke"
|
||||||
|
]);
|
||||||
|
mockInterceptor.appliesTo.and.returnValue(true);
|
||||||
|
mockInterceptor.invoke.and.callFake((identifier, object) => {
|
||||||
|
return Object.assign({
|
||||||
|
changed: true
|
||||||
|
}, object);
|
||||||
|
});
|
||||||
|
|
||||||
|
anotherMockInterceptor = jasmine.createSpyObj("another mock interceptor", [
|
||||||
|
"appliesTo",
|
||||||
|
"invoke"
|
||||||
|
]);
|
||||||
|
anotherMockInterceptor.appliesTo.and.returnValue(true);
|
||||||
|
anotherMockInterceptor.invoke.and.callFake((identifier, object) => {
|
||||||
|
return Object.assign({
|
||||||
|
alsoChanged: true
|
||||||
|
}, object);
|
||||||
|
});
|
||||||
|
|
||||||
|
notApplicableMockInterceptor = jasmine.createSpyObj("not applicable mock interceptor", [
|
||||||
|
"appliesTo",
|
||||||
|
"invoke"
|
||||||
|
]);
|
||||||
|
notApplicableMockInterceptor.appliesTo.and.returnValue(false);
|
||||||
|
notApplicableMockInterceptor.invoke.and.callFake((identifier, object) => {
|
||||||
|
return Object.assign({
|
||||||
|
shouldNotBeChanged: true
|
||||||
|
}, object);
|
||||||
|
});
|
||||||
objectAPI.addProvider(TEST_NAMESPACE, mockProvider);
|
objectAPI.addProvider(TEST_NAMESPACE, mockProvider);
|
||||||
|
objectAPI.addGetInterceptor(mockInterceptor);
|
||||||
|
objectAPI.addGetInterceptor(anotherMockInterceptor);
|
||||||
|
objectAPI.addGetInterceptor(notApplicableMockInterceptor);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("Caches multiple requests for the same object", () => {
|
it("Caches multiple requests for the same object", () => {
|
||||||
@@ -78,6 +136,166 @@ describe("The Object API", () => {
|
|||||||
objectAPI.get(mockDomainObject.identifier);
|
objectAPI.get(mockDomainObject.identifier);
|
||||||
expect(mockProvider.get.calls.count()).toBe(1);
|
expect(mockProvider.get.calls.count()).toBe(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("applies any applicable interceptors", () => {
|
||||||
|
expect(mockDomainObject.changed).toBeUndefined();
|
||||||
|
objectAPI.get(mockDomainObject.identifier).then((object) => {
|
||||||
|
expect(object.changed).toBeTrue();
|
||||||
|
expect(object.alsoChanged).toBeTrue();
|
||||||
|
expect(object.shouldNotBeChanged).toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("the mutation API", () => {
|
||||||
|
let testObject;
|
||||||
|
let updatedTestObject;
|
||||||
|
let mutable;
|
||||||
|
let mockProvider;
|
||||||
|
let callbacks = [];
|
||||||
|
|
||||||
|
beforeEach(function () {
|
||||||
|
objectAPI = new ObjectAPI(typeRegistry, openmct);
|
||||||
|
testObject = {
|
||||||
|
identifier: {
|
||||||
|
namespace: TEST_NAMESPACE,
|
||||||
|
key: 'test-key'
|
||||||
|
},
|
||||||
|
name: 'test object',
|
||||||
|
otherAttribute: 'other-attribute-value',
|
||||||
|
objectAttribute: {
|
||||||
|
embeddedObject: {
|
||||||
|
embeddedKey: 'embedded-value'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
updatedTestObject = Object.assign({otherAttribute: 'changed-attribute-value'}, testObject);
|
||||||
|
mockProvider = jasmine.createSpyObj("mock provider", [
|
||||||
|
"get",
|
||||||
|
"create",
|
||||||
|
"update",
|
||||||
|
"observe",
|
||||||
|
"observeObjectChanges"
|
||||||
|
]);
|
||||||
|
mockProvider.get.and.returnValue(Promise.resolve(testObject));
|
||||||
|
mockProvider.observeObjectChanges.and.callFake(() => {
|
||||||
|
callbacks[0](updatedTestObject);
|
||||||
|
callbacks.splice(0, 1);
|
||||||
|
});
|
||||||
|
mockProvider.observe.and.callFake((id, callback) => {
|
||||||
|
if (callbacks.length === 0) {
|
||||||
|
callbacks.push(callback);
|
||||||
|
} else {
|
||||||
|
callbacks[0] = callback;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
objectAPI.addProvider(TEST_NAMESPACE, mockProvider);
|
||||||
|
|
||||||
|
return objectAPI.getMutable(testObject.identifier)
|
||||||
|
.then(object => {
|
||||||
|
mutable = object;
|
||||||
|
|
||||||
|
return mutable;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
mutable.$destroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('mutates the original object', () => {
|
||||||
|
const MUTATED_NAME = 'mutated name';
|
||||||
|
objectAPI.mutate(testObject, 'name', MUTATED_NAME);
|
||||||
|
expect(testObject.name).toBe(MUTATED_NAME);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe ('uses a MutableDomainObject', () => {
|
||||||
|
it('and retains properties of original object ', function () {
|
||||||
|
expect(hasOwnProperty(mutable, 'identifier')).toBe(true);
|
||||||
|
expect(hasOwnProperty(mutable, 'otherAttribute')).toBe(true);
|
||||||
|
expect(mutable.identifier).toEqual(testObject.identifier);
|
||||||
|
expect(mutable.otherAttribute).toEqual(testObject.otherAttribute);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('that is identical to original object when serialized', function () {
|
||||||
|
expect(JSON.stringify(mutable)).toEqual(JSON.stringify(testObject));
|
||||||
|
});
|
||||||
|
|
||||||
|
it('that observes for object changes', function () {
|
||||||
|
let mockListener = jasmine.createSpy('mockListener');
|
||||||
|
objectAPI.observe(testObject, '*', mockListener);
|
||||||
|
mockProvider.observeObjectChanges();
|
||||||
|
expect(mockListener).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('uses events', function () {
|
||||||
|
let testObjectDuplicate;
|
||||||
|
let mutableSecondInstance;
|
||||||
|
|
||||||
|
beforeEach(function () {
|
||||||
|
// Duplicate object to guarantee we are not sharing object instance, which would invalidate test
|
||||||
|
testObjectDuplicate = JSON.parse(JSON.stringify(testObject));
|
||||||
|
mutableSecondInstance = objectAPI._toMutable(testObjectDuplicate);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
mutableSecondInstance.$destroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('to stay synchronized when mutated', function () {
|
||||||
|
objectAPI.mutate(mutable, 'otherAttribute', 'new-attribute-value');
|
||||||
|
expect(mutableSecondInstance.otherAttribute).toBe('new-attribute-value');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('to indicate when a property changes', function () {
|
||||||
|
let mutationCallback = jasmine.createSpy('mutation-callback');
|
||||||
|
let unlisten;
|
||||||
|
|
||||||
|
return new Promise(function (resolve) {
|
||||||
|
mutationCallback.and.callFake(resolve);
|
||||||
|
unlisten = objectAPI.observe(mutableSecondInstance, 'otherAttribute', mutationCallback);
|
||||||
|
objectAPI.mutate(mutable, 'otherAttribute', 'some-new-value');
|
||||||
|
}).then(function () {
|
||||||
|
expect(mutationCallback).toHaveBeenCalledWith('some-new-value');
|
||||||
|
unlisten();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('to indicate when a child property has changed', function () {
|
||||||
|
let embeddedKeyCallback = jasmine.createSpy('embeddedKeyCallback');
|
||||||
|
let embeddedObjectCallback = jasmine.createSpy('embeddedObjectCallback');
|
||||||
|
let objectAttributeCallback = jasmine.createSpy('objectAttribute');
|
||||||
|
let listeners = [];
|
||||||
|
|
||||||
|
return new Promise(function (resolve) {
|
||||||
|
objectAttributeCallback.and.callFake(resolve);
|
||||||
|
|
||||||
|
listeners.push(objectAPI.observe(mutableSecondInstance, 'objectAttribute.embeddedObject.embeddedKey', embeddedKeyCallback));
|
||||||
|
listeners.push(objectAPI.observe(mutableSecondInstance, 'objectAttribute.embeddedObject', embeddedObjectCallback));
|
||||||
|
listeners.push(objectAPI.observe(mutableSecondInstance, 'objectAttribute', objectAttributeCallback));
|
||||||
|
|
||||||
|
objectAPI.mutate(mutable, 'objectAttribute.embeddedObject.embeddedKey', 'updated-embedded-value');
|
||||||
|
}).then(function () {
|
||||||
|
expect(embeddedKeyCallback).toHaveBeenCalledWith('updated-embedded-value');
|
||||||
|
expect(embeddedObjectCallback).toHaveBeenCalledWith({
|
||||||
|
embeddedKey: 'updated-embedded-value'
|
||||||
|
});
|
||||||
|
expect(objectAttributeCallback).toHaveBeenCalledWith({
|
||||||
|
embeddedObject: {
|
||||||
|
embeddedKey: 'updated-embedded-value'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
listeners.forEach(listener => listener());
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function hasOwnProperty(object, property) {
|
||||||
|
return Object.prototype.hasOwnProperty.call(object, property);
|
||||||
|
}
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ define([
|
|||||||
this.providers.push(function () {
|
this.providers.push(function () {
|
||||||
return key;
|
return key;
|
||||||
});
|
});
|
||||||
} else if (_.isFunction(key)) {
|
} else if (typeof key === "function") {
|
||||||
this.providers.push(key);
|
this.providers.push(key);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ class Dialog extends Overlay {
|
|||||||
constructor({iconClass, message, title, hint, timestamp, ...options}) {
|
constructor({iconClass, message, title, hint, timestamp, ...options}) {
|
||||||
|
|
||||||
let component = new Vue({
|
let component = new Vue({
|
||||||
|
components: {
|
||||||
|
DialogComponent: DialogComponent
|
||||||
|
},
|
||||||
provide: {
|
provide: {
|
||||||
iconClass,
|
iconClass,
|
||||||
message,
|
message,
|
||||||
@@ -13,9 +16,6 @@ class Dialog extends Overlay {
|
|||||||
hint,
|
hint,
|
||||||
timestamp
|
timestamp
|
||||||
},
|
},
|
||||||
components: {
|
|
||||||
DialogComponent: DialogComponent
|
|
||||||
},
|
|
||||||
template: '<dialog-component></dialog-component>'
|
template: '<dialog-component></dialog-component>'
|
||||||
}).$mount();
|
}).$mount();
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,9 @@ let component;
|
|||||||
class ProgressDialog extends Overlay {
|
class ProgressDialog extends Overlay {
|
||||||
constructor({progressPerc, progressText, iconClass, message, title, hint, timestamp, ...options}) {
|
constructor({progressPerc, progressText, iconClass, message, title, hint, timestamp, ...options}) {
|
||||||
component = new Vue({
|
component = new Vue({
|
||||||
|
components: {
|
||||||
|
ProgressDialogComponent: ProgressDialogComponent
|
||||||
|
},
|
||||||
provide: {
|
provide: {
|
||||||
iconClass,
|
iconClass,
|
||||||
message,
|
message,
|
||||||
@@ -14,9 +17,6 @@ class ProgressDialog extends Overlay {
|
|||||||
hint,
|
hint,
|
||||||
timestamp
|
timestamp
|
||||||
},
|
},
|
||||||
components: {
|
|
||||||
ProgressDialogComponent: ProgressDialogComponent
|
|
||||||
},
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
model: {
|
model: {
|
||||||
|
|||||||
@@ -38,12 +38,12 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
|
inject: ['dismiss', 'element', 'buttons', 'dismissable'],
|
||||||
data: function () {
|
data: function () {
|
||||||
return {
|
return {
|
||||||
focusIndex: -1
|
focusIndex: -1
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
inject: ['dismiss', 'element', 'buttons', 'dismissable'],
|
|
||||||
mounted() {
|
mounted() {
|
||||||
const element = this.$refs.element;
|
const element = this.$refs.element;
|
||||||
element.appendChild(this.element);
|
element.appendChild(this.element);
|
||||||
|
|||||||
37
src/plugins/CouchDBSearchFolder/plugin.js
Normal file
37
src/plugins/CouchDBSearchFolder/plugin.js
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
export default function (folderName, couchPlugin, searchFilter) {
|
||||||
|
return function install(openmct) {
|
||||||
|
const couchProvider = couchPlugin.couchProvider;
|
||||||
|
|
||||||
|
openmct.objects.addRoot({
|
||||||
|
namespace: 'couch-search',
|
||||||
|
key: 'couch-search'
|
||||||
|
});
|
||||||
|
|
||||||
|
openmct.objects.addProvider('couch-search', {
|
||||||
|
get(identifier) {
|
||||||
|
if (identifier.key !== 'couch-search') {
|
||||||
|
return undefined;
|
||||||
|
} else {
|
||||||
|
return Promise.resolve({
|
||||||
|
identifier,
|
||||||
|
type: 'folder',
|
||||||
|
name: folderName || "CouchDB Documents"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
openmct.composition.addProvider({
|
||||||
|
appliesTo(domainObject) {
|
||||||
|
return domainObject.identifier.namespace === 'couch-search'
|
||||||
|
&& domainObject.identifier.key === 'couch-search';
|
||||||
|
},
|
||||||
|
load() {
|
||||||
|
return couchProvider.getObjectsByFilter(searchFilter).then(objects => {
|
||||||
|
return objects.map(object => object.identifier);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
91
src/plugins/CouchDBSearchFolder/pluginSpec.js
Normal file
91
src/plugins/CouchDBSearchFolder/pluginSpec.js
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2020, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
|
import {createOpenMct, resetApplicationState} from "utils/testing";
|
||||||
|
import CouchDBSearchFolderPlugin from './plugin';
|
||||||
|
|
||||||
|
describe('the plugin', function () {
|
||||||
|
let identifier = {
|
||||||
|
namespace: 'couch-search',
|
||||||
|
key: "couch-search"
|
||||||
|
};
|
||||||
|
let testPath = '/test/db';
|
||||||
|
let openmct;
|
||||||
|
let composition;
|
||||||
|
|
||||||
|
beforeEach((done) => {
|
||||||
|
|
||||||
|
openmct = createOpenMct();
|
||||||
|
|
||||||
|
let couchPlugin = openmct.plugins.CouchDB(testPath);
|
||||||
|
openmct.install(couchPlugin);
|
||||||
|
|
||||||
|
openmct.install(new CouchDBSearchFolderPlugin('CouchDB Documents', couchPlugin, {
|
||||||
|
"selector": {
|
||||||
|
"model": {
|
||||||
|
"type": "plan"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
|
||||||
|
openmct.on('start', done);
|
||||||
|
openmct.startHeadless();
|
||||||
|
|
||||||
|
composition = openmct.composition.get({identifier});
|
||||||
|
|
||||||
|
spyOn(couchPlugin.couchProvider, 'getObjectsByFilter').and.returnValue(Promise.resolve([
|
||||||
|
{
|
||||||
|
identifier: {
|
||||||
|
key: "1",
|
||||||
|
namespace: "mct"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
identifier: {
|
||||||
|
key: "2",
|
||||||
|
namespace: "mct"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]));
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
return resetApplicationState(openmct);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('provides a folder to hold plans', () => {
|
||||||
|
openmct.objects.get(identifier).then((object) => {
|
||||||
|
expect(object).toEqual({
|
||||||
|
identifier,
|
||||||
|
type: 'folder',
|
||||||
|
name: "CouchDB Documents"
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('provides composition for couch search folders', () => {
|
||||||
|
composition.load().then((objects) => {
|
||||||
|
expect(objects.length).toEqual(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
@@ -44,11 +44,15 @@ export default function LADTableViewProvider(openmct) {
|
|||||||
LadTableComponent: LadTable
|
LadTableComponent: LadTable
|
||||||
},
|
},
|
||||||
provide: {
|
provide: {
|
||||||
openmct,
|
openmct
|
||||||
domainObject,
|
|
||||||
objectPath
|
|
||||||
},
|
},
|
||||||
template: '<lad-table-component></lad-table-component>'
|
data: () => {
|
||||||
|
return {
|
||||||
|
domainObject,
|
||||||
|
objectPath
|
||||||
|
};
|
||||||
|
},
|
||||||
|
template: '<lad-table-component :domain-object="domainObject" :object-path="objectPath"></lad-table-component>'
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
destroy: function (element) {
|
destroy: function (element) {
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
class="js-lad-table__body__row"
|
class="js-lad-table__body__row"
|
||||||
@contextmenu.prevent="showContextMenu"
|
@contextmenu.prevent="showContextMenu"
|
||||||
>
|
>
|
||||||
<td class="js-first-data">{{ name }}</td>
|
<td class="js-first-data">{{ domainObject.name }}</td>
|
||||||
<td class="js-second-data">{{ formattedTimestamp }}</td>
|
<td class="js-second-data">{{ formattedTimestamp }}</td>
|
||||||
<td
|
<td
|
||||||
class="js-third-data"
|
class="js-third-data"
|
||||||
@@ -50,12 +50,16 @@ const CONTEXT_MENU_ACTIONS = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
inject: ['openmct', 'objectPath'],
|
inject: ['openmct'],
|
||||||
props: {
|
props: {
|
||||||
domainObject: {
|
domainObject: {
|
||||||
type: Object,
|
type: Object,
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
|
objectPath: {
|
||||||
|
type: Array,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
hasUnits: {
|
hasUnits: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
requred: true
|
requred: true
|
||||||
@@ -66,7 +70,6 @@ export default {
|
|||||||
currentObjectPath.unshift(this.domainObject);
|
currentObjectPath.unshift(this.domainObject);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
name: this.domainObject.name,
|
|
||||||
timestamp: undefined,
|
timestamp: undefined,
|
||||||
value: '---',
|
value: '---',
|
||||||
valueClass: '',
|
valueClass: '',
|
||||||
@@ -89,14 +92,6 @@ export default {
|
|||||||
.telemetry
|
.telemetry
|
||||||
.limitEvaluator(this.domainObject);
|
.limitEvaluator(this.domainObject);
|
||||||
|
|
||||||
this.stopWatchingMutation = this.openmct
|
|
||||||
.objects
|
|
||||||
.observe(
|
|
||||||
this.domainObject,
|
|
||||||
'*',
|
|
||||||
this.updateName
|
|
||||||
);
|
|
||||||
|
|
||||||
this.openmct.time.on('timeSystem', this.updateTimeSystem);
|
this.openmct.time.on('timeSystem', this.updateTimeSystem);
|
||||||
this.openmct.time.on('bounds', this.updateBounds);
|
this.openmct.time.on('bounds', this.updateBounds);
|
||||||
|
|
||||||
@@ -119,7 +114,6 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
destroyed() {
|
destroyed() {
|
||||||
this.stopWatchingMutation();
|
|
||||||
this.unsubscribe();
|
this.unsubscribe();
|
||||||
this.openmct.time.off('timeSystem', this.updateTimeSystem);
|
this.openmct.time.off('timeSystem', this.updateTimeSystem);
|
||||||
this.openmct.time.off('bounds', this.updateBounds);
|
this.openmct.time.off('bounds', this.updateBounds);
|
||||||
@@ -160,9 +154,6 @@ export default {
|
|||||||
})
|
})
|
||||||
.then((array) => this.updateValues(array[array.length - 1]));
|
.then((array) => this.updateValues(array[array.length - 1]));
|
||||||
},
|
},
|
||||||
updateName(name) {
|
|
||||||
this.name = name;
|
|
||||||
},
|
|
||||||
updateBounds(bounds, isTick) {
|
updateBounds(bounds, isTick) {
|
||||||
this.bounds = bounds;
|
this.bounds = bounds;
|
||||||
if (!isTick) {
|
if (!isTick) {
|
||||||
|
|||||||
@@ -36,6 +36,7 @@
|
|||||||
v-for="item in items"
|
v-for="item in items"
|
||||||
:key="item.key"
|
:key="item.key"
|
||||||
:domain-object="item.domainObject"
|
:domain-object="item.domainObject"
|
||||||
|
:object-path="objectPath"
|
||||||
:has-units="hasUnits"
|
:has-units="hasUnits"
|
||||||
/>
|
/>
|
||||||
</tbody>
|
</tbody>
|
||||||
@@ -47,10 +48,20 @@
|
|||||||
import LadRow from './LADRow.vue';
|
import LadRow from './LADRow.vue';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
inject: ['openmct', 'domainObject', 'objectPath'],
|
|
||||||
components: {
|
components: {
|
||||||
LadRow
|
LadRow
|
||||||
},
|
},
|
||||||
|
inject: ['openmct'],
|
||||||
|
props: {
|
||||||
|
domainObject: {
|
||||||
|
type: Object,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
objectPath: {
|
||||||
|
type: Array,
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
items: []
|
items: []
|
||||||
|
|||||||
@@ -57,10 +57,10 @@
|
|||||||
import LadRow from './LADRow.vue';
|
import LadRow from './LADRow.vue';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
inject: ['openmct', 'domainObject'],
|
|
||||||
components: {
|
components: {
|
||||||
LadRow
|
LadRow
|
||||||
},
|
},
|
||||||
|
inject: ['openmct', 'domainObject'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
ladTableObjects: [],
|
ladTableObjects: [],
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ describe("The LAD Table", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("should provide a table view only for lad table objects", () => {
|
it("should provide a table view only for lad table objects", () => {
|
||||||
let applicableViews = openmct.objectViews.get(mockObj.ladTable);
|
let applicableViews = openmct.objectViews.get(mockObj.ladTable, []);
|
||||||
|
|
||||||
let ladTableView = applicableViews.find(
|
let ladTableView = applicableViews.find(
|
||||||
(viewProvider) => viewProvider.key === ladTableKey
|
(viewProvider) => viewProvider.key === ladTableKey
|
||||||
@@ -185,7 +185,7 @@ describe("The LAD Table", () => {
|
|||||||
end: bounds.end
|
end: bounds.end
|
||||||
});
|
});
|
||||||
|
|
||||||
applicableViews = openmct.objectViews.get(mockObj.ladTable);
|
applicableViews = openmct.objectViews.get(mockObj.ladTable, []);
|
||||||
ladTableViewProvider = applicableViews.find((viewProvider) => viewProvider.key === ladTableKey);
|
ladTableViewProvider = applicableViews.find((viewProvider) => viewProvider.key === ladTableKey);
|
||||||
ladTableView = ladTableViewProvider.view(mockObj.ladTable, [mockObj.ladTable]);
|
ladTableView = ladTableViewProvider.view(mockObj.ladTable, [mockObj.ladTable]);
|
||||||
ladTableView.show(child, true);
|
ladTableView.show(child, true);
|
||||||
@@ -296,7 +296,7 @@ describe("The LAD Table Set", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("should provide a lad table set view only for lad table set objects", () => {
|
it("should provide a lad table set view only for lad table set objects", () => {
|
||||||
let applicableViews = openmct.objectViews.get(mockObj.ladTableSet);
|
let applicableViews = openmct.objectViews.get(mockObj.ladTableSet, []);
|
||||||
|
|
||||||
let ladTableSetView = applicableViews.find(
|
let ladTableSetView = applicableViews.find(
|
||||||
(viewProvider) => viewProvider.key === ladTableSetKey
|
(viewProvider) => viewProvider.key === ladTableSetKey
|
||||||
@@ -391,7 +391,7 @@ describe("The LAD Table Set", () => {
|
|||||||
end: bounds.end
|
end: bounds.end
|
||||||
});
|
});
|
||||||
|
|
||||||
applicableViews = openmct.objectViews.get(mockObj.ladTableSet);
|
applicableViews = openmct.objectViews.get(mockObj.ladTableSet, []);
|
||||||
ladTableSetViewProvider = applicableViews.find((viewProvider) => viewProvider.key === ladTableSetKey);
|
ladTableSetViewProvider = applicableViews.find((viewProvider) => viewProvider.key === ladTableSetKey);
|
||||||
ladTableSetView = ladTableSetViewProvider.view(mockObj.ladTableSet, [mockObj.ladTableSet]);
|
ladTableSetView = ladTableSetViewProvider.view(mockObj.ladTableSet, [mockObj.ladTableSet]);
|
||||||
ladTableSetView.show(child, true);
|
ladTableSetView.show(child, true);
|
||||||
|
|||||||
@@ -19,342 +19,352 @@
|
|||||||
* this source code distribution or the Licensing information page available
|
* this source code distribution or the Licensing information page available
|
||||||
* at runtime from the About dialog for additional information.
|
* at runtime from the About dialog for additional information.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
import AutoflowTabularPlugin from './AutoflowTabularPlugin';
|
||||||
|
import AutoflowTabularConstants from './AutoflowTabularConstants';
|
||||||
|
import $ from 'zepto';
|
||||||
|
import DOMObserver from './dom-observer';
|
||||||
|
import {
|
||||||
|
createOpenMct,
|
||||||
|
resetApplicationState,
|
||||||
|
spyOnBuiltins
|
||||||
|
} from 'utils/testing';
|
||||||
|
|
||||||
define([
|
describe("AutoflowTabularPlugin", () => {
|
||||||
'./AutoflowTabularPlugin',
|
let testType;
|
||||||
'./AutoflowTabularConstants',
|
let testObject;
|
||||||
'../../MCT',
|
let mockmct;
|
||||||
'zepto',
|
|
||||||
'./dom-observer'
|
|
||||||
], function (AutoflowTabularPlugin, AutoflowTabularConstants, MCT, $, DOMObserver) {
|
|
||||||
describe("AutoflowTabularPlugin", function () {
|
|
||||||
let testType;
|
|
||||||
let testObject;
|
|
||||||
let mockmct;
|
|
||||||
|
|
||||||
beforeEach(function () {
|
beforeEach(() => {
|
||||||
testType = "some-type";
|
testType = "some-type";
|
||||||
testObject = { type: testType };
|
testObject = { type: testType };
|
||||||
mockmct = new MCT();
|
mockmct = createOpenMct();
|
||||||
spyOn(mockmct.composition, 'get');
|
spyOn(mockmct.composition, 'get');
|
||||||
spyOn(mockmct.objectViews, 'addProvider');
|
spyOn(mockmct.objectViews, 'addProvider');
|
||||||
spyOn(mockmct.telemetry, 'getMetadata');
|
spyOn(mockmct.telemetry, 'getMetadata');
|
||||||
spyOn(mockmct.telemetry, 'getValueFormatter');
|
spyOn(mockmct.telemetry, 'getValueFormatter');
|
||||||
spyOn(mockmct.telemetry, 'limitEvaluator');
|
spyOn(mockmct.telemetry, 'limitEvaluator');
|
||||||
spyOn(mockmct.telemetry, 'request');
|
spyOn(mockmct.telemetry, 'request');
|
||||||
spyOn(mockmct.telemetry, 'subscribe');
|
spyOn(mockmct.telemetry, 'subscribe');
|
||||||
|
|
||||||
const plugin = new AutoflowTabularPlugin({ type: testType });
|
const plugin = new AutoflowTabularPlugin({ type: testType });
|
||||||
plugin(mockmct);
|
plugin(mockmct);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
resetApplicationState(mockmct);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("installs a view provider", () => {
|
||||||
|
expect(mockmct.objectViews.addProvider).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("installs a view provider which", () => {
|
||||||
|
let provider;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
provider =
|
||||||
|
mockmct.objectViews.addProvider.calls.mostRecent().args[0];
|
||||||
});
|
});
|
||||||
|
|
||||||
it("installs a view provider", function () {
|
it("applies its view to the type from options", () => {
|
||||||
expect(mockmct.objectViews.addProvider).toHaveBeenCalled();
|
expect(provider.canView(testObject, [])).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("installs a view provider which", function () {
|
it("does not apply to other types", () => {
|
||||||
let provider;
|
expect(provider.canView({ type: 'foo' }, [])).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
beforeEach(function () {
|
describe("provides a view which", () => {
|
||||||
provider =
|
let testKeys;
|
||||||
mockmct.objectViews.addProvider.calls.mostRecent().args[0];
|
let testChildren;
|
||||||
});
|
let testContainer;
|
||||||
|
let testHistories;
|
||||||
|
let mockComposition;
|
||||||
|
let mockMetadata;
|
||||||
|
let mockEvaluator;
|
||||||
|
let mockUnsubscribes;
|
||||||
|
let callbacks;
|
||||||
|
let view;
|
||||||
|
let domObserver;
|
||||||
|
|
||||||
it("applies its view to the type from options", function () {
|
function waitsForChange() {
|
||||||
expect(provider.canView(testObject)).toBe(true);
|
return new Promise(function (resolve) {
|
||||||
});
|
window.requestAnimationFrame(resolve);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
it("does not apply to other types", function () {
|
function emitEvent(mockEmitter, type, event) {
|
||||||
expect(provider.canView({ type: 'foo' })).toBe(false);
|
mockEmitter.on.calls.all().forEach((call) => {
|
||||||
});
|
if (call.args[0] === type) {
|
||||||
|
call.args[1](event);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
describe("provides a view which", function () {
|
beforeEach((done) => {
|
||||||
let testKeys;
|
callbacks = {};
|
||||||
let testChildren;
|
|
||||||
let testContainer;
|
|
||||||
let testHistories;
|
|
||||||
let mockComposition;
|
|
||||||
let mockMetadata;
|
|
||||||
let mockEvaluator;
|
|
||||||
let mockUnsubscribes;
|
|
||||||
let callbacks;
|
|
||||||
let view;
|
|
||||||
let domObserver;
|
|
||||||
|
|
||||||
function waitsForChange() {
|
spyOnBuiltins(['requestAnimationFrame']);
|
||||||
return new Promise(function (resolve) {
|
window.requestAnimationFrame.and.callFake((callBack) => {
|
||||||
window.requestAnimationFrame(resolve);
|
callBack();
|
||||||
|
});
|
||||||
|
|
||||||
|
testObject = { type: 'some-type' };
|
||||||
|
testKeys = ['abc', 'def', 'xyz'];
|
||||||
|
testChildren = testKeys.map((key) => {
|
||||||
|
return {
|
||||||
|
identifier: {
|
||||||
|
namespace: "test",
|
||||||
|
key: key
|
||||||
|
},
|
||||||
|
name: "Object " + key
|
||||||
|
};
|
||||||
|
});
|
||||||
|
testContainer = $('<div>')[0];
|
||||||
|
domObserver = new DOMObserver(testContainer);
|
||||||
|
|
||||||
|
testHistories = testKeys.reduce((histories, key, index) => {
|
||||||
|
histories[key] = {
|
||||||
|
key: key,
|
||||||
|
range: index + 10,
|
||||||
|
domain: key + index
|
||||||
|
};
|
||||||
|
|
||||||
|
return histories;
|
||||||
|
}, {});
|
||||||
|
|
||||||
|
mockComposition =
|
||||||
|
jasmine.createSpyObj('composition', ['load', 'on', 'off']);
|
||||||
|
mockMetadata =
|
||||||
|
jasmine.createSpyObj('metadata', ['valuesForHints']);
|
||||||
|
|
||||||
|
mockEvaluator = jasmine.createSpyObj('evaluator', ['evaluate']);
|
||||||
|
mockUnsubscribes = testKeys.reduce((map, key) => {
|
||||||
|
map[key] = jasmine.createSpy('unsubscribe-' + key);
|
||||||
|
|
||||||
|
return map;
|
||||||
|
}, {});
|
||||||
|
|
||||||
|
mockmct.composition.get.and.returnValue(mockComposition);
|
||||||
|
mockComposition.load.and.callFake(() => {
|
||||||
|
testChildren.forEach(emitEvent.bind(null, mockComposition, 'add'));
|
||||||
|
|
||||||
|
return Promise.resolve(testChildren);
|
||||||
|
});
|
||||||
|
|
||||||
|
mockmct.telemetry.getMetadata.and.returnValue(mockMetadata);
|
||||||
|
mockmct.telemetry.getValueFormatter.and.callFake((metadatum) => {
|
||||||
|
const mockFormatter = jasmine.createSpyObj('formatter', ['format']);
|
||||||
|
mockFormatter.format.and.callFake((datum) => {
|
||||||
|
return datum[metadatum.hint];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
return mockFormatter;
|
||||||
|
});
|
||||||
|
mockmct.telemetry.limitEvaluator.and.returnValue(mockEvaluator);
|
||||||
|
mockmct.telemetry.subscribe.and.callFake((obj, callback) => {
|
||||||
|
const key = obj.identifier.key;
|
||||||
|
callbacks[key] = callback;
|
||||||
|
|
||||||
|
return mockUnsubscribes[key];
|
||||||
|
});
|
||||||
|
mockmct.telemetry.request.and.callFake((obj, request) => {
|
||||||
|
const key = obj.identifier.key;
|
||||||
|
|
||||||
|
return Promise.resolve([testHistories[key]]);
|
||||||
|
});
|
||||||
|
mockMetadata.valuesForHints.and.callFake((hints) => {
|
||||||
|
return [{ hint: hints[0] }];
|
||||||
|
});
|
||||||
|
|
||||||
|
view = provider.view(testObject);
|
||||||
|
view.show(testContainer);
|
||||||
|
|
||||||
|
return done();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
domObserver.destroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("populates its container", () => {
|
||||||
|
expect(testContainer.children.length > 0).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("when rows have been populated", () => {
|
||||||
|
function rowsMatch() {
|
||||||
|
const rows = $(testContainer).find(".l-autoflow-row").length;
|
||||||
|
|
||||||
|
return rows === testChildren.length;
|
||||||
}
|
}
|
||||||
|
|
||||||
function emitEvent(mockEmitter, type, event) {
|
it("shows one row per child object", () => {
|
||||||
mockEmitter.on.calls.all().forEach(function (call) {
|
return domObserver.when(rowsMatch);
|
||||||
if (call.args[0] === type) {
|
});
|
||||||
call.args[1](event);
|
|
||||||
}
|
// it("adds rows on composition change", () => {
|
||||||
});
|
// const child = {
|
||||||
|
// identifier: {
|
||||||
|
// namespace: "test",
|
||||||
|
// key: "123"
|
||||||
|
// },
|
||||||
|
// name: "Object 123"
|
||||||
|
// };
|
||||||
|
// testChildren.push(child);
|
||||||
|
// emitEvent(mockComposition, 'add', child);
|
||||||
|
|
||||||
|
// return domObserver.when(rowsMatch);
|
||||||
|
// });
|
||||||
|
|
||||||
|
it("removes rows on composition change", () => {
|
||||||
|
const child = testChildren.pop();
|
||||||
|
emitEvent(mockComposition, 'remove', child.identifier);
|
||||||
|
|
||||||
|
return domObserver.when(rowsMatch);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("removes subscriptions when destroyed", () => {
|
||||||
|
testKeys.forEach((key) => {
|
||||||
|
expect(mockUnsubscribes[key]).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
view.destroy();
|
||||||
|
testKeys.forEach((key) => {
|
||||||
|
expect(mockUnsubscribes[key]).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("provides a button to change column width", () => {
|
||||||
|
const initialWidth = AutoflowTabularConstants.INITIAL_COLUMN_WIDTH;
|
||||||
|
const nextWidth =
|
||||||
|
initialWidth + AutoflowTabularConstants.COLUMN_WIDTH_STEP;
|
||||||
|
|
||||||
|
expect($(testContainer).find('.l-autoflow-col').css('width'))
|
||||||
|
.toEqual(initialWidth + 'px');
|
||||||
|
|
||||||
|
$(testContainer).find('.change-column-width').click();
|
||||||
|
|
||||||
|
function widthHasChanged() {
|
||||||
|
const width = $(testContainer).find('.l-autoflow-col').css('width');
|
||||||
|
|
||||||
|
return width !== initialWidth + 'px';
|
||||||
}
|
}
|
||||||
|
|
||||||
beforeEach(function () {
|
return domObserver.when(widthHasChanged)
|
||||||
callbacks = {};
|
.then(() => {
|
||||||
|
expect($(testContainer).find('.l-autoflow-col').css('width'))
|
||||||
testObject = { type: 'some-type' };
|
.toEqual(nextWidth + 'px');
|
||||||
testKeys = ['abc', 'def', 'xyz'];
|
|
||||||
testChildren = testKeys.map(function (key) {
|
|
||||||
return {
|
|
||||||
identifier: {
|
|
||||||
namespace: "test",
|
|
||||||
key: key
|
|
||||||
},
|
|
||||||
name: "Object " + key
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
testContainer = $('<div>')[0];
|
});
|
||||||
domObserver = new DOMObserver(testContainer);
|
|
||||||
|
|
||||||
testHistories = testKeys.reduce(function (histories, key, index) {
|
it("subscribes to all child objects", () => {
|
||||||
histories[key] = {
|
testKeys.forEach((key) => {
|
||||||
key: key,
|
expect(callbacks[key]).toEqual(jasmine.any(Function));
|
||||||
range: index + 10,
|
});
|
||||||
domain: key + index
|
});
|
||||||
};
|
|
||||||
|
|
||||||
return histories;
|
it("displays historical telemetry", () => {
|
||||||
}, {});
|
function rowTextDefined() {
|
||||||
|
return $(testContainer).find(".l-autoflow-item").filter(".r").text() !== "";
|
||||||
|
}
|
||||||
|
|
||||||
mockComposition =
|
return domObserver.when(rowTextDefined).then(() => {
|
||||||
jasmine.createSpyObj('composition', ['load', 'on', 'off']);
|
testKeys.forEach((key, index) => {
|
||||||
mockMetadata =
|
const datum = testHistories[key];
|
||||||
jasmine.createSpyObj('metadata', ['valuesForHints']);
|
const $cell = $(testContainer).find(".l-autoflow-row").eq(index).find(".r");
|
||||||
|
expect($cell.text()).toEqual(String(datum.range));
|
||||||
mockEvaluator = jasmine.createSpyObj('evaluator', ['evaluate']);
|
|
||||||
mockUnsubscribes = testKeys.reduce(function (map, key) {
|
|
||||||
map[key] = jasmine.createSpy('unsubscribe-' + key);
|
|
||||||
|
|
||||||
return map;
|
|
||||||
}, {});
|
|
||||||
|
|
||||||
mockmct.composition.get.and.returnValue(mockComposition);
|
|
||||||
mockComposition.load.and.callFake(function () {
|
|
||||||
testChildren.forEach(emitEvent.bind(null, mockComposition, 'add'));
|
|
||||||
|
|
||||||
return Promise.resolve(testChildren);
|
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
mockmct.telemetry.getMetadata.and.returnValue(mockMetadata);
|
it("displays incoming telemetry", () => {
|
||||||
mockmct.telemetry.getValueFormatter.and.callFake(function (metadatum) {
|
const testData = testKeys.map((key, index) => {
|
||||||
const mockFormatter = jasmine.createSpyObj('formatter', ['format']);
|
return {
|
||||||
mockFormatter.format.and.callFake(function (datum) {
|
key: key,
|
||||||
return datum[metadatum.hint];
|
range: index * 100,
|
||||||
});
|
domain: key + index
|
||||||
|
};
|
||||||
return mockFormatter;
|
|
||||||
});
|
|
||||||
mockmct.telemetry.limitEvaluator.and.returnValue(mockEvaluator);
|
|
||||||
mockmct.telemetry.subscribe.and.callFake(function (obj, callback) {
|
|
||||||
const key = obj.identifier.key;
|
|
||||||
callbacks[key] = callback;
|
|
||||||
|
|
||||||
return mockUnsubscribes[key];
|
|
||||||
});
|
|
||||||
mockmct.telemetry.request.and.callFake(function (obj, request) {
|
|
||||||
const key = obj.identifier.key;
|
|
||||||
|
|
||||||
return Promise.resolve([testHistories[key]]);
|
|
||||||
});
|
|
||||||
mockMetadata.valuesForHints.and.callFake(function (hints) {
|
|
||||||
return [{ hint: hints[0] }];
|
|
||||||
});
|
|
||||||
|
|
||||||
view = provider.view(testObject);
|
|
||||||
view.show(testContainer);
|
|
||||||
|
|
||||||
return waitsForChange();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(function () {
|
testData.forEach((datum) => {
|
||||||
domObserver.destroy();
|
callbacks[datum.key](datum);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("populates its container", function () {
|
return waitsForChange().then(() => {
|
||||||
expect(testContainer.children.length > 0).toBe(true);
|
testData.forEach((datum, index) => {
|
||||||
|
const $cell = $(testContainer).find(".l-autoflow-row").eq(index).find(".r");
|
||||||
|
expect($cell.text()).toEqual(String(datum.range));
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe("when rows have been populated", function () {
|
it("updates classes for limit violations", () => {
|
||||||
function rowsMatch() {
|
const testClass = "some-limit-violation";
|
||||||
const rows = $(testContainer).find(".l-autoflow-row").length;
|
mockEvaluator.evaluate.and.returnValue({ cssClass: testClass });
|
||||||
|
testKeys.forEach((key) => {
|
||||||
return rows === testChildren.length;
|
callbacks[key]({
|
||||||
}
|
range: 'foo',
|
||||||
|
domain: 'bar'
|
||||||
it("shows one row per child object", function () {
|
|
||||||
return domObserver.when(rowsMatch);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("adds rows on composition change", function () {
|
|
||||||
const child = {
|
|
||||||
identifier: {
|
|
||||||
namespace: "test",
|
|
||||||
key: "123"
|
|
||||||
},
|
|
||||||
name: "Object 123"
|
|
||||||
};
|
|
||||||
testChildren.push(child);
|
|
||||||
emitEvent(mockComposition, 'add', child);
|
|
||||||
|
|
||||||
return domObserver.when(rowsMatch);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("removes rows on composition change", function () {
|
|
||||||
const child = testChildren.pop();
|
|
||||||
emitEvent(mockComposition, 'remove', child.identifier);
|
|
||||||
|
|
||||||
return domObserver.when(rowsMatch);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it("removes subscriptions when destroyed", function () {
|
return waitsForChange().then(() => {
|
||||||
testKeys.forEach(function (key) {
|
testKeys.forEach((datum, index) => {
|
||||||
expect(mockUnsubscribes[key]).not.toHaveBeenCalled();
|
const $cell = $(testContainer).find(".l-autoflow-row").eq(index).find(".r");
|
||||||
});
|
expect($cell.hasClass(testClass)).toBe(true);
|
||||||
view.destroy();
|
|
||||||
testKeys.forEach(function (key) {
|
|
||||||
expect(mockUnsubscribes[key]).toHaveBeenCalled();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it("provides a button to change column width", function () {
|
it("automatically flows to new columns", () => {
|
||||||
const initialWidth = AutoflowTabularConstants.INITIAL_COLUMN_WIDTH;
|
const rowHeight = AutoflowTabularConstants.ROW_HEIGHT;
|
||||||
const nextWidth =
|
const sliderHeight = AutoflowTabularConstants.SLIDER_HEIGHT;
|
||||||
initialWidth + AutoflowTabularConstants.COLUMN_WIDTH_STEP;
|
const count = testKeys.length;
|
||||||
|
const $container = $(testContainer);
|
||||||
|
let promiseChain = Promise.resolve();
|
||||||
|
|
||||||
expect($(testContainer).find('.l-autoflow-col').css('width'))
|
function columnsHaveAutoflowed() {
|
||||||
.toEqual(initialWidth + 'px');
|
const itemsHeight = $container.find('.l-autoflow-items').height();
|
||||||
|
const availableHeight = itemsHeight - sliderHeight;
|
||||||
|
const availableRows = Math.max(Math.floor(availableHeight / rowHeight), 1);
|
||||||
|
const columns = Math.ceil(count / availableRows);
|
||||||
|
|
||||||
$(testContainer).find('.change-column-width').click();
|
return $container.find('.l-autoflow-col').length === columns;
|
||||||
|
}
|
||||||
|
|
||||||
function widthHasChanged() {
|
$container.find('.abs').css({
|
||||||
const width = $(testContainer).find('.l-autoflow-col').css('width');
|
position: 'absolute',
|
||||||
|
left: '0px',
|
||||||
return width !== initialWidth + 'px';
|
right: '0px',
|
||||||
}
|
top: '0px',
|
||||||
|
bottom: '0px'
|
||||||
return domObserver.when(widthHasChanged)
|
|
||||||
.then(function () {
|
|
||||||
expect($(testContainer).find('.l-autoflow-col').css('width'))
|
|
||||||
.toEqual(nextWidth + 'px');
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
$container.css({ position: 'absolute' });
|
||||||
|
|
||||||
it("subscribes to all child objects", function () {
|
$container.appendTo(document.body);
|
||||||
testKeys.forEach(function (key) {
|
|
||||||
expect(callbacks[key]).toEqual(jasmine.any(Function));
|
function setHeight(height) {
|
||||||
});
|
$container.css('height', height + 'px');
|
||||||
|
|
||||||
|
return domObserver.when(columnsHaveAutoflowed);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (let height = 0; height < rowHeight * count * 2; height += rowHeight / 2) {
|
||||||
|
// eslint-disable-next-line no-invalid-this
|
||||||
|
promiseChain = promiseChain.then(setHeight.bind(this, height));
|
||||||
|
}
|
||||||
|
|
||||||
|
return promiseChain.then(() => {
|
||||||
|
$container.remove();
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it("displays historical telemetry", function () {
|
it("loads composition exactly once", () => {
|
||||||
function rowTextDefined() {
|
const testObj = testChildren.pop();
|
||||||
return $(testContainer).find(".l-autoflow-item").filter(".r").text() !== "";
|
emitEvent(mockComposition, 'remove', testObj.identifier);
|
||||||
}
|
testChildren.push(testObj);
|
||||||
|
emitEvent(mockComposition, 'add', testObj);
|
||||||
return domObserver.when(rowTextDefined).then(function () {
|
expect(mockComposition.load.calls.count()).toEqual(1);
|
||||||
testKeys.forEach(function (key, index) {
|
|
||||||
const datum = testHistories[key];
|
|
||||||
const $cell = $(testContainer).find(".l-autoflow-row").eq(index).find(".r");
|
|
||||||
expect($cell.text()).toEqual(String(datum.range));
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("displays incoming telemetry", function () {
|
|
||||||
const testData = testKeys.map(function (key, index) {
|
|
||||||
return {
|
|
||||||
key: key,
|
|
||||||
range: index * 100,
|
|
||||||
domain: key + index
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
testData.forEach(function (datum) {
|
|
||||||
callbacks[datum.key](datum);
|
|
||||||
});
|
|
||||||
|
|
||||||
return waitsForChange().then(function () {
|
|
||||||
testData.forEach(function (datum, index) {
|
|
||||||
const $cell = $(testContainer).find(".l-autoflow-row").eq(index).find(".r");
|
|
||||||
expect($cell.text()).toEqual(String(datum.range));
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("updates classes for limit violations", function () {
|
|
||||||
const testClass = "some-limit-violation";
|
|
||||||
mockEvaluator.evaluate.and.returnValue({ cssClass: testClass });
|
|
||||||
testKeys.forEach(function (key) {
|
|
||||||
callbacks[key]({
|
|
||||||
range: 'foo',
|
|
||||||
domain: 'bar'
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
return waitsForChange().then(function () {
|
|
||||||
testKeys.forEach(function (datum, index) {
|
|
||||||
const $cell = $(testContainer).find(".l-autoflow-row").eq(index).find(".r");
|
|
||||||
expect($cell.hasClass(testClass)).toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("automatically flows to new columns", function () {
|
|
||||||
const rowHeight = AutoflowTabularConstants.ROW_HEIGHT;
|
|
||||||
const sliderHeight = AutoflowTabularConstants.SLIDER_HEIGHT;
|
|
||||||
const count = testKeys.length;
|
|
||||||
const $container = $(testContainer);
|
|
||||||
let promiseChain = Promise.resolve();
|
|
||||||
|
|
||||||
function columnsHaveAutoflowed() {
|
|
||||||
const itemsHeight = $container.find('.l-autoflow-items').height();
|
|
||||||
const availableHeight = itemsHeight - sliderHeight;
|
|
||||||
const availableRows = Math.max(Math.floor(availableHeight / rowHeight), 1);
|
|
||||||
const columns = Math.ceil(count / availableRows);
|
|
||||||
|
|
||||||
return $container.find('.l-autoflow-col').length === columns;
|
|
||||||
}
|
|
||||||
|
|
||||||
$container.find('.abs').css({
|
|
||||||
position: 'absolute',
|
|
||||||
left: '0px',
|
|
||||||
right: '0px',
|
|
||||||
top: '0px',
|
|
||||||
bottom: '0px'
|
|
||||||
});
|
|
||||||
$container.css({ position: 'absolute' });
|
|
||||||
|
|
||||||
$container.appendTo(document.body);
|
|
||||||
|
|
||||||
function setHeight(height) {
|
|
||||||
$container.css('height', height + 'px');
|
|
||||||
|
|
||||||
return domObserver.when(columnsHaveAutoflowed);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (let height = 0; height < rowHeight * count * 2; height += rowHeight / 2) {
|
|
||||||
// eslint-disable-next-line no-invalid-this
|
|
||||||
promiseChain = promiseChain.then(setHeight.bind(this, height));
|
|
||||||
}
|
|
||||||
|
|
||||||
return promiseChain.then(function () {
|
|
||||||
$container.remove();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("loads composition exactly once", function () {
|
|
||||||
const testObj = testChildren.pop();
|
|
||||||
emitEvent(mockComposition, 'remove', testObj.identifier);
|
|
||||||
testChildren.push(testObj);
|
|
||||||
emitEvent(mockComposition, 'add', testObj);
|
|
||||||
expect(mockComposition.load.calls.count()).toEqual(1);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -37,12 +37,12 @@ define([
|
|||||||
return function install(openmct) {
|
return function install(openmct) {
|
||||||
if (installIndicator) {
|
if (installIndicator) {
|
||||||
let component = new Vue ({
|
let component = new Vue ({
|
||||||
provide: {
|
|
||||||
openmct
|
|
||||||
},
|
|
||||||
components: {
|
components: {
|
||||||
GlobalClearIndicator: GlobaClearIndicator.default
|
GlobalClearIndicator: GlobaClearIndicator.default
|
||||||
},
|
},
|
||||||
|
provide: {
|
||||||
|
openmct
|
||||||
|
},
|
||||||
template: '<GlobalClearIndicator></GlobalClearIndicator>'
|
template: '<GlobalClearIndicator></GlobalClearIndicator>'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -75,7 +75,8 @@ export default class Condition extends EventEmitter {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.isTelemetryUsed(datum.id)) {
|
// if all the criteria in this condition have no telemetry, we want to force the condition result to evaluate
|
||||||
|
if (this.hasNoTelemetry() || this.isTelemetryUsed(datum.id)) {
|
||||||
|
|
||||||
this.criteria.forEach(criterion => {
|
this.criteria.forEach(criterion => {
|
||||||
if (this.isAnyOrAllTelemetry(criterion)) {
|
if (this.isAnyOrAllTelemetry(criterion)) {
|
||||||
@@ -93,6 +94,12 @@ export default class Condition extends EventEmitter {
|
|||||||
return (criterion.telemetry && (criterion.telemetry === 'all' || criterion.telemetry === 'any'));
|
return (criterion.telemetry && (criterion.telemetry === 'all' || criterion.telemetry === 'any'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
hasNoTelemetry() {
|
||||||
|
return this.criteria.every((criterion) => {
|
||||||
|
return !this.isAnyOrAllTelemetry(criterion) && criterion.telemetry === '';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
isTelemetryUsed(id) {
|
isTelemetryUsed(id) {
|
||||||
return this.criteria.some(criterion => {
|
return this.criteria.some(criterion => {
|
||||||
return this.isAnyOrAllTelemetry(criterion) || criterion.telemetryObjectIdAsString === id;
|
return this.isAnyOrAllTelemetry(criterion) || criterion.telemetryObjectIdAsString === id;
|
||||||
@@ -250,10 +257,17 @@ export default class Condition extends EventEmitter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getTriggerDescription() {
|
getTriggerDescription() {
|
||||||
return {
|
if (this.trigger) {
|
||||||
conjunction: TRIGGER_CONJUNCTION[this.trigger],
|
return {
|
||||||
prefix: `${TRIGGER_LABEL[this.trigger]}: `
|
conjunction: TRIGGER_CONJUNCTION[this.trigger],
|
||||||
};
|
prefix: `${TRIGGER_LABEL[this.trigger]}: `
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
return {
|
||||||
|
conjunction: '',
|
||||||
|
prefix: ''
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
requestLADConditionResult() {
|
requestLADConditionResult() {
|
||||||
|
|||||||
@@ -34,6 +34,9 @@ export default class ConditionManager extends EventEmitter {
|
|||||||
this.composition = this.openmct.composition.get(conditionSetDomainObject);
|
this.composition = this.openmct.composition.get(conditionSetDomainObject);
|
||||||
this.composition.on('add', this.subscribeToTelemetry, this);
|
this.composition.on('add', this.subscribeToTelemetry, this);
|
||||||
this.composition.on('remove', this.unsubscribeFromTelemetry, this);
|
this.composition.on('remove', this.unsubscribeFromTelemetry, this);
|
||||||
|
|
||||||
|
this.shouldEvaluateNewTelemetry = this.shouldEvaluateNewTelemetry.bind(this);
|
||||||
|
|
||||||
this.compositionLoad = this.composition.load();
|
this.compositionLoad = this.composition.load();
|
||||||
this.subscriptions = {};
|
this.subscriptions = {};
|
||||||
this.telemetryObjects = {};
|
this.telemetryObjects = {};
|
||||||
@@ -79,6 +82,17 @@ export default class ConditionManager extends EventEmitter {
|
|||||||
delete this.subscriptions[id];
|
delete this.subscriptions[id];
|
||||||
delete this.telemetryObjects[id];
|
delete this.telemetryObjects[id];
|
||||||
this.removeConditionTelemetryObjects();
|
this.removeConditionTelemetryObjects();
|
||||||
|
|
||||||
|
//force re-computation of condition set result as we might be in a state where
|
||||||
|
// there is no telemetry datum coming in for a while or at all.
|
||||||
|
let latestTimestamp = getLatestTimestamp(
|
||||||
|
{},
|
||||||
|
{},
|
||||||
|
this.timeSystems,
|
||||||
|
this.openmct.time.timeSystem()
|
||||||
|
);
|
||||||
|
this.updateConditionResults({id: id});
|
||||||
|
this.updateCurrentCondition(latestTimestamp);
|
||||||
}
|
}
|
||||||
|
|
||||||
initialize() {
|
initialize() {
|
||||||
@@ -326,6 +340,10 @@ export default class ConditionManager extends EventEmitter {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
shouldEvaluateNewTelemetry(currentTimestamp) {
|
||||||
|
return this.openmct.time.bounds().end >= currentTimestamp;
|
||||||
|
}
|
||||||
|
|
||||||
telemetryReceived(endpoint, datum) {
|
telemetryReceived(endpoint, datum) {
|
||||||
if (!this.isTelemetryUsed(endpoint)) {
|
if (!this.isTelemetryUsed(endpoint)) {
|
||||||
return;
|
return;
|
||||||
@@ -334,16 +352,21 @@ export default class ConditionManager extends EventEmitter {
|
|||||||
const normalizedDatum = this.createNormalizedDatum(datum, endpoint);
|
const normalizedDatum = this.createNormalizedDatum(datum, endpoint);
|
||||||
const timeSystemKey = this.openmct.time.timeSystem().key;
|
const timeSystemKey = this.openmct.time.timeSystem().key;
|
||||||
let timestamp = {};
|
let timestamp = {};
|
||||||
timestamp[timeSystemKey] = normalizedDatum[timeSystemKey];
|
const currentTimestamp = normalizedDatum[timeSystemKey];
|
||||||
|
timestamp[timeSystemKey] = currentTimestamp;
|
||||||
|
if (this.shouldEvaluateNewTelemetry(currentTimestamp)) {
|
||||||
|
this.updateConditionResults(normalizedDatum);
|
||||||
|
this.updateCurrentCondition(timestamp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
updateConditionResults(normalizedDatum) {
|
||||||
//We want to stop when the first condition evaluates to true.
|
//We want to stop when the first condition evaluates to true.
|
||||||
this.conditions.some((condition) => {
|
this.conditions.some((condition) => {
|
||||||
condition.updateResult(normalizedDatum);
|
condition.updateResult(normalizedDatum);
|
||||||
|
|
||||||
return condition.result === true;
|
return condition.result === true;
|
||||||
});
|
});
|
||||||
|
|
||||||
this.updateCurrentCondition(timestamp);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
updateCurrentCondition(timestamp) {
|
updateCurrentCondition(timestamp) {
|
||||||
|
|||||||
@@ -86,6 +86,7 @@ export default class StyleRuleManager extends EventEmitter {
|
|||||||
updateObjectStyleConfig(styleConfiguration) {
|
updateObjectStyleConfig(styleConfiguration) {
|
||||||
if (!styleConfiguration || !styleConfiguration.conditionSetIdentifier) {
|
if (!styleConfiguration || !styleConfiguration.conditionSetIdentifier) {
|
||||||
this.initialize(styleConfiguration || {});
|
this.initialize(styleConfiguration || {});
|
||||||
|
this.applyStaticStyle();
|
||||||
this.destroy();
|
this.destroy();
|
||||||
} else {
|
} else {
|
||||||
let isNewConditionSet = !this.conditionSetIdentifier
|
let isNewConditionSet = !this.conditionSetIdentifier
|
||||||
@@ -158,7 +159,6 @@ export default class StyleRuleManager extends EventEmitter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
destroy() {
|
destroy() {
|
||||||
this.applyStaticStyle();
|
|
||||||
if (this.stopProvidingTelemetry) {
|
if (this.stopProvidingTelemetry) {
|
||||||
this.stopProvidingTelemetry();
|
this.stopProvidingTelemetry();
|
||||||
delete this.stopProvidingTelemetry;
|
delete this.stopProvidingTelemetry;
|
||||||
|
|||||||
@@ -195,11 +195,11 @@ import { TRIGGER, TRIGGER_LABEL } from "@/plugins/condition/utils/constants";
|
|||||||
import uuid from 'uuid';
|
import uuid from 'uuid';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
inject: ['openmct'],
|
|
||||||
components: {
|
components: {
|
||||||
Criterion,
|
Criterion,
|
||||||
ConditionDescription
|
ConditionDescription
|
||||||
},
|
},
|
||||||
|
inject: ['openmct'],
|
||||||
props: {
|
props: {
|
||||||
currentConditionId: {
|
currentConditionId: {
|
||||||
type: String,
|
type: String,
|
||||||
|
|||||||
@@ -81,10 +81,10 @@ import Condition from './Condition.vue';
|
|||||||
import ConditionManager from '../ConditionManager';
|
import ConditionManager from '../ConditionManager';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
inject: ['openmct', 'domainObject'],
|
|
||||||
components: {
|
components: {
|
||||||
Condition
|
Condition
|
||||||
},
|
},
|
||||||
|
inject: ['openmct', 'domainObject'],
|
||||||
props: {
|
props: {
|
||||||
isEditing: Boolean,
|
isEditing: Boolean,
|
||||||
testData: {
|
testData: {
|
||||||
|
|||||||
@@ -58,11 +58,11 @@ import TestData from './TestData.vue';
|
|||||||
import ConditionCollection from './ConditionCollection.vue';
|
import ConditionCollection from './ConditionCollection.vue';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
inject: ["openmct", "domainObject"],
|
|
||||||
components: {
|
components: {
|
||||||
TestData,
|
TestData,
|
||||||
ConditionCollection
|
ConditionCollection
|
||||||
},
|
},
|
||||||
|
inject: ["openmct", "domainObject"],
|
||||||
props: {
|
props: {
|
||||||
isEditing: Boolean
|
isEditing: Boolean
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -31,7 +31,6 @@
|
|||||||
v-model="expanded"
|
v-model="expanded"
|
||||||
class="c-tree__item__view-control"
|
class="c-tree__item__view-control"
|
||||||
:enabled="hasChildren"
|
:enabled="hasChildren"
|
||||||
:propagate="false"
|
|
||||||
/>
|
/>
|
||||||
<div class="c-tree__item__label c-object-label">
|
<div class="c-tree__item__label c-object-label">
|
||||||
<div
|
<div
|
||||||
@@ -42,7 +41,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ul
|
<ul
|
||||||
v-if="expanded"
|
v-if="expanded && !isLoading"
|
||||||
class="c-tree"
|
class="c-tree"
|
||||||
>
|
>
|
||||||
<li
|
<li
|
||||||
@@ -69,10 +68,10 @@ import viewControl from '@/ui/components/viewControl.vue';
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ConditionSetDialogTreeItem',
|
name: 'ConditionSetDialogTreeItem',
|
||||||
inject: ['openmct'],
|
|
||||||
components: {
|
components: {
|
||||||
viewControl
|
viewControl
|
||||||
},
|
},
|
||||||
|
inject: ['openmct'],
|
||||||
props: {
|
props: {
|
||||||
node: {
|
node: {
|
||||||
type: Object,
|
type: Object,
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
></div>
|
></div>
|
||||||
<!-- end loading -->
|
<!-- end loading -->
|
||||||
|
|
||||||
<div v-if="(allTreeItems.length === 0) || (searchValue && filteredTreeItems.length === 0)"
|
<div v-if="shouldDisplayNoResultsText"
|
||||||
class="c-tree-and-search__no-results"
|
class="c-tree-and-search__no-results"
|
||||||
>
|
>
|
||||||
No results found
|
No results found
|
||||||
@@ -63,7 +63,7 @@
|
|||||||
<!-- end main tree -->
|
<!-- end main tree -->
|
||||||
|
|
||||||
<!-- search tree -->
|
<!-- search tree -->
|
||||||
<ul v-if="searchValue"
|
<ul v-if="searchValue && !isLoading"
|
||||||
class="c-tree-and-search__tree c-tree"
|
class="c-tree-and-search__tree c-tree"
|
||||||
>
|
>
|
||||||
<condition-set-dialog-tree-item
|
<condition-set-dialog-tree-item
|
||||||
@@ -80,16 +80,17 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import debounce from 'lodash/debounce';
|
||||||
import search from '@/ui/components/search.vue';
|
import search from '@/ui/components/search.vue';
|
||||||
import ConditionSetDialogTreeItem from './ConditionSetDialogTreeItem.vue';
|
import ConditionSetDialogTreeItem from './ConditionSetDialogTreeItem.vue';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
inject: ['openmct'],
|
|
||||||
name: 'ConditionSetSelectorDialog',
|
name: 'ConditionSetSelectorDialog',
|
||||||
components: {
|
components: {
|
||||||
search,
|
search,
|
||||||
ConditionSetDialogTreeItem
|
ConditionSetDialogTreeItem
|
||||||
},
|
},
|
||||||
|
inject: ['openmct'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
expanded: false,
|
expanded: false,
|
||||||
@@ -100,8 +101,20 @@ export default {
|
|||||||
selectedItem: undefined
|
selectedItem: undefined
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
computed: {
|
||||||
|
shouldDisplayNoResultsText() {
|
||||||
|
if (this.isLoading) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.allTreeItems.length === 0
|
||||||
|
|| (this.searchValue && this.filteredTreeItems.length === 0);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.getDebouncedFilteredChildren = debounce(this.getFilteredChildren, 400);
|
||||||
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.searchService = this.openmct.$injector.get('searchService');
|
|
||||||
this.getAllChildren();
|
this.getAllChildren();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
@@ -124,37 +137,44 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
getFilteredChildren() {
|
getFilteredChildren() {
|
||||||
this.searchService.query(this.searchValue).then(children => {
|
// clear any previous search results
|
||||||
this.filteredTreeItems = children.hits.map(child => {
|
this.filteredTreeItems = [];
|
||||||
|
|
||||||
let context = child.object.getCapability('context');
|
const promises = this.openmct.objects.search(this.searchValue)
|
||||||
let object = child.object.useCapability('adapter');
|
.map(promise => promise
|
||||||
let objectPath = [];
|
.then(results => this.aggregateFilteredChildren(results)));
|
||||||
let navigateToParent;
|
|
||||||
|
|
||||||
if (context) {
|
Promise.all(promises).then(() => {
|
||||||
objectPath = context.getPath().slice(1)
|
this.isLoading = false;
|
||||||
.map(oldObject => oldObject.useCapability('adapter'))
|
|
||||||
.reverse();
|
|
||||||
navigateToParent = '/browse/' + objectPath.slice(1)
|
|
||||||
.map((parent) => this.openmct.objects.makeKeyString(parent.identifier))
|
|
||||||
.join('/');
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
id: this.openmct.objects.makeKeyString(object.identifier),
|
|
||||||
object,
|
|
||||||
objectPath,
|
|
||||||
navigateToParent
|
|
||||||
};
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
async aggregateFilteredChildren(results) {
|
||||||
|
for (const object of results) {
|
||||||
|
const objectPath = await this.openmct.objects.getOriginalPath(object.identifier);
|
||||||
|
|
||||||
|
const navigateToParent = '/browse/'
|
||||||
|
+ objectPath.slice(1)
|
||||||
|
.map(parent => this.openmct.objects.makeKeyString(parent.identifier))
|
||||||
|
.join('/');
|
||||||
|
|
||||||
|
const filteredChild = {
|
||||||
|
id: this.openmct.objects.makeKeyString(object.identifier),
|
||||||
|
object,
|
||||||
|
objectPath,
|
||||||
|
navigateToParent
|
||||||
|
};
|
||||||
|
|
||||||
|
this.filteredTreeItems.push(filteredChild);
|
||||||
|
}
|
||||||
|
},
|
||||||
searchTree(value) {
|
searchTree(value) {
|
||||||
this.searchValue = value;
|
this.searchValue = value;
|
||||||
|
this.isLoading = true;
|
||||||
|
|
||||||
if (this.searchValue !== '') {
|
if (this.searchValue !== '') {
|
||||||
this.getFilteredChildren();
|
this.getDebouncedFilteredChildren();
|
||||||
|
} else {
|
||||||
|
this.isLoading = false;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleItemSelection(item, node) {
|
handleItemSelection(item, node) {
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
import { createOpenMct, resetApplicationState } from "utils/testing";
|
import { createOpenMct, resetApplicationState } from "utils/testing";
|
||||||
import ConditionPlugin from "./plugin";
|
import ConditionPlugin from "./plugin";
|
||||||
|
import stylesManager from '@/ui/inspector/styles/StylesManager';
|
||||||
import StylesView from "./components/inspector/StylesView.vue";
|
import StylesView from "./components/inspector/StylesView.vue";
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import {getApplicableStylesForItem} from "./utils/styleUtils";
|
import {getApplicableStylesForItem} from "./utils/styleUtils";
|
||||||
@@ -135,7 +136,7 @@ describe('the plugin', function () {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const applicableViews = openmct.objectViews.get(testViewObject);
|
const applicableViews = openmct.objectViews.get(testViewObject, []);
|
||||||
let conditionSetView = applicableViews.find((viewProvider) => viewProvider.key === 'conditionSet.view');
|
let conditionSetView = applicableViews.find((viewProvider) => viewProvider.key === 'conditionSet.view');
|
||||||
expect(conditionSetView).toBeDefined();
|
expect(conditionSetView).toBeDefined();
|
||||||
});
|
});
|
||||||
@@ -400,14 +401,15 @@ describe('the plugin', function () {
|
|||||||
let viewContainer = document.createElement('div');
|
let viewContainer = document.createElement('div');
|
||||||
child.append(viewContainer);
|
child.append(viewContainer);
|
||||||
component = new Vue({
|
component = new Vue({
|
||||||
provide: {
|
|
||||||
openmct: openmct,
|
|
||||||
selection: selection
|
|
||||||
},
|
|
||||||
el: viewContainer,
|
el: viewContainer,
|
||||||
components: {
|
components: {
|
||||||
StylesView
|
StylesView
|
||||||
},
|
},
|
||||||
|
provide: {
|
||||||
|
openmct: openmct,
|
||||||
|
selection: selection,
|
||||||
|
stylesManager
|
||||||
|
},
|
||||||
template: '<styles-view/>'
|
template: '<styles-view/>'
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -541,7 +543,6 @@ describe('the plugin', function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('should evaluate as stale when telemetry is not received in the allotted time', (done) => {
|
it('should evaluate as stale when telemetry is not received in the allotted time', (done) => {
|
||||||
|
|
||||||
let conditionMgr = new ConditionManager(conditionSetDomainObject, openmct);
|
let conditionMgr = new ConditionManager(conditionSetDomainObject, openmct);
|
||||||
conditionMgr.on('conditionSetResultUpdated', mockListener);
|
conditionMgr.on('conditionSetResultUpdated', mockListener);
|
||||||
conditionMgr.telemetryObjects = {
|
conditionMgr.telemetryObjects = {
|
||||||
@@ -563,7 +564,7 @@ describe('the plugin', function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('should not evaluate as stale when telemetry is received in the allotted time', (done) => {
|
it('should not evaluate as stale when telemetry is received in the allotted time', (done) => {
|
||||||
const date = Date.now();
|
const date = 1;
|
||||||
conditionSetDomainObject.configuration.conditionCollection[0].configuration.criteria[0].input = ["0.4"];
|
conditionSetDomainObject.configuration.conditionCollection[0].configuration.criteria[0].input = ["0.4"];
|
||||||
let conditionMgr = new ConditionManager(conditionSetDomainObject, openmct);
|
let conditionMgr = new ConditionManager(conditionSetDomainObject, openmct);
|
||||||
conditionMgr.on('conditionSetResultUpdated', mockListener);
|
conditionMgr.on('conditionSetResultUpdated', mockListener);
|
||||||
|
|||||||
@@ -56,14 +56,14 @@ define([
|
|||||||
return {
|
return {
|
||||||
show: function (element) {
|
show: function (element) {
|
||||||
component = new Vue({
|
component = new Vue({
|
||||||
provide: {
|
|
||||||
openmct,
|
|
||||||
objectPath
|
|
||||||
},
|
|
||||||
el: element,
|
el: element,
|
||||||
components: {
|
components: {
|
||||||
AlphanumericFormatView: AlphanumericFormatView.default
|
AlphanumericFormatView: AlphanumericFormatView.default
|
||||||
},
|
},
|
||||||
|
provide: {
|
||||||
|
openmct,
|
||||||
|
objectPath
|
||||||
|
},
|
||||||
template: '<alphanumeric-format-view ref="alphanumericFormatView"></alphanumeric-format-view>'
|
template: '<alphanumeric-format-view ref="alphanumericFormatView"></alphanumeric-format-view>'
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -51,11 +51,11 @@ export default {
|
|||||||
height: 5
|
height: 5
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
inject: ['openmct'],
|
|
||||||
components: {
|
components: {
|
||||||
LayoutFrame
|
LayoutFrame
|
||||||
},
|
},
|
||||||
mixins: [conditionalStylesMixin],
|
mixins: [conditionalStylesMixin],
|
||||||
|
inject: ['openmct'],
|
||||||
props: {
|
props: {
|
||||||
item: {
|
item: {
|
||||||
type: Object,
|
type: Object,
|
||||||
|
|||||||
@@ -152,10 +152,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
let domainObject = JSON.parse(JSON.stringify(this.domainObject));
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
internalDomainObject: domainObject,
|
|
||||||
initSelectIndex: undefined,
|
initSelectIndex: undefined,
|
||||||
selection: [],
|
selection: [],
|
||||||
showGrid: true
|
showGrid: true
|
||||||
@@ -163,10 +160,10 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
gridSize() {
|
gridSize() {
|
||||||
return this.internalDomainObject.configuration.layoutGrid;
|
return this.domainObject.configuration.layoutGrid;
|
||||||
},
|
},
|
||||||
layoutItems() {
|
layoutItems() {
|
||||||
return this.internalDomainObject.configuration.items;
|
return this.domainObject.configuration.items;
|
||||||
},
|
},
|
||||||
selectedLayoutItems() {
|
selectedLayoutItems() {
|
||||||
return this.layoutItems.filter(item => {
|
return this.layoutItems.filter(item => {
|
||||||
@@ -174,7 +171,7 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
layoutDimensions() {
|
layoutDimensions() {
|
||||||
return this.internalDomainObject.configuration.layoutDimensions;
|
return this.domainObject.configuration.layoutDimensions;
|
||||||
},
|
},
|
||||||
shouldDisplayLayoutDimensions() {
|
shouldDisplayLayoutDimensions() {
|
||||||
return this.layoutDimensions
|
return this.layoutDimensions
|
||||||
@@ -206,12 +203,9 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.unlisten = this.openmct.objects.observe(this.internalDomainObject, '*', function (obj) {
|
|
||||||
this.internalDomainObject = JSON.parse(JSON.stringify(obj));
|
|
||||||
}.bind(this));
|
|
||||||
this.openmct.selection.on('change', this.setSelection);
|
this.openmct.selection.on('change', this.setSelection);
|
||||||
this.initializeItems();
|
this.initializeItems();
|
||||||
this.composition = this.openmct.composition.get(this.internalDomainObject);
|
this.composition = this.openmct.composition.get(this.domainObject);
|
||||||
this.composition.on('add', this.addChild);
|
this.composition.on('add', this.addChild);
|
||||||
this.composition.on('remove', this.removeChild);
|
this.composition.on('remove', this.removeChild);
|
||||||
this.composition.load();
|
this.composition.load();
|
||||||
@@ -220,7 +214,6 @@ export default {
|
|||||||
this.openmct.selection.off('change', this.setSelection);
|
this.openmct.selection.off('change', this.setSelection);
|
||||||
this.composition.off('add', this.addChild);
|
this.composition.off('add', this.addChild);
|
||||||
this.composition.off('remove', this.removeChild);
|
this.composition.off('remove', this.removeChild);
|
||||||
this.unlisten();
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
addElement(itemType, element) {
|
addElement(itemType, element) {
|
||||||
@@ -347,7 +340,7 @@ export default {
|
|||||||
this.startingMinY2 = undefined;
|
this.startingMinY2 = undefined;
|
||||||
},
|
},
|
||||||
mutate(path, value) {
|
mutate(path, value) {
|
||||||
this.openmct.objects.mutate(this.internalDomainObject, path, value);
|
this.openmct.objects.mutate(this.domainObject, path, value);
|
||||||
},
|
},
|
||||||
handleDrop($event) {
|
handleDrop($event) {
|
||||||
if (!$event.dataTransfer.types.includes('openmct/domain-object-path')) {
|
if (!$event.dataTransfer.types.includes('openmct/domain-object-path')) {
|
||||||
@@ -387,11 +380,11 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
containsObject(identifier) {
|
containsObject(identifier) {
|
||||||
return _.get(this.internalDomainObject, 'composition')
|
return _.get(this.domainObject, 'composition')
|
||||||
.some(childId => this.openmct.objects.areIdsEqual(childId, identifier));
|
.some(childId => this.openmct.objects.areIdsEqual(childId, identifier));
|
||||||
},
|
},
|
||||||
handleDragOver($event) {
|
handleDragOver($event) {
|
||||||
if (this.internalDomainObject.locked) {
|
if (this.domainObject.locked) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -420,7 +413,7 @@ export default {
|
|||||||
item.id = uuid();
|
item.id = uuid();
|
||||||
this.trackItem(item);
|
this.trackItem(item);
|
||||||
this.layoutItems.push(item);
|
this.layoutItems.push(item);
|
||||||
this.openmct.objects.mutate(this.internalDomainObject, "configuration.items", this.layoutItems);
|
this.openmct.objects.mutate(this.domainObject, "configuration.items", this.layoutItems);
|
||||||
this.initSelectIndex = this.layoutItems.length - 1;
|
this.initSelectIndex = this.layoutItems.length - 1;
|
||||||
},
|
},
|
||||||
trackItem(item) {
|
trackItem(item) {
|
||||||
@@ -477,7 +470,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
removeFromComposition(keyString) {
|
removeFromComposition(keyString) {
|
||||||
let composition = _.get(this.internalDomainObject, 'composition');
|
let composition = _.get(this.domainObject, 'composition');
|
||||||
composition = composition.filter(identifier => {
|
composition = composition.filter(identifier => {
|
||||||
return this.openmct.objects.makeKeyString(identifier) !== keyString;
|
return this.openmct.objects.makeKeyString(identifier) !== keyString;
|
||||||
});
|
});
|
||||||
@@ -629,10 +622,10 @@ export default {
|
|||||||
createNewDomainObject(domainObject, composition, viewType, nameExtension, model) {
|
createNewDomainObject(domainObject, composition, viewType, nameExtension, model) {
|
||||||
let identifier = {
|
let identifier = {
|
||||||
key: uuid(),
|
key: uuid(),
|
||||||
namespace: this.internalDomainObject.identifier.namespace
|
namespace: this.domainObject.identifier.namespace
|
||||||
};
|
};
|
||||||
let type = this.openmct.types.get(viewType);
|
let type = this.openmct.types.get(viewType);
|
||||||
let parentKeyString = this.openmct.objects.makeKeyString(this.internalDomainObject.identifier);
|
let parentKeyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);
|
||||||
let objectName = nameExtension ? `${domainObject.name}-${nameExtension}` : domainObject.name;
|
let objectName = nameExtension ? `${domainObject.name}-${nameExtension}` : domainObject.name;
|
||||||
let object = {};
|
let object = {};
|
||||||
|
|
||||||
@@ -689,7 +682,7 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
duplicateItem(selectedItems) {
|
duplicateItem(selectedItems) {
|
||||||
let objectStyles = this.internalDomainObject.configuration.objectStyles || {};
|
let objectStyles = this.domainObject.configuration.objectStyles || {};
|
||||||
let selectItemsArray = [];
|
let selectItemsArray = [];
|
||||||
let newDomainObjectsArray = [];
|
let newDomainObjectsArray = [];
|
||||||
|
|
||||||
@@ -728,8 +721,8 @@ export default {
|
|||||||
});
|
});
|
||||||
|
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.openmct.objects.mutate(this.internalDomainObject, "configuration.items", this.layoutItems);
|
this.openmct.objects.mutate(this.domainObject, "configuration.items", this.layoutItems);
|
||||||
this.openmct.objects.mutate(this.internalDomainObject, "configuration.objectStyles", objectStyles);
|
this.openmct.objects.mutate(this.domainObject, "configuration.objectStyles", objectStyles);
|
||||||
this.$el.click(); //clear selection;
|
this.$el.click(); //clear selection;
|
||||||
|
|
||||||
newDomainObjectsArray.forEach(domainObject => {
|
newDomainObjectsArray.forEach(domainObject => {
|
||||||
@@ -768,13 +761,13 @@ export default {
|
|||||||
};
|
};
|
||||||
this.createNewDomainObject(mockDomainObject, overlayPlotIdentifiers, viewType).then((newDomainObject) => {
|
this.createNewDomainObject(mockDomainObject, overlayPlotIdentifiers, viewType).then((newDomainObject) => {
|
||||||
let newDomainObjectKeyString = this.openmct.objects.makeKeyString(newDomainObject.identifier);
|
let newDomainObjectKeyString = this.openmct.objects.makeKeyString(newDomainObject.identifier);
|
||||||
let internalDomainObjectKeyString = this.openmct.objects.makeKeyString(this.internalDomainObject.identifier);
|
let domainObjectKeyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);
|
||||||
|
|
||||||
this.composition.add(newDomainObject);
|
this.composition.add(newDomainObject);
|
||||||
this.addItem('subobject-view', newDomainObject, position);
|
this.addItem('subobject-view', newDomainObject, position);
|
||||||
|
|
||||||
overlayPlots.forEach(overlayPlot => {
|
overlayPlots.forEach(overlayPlot => {
|
||||||
if (overlayPlot.location === internalDomainObjectKeyString) {
|
if (overlayPlot.location === domainObjectKeyString) {
|
||||||
this.openmct.objects.mutate(overlayPlot, 'location', newDomainObjectKeyString);
|
this.openmct.objects.mutate(overlayPlot, 'location', newDomainObjectKeyString);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -51,11 +51,11 @@ export default {
|
|||||||
url: element.url
|
url: element.url
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
inject: ['openmct'],
|
|
||||||
components: {
|
components: {
|
||||||
LayoutFrame
|
LayoutFrame
|
||||||
},
|
},
|
||||||
mixins: [conditionalStylesMixin],
|
mixins: [conditionalStylesMixin],
|
||||||
|
inject: ['openmct'],
|
||||||
props: {
|
props: {
|
||||||
item: {
|
item: {
|
||||||
type: Object,
|
type: Object,
|
||||||
|
|||||||
@@ -99,8 +99,8 @@ export default {
|
|||||||
stroke: '#717171'
|
stroke: '#717171'
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
inject: ['openmct'],
|
|
||||||
mixins: [conditionalStylesMixin],
|
mixins: [conditionalStylesMixin],
|
||||||
|
inject: ['openmct'],
|
||||||
props: {
|
props: {
|
||||||
item: {
|
item: {
|
||||||
type: Object,
|
type: Object,
|
||||||
|
|||||||
@@ -80,11 +80,11 @@ export default {
|
|||||||
viewKey
|
viewKey
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
inject: ['openmct', 'objectPath'],
|
|
||||||
components: {
|
components: {
|
||||||
ObjectFrame,
|
ObjectFrame,
|
||||||
LayoutFrame
|
LayoutFrame
|
||||||
},
|
},
|
||||||
|
inject: ['openmct', 'objectPath'],
|
||||||
props: {
|
props: {
|
||||||
item: {
|
item: {
|
||||||
type: Object,
|
type: Object,
|
||||||
@@ -109,7 +109,8 @@ export default {
|
|||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
domainObject: undefined,
|
domainObject: undefined,
|
||||||
currentObjectPath: []
|
currentObjectPath: [],
|
||||||
|
mutablePromise: undefined
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@@ -129,17 +130,31 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.openmct.objects.get(this.item.identifier)
|
if (this.openmct.objects.supportsMutation(this.item.identifier)) {
|
||||||
.then(this.setObject);
|
this.mutablePromise = this.openmct.objects.getMutable(this.item.identifier)
|
||||||
|
.then(this.setObject);
|
||||||
|
} else {
|
||||||
|
this.openmct.objects.get(this.item.identifier)
|
||||||
|
.then(this.setObject);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
destroyed() {
|
beforeDestroy() {
|
||||||
if (this.removeSelectable) {
|
if (this.removeSelectable) {
|
||||||
this.removeSelectable();
|
this.removeSelectable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.mutablePromise) {
|
||||||
|
this.mutablePromise.then(() => {
|
||||||
|
this.openmct.objects.destroyMutable(this.domainObject);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.openmct.objects.destroyMutable(this.domainObject);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
setObject(domainObject) {
|
setObject(domainObject) {
|
||||||
this.domainObject = domainObject;
|
this.domainObject = domainObject;
|
||||||
|
this.mutablePromise = undefined;
|
||||||
this.currentObjectPath = [this.domainObject].concat(this.objectPath.slice());
|
this.currentObjectPath = [this.domainObject].concat(this.objectPath.slice());
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
let reference = this.$refs.objectFrame;
|
let reference = this.$refs.objectFrame;
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
v-if="domainObject"
|
v-if="domainObject"
|
||||||
class="c-telemetry-view"
|
class="c-telemetry-view u-style-receiver"
|
||||||
:class="[statusClass]"
|
:class="[statusClass]"
|
||||||
:style="styleObject"
|
:style="styleObject"
|
||||||
:data-font-size="item.fontSize"
|
:data-font-size="item.fontSize"
|
||||||
@@ -98,11 +98,11 @@ export default {
|
|||||||
font: 'default'
|
font: 'default'
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
inject: ['openmct', 'objectPath'],
|
|
||||||
components: {
|
components: {
|
||||||
LayoutFrame
|
LayoutFrame
|
||||||
},
|
},
|
||||||
mixins: [conditionalStylesMixin],
|
mixins: [conditionalStylesMixin],
|
||||||
|
inject: ['openmct', 'objectPath'],
|
||||||
props: {
|
props: {
|
||||||
item: {
|
item: {
|
||||||
type: Object,
|
type: Object,
|
||||||
@@ -131,7 +131,8 @@ export default {
|
|||||||
domainObject: undefined,
|
domainObject: undefined,
|
||||||
formats: undefined,
|
formats: undefined,
|
||||||
viewKey: `alphanumeric-format-${Math.random()}`,
|
viewKey: `alphanumeric-format-${Math.random()}`,
|
||||||
status: ''
|
status: '',
|
||||||
|
mutablePromise: undefined
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@@ -212,14 +213,20 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.openmct.objects.get(this.item.identifier)
|
if (this.openmct.objects.supportsMutation(this.item.identifier)) {
|
||||||
.then(this.setObject);
|
this.mutablePromise = this.openmct.objects.getMutable(this.item.identifier)
|
||||||
|
.then(this.setObject);
|
||||||
|
} else {
|
||||||
|
this.openmct.objects.get(this.item.identifier)
|
||||||
|
.then(this.setObject);
|
||||||
|
}
|
||||||
|
|
||||||
this.openmct.time.on("bounds", this.refreshData);
|
this.openmct.time.on("bounds", this.refreshData);
|
||||||
|
|
||||||
this.status = this.openmct.status.get(this.item.identifier);
|
this.status = this.openmct.status.get(this.item.identifier);
|
||||||
this.removeStatusListener = this.openmct.status.observe(this.item.identifier, this.setStatus);
|
this.removeStatusListener = this.openmct.status.observe(this.item.identifier, this.setStatus);
|
||||||
},
|
},
|
||||||
destroyed() {
|
beforeDestroy() {
|
||||||
this.removeSubscription();
|
this.removeSubscription();
|
||||||
this.removeStatusListener();
|
this.removeStatusListener();
|
||||||
|
|
||||||
@@ -228,13 +235,22 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.openmct.time.off("bounds", this.refreshData);
|
this.openmct.time.off("bounds", this.refreshData);
|
||||||
|
|
||||||
|
if (this.mutablePromise) {
|
||||||
|
this.mutablePromise.then(() => {
|
||||||
|
this.openmct.objects.destroyMutable(this.domainObject);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.openmct.objects.destroyMutable(this.domainObject);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
formattedValueForCopy() {
|
formattedValueForCopy() {
|
||||||
const timeFormatterKey = this.openmct.time.timeSystem().key;
|
const timeFormatterKey = this.openmct.time.timeSystem().key;
|
||||||
const timeFormatter = this.formats[timeFormatterKey];
|
const timeFormatter = this.formats[timeFormatterKey];
|
||||||
|
const unit = this.unit ? ` ${this.unit}` : '';
|
||||||
|
|
||||||
return `At ${timeFormatter.format(this.datum)} ${this.domainObject.name} had a value of ${this.telemetryValue} ${this.unit}`;
|
return `At ${timeFormatter.format(this.datum)} ${this.domainObject.name} had a value of ${this.telemetryValue}${unit}`;
|
||||||
},
|
},
|
||||||
requestHistoricalData() {
|
requestHistoricalData() {
|
||||||
let bounds = this.openmct.time.bounds();
|
let bounds = this.openmct.time.bounds();
|
||||||
@@ -285,6 +301,7 @@ export default {
|
|||||||
},
|
},
|
||||||
setObject(domainObject) {
|
setObject(domainObject) {
|
||||||
this.domainObject = domainObject;
|
this.domainObject = domainObject;
|
||||||
|
this.mutablePromise = undefined;
|
||||||
this.keyString = this.openmct.objects.makeKeyString(domainObject.identifier);
|
this.keyString = this.openmct.objects.makeKeyString(domainObject.identifier);
|
||||||
this.metadata = this.openmct.telemetry.getMetadata(this.domainObject);
|
this.metadata = this.openmct.telemetry.getMetadata(this.domainObject);
|
||||||
this.limitEvaluator = this.openmct.telemetry.limitEvaluator(this.domainObject);
|
this.limitEvaluator = this.openmct.telemetry.limitEvaluator(this.domainObject);
|
||||||
|
|||||||
@@ -59,11 +59,11 @@ export default {
|
|||||||
font: 'default'
|
font: 'default'
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
inject: ['openmct'],
|
|
||||||
components: {
|
components: {
|
||||||
LayoutFrame
|
LayoutFrame
|
||||||
},
|
},
|
||||||
mixins: [conditionalStylesMixin],
|
mixins: [conditionalStylesMixin],
|
||||||
|
inject: ['openmct'],
|
||||||
props: {
|
props: {
|
||||||
item: {
|
item: {
|
||||||
type: Object,
|
type: Object,
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ describe('the plugin', function () {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const applicableViews = openmct.objectViews.get(testViewObject);
|
const applicableViews = openmct.objectViews.get(testViewObject, []);
|
||||||
let displayLayoutViewProvider = applicableViews.find((viewProvider) => viewProvider.key === 'layout.view');
|
let displayLayoutViewProvider = applicableViews.find((viewProvider) => viewProvider.key === 'layout.view');
|
||||||
expect(displayLayoutViewProvider).toBeDefined();
|
expect(displayLayoutViewProvider).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|||||||
159
src/plugins/duplicate/DuplicateAction.js
Normal file
159
src/plugins/duplicate/DuplicateAction.js
Normal file
@@ -0,0 +1,159 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2020, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
import DuplicateTask from './DuplicateTask';
|
||||||
|
|
||||||
|
export default class DuplicateAction {
|
||||||
|
constructor(openmct) {
|
||||||
|
this.name = 'Duplicate';
|
||||||
|
this.key = 'duplicate';
|
||||||
|
this.description = 'Duplicate this object.';
|
||||||
|
this.cssClass = "icon-duplicate";
|
||||||
|
this.group = "action";
|
||||||
|
this.priority = 7;
|
||||||
|
|
||||||
|
this.openmct = openmct;
|
||||||
|
}
|
||||||
|
|
||||||
|
async invoke(objectPath) {
|
||||||
|
let duplicationTask = new DuplicateTask(this.openmct);
|
||||||
|
let originalObject = objectPath[0];
|
||||||
|
let parent = objectPath[1];
|
||||||
|
let userInput = await this.getUserInput(originalObject, parent);
|
||||||
|
let newParent = userInput.location;
|
||||||
|
let inNavigationPath = this.inNavigationPath(originalObject);
|
||||||
|
|
||||||
|
// legacy check
|
||||||
|
if (this.isLegacyDomainObject(newParent)) {
|
||||||
|
newParent = await this.convertFromLegacy(newParent);
|
||||||
|
}
|
||||||
|
|
||||||
|
// if editing, save
|
||||||
|
if (inNavigationPath && this.openmct.editor.isEditing()) {
|
||||||
|
this.openmct.editor.save();
|
||||||
|
}
|
||||||
|
|
||||||
|
// duplicate
|
||||||
|
let newObject = await duplicationTask.duplicate(originalObject, newParent);
|
||||||
|
this.updateNameCheck(newObject, userInput.name);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getUserInput(originalObject, parent) {
|
||||||
|
let dialogService = this.openmct.$injector.get('dialogService');
|
||||||
|
let dialogForm = this.getDialogForm(originalObject, parent);
|
||||||
|
let formState = {
|
||||||
|
name: originalObject.name
|
||||||
|
};
|
||||||
|
let userInput = await dialogService.getUserInput(dialogForm, formState);
|
||||||
|
|
||||||
|
return userInput;
|
||||||
|
}
|
||||||
|
|
||||||
|
updateNameCheck(object, name) {
|
||||||
|
if (object.name !== name) {
|
||||||
|
this.openmct.objects.mutate(object, 'name', name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inNavigationPath(object) {
|
||||||
|
return this.openmct.router.path
|
||||||
|
.some(objectInPath => this.openmct.objects.areIdsEqual(objectInPath.identifier, object.identifier));
|
||||||
|
}
|
||||||
|
|
||||||
|
getDialogForm(object, parent) {
|
||||||
|
return {
|
||||||
|
name: "Duplicate Item",
|
||||||
|
sections: [
|
||||||
|
{
|
||||||
|
rows: [
|
||||||
|
{
|
||||||
|
key: "name",
|
||||||
|
control: "textfield",
|
||||||
|
name: "Name",
|
||||||
|
pattern: "\\S+",
|
||||||
|
required: true,
|
||||||
|
cssClass: "l-input-lg"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "location",
|
||||||
|
cssClass: "grows",
|
||||||
|
control: "locator",
|
||||||
|
validate: this.validate(object, parent),
|
||||||
|
key: 'location'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
validate(object, currentParent) {
|
||||||
|
return (parentCandidate) => {
|
||||||
|
let currentParentKeystring = this.openmct.objects.makeKeyString(currentParent.identifier);
|
||||||
|
let parentCandidateKeystring = this.openmct.objects.makeKeyString(parentCandidate.getId());
|
||||||
|
let objectKeystring = this.openmct.objects.makeKeyString(object.identifier);
|
||||||
|
|
||||||
|
if (!parentCandidate || !currentParentKeystring) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (parentCandidateKeystring === objectKeystring) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.openmct.composition.checkPolicy(
|
||||||
|
parentCandidate.useCapability('adapter'),
|
||||||
|
object
|
||||||
|
);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
isLegacyDomainObject(domainObject) {
|
||||||
|
return domainObject.getCapability !== undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
async convertFromLegacy(legacyDomainObject) {
|
||||||
|
let objectContext = legacyDomainObject.getCapability('context');
|
||||||
|
let domainObject = await this.openmct.objects.get(objectContext.domainObject.id);
|
||||||
|
|
||||||
|
return domainObject;
|
||||||
|
}
|
||||||
|
|
||||||
|
appliesTo(objectPath) {
|
||||||
|
let parent = objectPath[1];
|
||||||
|
let parentType = parent && this.openmct.types.get(parent.type);
|
||||||
|
let child = objectPath[0];
|
||||||
|
let childType = child && this.openmct.types.get(child.type);
|
||||||
|
let locked = child.locked ? child.locked : parent && parent.locked;
|
||||||
|
|
||||||
|
if (locked) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return childType
|
||||||
|
&& childType.definition.creatable
|
||||||
|
&& parentType
|
||||||
|
&& parentType.definition.creatable
|
||||||
|
&& Array.isArray(parent.composition);
|
||||||
|
}
|
||||||
|
}
|
||||||
273
src/plugins/duplicate/DuplicateTask.js
Normal file
273
src/plugins/duplicate/DuplicateTask.js
Normal file
@@ -0,0 +1,273 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2020, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
|
import uuid from 'uuid';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This class encapsulates the process of duplicating/copying a domain object
|
||||||
|
* and all of its children.
|
||||||
|
*
|
||||||
|
* @param {DomainObject} domainObject The object to duplicate
|
||||||
|
* @param {DomainObject} parent The new location of the cloned object tree
|
||||||
|
* @param {src/plugins/duplicate.DuplicateService~filter} filter
|
||||||
|
* a function used to filter out objects from
|
||||||
|
* the cloning process
|
||||||
|
* @constructor
|
||||||
|
*/
|
||||||
|
export default class DuplicateTask {
|
||||||
|
|
||||||
|
constructor(openmct) {
|
||||||
|
this.domainObject = undefined;
|
||||||
|
this.parent = undefined;
|
||||||
|
this.firstClone = undefined;
|
||||||
|
this.filter = undefined;
|
||||||
|
this.persisted = 0;
|
||||||
|
this.clones = [];
|
||||||
|
this.idMap = {};
|
||||||
|
|
||||||
|
this.openmct = openmct;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute the duplicate/copy task with the objects provided.
|
||||||
|
* @returns {promise} Which will resolve with a clone of the object
|
||||||
|
* once complete.
|
||||||
|
*/
|
||||||
|
async duplicate(domainObject, parent, filter) {
|
||||||
|
this.domainObject = domainObject;
|
||||||
|
this.parent = parent;
|
||||||
|
this.namespace = parent.identifier.namespace;
|
||||||
|
this.filter = filter || this.isCreatable;
|
||||||
|
|
||||||
|
await this.buildDuplicationPlan();
|
||||||
|
await this.persistObjects();
|
||||||
|
await this.addClonesToParent();
|
||||||
|
|
||||||
|
return this.firstClone;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Will build a graph of an object and all of its child objects in
|
||||||
|
* memory
|
||||||
|
* @private
|
||||||
|
* @param domainObject The original object to be copied
|
||||||
|
* @param parent The parent of the original object to be copied
|
||||||
|
* @returns {Promise} resolved with an array of clones of the models
|
||||||
|
* of the object tree being copied. Duplicating is done in a bottom-up
|
||||||
|
* fashion, so that the last member in the array is a clone of the model
|
||||||
|
* object being copied. The clones are all full composed with
|
||||||
|
* references to their own children.
|
||||||
|
*/
|
||||||
|
async buildDuplicationPlan() {
|
||||||
|
let domainObjectClone = await this.duplicateObject(this.domainObject);
|
||||||
|
|
||||||
|
if (domainObjectClone !== this.domainObject) {
|
||||||
|
domainObjectClone.location = this.getKeyString(this.parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.firstClone = domainObjectClone;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Will persist a list of {@link objectClones}. It will persist all
|
||||||
|
* simultaneously, irrespective of order in the list. This may
|
||||||
|
* result in automatic request batching by the browser.
|
||||||
|
*/
|
||||||
|
async persistObjects() {
|
||||||
|
let initialCount = this.clones.length;
|
||||||
|
let dialog = this.openmct.overlays.progressDialog({
|
||||||
|
progressPerc: 0,
|
||||||
|
message: `Duplicating ${initialCount} objects.`,
|
||||||
|
iconClass: 'info',
|
||||||
|
title: 'Duplicating'
|
||||||
|
});
|
||||||
|
|
||||||
|
let clonesDone = Promise.all(this.clones.map((clone) => {
|
||||||
|
let percentPersisted = Math.ceil(100 * (++this.persisted / initialCount));
|
||||||
|
let message = `Duplicating ${initialCount - this.persisted} objects.`;
|
||||||
|
|
||||||
|
dialog.updateProgress(percentPersisted, message);
|
||||||
|
|
||||||
|
return this.openmct.objects.save(clone);
|
||||||
|
}));
|
||||||
|
|
||||||
|
await clonesDone;
|
||||||
|
|
||||||
|
dialog.dismiss();
|
||||||
|
this.openmct.notifications.info(`Duplicated ${this.persisted} objects.`);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Will add a list of clones to the specified parent's composition
|
||||||
|
*/
|
||||||
|
async addClonesToParent() {
|
||||||
|
let parentComposition = this.openmct.composition.get(this.parent);
|
||||||
|
await parentComposition.load();
|
||||||
|
parentComposition.add(this.firstClone);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A recursive function that will perform a bottom-up duplicate of
|
||||||
|
* the object tree with originalObject at the root. Recurses to
|
||||||
|
* the farthest leaf, then works its way back up again,
|
||||||
|
* cloning objects, and composing them with their child clones
|
||||||
|
* as it goes
|
||||||
|
* @private
|
||||||
|
* @returns {DomainObject} If the type of the original object allows for
|
||||||
|
* duplication, then a duplicate of the object, otherwise the object
|
||||||
|
* itself (to allow linking to non duplicatable objects).
|
||||||
|
*/
|
||||||
|
async duplicateObject(originalObject) {
|
||||||
|
// Check if the creatable (or other passed in filter).
|
||||||
|
if (this.filter(originalObject)) {
|
||||||
|
let clone = this.cloneObjectModel(originalObject);
|
||||||
|
let composeesCollection = this.openmct.composition.get(originalObject);
|
||||||
|
let composees;
|
||||||
|
|
||||||
|
if (composeesCollection) {
|
||||||
|
composees = await composeesCollection.load();
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.duplicateComposees(clone, composees);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Not creatable, creating a link, no need to iterate children
|
||||||
|
return originalObject;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Given an array of objects composed by a parent, clone them, then
|
||||||
|
* add them to the parent.
|
||||||
|
* @private
|
||||||
|
* @returns {*}
|
||||||
|
*/
|
||||||
|
async duplicateComposees(clonedParent, composees = []) {
|
||||||
|
let idMappings = [];
|
||||||
|
let allComposeesDuplicated = composees.reduce(async (previousPromise, nextComposee) => {
|
||||||
|
await previousPromise;
|
||||||
|
|
||||||
|
let clonedComposee = await this.duplicateObject(nextComposee);
|
||||||
|
|
||||||
|
if (clonedComposee) {
|
||||||
|
idMappings.push({
|
||||||
|
newId: clonedComposee.identifier,
|
||||||
|
oldId: nextComposee.identifier
|
||||||
|
});
|
||||||
|
this.composeChild(clonedComposee, clonedParent, clonedComposee !== nextComposee);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}, Promise.resolve());
|
||||||
|
|
||||||
|
await allComposeesDuplicated;
|
||||||
|
|
||||||
|
clonedParent = this.rewriteIdentifiers(clonedParent, idMappings);
|
||||||
|
this.clones.push(clonedParent);
|
||||||
|
|
||||||
|
return clonedParent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update identifiers in a cloned object model (or part of
|
||||||
|
* a cloned object model) to reflect new identifiers after
|
||||||
|
* duplicating.
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
rewriteIdentifiers(clonedParent, childIdMappings) {
|
||||||
|
for (let { newId, oldId } of childIdMappings) {
|
||||||
|
let newIdKeyString = this.openmct.objects.makeKeyString(newId);
|
||||||
|
let oldIdKeyString = this.openmct.objects.makeKeyString(oldId);
|
||||||
|
|
||||||
|
// regex replace keystrings
|
||||||
|
clonedParent = JSON.stringify(clonedParent).replace(new RegExp(oldIdKeyString, 'g'), newIdKeyString);
|
||||||
|
|
||||||
|
// parse reviver to replace identifiers
|
||||||
|
clonedParent = JSON.parse(clonedParent, (key, value) => {
|
||||||
|
if (Object.prototype.hasOwnProperty.call(value, 'key')
|
||||||
|
&& Object.prototype.hasOwnProperty.call(value, 'namespace')
|
||||||
|
&& value.key === oldId.key
|
||||||
|
&& value.namespace === oldId.namespace) {
|
||||||
|
return newId;
|
||||||
|
} else {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return clonedParent;
|
||||||
|
}
|
||||||
|
|
||||||
|
composeChild(child, parent, setLocation) {
|
||||||
|
parent.composition.push(child.identifier);
|
||||||
|
|
||||||
|
//If a location is not specified, set it.
|
||||||
|
if (setLocation && child.location === undefined) {
|
||||||
|
let parentKeyString = this.getKeyString(parent);
|
||||||
|
child.location = parentKeyString;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getTypeDefinition(domainObject, definition) {
|
||||||
|
let typeDefinitions = this.openmct.types.get(domainObject.type).definition;
|
||||||
|
|
||||||
|
return typeDefinitions[definition] || false;
|
||||||
|
}
|
||||||
|
|
||||||
|
cloneObjectModel(domainObject) {
|
||||||
|
let clone = JSON.parse(JSON.stringify(domainObject));
|
||||||
|
let identifier = {
|
||||||
|
key: uuid(),
|
||||||
|
namespace: this.namespace // set to NEW parent's namespace
|
||||||
|
};
|
||||||
|
|
||||||
|
if (clone.modified || clone.persisted || clone.location) {
|
||||||
|
clone.modified = undefined;
|
||||||
|
clone.persisted = undefined;
|
||||||
|
clone.location = undefined;
|
||||||
|
delete clone.modified;
|
||||||
|
delete clone.persisted;
|
||||||
|
delete clone.location;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (clone.composition) {
|
||||||
|
clone.composition = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
clone.identifier = identifier;
|
||||||
|
|
||||||
|
return clone;
|
||||||
|
}
|
||||||
|
|
||||||
|
getKeyString(domainObject) {
|
||||||
|
return this.openmct.objects.makeKeyString(domainObject.identifier);
|
||||||
|
}
|
||||||
|
|
||||||
|
isCreatable(domainObject) {
|
||||||
|
return this.getTypeDefinition(domainObject, 'creatable');
|
||||||
|
}
|
||||||
|
}
|
||||||
28
src/plugins/duplicate/plugin.js
Normal file
28
src/plugins/duplicate/plugin.js
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2019, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
import DuplicateAction from "./DuplicateAction";
|
||||||
|
|
||||||
|
export default function () {
|
||||||
|
return function (openmct) {
|
||||||
|
openmct.actions.register(new DuplicateAction(openmct));
|
||||||
|
};
|
||||||
|
}
|
||||||
159
src/plugins/duplicate/pluginSpec.js
Normal file
159
src/plugins/duplicate/pluginSpec.js
Normal file
@@ -0,0 +1,159 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2020, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
import DuplicateActionPlugin from './plugin.js';
|
||||||
|
import DuplicateAction from './DuplicateAction.js';
|
||||||
|
import DuplicateTask from './DuplicateTask.js';
|
||||||
|
import {
|
||||||
|
createOpenMct,
|
||||||
|
resetApplicationState,
|
||||||
|
getMockObjects
|
||||||
|
} from 'utils/testing';
|
||||||
|
|
||||||
|
describe("The Duplicate Action plugin", () => {
|
||||||
|
|
||||||
|
let openmct;
|
||||||
|
let duplicateTask;
|
||||||
|
let childObject;
|
||||||
|
let parentObject;
|
||||||
|
let anotherParentObject;
|
||||||
|
|
||||||
|
// this setups up the app
|
||||||
|
beforeEach((done) => {
|
||||||
|
openmct = createOpenMct();
|
||||||
|
|
||||||
|
childObject = getMockObjects({
|
||||||
|
objectKeyStrings: ['folder'],
|
||||||
|
overwrite: {
|
||||||
|
folder: {
|
||||||
|
name: "Child Folder",
|
||||||
|
identifier: {
|
||||||
|
namespace: "",
|
||||||
|
key: "child-folder-object"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}).folder;
|
||||||
|
parentObject = getMockObjects({
|
||||||
|
objectKeyStrings: ['folder'],
|
||||||
|
overwrite: {
|
||||||
|
folder: {
|
||||||
|
name: "Parent Folder",
|
||||||
|
type: "folder",
|
||||||
|
composition: [childObject.identifier]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}).folder;
|
||||||
|
anotherParentObject = getMockObjects({
|
||||||
|
objectKeyStrings: ['folder'],
|
||||||
|
overwrite: {
|
||||||
|
folder: {
|
||||||
|
name: "Another Parent Folder"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}).folder;
|
||||||
|
|
||||||
|
let objectGet = openmct.objects.get.bind(openmct.objects);
|
||||||
|
spyOn(openmct.objects, 'get').and.callFake((identifier) => {
|
||||||
|
let obj = [childObject, parentObject, anotherParentObject].find((ob) => ob.identifier.key === identifier.key);
|
||||||
|
|
||||||
|
if (!obj) {
|
||||||
|
// not one of the mocked objs, callthrough basically
|
||||||
|
return objectGet(identifier);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Promise.resolve(obj);
|
||||||
|
});
|
||||||
|
|
||||||
|
spyOn(openmct.composition, 'get').and.callFake((domainObject) => {
|
||||||
|
return {
|
||||||
|
load: async () => {
|
||||||
|
let obj = [childObject, parentObject, anotherParentObject].find((ob) => ob.identifier.key === domainObject.identifier.key);
|
||||||
|
let children = [];
|
||||||
|
|
||||||
|
if (obj) {
|
||||||
|
for (let i = 0; i < obj.composition.length; i++) {
|
||||||
|
children.push(await openmct.objects.get(obj.composition[i]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return Promise.resolve(children);
|
||||||
|
},
|
||||||
|
add: (child) => {
|
||||||
|
domainObject.composition.push(child.identifier);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
// already installed by default, but never hurts, just adds to context menu
|
||||||
|
openmct.install(DuplicateActionPlugin());
|
||||||
|
openmct.types.addType('folder', {creatable: true});
|
||||||
|
|
||||||
|
openmct.on('start', done);
|
||||||
|
openmct.startHeadless();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
resetApplicationState(openmct);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should be defined", () => {
|
||||||
|
expect(DuplicateActionPlugin).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("when moving an object to a new parent", () => {
|
||||||
|
|
||||||
|
beforeEach(async (done) => {
|
||||||
|
duplicateTask = new DuplicateTask(openmct);
|
||||||
|
await duplicateTask.duplicate(parentObject, anotherParentObject);
|
||||||
|
done();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("the duplicate child object's name (when not changing) should be the same as the original object", async () => {
|
||||||
|
let duplicatedObjectIdentifier = anotherParentObject.composition[0];
|
||||||
|
let duplicatedObject = await openmct.objects.get(duplicatedObjectIdentifier);
|
||||||
|
let duplicateObjectName = duplicatedObject.name;
|
||||||
|
|
||||||
|
expect(duplicateObjectName).toEqual(parentObject.name);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("the duplicate child object's identifier should be new", () => {
|
||||||
|
let duplicatedObjectIdentifier = anotherParentObject.composition[0];
|
||||||
|
|
||||||
|
expect(duplicatedObjectIdentifier.key).not.toEqual(parentObject.identifier.key);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("when a new name is provided for the duplicated object", () => {
|
||||||
|
const NEW_NAME = 'New Name';
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
duplicateTask = new DuplicateAction(openmct);
|
||||||
|
duplicateTask.updateNameCheck(parentObject, NEW_NAME);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("the name is updated", () => {
|
||||||
|
let childName = parentObject.name;
|
||||||
|
expect(childName).toEqual(NEW_NAME);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
@@ -47,13 +47,13 @@ define([
|
|||||||
return {
|
return {
|
||||||
show: function (element) {
|
show: function (element) {
|
||||||
component = new Vue({
|
component = new Vue({
|
||||||
provide: {
|
|
||||||
openmct
|
|
||||||
},
|
|
||||||
el: element,
|
el: element,
|
||||||
components: {
|
components: {
|
||||||
FiltersView: FiltersView.default
|
FiltersView: FiltersView.default
|
||||||
},
|
},
|
||||||
|
provide: {
|
||||||
|
openmct
|
||||||
|
},
|
||||||
template: '<filters-view></filters-view>'
|
template: '<filters-view></filters-view>'
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -65,11 +65,11 @@ import ToggleSwitch from '../../../ui/components/ToggleSwitch.vue';
|
|||||||
import isEmpty from 'lodash/isEmpty';
|
import isEmpty from 'lodash/isEmpty';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
inject: ['openmct'],
|
|
||||||
components: {
|
components: {
|
||||||
FilterField,
|
FilterField,
|
||||||
ToggleSwitch
|
ToggleSwitch
|
||||||
},
|
},
|
||||||
|
inject: ['openmct'],
|
||||||
props: {
|
props: {
|
||||||
filterObject: {
|
filterObject: {
|
||||||
type: Object,
|
type: Object,
|
||||||
|
|||||||
@@ -41,10 +41,10 @@
|
|||||||
import FilterField from './FilterField.vue';
|
import FilterField from './FilterField.vue';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
inject: ['openmct'],
|
|
||||||
components: {
|
components: {
|
||||||
FilterField
|
FilterField
|
||||||
},
|
},
|
||||||
|
inject: ['openmct'],
|
||||||
props: {
|
props: {
|
||||||
globalMetadata: {
|
globalMetadata: {
|
||||||
type: Object,
|
type: Object,
|
||||||
|
|||||||
@@ -87,12 +87,12 @@ import DropHint from './dropHint.vue';
|
|||||||
const MIN_FRAME_SIZE = 5;
|
const MIN_FRAME_SIZE = 5;
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
inject: ['openmct'],
|
|
||||||
components: {
|
components: {
|
||||||
FrameComponent,
|
FrameComponent,
|
||||||
ResizeHandle,
|
ResizeHandle,
|
||||||
DropHint
|
DropHint
|
||||||
},
|
},
|
||||||
|
inject: ['openmct'],
|
||||||
props: {
|
props: {
|
||||||
container: {
|
container: {
|
||||||
type: Object,
|
type: Object,
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
></div>
|
></div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
v-if="areAllContainersEmpty()"
|
v-if="allContainersAreEmpty"
|
||||||
class="c-fl__empty"
|
class="c-fl__empty"
|
||||||
>
|
>
|
||||||
<span class="c-fl__empty-message">This Flexible Layout is currently empty</span>
|
<span class="c-fl__empty-message">This Flexible Layout is currently empty</span>
|
||||||
@@ -94,7 +94,6 @@ import Container from '../utils/container';
|
|||||||
import Frame from '../utils/frame';
|
import Frame from '../utils/frame';
|
||||||
import ResizeHandle from './resizeHandle.vue';
|
import ResizeHandle from './resizeHandle.vue';
|
||||||
import DropHint from './dropHint.vue';
|
import DropHint from './dropHint.vue';
|
||||||
import RemoveAction from '../../remove/RemoveAction.js';
|
|
||||||
|
|
||||||
const MIN_CONTAINER_SIZE = 5;
|
const MIN_CONTAINER_SIZE = 5;
|
||||||
|
|
||||||
@@ -140,19 +139,20 @@ function sizeToFill(items) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
inject: ['openmct', 'objectPath', 'layoutObject'],
|
|
||||||
components: {
|
components: {
|
||||||
ContainerComponent,
|
ContainerComponent,
|
||||||
ResizeHandle,
|
ResizeHandle,
|
||||||
DropHint
|
DropHint
|
||||||
},
|
},
|
||||||
|
inject: ['openmct', 'objectPath', 'layoutObject'],
|
||||||
props: {
|
props: {
|
||||||
isEditing: Boolean
|
isEditing: Boolean
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
domainObject: this.layoutObject,
|
domainObject: this.layoutObject,
|
||||||
newFrameLocation: []
|
newFrameLocation: [],
|
||||||
|
identifierMap: {}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@@ -168,26 +168,30 @@ export default {
|
|||||||
},
|
},
|
||||||
rowsLayout() {
|
rowsLayout() {
|
||||||
return this.domainObject.configuration.rowsLayout;
|
return this.domainObject.configuration.rowsLayout;
|
||||||
|
},
|
||||||
|
allContainersAreEmpty() {
|
||||||
|
return this.containers.every(container => container.frames.length === 0);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
this.buildIdentifierMap();
|
||||||
this.composition = this.openmct.composition.get(this.domainObject);
|
this.composition = this.openmct.composition.get(this.domainObject);
|
||||||
this.composition.on('remove', this.removeChildObject);
|
this.composition.on('remove', this.removeChildObject);
|
||||||
this.composition.on('add', this.addFrame);
|
this.composition.on('add', this.addFrame);
|
||||||
|
this.composition.load();
|
||||||
this.RemoveAction = new RemoveAction(this.openmct);
|
|
||||||
|
|
||||||
this.unobserve = this.openmct.objects.observe(this.domainObject, '*', this.updateDomainObject);
|
|
||||||
},
|
},
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
this.composition.off('remove', this.removeChildObject);
|
this.composition.off('remove', this.removeChildObject);
|
||||||
this.composition.off('add', this.addFrame);
|
this.composition.off('add', this.addFrame);
|
||||||
|
|
||||||
this.unobserve();
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
areAllContainersEmpty() {
|
buildIdentifierMap() {
|
||||||
return !this.containers.filter(container => container.frames.length).length;
|
this.containers.forEach(container => {
|
||||||
|
container.frames.forEach(frame => {
|
||||||
|
let keystring = this.openmct.objects.makeKeyString(frame.domainObjectIdentifier);
|
||||||
|
this.identifierMap[keystring] = true;
|
||||||
|
});
|
||||||
|
});
|
||||||
},
|
},
|
||||||
addContainer() {
|
addContainer() {
|
||||||
let container = new Container();
|
let container = new Container();
|
||||||
@@ -236,16 +240,21 @@ export default {
|
|||||||
this.newFrameLocation = [containerIndex, insertFrameIndex];
|
this.newFrameLocation = [containerIndex, insertFrameIndex];
|
||||||
},
|
},
|
||||||
addFrame(domainObject) {
|
addFrame(domainObject) {
|
||||||
let containerIndex = this.newFrameLocation.length ? this.newFrameLocation[0] : 0;
|
let keystring = this.openmct.objects.makeKeyString(domainObject.identifier);
|
||||||
let container = this.containers[containerIndex];
|
|
||||||
let frameIndex = this.newFrameLocation.length ? this.newFrameLocation[1] : container.frames.length;
|
|
||||||
let frame = new Frame(domainObject.identifier);
|
|
||||||
|
|
||||||
container.frames.splice(frameIndex + 1, 0, frame);
|
if (!this.identifierMap[keystring]) {
|
||||||
sizeItems(container.frames, frame);
|
let containerIndex = this.newFrameLocation.length ? this.newFrameLocation[0] : 0;
|
||||||
|
let container = this.containers[containerIndex];
|
||||||
|
let frameIndex = this.newFrameLocation.length ? this.newFrameLocation[1] : container.frames.length;
|
||||||
|
let frame = new Frame(domainObject.identifier);
|
||||||
|
|
||||||
this.newFrameLocation = [];
|
container.frames.splice(frameIndex + 1, 0, frame);
|
||||||
this.persist(containerIndex);
|
sizeItems(container.frames, frame);
|
||||||
|
|
||||||
|
this.newFrameLocation = [];
|
||||||
|
this.persist(containerIndex);
|
||||||
|
this.identifierMap[keystring] = true;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
deleteFrame(frameId) {
|
deleteFrame(frameId) {
|
||||||
let container = this.containers
|
let container = this.containers
|
||||||
@@ -254,16 +263,15 @@ export default {
|
|||||||
.frames
|
.frames
|
||||||
.filter((f => f.id === frameId))[0];
|
.filter((f => f.id === frameId))[0];
|
||||||
|
|
||||||
this.removeFromComposition(frame.domainObjectIdentifier)
|
this.removeFromComposition(frame.domainObjectIdentifier);
|
||||||
.then(() => {
|
|
||||||
sizeToFill(container.frames);
|
this.$nextTick().then(() => {
|
||||||
this.setSelectionToParent();
|
sizeToFill(container.frames);
|
||||||
});
|
this.setSelectionToParent();
|
||||||
|
});
|
||||||
},
|
},
|
||||||
removeFromComposition(identifier) {
|
removeFromComposition(identifier) {
|
||||||
return this.openmct.objects.get(identifier).then((childDomainObject) => {
|
this.composition.remove({identifier});
|
||||||
this.RemoveAction.removeFromComposition(this.domainObject, childDomainObject);
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
setSelectionToParent() {
|
setSelectionToParent() {
|
||||||
this.$el.click();
|
this.$el.click();
|
||||||
@@ -342,6 +350,9 @@ export default {
|
|||||||
removeChildObject(identifier) {
|
removeChildObject(identifier) {
|
||||||
let removeIdentifier = this.openmct.objects.makeKeyString(identifier);
|
let removeIdentifier = this.openmct.objects.makeKeyString(identifier);
|
||||||
|
|
||||||
|
this.identifierMap[removeIdentifier] = undefined;
|
||||||
|
delete this.identifierMap[removeIdentifier];
|
||||||
|
|
||||||
this.containers.forEach(container => {
|
this.containers.forEach(container => {
|
||||||
container.frames = container.frames.filter(frame => {
|
container.frames = container.frames.filter(frame => {
|
||||||
let frameIdentifier = this.openmct.objects.makeKeyString(frame.domainObjectIdentifier);
|
let frameIdentifier = this.openmct.objects.makeKeyString(frame.domainObjectIdentifier);
|
||||||
|
|||||||
@@ -58,10 +58,10 @@
|
|||||||
import ObjectFrame from '../../../ui/components/ObjectFrame.vue';
|
import ObjectFrame from '../../../ui/components/ObjectFrame.vue';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
inject: ['openmct'],
|
|
||||||
components: {
|
components: {
|
||||||
ObjectFrame
|
ObjectFrame
|
||||||
},
|
},
|
||||||
|
inject: ['openmct'],
|
||||||
props: {
|
props: {
|
||||||
frame: {
|
frame: {
|
||||||
type: Object,
|
type: Object,
|
||||||
|
|||||||
@@ -44,15 +44,15 @@ define([
|
|||||||
return {
|
return {
|
||||||
show: function (element, isEditing) {
|
show: function (element, isEditing) {
|
||||||
component = new Vue({
|
component = new Vue({
|
||||||
|
el: element,
|
||||||
|
components: {
|
||||||
|
FlexibleLayoutComponent: FlexibleLayoutComponent.default
|
||||||
|
},
|
||||||
provide: {
|
provide: {
|
||||||
openmct,
|
openmct,
|
||||||
objectPath,
|
objectPath,
|
||||||
layoutObject: domainObject
|
layoutObject: domainObject
|
||||||
},
|
},
|
||||||
el: element,
|
|
||||||
components: {
|
|
||||||
FlexibleLayoutComponent: FlexibleLayoutComponent.default
|
|
||||||
},
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
isEditing: isEditing
|
isEditing: isEditing
|
||||||
|
|||||||
@@ -22,18 +22,22 @@
|
|||||||
|
|
||||||
define([
|
define([
|
||||||
'./components/GridView.vue',
|
'./components/GridView.vue',
|
||||||
|
'./constants.js',
|
||||||
'vue'
|
'vue'
|
||||||
], function (
|
], function (
|
||||||
GridViewComponent,
|
GridViewComponent,
|
||||||
|
constants,
|
||||||
Vue
|
Vue
|
||||||
) {
|
) {
|
||||||
function FolderGridView(openmct) {
|
function FolderGridView(openmct) {
|
||||||
|
const ALLOWED_FOLDER_TYPES = constants.ALLOWED_FOLDER_TYPES;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
key: 'grid',
|
key: 'grid',
|
||||||
name: 'Grid View',
|
name: 'Grid View',
|
||||||
cssClass: 'icon-thumbs-strip',
|
cssClass: 'icon-thumbs-strip',
|
||||||
canView: function (domainObject) {
|
canView: function (domainObject) {
|
||||||
return domainObject.type === 'folder';
|
return ALLOWED_FOLDER_TYPES.includes(domainObject.type);
|
||||||
},
|
},
|
||||||
view: function (domainObject) {
|
view: function (domainObject) {
|
||||||
let component;
|
let component;
|
||||||
|
|||||||
@@ -22,20 +22,24 @@
|
|||||||
|
|
||||||
define([
|
define([
|
||||||
'./components/ListView.vue',
|
'./components/ListView.vue',
|
||||||
|
'./constants.js',
|
||||||
'vue',
|
'vue',
|
||||||
'moment'
|
'moment'
|
||||||
], function (
|
], function (
|
||||||
ListViewComponent,
|
ListViewComponent,
|
||||||
|
constants,
|
||||||
Vue,
|
Vue,
|
||||||
Moment
|
Moment
|
||||||
) {
|
) {
|
||||||
function FolderListView(openmct) {
|
function FolderListView(openmct) {
|
||||||
|
const ALLOWED_FOLDER_TYPES = constants.ALLOWED_FOLDER_TYPES;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
key: 'list-view',
|
key: 'list-view',
|
||||||
name: 'List View',
|
name: 'List View',
|
||||||
cssClass: 'icon-list-view',
|
cssClass: 'icon-list-view',
|
||||||
canView: function (domainObject) {
|
canView: function (domainObject) {
|
||||||
return domainObject.type === 'folder';
|
return ALLOWED_FOLDER_TYPES.includes(domainObject.type);
|
||||||
},
|
},
|
||||||
view: function (domainObject) {
|
view: function (domainObject) {
|
||||||
let component;
|
let component;
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
<template>
|
<template>
|
||||||
<tr
|
<tr
|
||||||
class="c-list-item"
|
class="c-list-item"
|
||||||
:class="{ 'is-alias': item.isAlias === true }"
|
:class="{
|
||||||
|
'is-alias': item.isAlias === true
|
||||||
|
}"
|
||||||
@click="navigate"
|
@click="navigate"
|
||||||
>
|
>
|
||||||
<td class="c-list-item__name">
|
<td class="c-list-item__name">
|
||||||
|
|||||||
@@ -1,121 +0,0 @@
|
|||||||
/******************************* GRID ITEMS */
|
|
||||||
.c-grid-item {
|
|
||||||
// Mobile-first
|
|
||||||
@include button($bg: $colorItemBg, $fg: $colorItemFg);
|
|
||||||
cursor: pointer;
|
|
||||||
display: flex;
|
|
||||||
padding: $interiorMarginLg;
|
|
||||||
|
|
||||||
&__type-icon {
|
|
||||||
filter: $colorKeyFilter;
|
|
||||||
flex: 0 0 $gridItemMobile;
|
|
||||||
font-size: floor($gridItemMobile / 2);
|
|
||||||
margin-right: $interiorMarginLg;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.is-alias {
|
|
||||||
// Object is an alias to an original.
|
|
||||||
[class*='__type-icon'] {
|
|
||||||
@include isAlias();
|
|
||||||
color: $colorIconAliasForKeyFilter;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&__details {
|
|
||||||
display: flex;
|
|
||||||
flex-flow: column nowrap;
|
|
||||||
flex: 1 1 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
&__name {
|
|
||||||
@include ellipsize();
|
|
||||||
color: $colorItemFg;
|
|
||||||
@include headerFont(1.2em);
|
|
||||||
margin-bottom: $interiorMarginSm;
|
|
||||||
}
|
|
||||||
|
|
||||||
&__metadata {
|
|
||||||
color: $colorItemFgDetails;
|
|
||||||
font-size: 0.9em;
|
|
||||||
|
|
||||||
body.mobile & {
|
|
||||||
[class*='__item-count'] {
|
|
||||||
&:before {
|
|
||||||
content: ' - ';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&__controls {
|
|
||||||
color: $colorItemFgDetails;
|
|
||||||
flex: 0 0 64px;
|
|
||||||
font-size: 1.2em;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: flex-end;
|
|
||||||
|
|
||||||
> * + * {
|
|
||||||
margin-left: $interiorMargin;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
body.desktop & {
|
|
||||||
$transOutMs: 300ms;
|
|
||||||
flex-flow: column nowrap;
|
|
||||||
transition: background $transOutMs ease-in-out;
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background: $colorItemBgHov;
|
|
||||||
transition: $transIn;
|
|
||||||
|
|
||||||
.c-grid-item__type-icon {
|
|
||||||
filter: $colorKeyFilterHov;
|
|
||||||
transform: scale(1);
|
|
||||||
transition: $transInBounce;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
> * {
|
|
||||||
margin: 0; // Reset from mobile
|
|
||||||
}
|
|
||||||
|
|
||||||
&__controls {
|
|
||||||
align-items: start;
|
|
||||||
flex: 0 0 auto;
|
|
||||||
order: 1;
|
|
||||||
.c-info-button,
|
|
||||||
.c-pointer-icon { display: none; }
|
|
||||||
}
|
|
||||||
|
|
||||||
&__type-icon {
|
|
||||||
flex: 1 1 auto;
|
|
||||||
font-size: floor($gridItemDesk / 3);
|
|
||||||
margin: $interiorMargin 22.5% $interiorMargin * 3 22.5%;
|
|
||||||
order: 2;
|
|
||||||
transform: scale(0.9);
|
|
||||||
transform-origin: center;
|
|
||||||
transition: all $transOutMs ease-in-out;
|
|
||||||
}
|
|
||||||
|
|
||||||
&__details {
|
|
||||||
flex: 0 0 auto;
|
|
||||||
justify-content: flex-end;
|
|
||||||
order: 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
&__metadata {
|
|
||||||
display: flex;
|
|
||||||
|
|
||||||
&__type {
|
|
||||||
flex: 1 1 auto;
|
|
||||||
@include ellipsize();
|
|
||||||
}
|
|
||||||
|
|
||||||
&__item-count {
|
|
||||||
opacity: 0.7;
|
|
||||||
flex: 0 0 auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -43,7 +43,20 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&[class*='is-status'] {
|
&.is-status--notebook-default {
|
||||||
|
.is-status__indicator {
|
||||||
|
display: block;
|
||||||
|
|
||||||
|
&:before {
|
||||||
|
color: $colorFilter;
|
||||||
|
content: $glyph-icon-notebook-page;
|
||||||
|
font-family: symbolsfont;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&[class*='is-status--missing'],
|
||||||
|
&[class*='is-status--suspect']{
|
||||||
[class*='__type-icon'],
|
[class*='__type-icon'],
|
||||||
[class*='__details'] {
|
[class*='__details'] {
|
||||||
opacity: $opacityMissing;
|
opacity: $opacityMissing;
|
||||||
|
|||||||
23
src/plugins/folderView/constants.js
Normal file
23
src/plugins/folderView/constants.js
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2021, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
|
export const ALLOWED_FOLDER_TYPES = ['folder', 'noneditable.folder'];
|
||||||
73
src/plugins/goToOriginalAction/pluginSpec.js
Normal file
73
src/plugins/goToOriginalAction/pluginSpec.js
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2020, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
import {
|
||||||
|
createOpenMct,
|
||||||
|
resetApplicationState
|
||||||
|
} from 'utils/testing';
|
||||||
|
|
||||||
|
describe("the plugin", () => {
|
||||||
|
let openmct;
|
||||||
|
let goToFolderAction;
|
||||||
|
let mockObjectPath;
|
||||||
|
|
||||||
|
beforeEach((done) => {
|
||||||
|
openmct = createOpenMct();
|
||||||
|
|
||||||
|
openmct.on('start', done);
|
||||||
|
openmct.startHeadless();
|
||||||
|
|
||||||
|
goToFolderAction = openmct.actions._allActions.goToOriginal;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
return resetApplicationState(openmct);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('installs the go to folder action', () => {
|
||||||
|
expect(goToFolderAction).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('when invoked', () => {
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
mockObjectPath = [{
|
||||||
|
name: 'mock folder',
|
||||||
|
type: 'folder',
|
||||||
|
identifier: {
|
||||||
|
key: 'mock-folder',
|
||||||
|
namespace: ''
|
||||||
|
}
|
||||||
|
}];
|
||||||
|
spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({
|
||||||
|
identifier: {
|
||||||
|
namespace: '',
|
||||||
|
key: 'test'
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
goToFolderAction.invoke(mockObjectPath);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('goes to the original location', () => {
|
||||||
|
expect(window.location.href).toContain('context.html#/browse/?tc.mode=fixed&tc.startBound=0&tc.endBound=1&tc.timeSystem=utc');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,3 +1,25 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2021, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
import ImageryViewLayout from './components/ImageryViewLayout.vue';
|
import ImageryViewLayout from './components/ImageryViewLayout.vue';
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
|
|
||||||
|
|||||||
124
src/plugins/imagery/components/Compass/Compass.vue
Normal file
124
src/plugins/imagery/components/Compass/Compass.vue
Normal file
@@ -0,0 +1,124 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2021, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div
|
||||||
|
class="c-compass"
|
||||||
|
:style="compassDimensionsStyle"
|
||||||
|
>
|
||||||
|
<CompassHUD
|
||||||
|
v-if="hasCameraFieldOfView"
|
||||||
|
:sun-heading="sunHeading"
|
||||||
|
:camera-angle-of-view="cameraAngleOfView"
|
||||||
|
:camera-pan="cameraPan"
|
||||||
|
/>
|
||||||
|
<CompassRose
|
||||||
|
v-if="hasCameraFieldOfView"
|
||||||
|
:heading="heading"
|
||||||
|
:sun-heading="sunHeading"
|
||||||
|
:camera-angle-of-view="cameraAngleOfView"
|
||||||
|
:camera-pan="cameraPan"
|
||||||
|
:lock-compass="lockCompass"
|
||||||
|
@toggle-lock-compass="toggleLockCompass"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import CompassHUD from './CompassHUD.vue';
|
||||||
|
import CompassRose from './CompassRose.vue';
|
||||||
|
|
||||||
|
const CAMERA_ANGLE_OF_VIEW = 70;
|
||||||
|
|
||||||
|
export default {
|
||||||
|
components: {
|
||||||
|
CompassHUD,
|
||||||
|
CompassRose
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
containerWidth: {
|
||||||
|
type: Number,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
containerHeight: {
|
||||||
|
type: Number,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
naturalAspectRatio: {
|
||||||
|
type: Number,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
type: Object,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
lockCompass: {
|
||||||
|
type: Boolean,
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
hasCameraFieldOfView() {
|
||||||
|
return this.cameraPan !== undefined && this.cameraAngleOfView > 0;
|
||||||
|
},
|
||||||
|
// horizontal rotation from north in degrees
|
||||||
|
heading() {
|
||||||
|
return this.image.heading;
|
||||||
|
},
|
||||||
|
// horizontal rotation from north in degrees
|
||||||
|
sunHeading() {
|
||||||
|
return this.image.sunOrientation;
|
||||||
|
},
|
||||||
|
// horizontal rotation from north in degrees
|
||||||
|
cameraPan() {
|
||||||
|
return this.image.cameraPan;
|
||||||
|
},
|
||||||
|
cameraAngleOfView() {
|
||||||
|
return CAMERA_ANGLE_OF_VIEW;
|
||||||
|
},
|
||||||
|
compassDimensionsStyle() {
|
||||||
|
const containerAspectRatio = this.containerWidth / this.containerHeight;
|
||||||
|
|
||||||
|
let width;
|
||||||
|
let height;
|
||||||
|
|
||||||
|
if (containerAspectRatio < this.naturalAspectRatio) {
|
||||||
|
width = '100%';
|
||||||
|
height = `${ this.containerWidth / this.naturalAspectRatio }px`;
|
||||||
|
} else {
|
||||||
|
width = `${ this.containerHeight * this.naturalAspectRatio }px`;
|
||||||
|
height = '100%';
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
width: width,
|
||||||
|
height: height
|
||||||
|
};
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
toggleLockCompass() {
|
||||||
|
this.$emit('toggle-lock-compass');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
141
src/plugins/imagery/components/Compass/CompassHUD.vue
Normal file
141
src/plugins/imagery/components/Compass/CompassHUD.vue
Normal file
@@ -0,0 +1,141 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2021, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div
|
||||||
|
class="c-compass__hud c-hud"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
v-for="point in visibleCompassPoints"
|
||||||
|
:key="point.direction"
|
||||||
|
:class="point.class"
|
||||||
|
:style="point.style"
|
||||||
|
>
|
||||||
|
{{ point.direction }}
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="isSunInRange"
|
||||||
|
ref="sun"
|
||||||
|
class="c-hud__sun"
|
||||||
|
:style="sunPositionStyle"
|
||||||
|
></div>
|
||||||
|
<div class="c-hud__range"></div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {
|
||||||
|
rotate,
|
||||||
|
inRange,
|
||||||
|
percentOfRange
|
||||||
|
} from './utils';
|
||||||
|
|
||||||
|
const COMPASS_POINTS = [
|
||||||
|
{
|
||||||
|
direction: 'N',
|
||||||
|
class: 'c-hud__dir',
|
||||||
|
degrees: 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
direction: 'NE',
|
||||||
|
class: 'c-hud__dir--sub',
|
||||||
|
degrees: 45
|
||||||
|
},
|
||||||
|
{
|
||||||
|
direction: 'E',
|
||||||
|
class: 'c-hud__dir',
|
||||||
|
degrees: 90
|
||||||
|
},
|
||||||
|
{
|
||||||
|
direction: 'SE',
|
||||||
|
class: 'c-hud__dir--sub',
|
||||||
|
degrees: 135
|
||||||
|
},
|
||||||
|
{
|
||||||
|
direction: 'S',
|
||||||
|
class: 'c-hud__dir',
|
||||||
|
degrees: 180
|
||||||
|
},
|
||||||
|
{
|
||||||
|
direction: 'SW',
|
||||||
|
class: 'c-hud__dir--sub',
|
||||||
|
degrees: 225
|
||||||
|
},
|
||||||
|
{
|
||||||
|
direction: 'W',
|
||||||
|
class: 'c-hud__dir',
|
||||||
|
degrees: 270
|
||||||
|
},
|
||||||
|
{
|
||||||
|
direction: 'NW',
|
||||||
|
class: 'c-hud__dir--sub',
|
||||||
|
degrees: 315
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
export default {
|
||||||
|
props: {
|
||||||
|
sunHeading: {
|
||||||
|
type: Number,
|
||||||
|
default: undefined
|
||||||
|
},
|
||||||
|
cameraAngleOfView: {
|
||||||
|
type: Number,
|
||||||
|
default: undefined
|
||||||
|
},
|
||||||
|
cameraPan: {
|
||||||
|
type: Number,
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
visibleCompassPoints() {
|
||||||
|
return COMPASS_POINTS
|
||||||
|
.filter(point => inRange(point.degrees, this.visibleRange))
|
||||||
|
.map(point => {
|
||||||
|
const percentage = percentOfRange(point.degrees, this.visibleRange);
|
||||||
|
point.style = Object.assign(
|
||||||
|
{ left: `${ percentage * 100 }%` }
|
||||||
|
);
|
||||||
|
|
||||||
|
return point;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
isSunInRange() {
|
||||||
|
return inRange(this.sunHeading, this.visibleRange);
|
||||||
|
},
|
||||||
|
sunPositionStyle() {
|
||||||
|
const percentage = percentOfRange(this.sunHeading, this.visibleRange);
|
||||||
|
|
||||||
|
return {
|
||||||
|
left: `${ percentage * 100 }%`
|
||||||
|
};
|
||||||
|
},
|
||||||
|
visibleRange() {
|
||||||
|
return [
|
||||||
|
rotate(this.cameraPan, -this.cameraAngleOfView / 2),
|
||||||
|
rotate(this.cameraPan, this.cameraAngleOfView / 2)
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
261
src/plugins/imagery/components/Compass/CompassRose.vue
Normal file
261
src/plugins/imagery/components/Compass/CompassRose.vue
Normal file
@@ -0,0 +1,261 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2021, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div
|
||||||
|
class="c-direction-rose"
|
||||||
|
@click="toggleLockCompass"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="c-nsew"
|
||||||
|
:style="compassRoseStyle"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
class="c-nsew__minor-ticks"
|
||||||
|
viewBox="0 0 100 100"
|
||||||
|
>
|
||||||
|
<rect
|
||||||
|
class="c-nsew__tick c-tick-ne"
|
||||||
|
x="49"
|
||||||
|
y="0"
|
||||||
|
width="2"
|
||||||
|
height="5"
|
||||||
|
/>
|
||||||
|
<rect
|
||||||
|
class="c-nsew__tick c-tick-se"
|
||||||
|
x="95"
|
||||||
|
y="49"
|
||||||
|
width="5"
|
||||||
|
height="2"
|
||||||
|
/>
|
||||||
|
<rect
|
||||||
|
class="c-nsew__tick c-tick-sw"
|
||||||
|
x="49"
|
||||||
|
y="95"
|
||||||
|
width="2"
|
||||||
|
height="5"
|
||||||
|
/>
|
||||||
|
<rect
|
||||||
|
class="c-nsew__tick c-tick-nw"
|
||||||
|
x="0"
|
||||||
|
y="49"
|
||||||
|
width="5"
|
||||||
|
height="2"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
<svg
|
||||||
|
class="c-nsew__ticks"
|
||||||
|
viewBox="0 0 100 100"
|
||||||
|
>
|
||||||
|
<polygon
|
||||||
|
class="c-nsew__tick c-tick-n"
|
||||||
|
points="50,0 57,5 43,5"
|
||||||
|
/>
|
||||||
|
<rect
|
||||||
|
class="c-nsew__tick c-tick-e"
|
||||||
|
x="95"
|
||||||
|
y="49"
|
||||||
|
width="5"
|
||||||
|
height="2"
|
||||||
|
/>
|
||||||
|
<rect
|
||||||
|
class="c-nsew__tick c-tick-w"
|
||||||
|
x="0"
|
||||||
|
y="49"
|
||||||
|
width="5"
|
||||||
|
height="2"
|
||||||
|
/>
|
||||||
|
<rect
|
||||||
|
class="c-nsew__tick c-tick-s"
|
||||||
|
x="49"
|
||||||
|
y="95"
|
||||||
|
width="2"
|
||||||
|
height="5"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<text
|
||||||
|
class="c-nsew__label c-label-n"
|
||||||
|
text-anchor="middle"
|
||||||
|
:transform="northTextTransform"
|
||||||
|
>N</text>
|
||||||
|
<text
|
||||||
|
class="c-nsew__label c-label-e"
|
||||||
|
text-anchor="middle"
|
||||||
|
:transform="eastTextTransform"
|
||||||
|
>E</text>
|
||||||
|
<text
|
||||||
|
class="c-nsew__label c-label-w"
|
||||||
|
text-anchor="middle"
|
||||||
|
:transform="southTextTransform"
|
||||||
|
>W</text>
|
||||||
|
<text
|
||||||
|
class="c-nsew__label c-label-s"
|
||||||
|
text-anchor="middle"
|
||||||
|
:transform="westTextTransform"
|
||||||
|
>S</text>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="hasHeading"
|
||||||
|
class="c-spacecraft-body"
|
||||||
|
:style="headingStyle"
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="hasSunHeading"
|
||||||
|
class="c-sun"
|
||||||
|
:style="sunHeadingStyle"
|
||||||
|
></div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="c-cam-field"
|
||||||
|
:style="cameraPanStyle"
|
||||||
|
>
|
||||||
|
<div class="cam-field-half cam-field-half-l">
|
||||||
|
<div
|
||||||
|
class="cam-field-area"
|
||||||
|
:style="cameraFOVStyleLeftHalf"
|
||||||
|
></div>
|
||||||
|
</div>
|
||||||
|
<div class="cam-field-half cam-field-half-r">
|
||||||
|
<div
|
||||||
|
class="cam-field-area"
|
||||||
|
:style="cameraFOVStyleRightHalf"
|
||||||
|
></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { rotate } from './utils';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
props: {
|
||||||
|
heading: {
|
||||||
|
type: Number,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
sunHeading: {
|
||||||
|
type: Number,
|
||||||
|
default: undefined
|
||||||
|
},
|
||||||
|
cameraAngleOfView: {
|
||||||
|
type: Number,
|
||||||
|
default: undefined
|
||||||
|
},
|
||||||
|
cameraPan: {
|
||||||
|
type: Number,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
lockCompass: {
|
||||||
|
type: Boolean,
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
north() {
|
||||||
|
return this.lockCompass ? rotate(-this.cameraPan) : 0;
|
||||||
|
},
|
||||||
|
compassRoseStyle() {
|
||||||
|
return { transform: `rotate(${ this.north }deg)` };
|
||||||
|
},
|
||||||
|
northTextTransform() {
|
||||||
|
return this.cardinalPointsTextTransform.north;
|
||||||
|
},
|
||||||
|
eastTextTransform() {
|
||||||
|
return this.cardinalPointsTextTransform.east;
|
||||||
|
},
|
||||||
|
southTextTransform() {
|
||||||
|
return this.cardinalPointsTextTransform.south;
|
||||||
|
},
|
||||||
|
westTextTransform() {
|
||||||
|
return this.cardinalPointsTextTransform.west;
|
||||||
|
},
|
||||||
|
cardinalPointsTextTransform() {
|
||||||
|
/**
|
||||||
|
* cardinal points text must be rotated
|
||||||
|
* in the opposite direction that north is rotated
|
||||||
|
* to keep text vertically oriented
|
||||||
|
*/
|
||||||
|
const rotation = `rotate(${ -this.north })`;
|
||||||
|
|
||||||
|
return {
|
||||||
|
north: `translate(50,15) ${ rotation }`,
|
||||||
|
east: `translate(87,50) ${ rotation }`,
|
||||||
|
south: `translate(13,50) ${ rotation }`,
|
||||||
|
west: `translate(50,87) ${ rotation }`
|
||||||
|
};
|
||||||
|
},
|
||||||
|
hasHeading() {
|
||||||
|
return this.heading !== undefined;
|
||||||
|
},
|
||||||
|
headingStyle() {
|
||||||
|
const rotation = rotate(this.north, this.heading);
|
||||||
|
|
||||||
|
return {
|
||||||
|
transform: `translateX(-50%) rotate(${ rotation }deg)`
|
||||||
|
};
|
||||||
|
},
|
||||||
|
hasSunHeading() {
|
||||||
|
return this.sunHeading !== undefined;
|
||||||
|
},
|
||||||
|
sunHeadingStyle() {
|
||||||
|
const rotation = rotate(this.north, this.sunHeading);
|
||||||
|
|
||||||
|
return {
|
||||||
|
transform: `rotate(${ rotation }deg)`
|
||||||
|
};
|
||||||
|
},
|
||||||
|
cameraPanStyle() {
|
||||||
|
const rotation = rotate(this.north, this.cameraPan);
|
||||||
|
|
||||||
|
return {
|
||||||
|
transform: `rotate(${ rotation }deg)`
|
||||||
|
};
|
||||||
|
},
|
||||||
|
// left half of camera field of view
|
||||||
|
// rotated counter-clockwise from camera pan angle
|
||||||
|
cameraFOVStyleLeftHalf() {
|
||||||
|
return {
|
||||||
|
transform: `translateX(50%) rotate(${ -this.cameraAngleOfView / 2 }deg)`
|
||||||
|
};
|
||||||
|
},
|
||||||
|
// right half of camera field of view
|
||||||
|
// rotated clockwise from camera pan angle
|
||||||
|
cameraFOVStyleRightHalf() {
|
||||||
|
return {
|
||||||
|
transform: `translateX(-50%) rotate(${ this.cameraAngleOfView / 2 }deg)`
|
||||||
|
};
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
toggleLockCompass() {
|
||||||
|
this.$emit('toggle-lock-compass');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
214
src/plugins/imagery/components/Compass/compass.scss
Normal file
214
src/plugins/imagery/components/Compass/compass.scss
Normal file
@@ -0,0 +1,214 @@
|
|||||||
|
/***************************** THEME/UI CONSTANTS AND MIXINS */
|
||||||
|
$interfaceKeyColor: #00B9C5;
|
||||||
|
$elemBg: rgba(black, 0.7);
|
||||||
|
|
||||||
|
@mixin sun($position: 'circle closest-side') {
|
||||||
|
$color: #ff9900;
|
||||||
|
$gradEdgePerc: 60%;
|
||||||
|
background: radial-gradient(#{$position}, $color, $color $gradEdgePerc, rgba($color, 0.4) $gradEdgePerc + 5%, transparent);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
.c-compass {
|
||||||
|
position: absolute;
|
||||||
|
left: 50%;
|
||||||
|
top: 50%;
|
||||||
|
transform: translate(-50%, -50%);
|
||||||
|
z-index: 1;
|
||||||
|
@include userSelectNone;
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************** COMPASS HUD */
|
||||||
|
.c-hud {
|
||||||
|
// To be placed within a imagery view, in the bounding box of the image
|
||||||
|
$m: 1px;
|
||||||
|
$padTB: 2px;
|
||||||
|
$padLR: $padTB;
|
||||||
|
color: $interfaceKeyColor;
|
||||||
|
font-size: 0.8em;
|
||||||
|
position: absolute;
|
||||||
|
top: $m; right: $m; left: $m;
|
||||||
|
height: 18px;
|
||||||
|
|
||||||
|
svg, div {
|
||||||
|
position: absolute;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__display {
|
||||||
|
height: 30px;
|
||||||
|
pointer-events: all;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__range {
|
||||||
|
border: 1px solid $interfaceKeyColor;
|
||||||
|
border-top-color: transparent;
|
||||||
|
position: absolute;
|
||||||
|
top: 50%; right: $padLR; bottom: $padTB; left: $padLR;
|
||||||
|
}
|
||||||
|
|
||||||
|
[class*="__dir"] {
|
||||||
|
// NSEW
|
||||||
|
display: inline-block;
|
||||||
|
font-weight: bold;
|
||||||
|
text-shadow: 0 1px 2px black;
|
||||||
|
top: 50%;
|
||||||
|
transform: translate(-50%,-50%);
|
||||||
|
z-index: 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
[class*="__dir--sub"] {
|
||||||
|
font-weight: normal;
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__sun {
|
||||||
|
$s: 10px;
|
||||||
|
@include sun('circle farthest-side at bottom');
|
||||||
|
bottom: $padTB + 2px;
|
||||||
|
height: $s; width: $s*2;
|
||||||
|
opacity: 0.8;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************** COMPASS DIRECTIONS */
|
||||||
|
.c-nsew {
|
||||||
|
$color: $interfaceKeyColor;
|
||||||
|
$inset: 7%;
|
||||||
|
$tickHeightPerc: 15%;
|
||||||
|
text-shadow: black 0 0 10px;
|
||||||
|
top: $inset; right: $inset; bottom: $inset; left: $inset;
|
||||||
|
z-index: 3;
|
||||||
|
|
||||||
|
&__tick,
|
||||||
|
&__label {
|
||||||
|
fill: $color;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__minor-ticks {
|
||||||
|
opacity: 0.5;
|
||||||
|
transform-origin: center;
|
||||||
|
transform: rotate(45deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
&__label {
|
||||||
|
dominant-baseline: central;
|
||||||
|
font-size: 0.8em;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.c-label-n {
|
||||||
|
font-size: 1.1em;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************** CAMERA FIELD ANGLE */
|
||||||
|
.c-cam-field {
|
||||||
|
$color: white;
|
||||||
|
opacity: 0.2;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
z-index: 2;
|
||||||
|
|
||||||
|
.cam-field-half {
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
|
||||||
|
.cam-field-area {
|
||||||
|
background: $color;
|
||||||
|
top: -30%;
|
||||||
|
right: 0;
|
||||||
|
bottom: -30%;
|
||||||
|
left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// clip-paths overlap a bit to avoid a gap between halves
|
||||||
|
&-l {
|
||||||
|
clip-path: polygon(0 0, 50.5% 0, 50.5% 100%, 0 100%);
|
||||||
|
.cam-field-area {
|
||||||
|
transform-origin: left center;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&-r {
|
||||||
|
clip-path: polygon(49.5% 0, 100% 0, 100% 100%, 49.5% 100%);
|
||||||
|
.cam-field-area {
|
||||||
|
transform-origin: right center;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************** SPACECRAFT BODY */
|
||||||
|
.c-spacecraft-body {
|
||||||
|
$color: $interfaceKeyColor;
|
||||||
|
$s: 30%;
|
||||||
|
background: $color;
|
||||||
|
border-radius: 3px;
|
||||||
|
height: $s; width: $s;
|
||||||
|
left: 50%; top: 50%;
|
||||||
|
opacity: 0.4;
|
||||||
|
transform-origin: center top;
|
||||||
|
|
||||||
|
&:before {
|
||||||
|
// Direction arrow
|
||||||
|
$color: rgba(black, 0.5);
|
||||||
|
$arwPointerY: 60%;
|
||||||
|
$arwBodyOffset: 25%;
|
||||||
|
background: $color;
|
||||||
|
content: '';
|
||||||
|
display: block;
|
||||||
|
position: absolute;
|
||||||
|
top: 10%; right: 20%; bottom: 50%; left: 20%;
|
||||||
|
clip-path: polygon(50% 0, 100% $arwPointerY, 100%-$arwBodyOffset $arwPointerY, 100%-$arwBodyOffset 100%, $arwBodyOffset 100%, $arwBodyOffset $arwPointerY, 0 $arwPointerY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************** DIRECTION ROSE */
|
||||||
|
.c-direction-rose {
|
||||||
|
$d: 100px;
|
||||||
|
$c2: rgba(white, 0.1);
|
||||||
|
background: $elemBg;
|
||||||
|
background-image: radial-gradient(circle closest-side, transparent, transparent 80%, $c2);
|
||||||
|
width: $d;
|
||||||
|
height: $d;
|
||||||
|
transform-origin: 0 0;
|
||||||
|
position: absolute;
|
||||||
|
bottom: 10px; left: 10px;
|
||||||
|
clip-path: circle(50% at 50% 50%);
|
||||||
|
border-radius: 100%;
|
||||||
|
|
||||||
|
svg, div {
|
||||||
|
position: absolute;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sun
|
||||||
|
.c-sun {
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
|
||||||
|
&:before {
|
||||||
|
$s: 35%;
|
||||||
|
@include sun();
|
||||||
|
content: '';
|
||||||
|
display: block;
|
||||||
|
position: absolute;
|
||||||
|
opacity: 0.7;
|
||||||
|
top: 0; left: 50%;
|
||||||
|
height:$s; width: $s;
|
||||||
|
transform: translate(-50%, -60%);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
84
src/plugins/imagery/components/Compass/pluginSpec.js
Normal file
84
src/plugins/imagery/components/Compass/pluginSpec.js
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2020, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
import Compass from './Compass.vue';
|
||||||
|
import Vue from 'vue';
|
||||||
|
|
||||||
|
const COMPASS_ROSE_CLASS = '.c-direction-rose';
|
||||||
|
const COMPASS_HUD_CLASS = '.c-compass__hud';
|
||||||
|
|
||||||
|
describe("The Compass component", () => {
|
||||||
|
let app;
|
||||||
|
let instance;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
let imageDatum = {
|
||||||
|
heading: 100,
|
||||||
|
roll: 90,
|
||||||
|
pitch: 90,
|
||||||
|
cameraTilt: 100,
|
||||||
|
cameraPan: 90,
|
||||||
|
sunAngle: 30
|
||||||
|
};
|
||||||
|
let propsData = {
|
||||||
|
containerWidth: 600,
|
||||||
|
containerHeight: 600,
|
||||||
|
naturalAspectRatio: 0.9,
|
||||||
|
image: imageDatum
|
||||||
|
};
|
||||||
|
|
||||||
|
app = new Vue({
|
||||||
|
components: { Compass },
|
||||||
|
data() {
|
||||||
|
return propsData;
|
||||||
|
},
|
||||||
|
template: `<Compass
|
||||||
|
:container-width="containerWidth"
|
||||||
|
:container-height="containerHeight"
|
||||||
|
:natural-aspect-ratio="naturalAspectRatio"
|
||||||
|
:image="image" />`
|
||||||
|
});
|
||||||
|
instance = app.$mount();
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
app.$destroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("when a heading value exists on the image", () => {
|
||||||
|
|
||||||
|
it("should display a compass rose", () => {
|
||||||
|
let compassRoseElement = instance.$el.querySelector(COMPASS_ROSE_CLASS
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(compassRoseElement).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should display a compass HUD", () => {
|
||||||
|
let compassHUDElement = instance.$el.querySelector(COMPASS_HUD_CLASS);
|
||||||
|
|
||||||
|
expect(compassHUDElement).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
44
src/plugins/imagery/components/Compass/utils.js
Normal file
44
src/plugins/imagery/components/Compass/utils.js
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
/**
|
||||||
|
*
|
||||||
|
* sums an arbitrary number of absolute rotations
|
||||||
|
* (meaning rotations relative to one common direction 0)
|
||||||
|
* normalizes the rotation to the range [0, 360)
|
||||||
|
*
|
||||||
|
* @param {...number} rotations in degrees
|
||||||
|
* @returns {number} normalized sum of all rotations - [0, 360) degrees
|
||||||
|
*/
|
||||||
|
export function rotate(...rotations) {
|
||||||
|
const rotation = rotations.reduce((a, b) => a + b, 0);
|
||||||
|
|
||||||
|
return normalizeCompassDirection(rotation);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function inRange(degrees, [min, max]) {
|
||||||
|
const point = rotate(degrees);
|
||||||
|
|
||||||
|
return min > max
|
||||||
|
? (point >= min && point < 360) || (point <= max && point >= 0)
|
||||||
|
: point >= min && point <= max;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function percentOfRange(degrees, [min, max]) {
|
||||||
|
let distance = rotate(degrees);
|
||||||
|
let minRange = min;
|
||||||
|
let maxRange = max;
|
||||||
|
|
||||||
|
if (min > max) {
|
||||||
|
if (distance < max) {
|
||||||
|
distance += 360;
|
||||||
|
}
|
||||||
|
|
||||||
|
maxRange += 360;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (distance - minRange) / (maxRange - minRange);
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeCompassDirection(degrees) {
|
||||||
|
const base = degrees % 360;
|
||||||
|
|
||||||
|
return base >= 0 ? base : 360 + base;
|
||||||
|
}
|
||||||
@@ -1,3 +1,25 @@
|
|||||||
|
/*****************************************************************************
|
||||||
|
* Open MCT, Copyright (c) 2014-2021, 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.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div
|
<div
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
@@ -36,14 +58,25 @@
|
|||||||
<div class="c-imagery__main-image__bg"
|
<div class="c-imagery__main-image__bg"
|
||||||
:class="{'paused unnsynced': isPaused,'stale':false }"
|
:class="{'paused unnsynced': isPaused,'stale':false }"
|
||||||
>
|
>
|
||||||
<div class="c-imagery__main-image__image"
|
<img
|
||||||
:style="{
|
ref="focusedImage"
|
||||||
'background-image': imageUrl ? `url(${imageUrl})` : 'none',
|
class="c-imagery__main-image__image js-imageryView-image"
|
||||||
'filter': `brightness(${filters.brightness}%) contrast(${filters.contrast}%)`
|
:src="imageUrl"
|
||||||
}"
|
:style="{
|
||||||
:data-openmct-image-timestamp="time"
|
'filter': `brightness(${filters.brightness}%) contrast(${filters.contrast}%)`
|
||||||
:data-openmct-object-keystring="keyString"
|
}"
|
||||||
></div>
|
:data-openmct-image-timestamp="time"
|
||||||
|
:data-openmct-object-keystring="keyString"
|
||||||
|
>
|
||||||
|
<Compass
|
||||||
|
v-if="shouldDisplayCompass"
|
||||||
|
:container-width="imageContainerWidth"
|
||||||
|
:container-height="imageContainerHeight"
|
||||||
|
:natural-aspect-ratio="focusedImageNaturalAspectRatio"
|
||||||
|
:image="focusedImage"
|
||||||
|
:lock-compass="lockCompass"
|
||||||
|
@toggle-lock-compass="toggleLockCompass"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="c-local-controls c-local-controls--show-on-hover c-imagery__prev-next-buttons">
|
<div class="c-local-controls c-local-controls--show-on-hover c-imagery__prev-next-buttons">
|
||||||
<button class="c-nav c-nav--prev"
|
<button class="c-nav c-nav--prev"
|
||||||
@@ -61,11 +94,25 @@
|
|||||||
<div class="c-imagery__control-bar">
|
<div class="c-imagery__control-bar">
|
||||||
<div class="c-imagery__time">
|
<div class="c-imagery__time">
|
||||||
<div class="c-imagery__timestamp u-style-receiver js-style-receiver">{{ time }}</div>
|
<div class="c-imagery__timestamp u-style-receiver js-style-receiver">{{ time }}</div>
|
||||||
|
|
||||||
|
<!-- image fresh -->
|
||||||
<div
|
<div
|
||||||
v-if="canTrackDuration"
|
v-if="canTrackDuration"
|
||||||
:class="{'c-imagery--new': isImageNew && !refreshCSS}"
|
:class="{'c-imagery--new': isImageNew && !refreshCSS}"
|
||||||
class="c-imagery__age icon-timer"
|
class="c-imagery__age icon-timer"
|
||||||
>{{ formattedDuration }}</div>
|
>{{ formattedDuration }}</div>
|
||||||
|
|
||||||
|
<!-- spacecraft position fresh -->
|
||||||
|
<div
|
||||||
|
v-if="relatedTelemetry.hasRelatedTelemetry && isSpacecraftPositionFresh"
|
||||||
|
class="c-imagery__age icon-check c-imagery--new"
|
||||||
|
>POS</div>
|
||||||
|
|
||||||
|
<!-- camera position fresh -->
|
||||||
|
<div
|
||||||
|
v-if="relatedTelemetry.hasRelatedTelemetry && isCameraPositionFresh"
|
||||||
|
class="c-imagery__age icon-check c-imagery--new"
|
||||||
|
>CAM</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="h-local-controls">
|
<div class="h-local-controls">
|
||||||
<button
|
<button
|
||||||
@@ -76,28 +123,32 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div ref="thumbsWrapper"
|
<div
|
||||||
class="c-imagery__thumbs-wrapper"
|
ref="thumbsWrapper"
|
||||||
:class="{'is-paused': isPaused}"
|
class="c-imagery__thumbs-wrapper"
|
||||||
@scroll="handleScroll"
|
:class="{'is-paused': isPaused}"
|
||||||
|
@scroll="handleScroll"
|
||||||
>
|
>
|
||||||
<div v-for="(datum, index) in imageHistory"
|
<div v-for="(image, index) in imageHistory"
|
||||||
:key="datum.url"
|
:key="image.url + image.time"
|
||||||
class="c-imagery__thumb c-thumb"
|
class="c-imagery__thumb c-thumb"
|
||||||
:class="{ selected: focusedImageIndex === index && isPaused }"
|
:class="{ selected: focusedImageIndex === index && isPaused }"
|
||||||
@click="setFocusedImage(index, thumbnailClick)"
|
@click="setFocusedImage(index, thumbnailClick)"
|
||||||
>
|
>
|
||||||
<img class="c-thumb__image"
|
<img class="c-thumb__image"
|
||||||
:src="formatImageUrl(datum)"
|
:src="image.url"
|
||||||
>
|
>
|
||||||
<div class="c-thumb__timestamp">{{ formatTime(datum) }}</div>
|
<div class="c-thumb__timestamp">{{ image.formattedTime }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import _ from 'lodash';
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
|
import Compass from './Compass/Compass.vue';
|
||||||
|
import RelatedTelemetry from './RelatedTelemetry/RelatedTelemetry';
|
||||||
|
|
||||||
const DEFAULT_DURATION_FORMATTER = 'duration';
|
const DEFAULT_DURATION_FORMATTER = 'duration';
|
||||||
const REFRESH_CSS_MS = 500;
|
const REFRESH_CSS_MS = 500;
|
||||||
@@ -116,6 +167,9 @@ const ARROW_RIGHT = 39;
|
|||||||
const ARROW_LEFT = 37;
|
const ARROW_LEFT = 37;
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
components: {
|
||||||
|
Compass
|
||||||
|
},
|
||||||
inject: ['openmct', 'domainObject'],
|
inject: ['openmct', 'domainObject'],
|
||||||
data() {
|
data() {
|
||||||
let timeSystem = this.openmct.time.timeSystem();
|
let timeSystem = this.openmct.time.timeSystem();
|
||||||
@@ -137,7 +191,15 @@ export default {
|
|||||||
refreshCSS: false,
|
refreshCSS: false,
|
||||||
keyString: undefined,
|
keyString: undefined,
|
||||||
focusedImageIndex: undefined,
|
focusedImageIndex: undefined,
|
||||||
numericDuration: undefined
|
focusedImageRelatedTelemetry: {},
|
||||||
|
numericDuration: undefined,
|
||||||
|
metadataEndpoints: {},
|
||||||
|
relatedTelemetry: {},
|
||||||
|
latestRelatedTelemetry: {},
|
||||||
|
focusedImageNaturalAspectRatio: undefined,
|
||||||
|
imageContainerWidth: undefined,
|
||||||
|
imageContainerHeight: undefined,
|
||||||
|
lockCompass: true
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@@ -195,15 +257,83 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
},
|
||||||
|
shouldDisplayCompass() {
|
||||||
|
return this.focusedImage !== undefined
|
||||||
|
&& this.focusedImageNaturalAspectRatio !== undefined
|
||||||
|
&& this.imageContainerWidth !== undefined
|
||||||
|
&& this.imageContainerHeight !== undefined;
|
||||||
|
},
|
||||||
|
isSpacecraftPositionFresh() {
|
||||||
|
let isFresh = undefined;
|
||||||
|
let latest = this.latestRelatedTelemetry;
|
||||||
|
let focused = this.focusedImageRelatedTelemetry;
|
||||||
|
|
||||||
|
if (this.relatedTelemetry.hasRelatedTelemetry) {
|
||||||
|
isFresh = true;
|
||||||
|
for (let key of this.spacecraftPositionKeys) {
|
||||||
|
if (this.relatedTelemetry[key] && latest[key] && focused[key]) {
|
||||||
|
isFresh = isFresh && Boolean(this.relatedTelemetry[key].comparisonFunction(latest[key], focused[key]));
|
||||||
|
} else {
|
||||||
|
isFresh = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return isFresh;
|
||||||
|
},
|
||||||
|
isSpacecraftOrientationFresh() {
|
||||||
|
let isFresh = undefined;
|
||||||
|
let latest = this.latestRelatedTelemetry;
|
||||||
|
let focused = this.focusedImageRelatedTelemetry;
|
||||||
|
|
||||||
|
if (this.relatedTelemetry.hasRelatedTelemetry) {
|
||||||
|
isFresh = true;
|
||||||
|
for (let key of this.spacecraftOrientationKeys) {
|
||||||
|
if (this.relatedTelemetry[key] && latest[key] && focused[key]) {
|
||||||
|
isFresh = isFresh && Boolean(this.relatedTelemetry[key].comparisonFunction(latest[key], focused[key]));
|
||||||
|
} else {
|
||||||
|
isFresh = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return isFresh;
|
||||||
|
},
|
||||||
|
isCameraPositionFresh() {
|
||||||
|
let isFresh = undefined;
|
||||||
|
let latest = this.latestRelatedTelemetry;
|
||||||
|
let focused = this.focusedImageRelatedTelemetry;
|
||||||
|
|
||||||
|
if (this.relatedTelemetry.hasRelatedTelemetry) {
|
||||||
|
isFresh = true;
|
||||||
|
|
||||||
|
// camera freshness relies on spacecraft position freshness
|
||||||
|
if (this.isSpacecraftPositionFresh && this.isSpacecraftOrientationFresh) {
|
||||||
|
for (let key of this.cameraKeys) {
|
||||||
|
if (this.relatedTelemetry[key] && latest[key] && focused[key]) {
|
||||||
|
isFresh = isFresh && Boolean(this.relatedTelemetry[key].comparisonFunction(latest[key], focused[key]));
|
||||||
|
} else {
|
||||||
|
isFresh = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
isFresh = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return isFresh;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
focusedImageIndex() {
|
focusedImageIndex() {
|
||||||
this.trackDuration();
|
this.trackDuration();
|
||||||
this.resetAgeCSS();
|
this.resetAgeCSS();
|
||||||
|
this.updateRelatedTelemetryForFocusedImage();
|
||||||
|
this.getImageNaturalDimensions();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
async mounted() {
|
||||||
// listen
|
// listen
|
||||||
this.openmct.time.on('bounds', this.boundsChange);
|
this.openmct.time.on('bounds', this.boundsChange);
|
||||||
this.openmct.time.on('timeSystem', this.timeSystemChange);
|
this.openmct.time.on('timeSystem', this.timeSystemChange);
|
||||||
@@ -212,8 +342,15 @@ export default {
|
|||||||
// set
|
// set
|
||||||
this.keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);
|
this.keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);
|
||||||
this.metadata = this.openmct.telemetry.getMetadata(this.domainObject);
|
this.metadata = this.openmct.telemetry.getMetadata(this.domainObject);
|
||||||
|
this.imageHints = { ...this.metadata.valuesForHints(['image'])[0] };
|
||||||
this.durationFormatter = this.getFormatter(this.timeSystem.durationFormat || DEFAULT_DURATION_FORMATTER);
|
this.durationFormatter = this.getFormatter(this.timeSystem.durationFormat || DEFAULT_DURATION_FORMATTER);
|
||||||
this.imageFormatter = this.openmct.telemetry.getValueFormatter(this.metadata.valuesForHints(['image'])[0]);
|
this.imageFormatter = this.openmct.telemetry.getValueFormatter(this.imageHints);
|
||||||
|
|
||||||
|
// related telemetry keys
|
||||||
|
this.spacecraftPositionKeys = ['positionX', 'positionY', 'positionZ'];
|
||||||
|
this.spacecraftOrientationKeys = ['heading'];
|
||||||
|
this.cameraKeys = ['cameraPan', 'cameraTilt'];
|
||||||
|
this.sunKeys = ['sunOrientation'];
|
||||||
|
|
||||||
// initialize
|
// initialize
|
||||||
this.timeKey = this.timeSystem.key;
|
this.timeKey = this.timeSystem.key;
|
||||||
@@ -222,6 +359,18 @@ export default {
|
|||||||
// kickoff
|
// kickoff
|
||||||
this.subscribe();
|
this.subscribe();
|
||||||
this.requestHistory();
|
this.requestHistory();
|
||||||
|
|
||||||
|
// related telemetry
|
||||||
|
await this.initializeRelatedTelemetry();
|
||||||
|
this.updateRelatedTelemetryForFocusedImage();
|
||||||
|
this.trackLatestRelatedTelemetry();
|
||||||
|
|
||||||
|
// for scrolling through images quickly and resizing the object view
|
||||||
|
_.debounce(this.updateRelatedTelemetryForFocusedImage, 400);
|
||||||
|
_.debounce(this.resizeImageContainer, 400);
|
||||||
|
|
||||||
|
this.imageContainerResizeObserver = new ResizeObserver(this.resizeImageContainer);
|
||||||
|
this.imageContainerResizeObserver.observe(this.$refs.focusedImage);
|
||||||
},
|
},
|
||||||
updated() {
|
updated() {
|
||||||
this.scrollToRight();
|
this.scrollToRight();
|
||||||
@@ -232,12 +381,120 @@ export default {
|
|||||||
delete this.unsubscribe;
|
delete this.unsubscribe;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.imageContainerResizeObserver.disconnect();
|
||||||
|
|
||||||
|
if (this.relatedTelemetry.hasRelatedTelemetry) {
|
||||||
|
this.relatedTelemetry.destroy();
|
||||||
|
}
|
||||||
|
|
||||||
this.stopDurationTracking();
|
this.stopDurationTracking();
|
||||||
this.openmct.time.off('bounds', this.boundsChange);
|
this.openmct.time.off('bounds', this.boundsChange);
|
||||||
this.openmct.time.off('timeSystem', this.timeSystemChange);
|
this.openmct.time.off('timeSystem', this.timeSystemChange);
|
||||||
this.openmct.time.off('clock', this.clockChange);
|
this.openmct.time.off('clock', this.clockChange);
|
||||||
|
|
||||||
|
// unsubscribe from related telemetry
|
||||||
|
if (this.relatedTelemetry.hasRelatedTelemetry) {
|
||||||
|
for (let key of this.relatedTelemetry.keys) {
|
||||||
|
if (this.relatedTelemetry[key] && this.relatedTelemetry[key].unsubscribe) {
|
||||||
|
this.relatedTelemetry[key].unsubscribe();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
async initializeRelatedTelemetry() {
|
||||||
|
this.relatedTelemetry = new RelatedTelemetry(
|
||||||
|
this.openmct,
|
||||||
|
this.domainObject,
|
||||||
|
[...this.spacecraftPositionKeys, ...this.spacecraftOrientationKeys, ...this.cameraKeys, ...this.sunKeys]
|
||||||
|
);
|
||||||
|
|
||||||
|
if (this.relatedTelemetry.hasRelatedTelemetry) {
|
||||||
|
await this.relatedTelemetry.load();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async getMostRecentRelatedTelemetry(key, targetDatum) {
|
||||||
|
if (!this.relatedTelemetry.hasRelatedTelemetry) {
|
||||||
|
throw new Error(`${this.domainObject.name} does not have any related telemetry`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.relatedTelemetry[key]) {
|
||||||
|
throw new Error(`${key} does not exist on related telemetry`);
|
||||||
|
}
|
||||||
|
|
||||||
|
let mostRecent;
|
||||||
|
let valueKey = this.relatedTelemetry[key].historical.valueKey;
|
||||||
|
let valuesOnTelemetry = this.relatedTelemetry[key].hasTelemetryOnDatum;
|
||||||
|
|
||||||
|
if (valuesOnTelemetry) {
|
||||||
|
mostRecent = targetDatum[valueKey];
|
||||||
|
|
||||||
|
if (mostRecent) {
|
||||||
|
return mostRecent;
|
||||||
|
} else {
|
||||||
|
console.warn(`Related Telemetry for ${key} does NOT exist on this telemetry datum as configuration implied.`);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mostRecent = await this.relatedTelemetry[key].requestLatestFor(targetDatum);
|
||||||
|
|
||||||
|
return mostRecent[valueKey];
|
||||||
|
},
|
||||||
|
// will subscribe to data for this key if not already done
|
||||||
|
subscribeToDataForKey(key) {
|
||||||
|
if (this.relatedTelemetry[key].isSubscribed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.relatedTelemetry[key].realtimeDomainObject) {
|
||||||
|
this.relatedTelemetry[key].unsubscribe = this.openmct.telemetry.subscribe(
|
||||||
|
this.relatedTelemetry[key].realtimeDomainObject, datum => {
|
||||||
|
this.relatedTelemetry[key].listeners.forEach(callback => {
|
||||||
|
callback(datum);
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
this.relatedTelemetry[key].isSubscribed = true;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async updateRelatedTelemetryForFocusedImage() {
|
||||||
|
if (!this.relatedTelemetry.hasRelatedTelemetry || !this.focusedImage) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// set data ON image telemetry as well as in focusedImageRelatedTelemetry
|
||||||
|
for (let key of this.relatedTelemetry.keys) {
|
||||||
|
if (
|
||||||
|
this.relatedTelemetry[key]
|
||||||
|
&& this.relatedTelemetry[key].historical
|
||||||
|
&& this.relatedTelemetry[key].requestLatestFor
|
||||||
|
|
||||||
|
) {
|
||||||
|
let valuesOnTelemetry = this.relatedTelemetry[key].hasTelemetryOnDatum;
|
||||||
|
let value = await this.getMostRecentRelatedTelemetry(key, this.focusedImage);
|
||||||
|
|
||||||
|
if (!valuesOnTelemetry) {
|
||||||
|
this.$set(this.imageHistory[this.focusedImageIndex], key, value); // manually add to telemetry
|
||||||
|
}
|
||||||
|
|
||||||
|
this.$set(this.focusedImageRelatedTelemetry, key, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
trackLatestRelatedTelemetry() {
|
||||||
|
[...this.spacecraftPositionKeys, ...this.spacecraftOrientationKeys, ...this.cameraKeys, ...this.sunKeys].forEach(key => {
|
||||||
|
if (this.relatedTelemetry[key] && this.relatedTelemetry[key].subscribe) {
|
||||||
|
this.relatedTelemetry[key].subscribe((datum) => {
|
||||||
|
let valueKey = this.relatedTelemetry[key].realtime.valueKey;
|
||||||
|
this.$set(this.latestRelatedTelemetry, key, datum[valueKey]);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
focusElement() {
|
focusElement() {
|
||||||
this.$el.focus();
|
this.$el.focus();
|
||||||
},
|
},
|
||||||
@@ -358,6 +615,7 @@ export default {
|
|||||||
this.requestCount++;
|
this.requestCount++;
|
||||||
const requestId = this.requestCount;
|
const requestId = this.requestCount;
|
||||||
this.imageHistory = [];
|
this.imageHistory = [];
|
||||||
|
|
||||||
let data = await this.openmct.telemetry
|
let data = await this.openmct.telemetry
|
||||||
.request(this.domainObject, bounds) || [];
|
.request(this.domainObject, bounds) || [];
|
||||||
|
|
||||||
@@ -393,7 +651,12 @@ export default {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.imageHistory.push(datum);
|
let image = { ...datum };
|
||||||
|
image.formattedTime = this.formatTime(datum);
|
||||||
|
image.url = this.formatImageUrl(datum);
|
||||||
|
image.time = datum[this.timeKey];
|
||||||
|
|
||||||
|
this.imageHistory.push(image);
|
||||||
|
|
||||||
if (setFocused) {
|
if (setFocused) {
|
||||||
this.setFocusedImage(this.imageHistory.length - 1);
|
this.setFocusedImage(this.imageHistory.length - 1);
|
||||||
@@ -509,6 +772,28 @@ export default {
|
|||||||
},
|
},
|
||||||
isLeftOrRightArrowKey(keyCode) {
|
isLeftOrRightArrowKey(keyCode) {
|
||||||
return [ARROW_RIGHT, ARROW_LEFT].includes(keyCode);
|
return [ARROW_RIGHT, ARROW_LEFT].includes(keyCode);
|
||||||
|
},
|
||||||
|
getImageNaturalDimensions() {
|
||||||
|
this.focusedImageNaturalAspectRatio = undefined;
|
||||||
|
|
||||||
|
const img = this.$refs.focusedImage;
|
||||||
|
|
||||||
|
// TODO - should probably cache this
|
||||||
|
img.addEventListener('load', () => {
|
||||||
|
this.focusedImageNaturalAspectRatio = img.naturalWidth / img.naturalHeight;
|
||||||
|
}, { once: true });
|
||||||
|
},
|
||||||
|
resizeImageContainer() {
|
||||||
|
if (this.$refs.focusedImage.clientWidth !== this.imageContainerWidth) {
|
||||||
|
this.imageContainerWidth = this.$refs.focusedImage.clientWidth;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.$refs.focusedImage.clientHeight !== this.imageContainerHeight) {
|
||||||
|
this.imageContainerHeight = this.$refs.focusedImage.clientHeight;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
toggleLockCompass() {
|
||||||
|
this.lockCompass = !this.lockCompass;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user